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

627 Commits

Author SHA1 Message Date
zsilencer 26ab7c7b7e #1011 2015-04-25 09:20:15 -06:00
Duncan Frost 4c6b444664 Addin missing breaks. 2015-04-23 21:09:01 +01:00
Duncan Frost e04165eef4 Refactoring and bug fixing. 
Noticed a bug that was causing path bits to fail to be changed.
Reduced compile warnings by using ints for coordinates.
Rearanged colour picker to stop bug that prevents its use when first clicked.
 2015-04-23 20:40:53 +01:00
Duncan Frost b950447330 Refactor of placement code 2015-04-23 20:00:18 +01:00
Duncan Frost f2fd8d81ba Added small scenery placement code 
Requires major refactoring.
 2015-04-23 18:03:52 +01:00
Duncan Frost 9749d7d602 Added path bit placement 
Fixed bug in footpath_place_real that causes it to not place path bits.
 2015-04-23 17:23:01 +01:00
Duncan Frost 4352820851 Added walls placement code 
Fixed bugs in the large scenery placement code.
Moved banners to the new parameter style code.
Consider refactoring of all of these to use a different parameter style
 2015-04-22 20:41:46 +01:00
Duncan Frost b3be906270 Added remaining scenery functions 2015-04-21 18:19:11 +01:00
Duncan Frost 59c594fcf6 Added small scenery 6e1f34 code 2015-04-20 20:11:45 +01:00
Duncan Frost fedbc83829 Started 6e1f34 2015-04-18 12:17:44 +01:00
Duncan Frost b7e92b2efb Initial attempt at understanding large_scenery placement 2015-04-18 10:32:23 +01:00
Duncan Frost 8aa353f73e Refactor selection_raise/lower_land. 
Interestingly you can only move land up/down one at a time
 2015-04-18 08:40:43 +01:00
Duncan Frost e8d27b0424 Finished scenery repaint tool down 
Renamed map_element variables that were badly named
Changed scenerymultiple(large) to use the correct size for type. This will cause merge issues with anyone working on large scenery.
 2015-04-17 17:36:28 +01:00
Duncan Frost a684e338b0 Started repaint_scenery_tool_down 2015-04-17 17:36:27 +01:00
Duncan Frost f9c9e9b9aa Added scenery_remove_ghost_tool_placement 2015-04-17 17:36:26 +01:00
Ted John ed0c3a9490 Merge pull request #987 from Gymnasiast/patch-2 
Fix #986
 2015-04-16 09:19:00 +01:00
Ted John 6a82407056 Merge pull request #1019 from duncanspumpkin/fix_ride 
Fix vehicle and graph tab of ride window and options window
 2015-04-15 22:00:25 +01:00
Duncan Frost 1d7ab54ab8 Added checks to prevent underflow 2015-04-15 19:04:02 +01:00
Duncan Frost f40555f88b Revert options window stick to front. 
Changed scenarioselect to not stick to front.
Object selection now correctly changed to not stick to front.
 2015-04-15 18:02:04 +01:00
Duncan Frost 9d8983a5c7 Fix ride graphs and negative lengths 2015-04-14 19:00:29 +01:00
Duncan Frost 869142bc89 Set options window to always be ontop 2015-04-14 18:40:41 +01:00
Duncan Frost a822301002 Fix vehicle tab from failing to reload new variables 2015-04-14 18:35:26 +01:00
Michael Steenbeek 6fe3b5bdd2 Highlight tile when buying construction rights, fixes #1017 2015-04-14 18:45:54 +02:00
Ted John e08e4b7f61 Merge pull request #988 from Garogolun/footpath-stuff 
Added two footpath functions
 2015-04-12 23:15:20 +01:00
Timmy Weerwag 930a9d61dd Fixes for a couple of warnings 2015-04-12 23:26:15 +02:00
IntelOrca 12edf8b4a0 rename unidentified ride entry struct members 2015-04-07 00:16:47 +01:00
Timmy Weerwag 05fa87ad5d Fixed warnings 2015-04-04 15:22:37 +02:00
Timmy Weerwag a78b37e96e Decompiled sub_68A15E 2015-04-04 15:15:24 +02:00
Timmy Weerwag f52ccebbca Decompiled screen_pos_to_map_pos 2015-04-04 12:32:35 +02:00
Duncan Frost d04bba1ab3 Fix travis 2015-04-02 22:11:34 +01:00
Duncan Frost cfeb039ad2 Added install_track window 2015-04-02 22:00:59 +01:00
Timmy Weerwag 6cb205c9cc Added footpath_get_coordinates_from_pos 2015-04-01 02:28:47 +02:00
Timmy Weerwag fe799f03a5 Added footpath_bridge_get_info_from_pos 2015-04-01 01:45:18 +02:00
IntelOrca 509b2a1c6d implement research_populate_list_random 2015-03-31 17:09:16 +01:00
IntelOrca 4d11def81d implement editor_fix_rct1_scenery, editor_rct1_reset_research and research_remove_non_separate_vehicle_types 2015-03-31 15:17:43 +01:00
IntelOrca 851b0819b9 clean up many CALL_PROCs and implement a few functions 2015-03-31 02:21:30 +01:00
IntelOrca d1e4fe8060 implement scenery_set_default_placement_configuration 2015-03-29 02:29:07 +01:00
Michael Steenbeek 7668591591 Add cheat to make all rides destructible 2015-03-28 19:29:19 +01:00
Ted John f28d2c9f2d Merge pull request #953 from Garogolun/proc-6a8388 
Decompiled 0x006A8388
 2015-03-28 17:22:51 +00:00
IntelOrca 2248e8623d fix cheat window tab images 2015-03-28 17:20:19 +00:00
IntelOrca 43d90e8eb0 Merge branch 'develop' of https://github.com/Gymnasiast/OpenRCT2 into Gymnasiast-develop 2015-03-28 17:14:00 +00:00
Ted John c7ef1fa960 Merge pull request #972 from duncanspumpkin/track_place 
Fix right click when track place is on
 2015-03-28 14:02:32 +00:00
Duncan Frost ab038f4341 Fix right click when track place is on 2015-03-28 13:37:43 +00:00
Duncan Frost ac23ef2787 Research now resets funding when all rides finished. New string to indicate reasearch complete 2015-03-28 12:42:09 +00:00
Michael Steenbeek 803232642d Add a cheat the remove Six Flags status from rides 2015-03-26 21:52:19 +01:00
Ted John 76358fdf31 Merge pull request #961 from duncanspumpkin/peep 
Peep
 2015-03-25 18:54:22 +00:00
Duncan Frost ddfdfd37be Added start of sub_state_7 2015-03-25 18:36:17 +00:00
Duncan Frost a50b0c4200 Label max/min cars in train offset 2015-03-25 18:36:12 +00:00
Duncan Frost d11ddc3ec2 Labeled found sprite and peep offsets. 2015-03-25 18:34:19 +00:00
Duncan Frost ef95597374 Fix research ride not selecting when clicked 2015-03-25 18:20:18 +00:00
IntelOrca c6c796ab06 fix invalid park stats information when paused, fixes #957 2015-03-25 11:14:59 +00:00
Michael Steenbeek 08a710e13f Also make rides reliable when renewing them 2015-03-25 11:12:17 +01:00
Ted John 308238ba67 Merge pull request #956 from duncanspumpkin/fix_peep_inventory 
Fix peep extra inventory
 2015-03-24 21:06:58 +00:00
Timmy Weerwag af8857dd32 Replace more occurrences of addresses with new name 2015-03-24 22:04:22 +01:00
Duncan Frost 1223c4efb7 Fix peep extra inventory displaying the wrong message. 2015-03-24 21:02:56 +00:00
Duncan Frost e010d43763 Add load and save audio options. Fix all sounds not pausing 2015-03-24 20:42:20 +00:00
Timmy Weerwag 6c264195ce Small typo; use map_element_get_type 2015-03-24 15:12:09 +01:00
Timmy Weerwag 8bc40cd48c Documented selection globals a bit 2015-03-23 23:26:51 +01:00
Timmy Weerwag 66baebb2fc Named map arrow globals 2015-03-23 23:26:50 +01:00
Timmy Weerwag 498810cc46 Decompiled 0x006A8388 2015-03-23 23:26:49 +01:00
Ted John c62cc63c5f Merge pull request #951 from kevinburke/name-invalidate-flag 
Name the ride window-invalidate flag
 2015-03-23 21:05:50 +00:00
Ted John eac4e28efd Merge pull request #952 from Garogolun/footpath-functions 
Decompiled some footpath stuff
 2015-03-23 21:03:33 +00:00
Kevin Burke 23bfd13ba9 replace ride_window_invalidate flags with constants 2015-03-23 08:33:07 -07:00
Kevin Burke ebd02d022a Fix hex/decimal flag errors 2015-03-23 08:33:07 -07:00
Kevin Burke 09431278e4 Name the ride window-invalidate flag 2015-03-23 08:33:07 -07:00
Timmy Weerwag cf8034a29e Better comments and coding style 2015-03-23 15:32:03 +01:00
Timmy Weerwag 945f60c297 Made a wrong assumption 
z is not always the same as the construct_path_slope global
 2015-03-23 12:47:16 +01:00
Timmy Weerwag 2298a32d89 Decompiled 6A79B7 (window_footpath_construct) 2015-03-23 02:59:46 +01:00
Timmy Weerwag 071ef2c88f Fixed an original bug in bridge footpath building 
Affects starting to build a footpath bridge on a sloped tile. The original code
was horribly broken. I think this is the most intuitive solution considering
the height of the arrow when selecting the tile.
 2015-03-23 00:34:00 +01:00
Timmy Weerwag d4f495cc0e Renamed sub_6A7831 to footpath_provisional_update 2015-03-22 22:18:36 +01:00
Timmy Weerwag ba8066c719 Decompiled 0x006A8380 2015-03-22 22:02:21 +01:00
Timmy Weerwag ecdc76d697 Replaced call with existing decompiled function 2015-03-22 21:50:16 +01:00
Ted John 8013807f68 Merge pull request #948 from kevinburke/downtime 
Name var_199 as the downtime parameter
 2015-03-22 19:32:34 +00:00
Kevin Burke 6423c857a7 Name var_199 as the downtime parameter 2015-03-22 12:28:55 -07:00
IntelOrca 7d383a586e implement map_update_tiles, grass growing and scenery aging 2015-03-22 17:04:50 +00:00
Kevin Burke 5fc72d354d Rename fair_value to value 2015-03-22 08:38:42 -07:00
Kevin Burke 3862a85666 Name reliability variables 
- Rename var_146 to fair_value (it is not reliability)
- Add a helper method get_age_penalty which computes the age penalty for
  a ride.
- Adds a constant for a ride's initial reliability
- Names a subroutine
 2015-03-22 08:21:13 -07:00
Michael Steenbeek 111309bd7e Merge pull request #5 from duncanspumpkin/set_ride_setting 
Added game_command_set_ride_setting.
 2015-03-21 00:02:29 +01:00
Duncan Frost 4171289050 Added game_command_set_ride_setting. 2015-03-20 22:33:06 +00:00
Gymnasiast 981affe04c Refactor powered launch modes, add RCT1 style launch to looping RC. 2015-03-20 17:32:59 +01:00
IntelOrca cd16af0f60 add some event handlers for invalidating map objects 2015-03-18 19:52:45 +00:00
Ted John 54739de4d1 Merge pull request #927 from Gymnasiast/patch-4 
Add cheat to renew all rides
 2015-03-18 18:24:25 +00:00
Ted John 1f718cda07 Merge pull request #924 from Gymnasiast/patch-2 
Fix negative ride ages
 2015-03-18 18:23:32 +00:00
Michael Steenbeek f0b3525395 Add cheat to renew all rides 2015-03-18 16:21:45 +01:00
Michael Steenbeek ab5285cf1e Don't reset built dates that are in the future 2015-03-18 16:20:12 +01:00
Ted John d862ff73a7 Merge pull request #891 from Gericom/develop 
Implemented some viewport drawing functions
 2015-03-17 17:07:37 +00:00
Michael Steenbeek aacef89973 Reset build dates that are in the future 2015-03-17 14:41:57 +01:00
Michael Steenbeek d77d9e9a58 Fix negative ride ages 2015-03-17 10:45:33 +01:00
Adrian Wielgosik fa5bee8c40 Fix "research group" being displayed when no item is selected 2015-03-16 13:58:07 +01:00
Duncan Frost aa268dc307 Fix text input that is populated with text greater than max length 2015-03-15 14:41:43 +00:00
Gymnasiast 38e8a028c0 Futureproof the options window invalidation for this and future additions 2015-03-14 20:54:24 +01:00
Gymnasiast 5a5cf21cd3 Made subtype switching an option 2015-03-14 20:29:49 +01:00
Michael Steenbeek 22b4001c29 Allow changing subtype 2015-03-14 16:52:48 +01:00
Adrian Wielgosik 002d106111 Removed accidental call to original code in decompiled function 2015-03-13 22:27:12 +01:00
Gericom 11b0646176 Added some viewport functions and refactoring 2015-03-11 19:13:14 +01:00
IntelOrca 5791522d69 implement 0x0066F6B0 so that new map window opens after object selection 2015-03-11 12:57:59 +00:00
Michael Steenbeek adfd678469 Fix map tool sizes larger than 7 not being drawn correctly 2015-03-11 12:39:18 +01:00
Michael Steenbeek 564e215051 Fix 'Map size:' text appearing when it should be hidden 2015-03-11 12:16:32 +01:00
Michael Steenbeek 80571814c4 Fix old land ownership tool sizes being written to the map window 2015-03-11 11:26:55 +01:00
Michael Steenbeek 1f80802dbf Fix terraforming tool sizes bigger than 7 being written to the map window 2015-03-11 11:11:19 +01:00
Michael Steenbeek 9340c99a1e Fix indentation 2015-03-10 10:21:46 +01:00
Michael Steenbeek e76bddb820 Extend max land ownership tool size to 64 2015-03-09 22:51:36 +01:00
IntelOrca 488282d653 name some of the ride type flags 2015-03-07 19:56:30 +00:00
IntelOrca 6ae0c10350 refactor ride type flag checks 2015-03-07 19:15:47 +00:00
IntelOrca c4f1fa3b0c remove redundant sound options 2015-03-07 16:50:54 +00:00
IntelOrca de34ab5ed8 add options for finance and research on toolbar 2015-03-07 16:38:17 +00:00
Ted John 7154702ca3 Merge pull request #898 from adrian17/window_ride_disable_tabs 
Decompiled window_ride_disable_tabs
 2015-03-07 15:51:35 +00:00
Ted John 2f11c9398f Merge pull request #901 from duncanspumpkin/refactor 
Refactor of Object Functions
 2015-03-07 14:03:53 +00:00
Duncan Frost a04de29bf8 Finish refactor of object_list.c 2015-03-07 12:45:13 +00:00
Duncan Frost 936f2f127f Refactor of object_list.c 2015-03-07 11:13:10 +00:00
Duncan Frost ddcf766fea More refactoring of object.c 2015-03-07 09:44:34 +00:00
Adrian Wielgosik 8dce074960 Changed variable types, removed unnecessary AND 2015-03-07 00:38:31 +01:00
Adrian Wielgosik fce6893e2b Decompiled window_ride_disable_tabs 2015-03-06 17:05:47 +01:00
Duncan Frost c66a64ac56 Add hack to fix scenery scroll bar 2015-03-05 21:27:38 +00:00
Adrian Wielgosik 21b55888ec Clean up guest_list_open_with_filter a bit 2015-03-05 21:02:16 +01:00
Adrian Wielgosik 5a7d0a506e Fixed "thinking about" guest list filter not working 2015-03-05 21:02:15 +01:00
Adrian Wielgosik 7f10024b8e Decompiled window_guest_list_open_with_filter 2015-03-05 21:02:14 +01:00
Duncan Frost 8cf3eebf9d Fix misc scenery tab. Issue due to accessing invalid memory 2015-03-05 19:29:38 +00:00
Duncan Frost 9378f8698e Refactor of object_paint_ride. 2015-03-01 14:24:05 +00:00
Duncan Frost cf5f2e0ae4 Fix cursor not changing when switching between scenery and other windows 2015-02-27 23:00:29 +00:00
IntelOrca 4268c930e8 fix shortcuts, fixes #824, fixes #512... 
- add saving of shortcut configuration
- allow setting of shortcuts in title screen
 2015-02-27 17:29:23 +00:00
Duncan Frost 4c527225fb Refactor. Now uses same code for scenery_tracks and just tracks 2015-02-27 13:04:48 +00:00
Duncan Frost ca653aed63 Implemented go into scenery select mode 2015-02-27 13:04:46 +00:00
Duncan Frost b72ffb43db Finish track_save_scenery. Design cancel now called after save 2015-02-27 13:04:45 +00:00
Ted John b89af82f07 Merge pull request #876 from Gericom/develop 
Implemented paint_ride_entry and cleanup,  Implemented window_construction_paint
 2015-02-27 12:11:53 +00:00
Gericom a64e89ec66 Refactoring window_construction_paint, fixed bugs 2015-02-27 12:49:22 +01:00
Michael Steenbeek d6d71e6fe6 Make (up) and (new file) strings translatable 2015-02-27 10:46:12 +01:00
Gericom 00dcd4fba8 Implemented window_construction_paint 
Still contains some bug related to drawing the current track piece
 2015-02-27 10:37:17 +01:00
Duncan Frost e5bc7e8998 Fix transparent fences 2015-02-25 21:21:08 +00:00
IntelOrca 3c6e136b02 fix marketing campaign ride dropdown again, #874 2015-02-25 19:38:43 +00:00
IntelOrca d79bb68bfa fix marketing campaign ride dropdown, #874 2015-02-25 19:04:46 +00:00
IntelOrca ae69718b53 refactor ride_construct, fixes #725 2015-02-25 18:26:37 +00:00
IntelOrca 3da2275b5e add missing breaks, fixes #838 2015-02-25 17:53:50 +00:00
IntelOrca 3e75e82d93 update audio device list, #594 2015-02-25 17:47:11 +00:00
Thomas 19b710da5c Make cheat strings translatable 2015-02-25 12:27:31 +01:00
Duncan Frost 1c32a429c2 Fix ghost entrances caused by tool_cancel not being called 2015-02-23 17:58:22 +00:00
Thomas b5d0c3466b Resolve string conflict 
Simplex noise and autosave used the same string constants
 2015-02-22 15:49:23 +01:00
IntelOrca a3df2527b0 implement autosaving, closes #778 2015-02-21 11:05:15 +00:00
Ted John eb77e96105 Merge pull request #848 from Garogolun/tooltip-fix 
Fix tooltip y calculation, fixes #340
 2015-02-21 02:07:13 +00:00
IntelOrca ff8bef8fc3 try to fix to scenario complete issues 2015-02-21 02:04:46 +00:00
Timmy Weerwag eb44707ec9 Fix tooltip y calculation, fixes #340 2015-02-21 03:01:32 +01:00
Timmy Weerwag 8abd8ad775 Decompiled the window_footpath_mousdown procs 2015-02-21 00:40:52 +01:00
IntelOrca f172b26291 make options window centred 2015-02-20 02:19:18 +00:00
Timmy Weerwag d38852f926 Stick windows on title screen to back 2015-02-20 02:30:16 +01:00
Timmy Weerwag 873eac46e8 Restart title music if necessary 2015-02-20 02:10:13 +01:00
Timmy Weerwag 09e9288eb8 Added options button to title screen 2015-02-20 01:35:29 +01:00
Timmy Weerwag 1df5202af1 fix the resolution dropdown disabling 
fixes after setting fullscreen mode to "Fullscreen (desktop)" and
re-opening the options screen, the resolution dropdown was enabled again
 2015-02-19 23:49:17 +01:00
Adrian Wielgosik 1ae4bf42ce Removed unused arguments 2015-02-19 17:39:35 +01:00
Adrian Wielgosik 1b6f752a00 Decompiled window_top_toolbar_land_tool_drag 2015-02-19 17:33:26 +01:00
Adrian Wielgosik a7455f8b31 Decompiled window_top_toolbar_water_tool_drag 2015-02-18 20:28:45 +01:00
Duncan Frost 612fcbe770 Implemented missing guest icons from news messsages. 2015-02-17 20:39:35 +00:00
Ted John e39a220058 Merge pull request #814 from nbrochu/mapgen-simplex-tab 
Added a 3rd tab to Map Generation (Simplex)
 2015-02-17 18:54:20 +00:00
IntelOrca 2ab48c998e Merge branch 'set-ride-status' into develop 
Conflicts:
	src/ride/track.h
 2015-02-17 17:00:47 +00:00
Adrian Wielgosik 867201944e window_map_set_bounds is actually window_map_resize 2015-02-17 16:04:24 +01:00
Adrian Wielgosik fc15da5bbf Decoupled two constant arrays and renamed a function 2015-02-17 16:04:24 +01:00
IntelOrca 7f0ed995b5 improve reading and saving of configuration 2015-02-16 22:47:11 +00:00
Adrian Wielgosik bfe401c778 Refactor code related to map flashing, removed a small mistake related with it 
Removed code related to map flashing from title_update
 2015-02-16 18:53:47 +01:00
Adrian Wielgosik c6e690a71b Removed gotos from window_map_paint_peep_overlay 2015-02-16 18:53:46 +01:00
Adrian Wielgosik c1df97cdd0 Simplify window_map_paint_hud_rectangle 2015-02-16 18:53:46 +01:00
Adrian Wielgosik baa7703451 Clean up window_map_paint_hud_rectangle 2015-02-16 18:53:45 +01:00
Adrian Wielgosik 13359d4220 Initial decompilation of window_map_paint_hud_rectangle 2015-02-16 18:53:44 +01:00
Adrian Wielgosik 7ba49b8887 Separate common code to window_map_transform_to_map_coords; small cleanup 2015-02-16 18:53:44 +01:00
Adrian Wielgosik 2e6fb1cc0f Decompiled window_map_paint_train_overlay 2015-02-16 18:53:43 +01:00
Adrian Wielgosik a14a389040 Initial decompilation of window_map_paint_peep_overlay 2015-02-16 18:53:43 +01:00
Nicholas Brochu 14d919819b Added a 3rd tab to Map Generation (Simplex) 
Complete with sensible defaults.
 2015-02-16 01:18:08 -05:00
Thomas 671aff6534 Add button to use native file browser 2015-02-15 19:48:25 +01:00
IntelOrca 524ae55052 fix initial directory issue on loadsave and sort items 2015-02-15 15:35:30 +00:00
IntelOrca cfff5c6d88 make scenery window usable, partially fixes #408 2015-02-15 15:24:36 +01:00
Thomas abe3008fc8 Fix warnings and add path indicator 2015-02-15 15:20:19 +01:00
Thomas c59aadb676 Fix going up at top level and issue when saving 2015-02-14 23:26:04 +01:00
Thomas 10babd3c77 Add ability to change directory in loadsave 2015-02-14 23:26:04 +01:00
IntelOrca 66c302eb3d use new create_window_centred function 2015-02-14 18:26:59 +00:00
IntelOrca ac4cd56b63 add new load / save window, closes #580 2015-02-14 02:16:03 +00:00
IntelOrca 97e7a27c17 Merge branch 'footpath-commands' into develop 2015-02-13 20:58:27 +00:00
Adrian Wielgosik 35bf40fb39 Fix map window scrollbars not being initialized properly; fixes #478. 2015-02-13 21:39:51 +01:00
IntelOrca 886f30d00c Merge branch 'develop' into footpath-commands 2015-02-13 19:32:13 +00:00
IntelOrca e8e7dfbc70 improve object selection window 2015-02-13 18:43:22 +00:00
IntelOrca e953fdc360 improve random map generator, change algorithm to simplex noise 2015-02-13 03:29:40 +00:00
Duncan Frost a7f4d44ece Add check_for_entrance_exit. Fixed ride name not shown 2015-02-12 22:30:31 +00:00
IntelOrca a66b29076b move osinterface code to shared or windows 2015-02-12 20:51:40 +00:00
Duncan Frost 719e23ec3b Fix bathrooms missing same price everywhere box. Fix #761 2015-02-12 18:58:16 +00:00
IntelOrca 392ff7bfea remove expansion packs from title sequence, closes #752 2015-02-11 22:18:19 +00:00
IntelOrca fadeff9dda fix a few issues with object selection and track manage 2015-02-11 21:03:23 +00:00
IntelOrca 74e1c0923f implement window_editor_object_selection_scrollpaint 2015-02-11 19:42:10 +00:00
IntelOrca 51802aac45 fix object order and add object dat name to object selection window, closes #440 2015-02-11 18:54:31 +00:00
IntelOrca 59eff1f572 implement window_editor_object_selection_paint 2015-02-11 17:50:52 +00:00
IntelOrca 9c06699dce implement more events for object selection window 2015-02-11 16:02:57 +00:00
IntelOrca 0db1c88f2b refactor window hold down widgets (var_020) 2015-02-10 20:40:33 +00:00
IntelOrca f6c09b44b6 merge in random map generator 2015-02-10 20:11:59 +00:00
IntelOrca 5b3c1b6764 finalise placing of trees 2015-02-10 19:52:24 +00:00
IntelOrca 9cc108abbb remove toolbar.c and ignore seperators at the end of the toolbar 2015-02-10 14:41:35 +00:00
Duncan Frost b388512c4f Remove hack to pass exapanison check 2015-02-09 19:02:54 +00:00
Duncan Frost edfbd80747 Added track_data refactored track_place to use track_data 2015-02-09 18:52:01 +00:00
Duncan Frost a0775f9ac9 Refactor track_place to use new structs 2015-02-09 18:51:59 +00:00
Duncan Frost bc847628cd Labelled track preview offsets 2015-02-09 18:51:58 +00:00
Duncan Frost 6943c7dce0 Finished sub_6D2189 2015-02-09 18:51:56 +00:00
Duncan Frost df723b871c Added more of 6d2189 2015-02-09 18:51:55 +00:00
Duncan Frost aeb3764ab5 Added load track objects 2015-02-09 18:51:53 +00:00
IntelOrca 9d2abf1925 add map generation window 2015-02-09 18:32:58 +00:00
IntelOrca 7ea809492a allow translation of unit and date strings, closes #307 2015-02-09 12:53:11 +00:00
IntelOrca 78e3b1aa95 fix a few errors with check-valid-ride 2015-02-08 16:53:38 +00:00
IntelOrca 1ad04a24c4 Merge branch 'develop' into set-ride-status 2015-02-08 16:53:19 +00:00
IntelOrca ee51f31f57 fix station-to-station operating tab error on ride window 2015-02-08 16:50:49 +00:00
IntelOrca a6c95f1f38 Merge branch 'develop' into set-ride-status 
Conflicts:
	src/ride/track.c
	src/windows/ride_construction.c
 2015-02-08 16:04:35 +00:00
IntelOrca dfc723573c fix expenditure table issues, fixes #762 2015-02-08 14:31:57 +00:00
Adrian Wielgosik 6380ce63d9 Make bottom toolbar panels bigger to hold longer date strings 2015-02-07 23:53:17 +01:00
Adrian Wielgosik c0b2c79aad Add widget ordering in editor top toolbar 2015-02-07 23:50:51 +01:00
Adrian Wielgosik cdc8642709 Add an artificial separator widget 2015-02-07 23:50:51 +01:00
Adrian Wielgosik dc4d14b16b Refactor placement of top toolbar items 2015-02-07 23:50:50 +01:00
Duncan Frost 0f6dd51736 Added load_palette. Labelled offset for paused and palette effect frame. Fixed fast moving water. 2015-02-07 17:40:20 +00:00
IntelOrca ce719ef086 fix fullscreen issues and add title music option 2015-02-06 22:35:08 +00:00
Ted John aad90f39ef Merge pull request #719 from IntelOrca/fullscreen-fixes 
Fix fullscreen issues
 2015-02-06 00:19:59 +00:00
Duncan Frost cf6f8c417c Fix #747 mistake caused by missing value 2015-02-05 18:22:04 +00:00
Duncan Frost 22c6d500a6 Fix #738 ride name now copied into required address 2015-02-03 18:39:07 +00:00
Duncan Frost 1fc525214d Refactor track_load. Relabeled address' 2015-02-02 18:52:50 +00:00
Duncan Frost fc8728aa9d Refactor of editor window. Added object_selection_close and load_selected_objects. Fix small display bugs. 2015-02-02 18:49:07 +00:00
Duncan Frost b7470447e8 Refactor track_list using TD4 knowledge 2015-02-02 18:43:02 +00:00
Duncan Frost 9367ec8d05 Fix price throughout park not always working 2015-01-31 12:24:11 +00:00
Duncan Frost f6a0fcc255 Fix secondary price loss per item 2015-01-31 11:46:56 +00:00
IntelOrca 5b4ec3621a refactor many functions to use rct_xy_element 2015-01-30 19:20:19 +00:00
IntelOrca debafcf051 code set ride status, not yet fixed and tested 2015-01-29 00:16:34 +00:00
IntelOrca 36971b29cb implement game_command_set_park_name and game_command_remove_park_entrance 2015-01-27 21:18:41 +00:00
Duncan Frost a67815821e Fix crash on map due to EBPSAFE 2015-01-27 18:18:26 +00:00
IntelOrca 1c18f80f07 implement game_command_set_ride_name 2015-01-27 02:05:54 +00:00
Ted John 1aee1825d1 Merge pull request #723 from duncanspumpkin/peep_update 
Peep update
 2015-01-26 17:38:18 +00:00
IntelOrca ba4d9b3975 implement game_command_set_park_open 2015-01-25 00:20:53 +00:00
Duncan Frost 43550e2a7b Fix small offset bugs. Label ride offsets 2015-01-24 19:48:26 +00:00
Duncan Frost 495e60a5a7 Labeled peep->sub_state and rejiged next_z 2015-01-24 19:48:15 +00:00
IntelOrca dfb1f055b9 implement game_command_set_current_loan 2015-01-24 19:07:35 +00:00
IntelOrca 475c98c540 implement game_command_set_research_funding 2015-01-24 18:41:55 +00:00
IntelOrca eec7e2e458 implement marketing_start_campaign 2015-01-24 18:22:06 +00:00
Ted John 84e1d2cdf8 Merge pull request #715 from IntelOrca/refactor-map-element-iteration 
Refactor map element iteration
 2015-01-24 17:43:54 +00:00
IntelOrca 80959b7db7 fix fullscreen mode saving 2015-01-24 15:06:14 +00:00
IntelOrca 7cdcb6402e fix fullscreen resolution, fixes #89 2015-01-23 20:47:33 +00:00
Duncan Frost 007817f967 Fix bug in vehicle dropdown. Refactor track more 2015-01-22 21:08:45 +00:00
Duncan Frost 4a6b6475fd Fixed track_place crash #713. 2015-01-22 21:05:52 +00:00
Duncan Frost dd97974741 Refactored track_load 2015-01-22 21:04:53 +00:00
Duncan Frost a57bf368bb Reworked EBPSAFE. Removed EBPSAFE_X. Fixed track list bug #606. 2015-01-22 21:01:57 +00:00
IntelOrca 8774731f03 refactor map element iteration 2015-01-22 00:19:05 +00:00
Duncan Frost 4e917de6cc Fix height markers. 2015-01-19 18:13:25 +00:00
Duncan Frost e7a0b31884 Ride locate now uses standard scroll_to_viewport.Fix #705 2015-01-19 17:24:39 +00:00
IntelOrca c88cde8472 fix vehicle type dropdown in ride window and 0% rating modifiers, fixes #696, fixes #699 2015-01-17 19:13:05 +00:00
Duncan Frost e2b2c94ca1 Fix dropdown location at sides of the screen #690 2015-01-17 09:14:17 +00:00
IntelOrca 3a8f85b7d2 implement footpath remove and create, bugs exist 2015-01-14 23:51:59 +00:00
IntelOrca 0ff125b9b3 move across useful map functions and other bits from footpath branch to develop 2015-01-14 23:38:48 +00:00
Duncan Frost 11be3cd5bd Removed finance button when in no money mode 2015-01-12 18:57:03 +00:00
Duncan Frost 974ecd904c Finish game command 20 change surface style 2015-01-12 18:39:53 +00:00
Duncan Frost 8a4e12a3f4 Started game_command_20 raise lower land 2015-01-12 18:39:52 +00:00
Duncan Frost 42383cc192 Finished tool_down. 2015-01-12 18:39:51 +00:00
IntelOrca f4e0f59355 fix #606, track names in track select window writing one byte out 2015-01-12 18:30:50 +00:00
Ted John 295b08e0fd Merge pull request #660 from eezstreet/develop 
Added 'financial options' button in toolbar, similar to RCT1
 2015-01-12 12:55:51 +00:00
Duncan Frost 4346f8c993 Fix issues due to comparing no money flag instead of 18 2015-01-10 14:15:48 +00:00
Duncan 3603b5773e fix spelling mistake. 2015-01-08 12:17:18 +00:00
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