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

1600 Commits

Author SHA1 Message Date
adrian17 4cce2e3883 Fixed some buttons not working after last commit 2014-08-30 15:29:14 +02:00
Patrick Wijnings 81163506e9 Merge remote-tracking branch 'IntelOrca/master' 
Conflicts:
	src/game.c
	src/park.h
 2014-08-30 15:18:31 +02:00
Patrick Wijnings 5e96da6634 Fix definition of PARK_FLAGS_NO_MONEY flag and clean up related code. 2014-08-30 15:11:19 +02:00
adrian17 4d29aaa6bd Fix #385, made widget_is_enabled return 1 if true 2014-08-30 14:31:36 +02:00
Ted John 7d336c440c Merge pull request #386 from wolfreak99/patch-1 
Corrected about window's credits.
 2014-08-30 10:35:27 +01:00
zsilencer d225e74ad0 0x00405465, 0x004016FF, 0x00405222 2014-08-29 23:53:29 -06:00
wolfreak99 24331b781d Corrected about window's credits. 
Switched the callproc values in the credits to open the proper music/publisher credits.
 2014-08-30 00:17:01 -04:00
Ted John 9357b48869 Merge pull request #384 from hexdec/master 
More window staff peep functions
 2014-08-29 19:24:55 +01:00
hexdec c50b9d1214 Implemented stats_update and orders_update. 2014-08-29 20:08:48 +02:00
hexdec 9039c19639 Implemented overview_update. 2014-08-29 18:32:06 +02:00
hexdec 8717177289 Implemented overview_dropdown. 2014-08-29 18:13:32 +02:00
hexdec ced3c20bb1 Implemented overview_mousedown. 2014-08-29 18:13:17 +02:00
hexdec 5bd3505771 Implemented window_staff_peep_overview_resize. 2014-08-29 15:51:47 +02:00
hexdec da10c1d998 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-29 14:56:57 +02:00
hexdec 199946d682 Added window_staff_peep_stats_resize. 2014-08-29 14:56:46 +02:00
Ted John d93dec98d8 Merge pull request #383 from adrian17/set-park-entrance-fee 
Decompiled game_command_set_park_entrance_fee
 2014-08-29 11:21:48 +01:00
Ted John 990dfe88d0 Merge pull request #382 from adrian17/input_minor 
Move input functions and add an address
 2014-08-29 11:21:25 +01:00
adrian17 6473da43b2 Decompiled game_command_set_park_entrance_fee 2014-08-29 11:37:32 +02:00
adrian17 f5841c24f4 Move input functions and add an address 2014-08-29 10:25:07 +02:00
Ted John 4d9caf9f41 Merge pull request #381 from jcdavis/master 
Add 0x00407074 and also clean up mouse structs/addresses
 2014-08-29 09:01:13 +01:00
Jackson Davis 57a2bc02fe Add structs/addresses for mouse buffer functions 2014-08-29 08:45:32 +01:00
Jackson Davis a2324a278d First pass at 0x407074 (mouse read) 2014-08-29 08:45:32 +01:00
Ted John fd953220e0 Merge pull request #380 from zsilencer/master 
couple functions decompiled
 2014-08-29 07:41:44 +01:00
zsilencer f0ce2dcb1a test 2014-08-28 22:02:05 -06:00
zsilencer 0496312cab 0x0040153, 0x0040182 2014-08-28 21:47:35 -06:00
zsilencer b788afc5df Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-28 17:38:25 -06:00
zsilencer 5c44a07aac sub_405383 2014-08-28 17:36:52 -06:00
hexdec 77384e45fa Implemented mouseup for window_staff_peep. 2014-08-29 00:58:09 +02:00
zsilencer 01789c0781 0x00401000 2014-08-28 14:05:56 -06:00
Ted John 5a80e76f41 Merge pull request #379 from adrian17/audio-fix 
Fix wrong condition in audio.c
 2014-08-28 20:33:44 +01:00
adrian17 563e0ca3dc Fix wrong condition in audio.c 2014-08-28 20:14:00 +02:00
qcz 5fc5b3f8d3 Merge remote-tracking branch 'upstream/master' into scenery-window 2014-08-28 18:54:36 +02:00
qcz 1ce9e60310 Added window_scenery_close and implemented window_scenery_tooltip 2014-08-28 18:51:24 +02:00
Ted John 635a0d6ab4 Merge pull request #378 from adrian17/addresses 
Use macros from addresses.h
 2014-08-28 16:46:56 +01:00
adrian17 b6f98167c4 Use macros from addresses.h 2014-08-28 17:27:48 +02:00
hexdec 5fdc66d446 Renamed window_staff_peep_mouse_up to window_staff_peep_mouseup. 2014-08-28 16:30:42 +02:00
hexdec 4b8fbcfd28 Added order and stats events for window_staff_peep. 2014-08-28 16:28:19 +02:00
hexdec 1b077af90e Implemented window_staff_peep_fire. Added new window class WC_FIRE_PROMPT. 2014-08-28 15:31:44 +02:00
Ted John 60e90063f0 Merge pull request #376 from duncanspumpkin/window_peep_events 
Window peep events
 2014-08-28 07:36:00 +01:00
Duncan Frost 6f14e48a33 Switched window_park_align tabs to new window version 2014-08-28 07:04:02 +01:00
Duncan Frost 03d75b51b2 fix compile mistakes 2014-08-28 06:58:57 +01:00
Duncan 6573dbba4e Added start of window_peep_overview_tab_paint 
Will not compile at present.
 2014-08-28 06:35:15 +01:00
Duncan ba2e8f4942 Added viewport_init_wrapper for event 2014-08-28 06:35:15 +01:00
Duncan e84a9606e3 Added correct events to peep overview 2014-08-28 06:35:14 +01:00
Duncan 71090c4c6e Now uses window_align_tabs 2014-08-28 06:35:13 +01:00
Duncan b1a5045962 Added window_align_tabs 2014-08-28 06:35:12 +01:00
Duncan 5bdff85db1 Added window_align_tabs 
New cross window compatible version. For window_park and window_peep.
 2014-08-28 06:35:11 +01:00
Duncan d3455b8f22 cleaned up peep invalidate 2014-08-28 06:35:11 +01:00
Duncan 92279becc9 Added missing call procs in peep invalidate. 2014-08-28 06:35:10 +01:00
Duncan 28056baf8d Added window_peep_invalidate 
Not tested.
 2014-08-28 06:35:09 +01:00