mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,914 Commits 9 Branches 40 Tags 382 MiB
Commit Graph

1484 Commits

Author SHA1 Message Date
qcz d4201a7eb7 add rct_scenery_set_entry struct, use it everywhere where referenced, continue to unify code in scenery window 2014-09-05 23:08:51 +02:00
qcz 90b0ec02b3 fix tab ordering, add pressed state for cluster button 2014-09-05 21:32:08 +02:00
IntelOrca 5c1b8a7c3c fix various bugs with ride window 2014-09-05 19:33:51 +01:00
IntelOrca caa7a50ec2 implement measurements tab on ride window 2014-09-05 18:10:30 +01:00
IntelOrca 4d5dd76713 refactor and implement locate mechanic for ride window 2014-09-05 14:24:54 +01:00
IntelOrca 9fe7f7ab2c implement maintenance tab on ride window 2014-09-05 02:37:48 +01:00
IntelOrca f7a5e82ebb Merge branch 'master' into ride-window 2014-09-04 23:27:29 +01:00
IntelOrca 2bb4274f05 fix warnings 2014-09-04 23:27:16 +01:00
IntelOrca 914ff60680 Merge branch 'master' into ride-window 2014-09-04 23:23:55 +01:00
Ted John b284077b73 Merge pull request #401 from adrian17/window_rotate_camera 
Window rotate camera
 2014-09-04 23:23:35 +01:00
IntelOrca 4de8808fdb Merge branch 'master' of https://github.com/vanderkleij/OpenRCT2 into vanderkleij-master 2014-09-04 23:17:37 +01:00
Tom van der Kleij c9f081e5d2 Renamed peep_create --> create_sprite + minor changes from feedback 2014-09-04 23:22:06 +02:00
adrian17 7359134fc5 Fix off-by-one error in center_2d_coordinates 2014-09-04 22:53:54 +02:00
adrian17 657621db20 Decompile window_rotate_camera, change sub_689174 to use z parameter 2014-09-04 22:53:40 +02:00
qcz 9b39a211e4 remove debug printf 2014-09-04 22:38:38 +02:00
qcz f6da2edc1c fix most of the bugs, rename widget ids 2014-09-04 22:37:03 +02:00
Tom van der Kleij 10ab0030ae Decompiled peep_create (0x0069EC6B) 2014-09-04 22:10:53 +02:00
IntelOrca 490027a2a8 implement customer tab on ride window 2014-09-04 19:59:42 +01:00
IntelOrca 722976e237 implement music tab for ride window 2014-09-04 15:42:36 +01:00
IntelOrca ae9b91d859 implement tab images 2014-09-03 23:19:13 +01:00
IntelOrca e452ed00fa Merge branch 'master' into ride-window 2014-09-03 23:18:53 +01:00
IntelOrca f639fd6054 refactor ride structure 2014-09-03 23:17:31 +01:00
qcz a172d5a5d5 decompile window_scenery_update_scroll, some fixes 2014-09-03 22:13:19 +02:00
qcz 10c2f10a24 Merge remote-tracking branch 'upstream/master' into scenery-window 2014-09-03 21:20:43 +02:00
qcz 446620610d free dat clipdpi 2014-09-03 21:19:54 +02:00
qcz de734d49cc move scenery related types and enums to scenery.h 2014-09-03 21:18:08 +02:00
qcz 9742ccc64b implement window_scenery_scrollpaint 2014-09-03 21:13:42 +02:00
IntelOrca 76fda20859 implement ride window drawing 2014-09-03 19:13:37 +01:00
qcz c996dba32a Fix the final bug in clip_drawpixelinfo 2014-09-03 18:59:03 +02:00
IntelOrca 55fc04ae82 Merge branch 'master' into ride-window 2014-09-03 14:01:42 +01:00
Balletie fb9819f9c6 Merge remote-tracking branch 'upstream/master' 2014-09-02 23:39:21 +02:00
Balletie 91ca6401b5 Fixes the last bug 2014-09-02 23:38:59 +02:00
Balletie 51b377b7b9 Construction window is shown, but with very weird results still 2014-09-02 20:33:23 +02:00
Jackson Davis c6bb6f5809 Move to viewport.c 2014-09-02 19:10:49 +02:00
Jackson Davis 7cc79d95c1 First pass at 6CB70A 2014-09-02 17:56:30 +02:00
Balletie 152f244cdf Merge remote-tracking branch 'upstream/master' 2014-09-02 17:53:00 +02:00
Balletie 4f5dc9b33e Initial crack at decompiling 0x006B4800 2014-09-02 17:52:23 +02:00
IntelOrca a72b879660 implement ride rename for ride window 2014-09-02 14:05:44 +01:00
IntelOrca fc1f28e845 Merge branch 'master' into ride-window 2014-09-02 13:31:23 +01:00
zsilencer a284d446ee Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 
Conflicts:
	src/addresses.h
 2014-09-01 20:20:03 -06:00
zsilencer 6dd4110b89 useless functions decompiled 2014-09-01 19:59:39 -06:00
zsilencer 6de4fa1fcf low-hanging fruit 2014-09-01 15:42:56 -06:00
qcz ac04de3e3c add window_scenery_scrollmouseover, move common code with scrollmousedown to a function 2014-09-01 23:09:22 +02:00
qcz 0661511d9d Merge remote-tracking branch 'upstream/master' into scenery-window 2014-09-01 22:57:21 +02:00
qcz 4948537654 add window_scenery_scrollmousedown, fix scenery_mousedown crash 2014-09-01 22:56:22 +02:00
Jackson Davis 4b3150449a Fix typo 2014-09-01 22:22:54 +02:00
qcz 6b92eb0d72 add window_scenery_scrollgetsize, identify scenery entry field 2014-09-01 22:20:27 +02:00
Jackson Davis fc2c3bdb51 Rename 6EE65A to push_others_right + refactor 2014-09-01 22:16:08 +02:00
qcz 087b56babe add window_scenery_mousedown 2014-09-01 21:55:08 +02:00
qcz 804765f8ad add window_scenery_mouseup and window_scenery_resize 2014-09-01 21:38:35 +02:00
qcz 2d7881c2a2 add window_scenery_dropdown, fix var_480 default value and conditions 2014-09-01 21:02:48 +02:00
qcz 8d9488f4e4 add window_scenery_event_07 2014-09-01 20:50:53 +02:00
Jackson Davis f0d4261659 Move 6EE65A to window.c + minor refactor 2014-09-01 17:10:15 +01:00
Jackson Davis ba6d0bee30 First pass at 6EE65A 2014-09-01 16:55:51 +01:00
IntelOrca 1647100b1a implement dropdown behaviour for window ride 2014-09-01 14:06:21 +01:00
IntelOrca 17c4e4937a implement ride window widgets and dropdown lists 2014-09-01 12:04:34 +01:00
zsilencer b02463478b few basic functions decompiled and small bug fix 2014-09-01 00:12:46 -06:00
qcz cedeb0d4b3 window_update is almost done 2014-08-31 22:21:39 +02:00
qcz 013144115d move repeated scenery initialization code to a function 2014-08-31 21:21:30 +02:00
qcz c192f383f4 finish init_scenery 2014-08-31 21:11:38 +02:00
IntelOrca 78cd7407fa implement construction button 2014-08-31 15:43:07 +01:00
IntelOrca 8e0f1884b9 Merge branch 'master' into ride-window 2014-08-31 15:41:39 +01:00
IntelOrca 2cfb2908de add ride track functions, for window ride branch 2014-08-31 15:40:08 +01:00
IntelOrca 53ac0b971b Merge branch 'master' into ride-window 2014-08-31 12:28:23 +01:00
qcz e2d1321de7 Use PARK_FLAGS_NO_MONEY instead of PARK_FLAGS_11 2014-08-31 13:27:28 +02:00
qcz 3408872a28 Merge remote-tracking branch 'upstream/master' into scenery-window 2014-08-31 13:26:03 +02:00
qcz 3d7496c7c9 Started to work on init_scenery, added structs for different scenery entries 2014-08-31 13:24:20 +02:00
Patrick Wijnings 094a5083ae Merge remote-tracking branch 'IntelOrca/master' 2014-08-31 13:07:00 +02:00
Patrick Wijnings 9a6537209d Add comment to finance_update_daily_profit(). 2014-08-31 13:06:24 +02:00
Patrick Wijnings b832a7235b More PARK_FLAGS_NO_MONEY updates. Implement finance_update_daily_profit(). 2014-08-31 13:01:50 +02:00
hexdec d2e27c0428 Added Widget enums for window_staff_peep. 2014-08-31 00:16:35 +02:00
hexdec 858be90222 Added the missing enabled_widgets for window_staff_peep. 2014-08-31 00:06:11 +02:00
Ted John 33eaa81e20 Merge pull request #390 from zsilencer/master 
sound routines
 2014-08-30 20:55:08 +01:00
zsilencer 81de6e1234 0x004015E7 2014-08-30 13:44:47 -06:00
Ted John 693358e3e7 Merge pull request #388 from adrian17/widget_is_enabled_fix 
Fix #385
 2014-08-30 16:07:33 +01:00
hexdec b253ad56ce Fixed typo in window_staff_peep_stats_update. 2014-08-30 15:31:44 +02:00
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
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
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
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
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
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
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
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
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
Duncan 217b5c1281 Added remaining window_peep widgets. 2014-08-28 06:35:08 +01:00
Duncan Frost dffd689ee6 Added more to window_peep overview paint 
Moved get_arguments_from_thought to peep.c and added to peep.h
Fixed possible crash in viewport_update_position
Fixed compile error
 2014-08-28 06:35:08 +01:00
Duncan edd1651b4d Added peep_stats_widgets 2014-08-28 06:35:06 +01:00
Duncan 2a41c031ac Added window_peep_event arrays. 2014-08-28 06:35:05 +01:00
qcz 0c0b3a752f window_scenery_paint and window_scenery invalidate is done 2014-08-27 22:50:33 +02:00
qcz 2eef202628 Merge remote-tracking branch 'upstream/master' into scenery-window 
Resolve conflict in projects/openrct2.vcxproj.filters
 2014-08-27 18:21:11 +02:00
zsilencer 6250331bd0 compile test 2014-08-26 21:48:47 -06:00
zsilencer fba1a81e07 audio_remove_timer, audio_create_timer, map_file, audio_timer_callback 2014-08-26 20:23:32 -06:00
zsilencer 08ab2cdfe8 some directsound decompilation 2014-08-26 16:34:34 -06:00
zsilencer f6fde582bf audio work 2014-08-25 23:11:57 -06:00
zsilencer 44217734d0 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-25 19:57:02 -06:00
zsilencer 5fe03d9929 sound_fill_buffer, sound_prepare 2014-08-25 19:56:20 -06:00
adrian17 f14a9411c4 Fix #305, the day value wasn't increased by 1 as it should be 2014-08-25 23:51:05 +02:00
IntelOrca 34be2e6089 finish window_ride_main_invalidate 2014-08-25 22:07:36 +01:00
Ted John 4ddb26fc21 Merge pull request #364 from zsilencer/master 
Additional sound decompilation and fixes
 2014-08-25 19:14:45 +01:00
zsilencer 9cb6b2ada5 compile fix 2014-08-25 11:39:01 -06:00
IntelOrca 29806414c8 start implementing the first page for ride window 2014-08-25 18:29:04 +01:00
IntelOrca 449f5afe50 stop working directory from changing on load and save 2014-08-25 15:46:11 +01:00
IntelOrca d3055fd3ef add and start implementing ride window 2014-08-25 15:04:28 +01:00
Ted John 6614483ba7 Merge pull request #365 from jcdavis/master 
First pass at 0x00406C96
 2014-08-25 13:11:13 +01:00
Jackson Davis cbb617c56f First pass at 0x00406C96 2014-08-25 12:15:29 +07:00
zsilencer 7f5b501808 travis 2014-08-24 22:39:37 -06:00
zsilencer 799797876a Audio fixes #361 #355 2014-08-24 22:18:01 -06:00
Marco Costa b3e1da78a4 Update gfx_draw_rain declaration to match definition 2014-08-24 21:33:09 -04:00
Marco Costa bb81bfd5d0 Created named address RCT2_ADDRESS_SCENARIO_TICKS 
* 0x00F663AC is now named RCT2_ADDRESS_SCENARIO_TICKS. This variable
starts at an arbitrary value, defined by the current scenario, and
increments by 1 on every game tick.
* Also, added meaningful name to some variables in draw_light_rain and
draw_heavy_rain.
 2014-08-24 21:27:56 -04:00
IntelOrca 16b552270b add rct_ride_type structure 2014-08-24 23:02:19 +01:00
zsilencer 178a2fe3d0 Merge remote-tracking branch 'remotes/remote/master' 2014-08-24 14:50:11 -06:00
zsilencer 362082980f Audio things 2014-08-24 14:30:48 -06:00
IntelOrca 83ba89214c move input functions to input code file 2014-08-24 18:45:47 +01:00
IntelOrca 425881b8b1 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2.git 2014-08-24 17:52:21 +01:00
IntelOrca 02293c46a8 fixes #357, glitchy viewport dragging 2014-08-24 17:52:17 +01:00
Duncan Frost f94ebfc4e5 Tidied up 689174. Fixed remaining small map bugs 2014-08-24 17:39:36 +01:00
Duncan Frost 3b2fa2ddce Trying to find cause of subtle bug 2014-08-24 17:39:35 +01:00
Duncan Frost d095dce810 Finished viewport_update_position. 2014-08-24 17:39:34 +01:00
Duncan Frost 330fa2326c Fix bugs with viewport 2014-08-24 17:39:33 +01:00
Duncan Frost 169a69cfec First draft of viewport_update. 
Not working
 2014-08-24 17:39:33 +01:00
Duncan Frost 2d2ff0dead Started reverse of viewport_update_position 2014-08-24 17:39:32 +01:00
zsilencer 2b04c64e9c More decompiled sound functions 2014-08-24 04:45:59 -06:00
zsilencer dbc7e511f7 formatting 2014-08-24 02:28:33 -06:00
zsilencer 835871a475 removed debug printf 2014-08-24 02:00:00 -06:00
zsilencer 04e5a028d9 Fixed sound_remove, renamed variables, removed compiler warnings 2014-08-24 01:56:54 -06:00
zsilencer 11063c9623 Fixed crash when selected ride is undefined 2014-08-24 00:58:10 -06:00
zsilencer 4d821db3cb Fixed issue #353 2014-08-24 00:34:18 -06:00
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
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
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
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 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
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
IntelOrca b4e72cf960 add window_new_ride_paint_ride_information 2014-08-21 21:48:23 +01:00
qcz 168537d338 Add window_scenery.c, start working on scenery window 2014-08-21 21:53:17 +02:00
Balletie 8d75552cf4 Fix build on OSX (missing include) 2014-08-21 11:57:54 +02:00
Ted John 0969c0bcff Merge pull request #341 from qcz/hire-staff-command 
Decompile the hire staff game command
 2014-08-20 23:44:40 +01:00
qcz 3a55af7403 Fix new file encodings 2014-08-20 23:53:51 +02:00
qcz fa6caa856a Move staff related stuff to its own file 2014-08-20 23:48:36 +02:00
IntelOrca 8644ed5b57 implement scroll mouse events for new ride window 2014-08-20 22:06:47 +01:00
IntelOrca 6ab6c5d9a6 add spanish language entry, #338 2014-08-20 20:32:25 +01:00
IntelOrca 8e4cc238cc fix window_new_ride_populate_list and add window_new_ride_scroll_to_focused_ride 2014-08-20 20:18:17 +01:00
qcz 250acea957 Rename tabIndex to staff_type, move staff max count constant to #define 2014-08-20 17:48:47 +02:00
qcz 12f6d57876 Fix pointer type 2014-08-20 17:39:41 +02:00
qcz f142cddbd6 Add return type to remove Travis warnings 2014-08-20 16:04:10 +02:00
qcz 1007e79baa Fix Travis error 2014-08-20 16:00:47 +02:00
qcz 92f0139b5a Move typedef to header file 2014-08-20 15:48:53 +02:00
qcz cb169952ac Remove unused variable, add indices to new_game_command_table 2014-08-20 15:38:21 +02:00
qcz 1b3f98362f Finalize hire-staff-command 2014-08-20 15:32:39 +02:00
qcz 6112668bcc Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-20 14:30:46 +02:00
qcz be1505c007 Fix missing comma 2014-08-20 09:37:28 +02:00
IntelOrca 01e32c301d improve new ride window populate docs 2014-08-20 07:50:01 +01:00
qcz 0e48e92949 Entertainers don't crash the game anymore 2014-08-20 07:23:02 +02:00
IntelOrca 9b08db7020 add window_new_ride_populate_list 2014-08-20 00:05:40 +01:00
qcz 4959bdd55d Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-19 23:52:23 +02:00
IntelOrca 16106c7569 Merge branch 'master' into new-ride-window 
Conflicts:
	src/window_new_ride.c
	src/window_research.c
 2014-08-19 21:43:25 +01:00
hexdec 540c8efd23 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-19 22:41:13 +02:00
hexdec de01827de9 Decompiled game shortcuts for viewport flags. 2014-08-19 22:39:22 +02:00
IntelOrca c7986d140c add widgets, sizing and basic events for new ride window 2014-08-19 21:33:05 +01:00
Ted John 654e40aaa5 Merge pull request #333 from qcz/hulang 
Add Hungarian language
 2014-08-19 21:31:57 +01:00
Ted John 9065837c9b Merge pull request #334 from qcz/316-fix 
Fix #316
 2014-08-19 21:31:18 +01:00
Ted John c7edafc627 Merge pull request #332 from duncanspumpkin/update_viewport_left 
Update viewport left and fix #318
 2014-08-19 21:30:32 +01:00
qcz 8f33388d37 Typo in variable name 2014-08-19 22:19:32 +02:00
qcz 06114c2116 Fix #316 2014-08-19 22:16:05 +02:00
Duncan Frost 71b6389ec7 Fix 1 pixel width ride_window 2014-08-19 20:54:58 +01:00
Duncan Frost 5f68d4b2a0 Fix #318. Issue caused by checking progressivly more incorrect coordinates for connection 2014-08-19 20:41:46 +01:00
Ted John 2a09b03c43 Merge pull request #331 from duncanspumpkin/fix_317 
Fix #317 crash on viewing news items
 2014-08-19 20:31:06 +01:00
qcz a4bab7cd0d Add Hungarian language 2014-08-19 21:17:20 +02:00
Duncan Frost 3307560a74 Merge branch 'upadate_viewport_left' of https://github.com/duncanspumpkin/OpenRCT2 into update_viewport_left 2014-08-19 19:56:41 +01:00
Ted John 274c2dc36f Merge pull request #330 from qcz/window-staff-registers 
Clean up most of the inline assembly from windows
 2014-08-19 19:35:06 +01:00
Duncan Frost 3df3ff4d1c Fix #317 crash on viewing news items caused by double pointer de ref and reuse of same pointers. 2014-08-19 19:34:31 +01:00
IntelOrca 37258b4710 add polish language entry, #329 2014-08-19 19:31:51 +01:00
qcz 6473fd2b97 Maybe this will statisfy Travis 2014-08-19 20:22:13 +02:00
qcz 5c22530965 Fix coordinate type to avoid invalid cast 2014-08-19 20:08:09 +02:00
qcz bd06c7caee Clean up most of the inline assembly from windows 2014-08-19 19:47:12 +02:00
Duncan 56e6028a56 Rewrote to use map_elements 
not tested
 2014-08-19 12:48:00 +01:00
qcz 2bbba4672b Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-19 09:46:25 +02:00
qcz c88a786399 Fix peep struct member name 2014-08-19 09:46:04 +02:00
IntelOrca e222b88581 start work on new ride window 2014-08-17 23:57:41 +01:00
Ted John b5d796b48e Merge pull request #322 from hexdec/master 
Fixed resize gripper not showing up on guest and staff windows.
 2014-08-17 22:23:37 +01:00
hexdec 2f5f65d607 Fixed resize gripper not showing up on guest and staff windows. 2014-08-17 22:40:34 +02:00
Ted John e36836366d Merge pull request #312 from hexdec/master 
Initial window_staff_peep_open create window
 2014-08-17 20:17:30 +01:00
hexdec ea43709c27 Fixed using wrong class & flag. 2014-08-17 21:11:26 +02:00
IntelOrca 92b74a8deb handle utf8 characters in languages, convert appropriately for #319 2014-08-17 19:20:45 +01:00
hexdec 7071f68670 Merge branch 'window_staff_peep' of https://github.com/duncanspumpkin/OpenRCT2 
Conflicts:
	src/window_peep.c
 2014-08-17 16:30:01 +02:00
Ted John 83c047e632 Merge pull request #315 from duncanspumpkin/fix_303 
Fix crash on right click of flat rides
 2014-08-17 12:46:33 +01:00
Ted John 4262366cf5 Merge pull request #314 from duncanspumpkin/fix_graph 
Fixes upside down graph
 2014-08-17 12:46:24 +01:00
Duncan Frost ca49b7ca09 Fix crash on right click of flat rides 2014-08-17 11:57:50 +01:00
Duncan Frost b0d39bbf0e Added sepearte file for staff_peep_window 2014-08-17 11:45:43 +01:00
Duncan Frost aa0709c439 Fixed clicking on peep causing hybrid 2014-08-17 11:01:34 +01:00
Duncan Frost 6258a76b96 Fixes upside down graph 2014-08-17 10:52:12 +01:00
Duncan Frost 1943682153 Fixed bug in toolbar widget drawing. Added pause and zoom out disable. 2014-08-17 10:11:19 +01:00
hexdec d3a55efd30 Added window_peep_staff_events. 2014-08-17 01:37:28 +02:00
hexdec 7285dbc339 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-08-17 01:08:41 +02:00
IntelOrca 2dcdb09d05 partial fix to #305 2014-08-16 19:07:13 +01:00
IntelOrca 9b64c576c4 fixes #293, closes #301 (min/max) and fixes #304 (research window bug) 2014-08-16 18:15:27 +01:00
Ted John e3c407d5b5 Merge pull request #302 from duncanspumpkin/viewport_left_down 
Viewport left down
 2014-08-16 15:30:10 +01:00
IntelOrca 8b503a4722 change options window to tab interface 
To better group the options together and allow the window to be scalable with additional OpenRCT2 options, I have changed the window to a tab interface similar to the options window seen in Locomotion.
 2014-08-16 15:29:15 +01:00
Duncan Frost 9e5412579a Moved old function comment to top of func 2014-08-16 14:40:07 +01:00
Duncan Frost ad8a96c196 Added remaining left click on viewport functions 2014-08-16 14:38:45 +01:00
Duncan Frost 1adeb35e69 Decompiled first part of left down 2014-08-16 00:43:19 +01:00
IntelOrca 62a24e5383 add research window 
As seen from RollerCoaster Tycoon 1. This allows the player to change the priorities in a "no money" park. I find it also more logical than the two research panels being separated in finances and new ride windows.
 2014-08-15 22:05:35 +01:00
Duncan Frost d8ab81c456 Fixed Zoom bug. No longer uses undefined behaviour. 2014-08-15 15:07:35 +01:00
Duncan Frost 4ec0920968 Trying to solve gfx issues 2014-08-15 14:46:26 +01:00
IntelOrca 0b744c684a add french language 2014-08-15 00:13:08 +01:00
IntelOrca 831e67068c Merge branch 'load_custom_text' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-load_custom_text 
Conflicts:
	src/string_ids.c
 2014-08-14 23:56:38 +01:00
IntelOrca e66b686f75 add ability to change language 2014-08-14 23:46:36 +01:00
Duncan Frost 12800b8d74 Removed warnings. Only reads 4 characters for string id 2014-08-14 23:08:46 +01:00
Duncan Frost 0251cf7679 Added comments capability to language.txt. Now reads string number 2014-08-14 23:01:57 +01:00
Duncan Frost 5bfe2d52f5 Added object_scenario_load_custom_text function 2014-08-14 23:01:56 +01:00
Ted John b306e1e28c Merge pull request #291 from duncanspumpkin/fix_286 
Fixes #286. Issue was caused by a typo.
 2014-08-14 22:27:01 +01:00
Duncan Frost 2345a510bf Fixes #286. Issue was caused by a typo. 2014-08-14 22:18:12 +01:00
Duncan Frost 412c9b689a Fix see through glass 2014-08-14 20:56:26 +01:00
hexdec 593841060f Removed unused parameters, fixed warning. 2014-08-14 15:33:57 +02:00
hexdec 5c1a19e1de Changed sub_6BEF1B to use window_create_auto_pos rather than the subfunction. 2014-08-14 15:28:22 +02:00
Ted John 462cd6d65b Merge pull request #280 from duncanspumpkin/gfx_invalidate_window 
Added gfx_invalidate_window
 2014-08-14 09:02:29 +01:00
Duncan Frost c5473266bb Added more cheat strings to load from language file 2014-08-14 07:47:23 +01:00
Duncan Frost bc2640314e Remove duplicate function. Change comment to prevent repeat 2014-08-14 07:22:47 +01:00
hexdec db42345d94 Used proper function for window_invalidate. 2014-08-14 00:32:18 +02:00
hexdec af06b5aae2 Changed sub_6EBED21 to use peep as a parameter. 2014-08-14 00:18:33 +02:00
hexdec 229dedbb64 Changed hardcode address to RCT2_ADDRESS_SPRITE_LIST. 2014-08-14 00:07:47 +02:00
hexdec 31440c9da7 Removed goto in sub_6BED21. 2014-08-14 00:01:17 +02:00
hexdec 6217440bc9 Added sub_6BED21 (called from sub_6BEF1B). 2014-08-13 23:41:13 +02:00
qcz ff28ff7e1b Merge remote-tracking branch 'upstream/master' into hire-staff-command 2014-08-13 22:18:31 +02:00
Duncan Frost 4292109753 Added gfx_invalidate_window 2014-08-13 20:47:30 +01:00
hexdec 3f10c76344 Cleaned up more code in sub_6BEF1B. 2014-08-13 21:22:59 +02:00
hexdec 67e0afca70 Removed comments, removed v3 variable. 2014-08-13 02:23:59 +02:00
hexdec 5d2e73ae25 Initial work on 0x006BEF1B. 2014-08-13 02:16:28 +02:00