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

524 Commits

Author SHA1 Message Date
Duncan Frost 1fed6ac32c Added missing btm toolbar functions. Added dirty enum 2015-01-07 20:25:48 +00:00
Duncan Frost 4da2521967 Fix dirty money flag. 2015-01-05 18:48:55 +00:00
Ted John 2b267a861b Merge pull request #673 from duncanspumpkin/text_input_unknown_7 
Fix #672
 2015-01-04 17:25:30 +00:00
Duncan Frost ef72f66fa7 Moved text_input update to unknown7 function in order to force updates when paused. 2015-01-04 17:00:36 +00:00
Duncan Frost 8cd6d51cea Fixed secondary item count. Labeled count offsets 2015-01-04 16:28:19 +00:00
eezstreet 68ada3d06b Added financial options tab to main toolbar 2014-12-31 23:28:50 -05:00
Duncan Frost 4257d0bcc4 Labelled offset to redundant max vehicle sounds. 2014-12-31 15:04:20 +00:00
Duncan Frost cbe49300b8 Fixed sounds not playing properly when paused. Labeled max sounds offset. Prevented crash on null dereference 2014-12-31 14:54:23 +00:00
Duncan Frost c3c8a73225 Fixed drawing issues when zoomed. 2014-12-28 13:29:26 +00:00
Ted John 7b8dc291a5 Merge pull request #650 from duncanspumpkin/text_input_large 
Added multi line text input
 2014-12-22 19:35:50 +00:00
Duncan Frost 153196a905 Remove redundant define 2014-12-22 16:55:17 +00:00
Duncan Frost ba93cd337b Added dynamic window resizing on change of text. Fixed cursor display issue 2014-12-22 16:50:35 +00:00
Duncan Frost f93aeb33c6 Added multi line text input 2014-12-22 10:40:00 +00:00
Duncan Frost acf6ef7b88 Fixed construct bug 2014-12-20 13:06:17 +00:00
Duncan Frost a96bf872bf Added more of demolish. Fixed bug in window_close 2014-12-20 11:14:26 +00:00
Duncan Frost 749bd48f3d Started adding a little bit of ride construct mouse down 2014-12-20 10:43:30 +00:00
Duncan Frost 583cb5118c Added construct dropdown function fixes #638. 2014-12-19 18:44:42 +00:00
IntelOrca 44efbd95ac implement more footpath construction and window 2014-12-17 20:45:27 +00:00
IntelOrca 0209ad080c fix various footpath bugs and refactor, fixes #637 2014-12-16 22:03:56 +00:00
IntelOrca 99b85b2339 add manage track design window (UNTESTED) 2014-12-16 15:33:32 +00:00
IntelOrca a319bb15e2 fix compile error for GCC 2014-12-16 11:37:46 +00:00
IntelOrca d7212c1b14 implement inventions list window, fixes #630 2014-12-16 01:24:13 +00:00
Ted John e47b2c920f Merge pull request #636 from duncanspumpkin/fix_lightning 
Fix lightning
 2014-12-14 21:10:05 +00:00
IntelOrca 1459263b3c implement editor scenario options window 2014-12-14 19:21:06 +00:00
Duncan Frost 83a7dd5095 Fix lightning error caused by buffer overflow in scenery 2014-12-14 15:00:22 +00:00
Duncan Frost d3de21463a Fix #625 issue caused by unitialised variable 2014-12-11 18:26:44 +00:00
IntelOrca ff478b8673 implement editor objective options window 2014-12-10 23:07:11 +00:00
IntelOrca e887311219 add more cheats to cheat window and a small amount of refactoring 2014-12-10 01:44:30 +00:00
Duncan Frost eed854ed6f Fixed #621 error caused by signed word expanding incorrectly to an unsigned dword 2014-12-08 16:20:02 +00:00
Duncan Frost ef0b29d996 Fixed issue preventing rides from being destroyed 2014-12-03 20:37:38 +00:00
Duncan Frost f11f2f270f Added enough of ride_construction to fix #601 2014-12-02 18:09:13 +00:00
Duncan Frost d1c49ee32b Fix #600. Issue caused by not passing model_type argument 2014-12-01 17:16:30 +00:00
Duncan Frost a11f7fbd7c Fix #610. Pause toggle display issue. 2014-12-01 17:04:47 +00:00
IntelOrca d00001fed2 remove unnecessary header includes 2014-11-30 20:27:14 +00:00
IntelOrca 31ebf03c30 implement enter name on scenario complete, closes #605 2014-11-30 02:17:01 +00:00
IntelOrca 88b425f6a7 implement ride open station and ride open vehicle, partial fix for #601 2014-11-29 15:55:44 +00:00
IntelOrca 0492c966d7 fix ride shop item colouring in ride window, fixes #602 2014-11-29 13:54:53 +00:00
IntelOrca aee1b3825e fix object_free_scenario_text problem in window_editor_object_selection 2014-11-25 21:49:05 +00:00
IntelOrca d9e0f8ff6a implement save scenario and fix various load / save dialog issues, fixes #433 2014-11-25 02:06:26 +00:00
IntelOrca 8e3ee3f7e9 implement bare minimum so that close button is implemented on object selection window, partial fix for #433 2014-11-24 23:05:35 +00:00
Miso Zmiric (Mike Squinter) a7f015669a fix erroneous position calculation due to additional offset 2014-11-24 17:37:45 +00:00
Miso Zmiric (Mike Squinter) 1e6c9ddfd8 map cheat window to shortcut, hide fast forward button, fix toolbar autolayout 2014-11-24 16:38:19 +00:00
IntelOrca 73a6b1acea implement editor_read_s6, partial fix for #433 2014-11-24 02:58:48 +00:00
IntelOrca 0e0e9c9840 merge qcz editor early to help finish other editor parts 2014-11-23 16:28:23 +00:00
IntelOrca ca384e0b51 fix #278, objective window complete / fail text mis-aligned 2014-11-22 23:45:30 +00:00
Duncan Frost 7252667a25 Implemented the same changes to scenario load. Error messages now copied onto cmd prompt 2014-11-20 19:02:27 +00:00
Ted John af1cd86a35 Merge pull request #570 from duncanspumpkin/peep_update 
Peep update
 2014-11-18 13:26:53 +00:00
IntelOrca d821456709 fix don't save button on quit game prompt, fixes #465 2014-11-17 01:20:20 +00:00
Duncan Frost 135abc90a4 Added sub_693b58 2014-11-15 19:45:42 +00:00
IntelOrca 2b7142e49f attempt to fix #566 and other bugs, also refactor some footpath related functions 2014-11-15 18:22:06 +00:00
Duncan Frost bd06488450 Fix peeps sitting. Renamed a function to sprite_move 2014-11-12 17:45:39 +00:00
Adrian Wielgosik ad2502e4d5 - fixed a condition in sub_6939EB that compared against a wrong field 
- added a missing break that caused the wrong text to be displayed in ride window
 2014-11-12 12:30:28 +01:00
IntelOrca 5a4b940fc2 fix and refactor window event calls 2014-11-11 20:51:25 +00:00
IntelOrca d111c715d6 implement viewport_interaction_get_item_left 2014-11-10 00:40:59 +00:00
Duncan Frost 1a857edc21 Playing about with viewport setup 2014-11-06 21:16:45 +00:00
Duncan Frost 97abffd4e8 Added force sun/thunder cheat. 2014-11-05 20:26:27 +00:00
Duncan Frost c1ef7ac61f Use reversed peep functions where required 2014-11-05 16:45:42 +00:00
Duncan Frost 481fd08ab5 Added update_picked and update_entering_park. Added new entries to peep struct 2014-11-05 16:35:22 +00:00
Duncan Frost 22df12c1c8 Added sub_69e9d3 a sprite moving function 2014-11-05 16:35:18 +00:00
Duncan Frost 573fe0c6f7 Added peep_decrement_num_riders 2014-11-05 16:35:17 +00:00
Duncan Frost 388b8ec337 Added peep_window_state_update 2014-11-05 16:35:16 +00:00
Duncan Frost 95557bc732 Added peep_insert_new_thought 2014-11-05 16:30:21 +00:00
Duncan Frost 0624736b47 Decompiled PEEP_STATE_QUEUING 2014-11-05 16:30:19 +00:00
IntelOrca 0e223c524e implement sub_6EDE88 2014-11-05 16:14:12 +00:00
IntelOrca ad84e6d076 implement ride_modify and supporting methods 2014-11-05 02:55:29 +00:00
IntelOrca 508ed131f7 implement sub_6CC3FB 2014-11-04 21:39:03 +00:00
IntelOrca 39ad49bac9 implement find mechanic in ride window 2014-11-04 19:33:17 +00:00
IntelOrca 0104042640 Merge branch 'ride-update' 
Conflicts:
	src/world/map.c
 2014-11-04 19:01:59 +00:00
IntelOrca d92a4d9418 implement clear scenery game command, try out removing paths feature 2014-11-04 03:34:48 +00:00
Duncan Frost 70c06d62ef Added zero clearance cheat tool. Warning does not clean itself up 2014-11-03 21:15:35 +00:00
IntelOrca 8ab3188914 Merge branch 'master' into ride-update 
Conflicts:
	projects/openrct2.vcxproj.filters
 2014-11-03 17:37:08 +00:00
Duncan Frost c87e373ced Added window_sign_small 2014-11-02 14:16:44 +00:00
Duncan Frost 49ccea7f26 Fix remaining bugs with window_sign(large) 2014-11-02 14:16:43 +00:00
Duncan Frost 828c6ff7a2 Added window_sign. Invalidate function to be finished 2014-11-02 14:15:18 +00:00
Duncan Frost 40a26f689f Added demolish ride prompt 2014-11-02 08:39:01 +00:00
IntelOrca 3d40c7e3ee add various ride mechanic functions 2014-11-02 01:41:00 +00:00
Duncan Frost 53e0ebc57c Refactored a bit of tooltip window. Added hack to fix #540 note this should be fixed better 2014-11-01 13:10:14 +00:00
Duncan Frost 605c62f566 Window banner complete 2014-10-21 17:59:47 +01:00
IntelOrca 287b614392 fix window_map_tooltip using original window events instead of new 2014-10-21 11:07:11 +01:00
IntelOrca ae85fc265e implement window_map_tooltip 2014-10-17 02:01:58 +01:00
Duncan Frost 04965ae9d2 Added home, end key. Now uses host window colours. 2014-10-16 21:50:03 +01:00
Duncan Frost 76caeaf040 Fix warning. 2014-10-16 21:00:49 +01:00
Duncan Frost 1c62a0c29d Cleaned up code, renamed variables, added comments. Switched over all existing text boxes to new code 2014-10-16 20:58:31 +01:00
Duncan Frost edbfb43251 Added ok/cancel buttons. Added closing on main. 2014-10-16 20:58:30 +01:00
Duncan Frost 9a3aeed508 Added some of the suggested changes 2014-10-16 20:58:28 +01:00
Duncan Frost 9cb03a9d3e Fixed bugs in existing method. Now has correct title and description 2014-10-16 20:58:27 +01:00
Duncan Frost cad821349b New technique for text input. 2014-10-16 20:58:26 +01:00
Duncan Frost 306310c5d9 Fix warning 2014-10-16 20:58:26 +01:00
Duncan Frost b1721f217d Trying out a new technique for text input 2014-10-16 20:58:25 +01:00
Ted John 0053dd82dc Merge pull request #529 from duncanspumpkin/fix_527 
Fix #527
 2014-10-16 19:44:31 +01:00
Duncan Frost 0a5e304a92 Fixes #527. Error caused by passing a variable a factor of 8 out. 2014-10-16 19:35:01 +01:00
zsilencer 6628a4eace 0x006BC3AC, 0x00405199, 0x00404E0D, sort audio functions by address, volume fading 2014-10-15 20:03:15 -06:00
IntelOrca ece2522273 refactor window search functions 2014-10-16 02:02:43 +01:00
IntelOrca 268e7530c2 fix #525, creating a ride crashes when footpath window is open 2014-10-16 00:35:42 +01:00
IntelOrca 6fe1bace20 refactor input (flags in particular) and add sub_6EA73F 2014-10-15 22:59:26 +01:00
IntelOrca dda40cb99a add missing breaks in dropdown switch for top toolbar 2014-10-14 03:38:46 +01:00
IntelOrca f22cc6bbeb Merge branch 'master' into viewport-window 
Conflicts:
	projects/openrct2.vcxproj.filters
 2014-10-12 17:28:17 +01:00
IntelOrca 9ebf6e5550 add open extra viewport to map button on top toolbar 2014-10-12 15:48:21 +01:00
Duncan Frost 18db536f87 Less magic numbers 2014-10-12 15:04:37 +01:00
Duncan Frost bab896ad1e Finished staff window. 2014-10-12 11:37:07 +01:00
Duncan Frost 2774c63eba Added first draft of tool update and down 2014-10-12 11:37:06 +01:00
Duncan Frost 5ee4616685 Added remaining paint and invalidate functions 2014-10-12 11:37:05 +01:00
Duncan Frost d02017cb48 Refactored widgets. Added staff stats invalidate 2014-10-12 11:37:05 +01:00
Duncan Frost 0ba79d70ab Added remaining widgets 2014-10-12 11:37:04 +01:00
Duncan Frost 950bbccb34 Fix bugs introduced by previous commit. 2014-10-12 11:37:03 +01:00
Duncan Frost 10793011c4 Fix small mistakes in fire prompt 2014-10-12 11:37:02 +01:00
Duncan Frost 2a3989019b Fix merge fails. Renamed a few functions 2014-10-12 11:37:02 +01:00
Duncan Frost 719ca2ddd2 Added start of window_staff_fire. Refactored some of window_staff_peep 2014-10-12 11:35:09 +01:00
IntelOrca a12c771190 add locate button to viewport 2014-10-12 03:10:03 +01:00
IntelOrca 17e9ea1fc4 implement the viewport window 2014-10-12 02:55:42 +01:00
IntelOrca c91c4f7ea0 implement mine train coaster rating calculation 2014-10-11 23:07:20 +01:00
Neranjen 9f556549c7 fix #516 2014-10-09 21:19:29 +05:30
IntelOrca 3cf28d6ef8 refactor config and add window size 2014-10-09 15:55:47 +01:00
IntelOrca edf2b9c93a refactor openrct2 loop 2014-10-09 14:31:51 +01:00
IntelOrca 93c5bddd4e fix various research issues and improve 2014-10-08 22:11:50 +01:00
IntelOrca 7607468a42 Merge branch 'master' into research-update 2014-10-08 21:30:20 +01:00
zsilencer 9df2ee4b77 use mixer for title music, crowd noise, rain/thunder, and sound effects 2014-10-07 23:00:11 -06:00
IntelOrca 141f33acf8 implement research_next_design 2014-10-07 23:42:17 +01:00
IntelOrca a32f73d27f Merge branch 'master' into reorganise-src 
Conflicts:
	projects/openrct2.vcxproj
	src/interface/window.h
 2014-10-07 20:07:15 +01:00
IntelOrca 1770e82643 organise: refactor peep / staff window names 2014-10-07 19:39:52 +01:00
IntelOrca 1d92e3d7ab Merge branch 'master' into reorganise-src 
Conflicts:
	projects/openrct2.vcxproj
	projects/openrct2.vcxproj.filters
	src/audio/audio.c
	src/audio/mixer.h
	src/game.c
	src/ride/vehicle.c
	src/windows/finances.c
	src/windows/research.c
 2014-10-07 19:10:16 +01:00
IntelOrca daf231a2e9 organisation: move peep and staff to sub directory of its own 2014-10-06 19:41:43 +01:00
IntelOrca c8df6174b8 organisation: fix includes 2014-10-06 17:36:58 +01:00
IntelOrca 554e1fe70e organisation: move files and update project 2014-10-06 10:21:07 +01:00