mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,587 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

1587 Commits

Author SHA1 Message Date
zsilencer 57e1220cb2 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-23 23:57:18 -06:00
zsilencer 31e2e4919a Decompiled audio functions 2014-08-23 23:50:50 -06:00
Ted John beeb1cbd46 Merge pull request #352 from hexdec/window_staff_peep_functions 
Window staff peep functions
 2014-08-23 23:13:07 +01:00
hexdec e71711e931 Added code for Pickup for guests and staff. 2014-08-23 23:03:22 +02:00
hexdec d9e2b39b30 Added rename code for guests and staff. 2014-08-23 22:24:27 +02:00
hexdec e4ef47d63b Added missing addresses. 2014-08-23 20:30:17 +02:00
qcz 593830d9f6 Merge remote-tracking branch 'upstream/master' into scenery-window 2014-08-23 20:18:26 +02:00
qcz 4397822578 Continue working on window_scenery 2014-08-23 20:17:22 +02:00
hexdec 7eff50b819 Moved window_create into window_open and renamed sub_6BED21 to window_staff_peep_disable_widgets to follow the same pattern as window_peep. 2014-08-23 20:08:52 +02:00
hexdec d74b8c6de9 Added window_staff_peep_page_events for all tabs. 2014-08-23 19:53:52 +02:00
hexdec ab2564b873 Added window_staff_set_page. 2014-08-23 19:49:19 +02:00
hexdec 3a2f66731a Added window_staff_peep_close and window_staff_peep_mouse_up. 2014-08-23 17:32:07 +02:00
hexdec 7d265000b4 Added WIDX_PICKUP. 2014-08-23 17:18:23 +02:00
Ted John 5c01091043 Merge pull request #344 from duncanspumpkin/window_peep_functions 
Window peep functions
 2014-08-23 14:10:52 +01:00
Duncan Frost 4dd7a7dbc6 Add in address 
's
 2014-08-23 13:35:55 +01:00
Ted John 6a405aa905 Merge pull request #348 from zsilencer/master 
Decompiled function 0x006AF561
 2014-08-23 12:32:08 +01:00
Ted John d0ea5d84ac Merge pull request #349 from Gymnasiast/master 
Many additional translations, some fixes
 2014-08-23 12:30:47 +01:00
Duncan Frost 19e72c54c7 Started peep_overview_paint 2014-08-23 12:06:25 +01:00
Duncan Frost 7d29081331 Fix remaining issues. Viewport init working 2014-08-23 11:56:20 +01:00
Duncan Frost 0b20bb79b8 Added window_peep_viewport_init 2014-08-23 10:39:15 +01:00
Gymnasiast b9d8ac6ac1 Many additional translations, some fixes 2014-08-23 11:02:41 +02:00
zsilencer 5ff2d9e6b3 remove test 2014-08-23 02:49:50 -06:00
zsilencer 84d4747a60 Decompiled function 0x006AF561 2014-08-23 02:44:06 -06:00
Duncan Frost 810590e754 Changed struct for last time 2014-08-23 08:30:31 +01:00
Duncan Frost 5795165ced Fix missing variables. Labeled even more vars 2014-08-23 08:08:26 +01:00
Duncan Frost 0c3844787b Fix compile issues. Add new structs 2014-08-23 08:08:25 +01:00
Duncan f700e560ca Added missing enabled widgets 
1 widx is missing
 2014-08-23 08:08:25 +01:00
Duncan 7500fccc79 Now uses new viewport_scroll function 2014-08-23 08:08:24 +01:00
Duncan 16cddec597 Fixed slight mistake with order. 
not tested.
 2014-08-23 08:08:23 +01:00
Duncan c2557be14d Fixed slight mistake with order. 2014-08-23 08:08:22 +01:00
Duncan 967af50f4d Added window_scroll_to_viewport based off previous function 2014-08-23 08:08:21 +01:00
Duncan 8379262ea4 Added viewport focus struct. 
Definitely breaks build
 2014-08-23 08:08:20 +01:00
Duncan 52d69be031 added locate function 
not tested.
 2014-08-23 08:08:19 +01:00
Duncan ba76d6e4e5 added window_close mouse down 2014-08-23 08:08:19 +01:00
Duncan ca5e60639e Added set_page 
Not tested.
 2014-08-23 08:08:18 +01:00
Duncan 4db53e2bfb Added start of window_peep_overview_mouse_down 
Not tested.
 2014-08-23 08:08:17 +01:00
Duncan ed753875d6 Finish peep_resize 
not tested.
 2014-08-23 08:08:15 +01:00
Duncan 6524f27706 Started addition of window_peep_resize 
Not tested.
 2014-08-23 08:08:14 +01:00
Duncan 581114b1e5 Added window_peep_close 
Not tested. Cancels any tool that was in use by the window.
 2014-08-23 08:08:14 +01:00
IntelOrca a5fcb473ab Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-22 23:57:29 +01:00
IntelOrca ef21458140 Merge branch 'zsilencer-master' 2014-08-22 23:57:02 +01:00
IntelOrca 1158a8876b Merge branch 'master' of https://github.com/zsilencer/OpenRCT2 into zsilencer-master 
Conflicts:
	src/window_research.c
 2014-08-22 23:55:19 +01:00
zsilencer 0992a6adcd window_research_development_paint() ride names fix 
stringId from typeId was not working right, this fixes it and gives
correct research ride names
 2014-08-22 15:37:18 -06:00
Ted John f4164a4c2b Merge pull request #345 from zsilencer/master 
window_research_development_paint() crash fix
 2014-08-22 22:29:56 +01:00
zsilencer 6414d44306 window_research_development_paint() crash fix 
When the Currently in development Type: is "Ride" the game will crash,
looks like the wrong value is ANDed.
 2014-08-22 14:05:41 -06:00
qcz 92afe2d5e8 Merge remote-tracking branch 'upstream/master' into scenery-window 2014-08-22 18:23:19 +02:00
IntelOrca 306ff79bc7 fix merge error 2014-08-21 22:54:27 +01:00
IntelOrca e9fab52db2 Merge branch 'new-ride-window' 
Conflicts:
	src/language.c
 2014-08-21 22:51:47 +01:00
IntelOrca 76ca655b0e finish window_new_ride 2014-08-21 22:50:06 +01:00
IntelOrca 25a31b9875 clear up window_new_ride a bit 2014-08-21 22:33:36 +01:00