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

219 Commits

Author SHA1 Message Date
IntelOrca c6e84181cb implement ride_entry_get_train_layout 2015-06-29 01:24:07 +01:00
Gymnasiast ca1b88fc53 Don't modify flags when in select_by_track_type mode; make it switchable in-game again. 2015-06-25 11:46:17 +02:00
IntelOrca 474d300578 change enabledTrackPieces to 64 bit integer in ride type struct 2015-06-24 16:43:21 +01:00
Gymnasiast a6225ebf06 Add option to select by track type (RCT1 style); correct misspellings of 'separate' 2015-06-24 12:41:19 +02:00
IntelOrca 3feacc3400 fix #1356 2015-06-15 22:08:03 +01:00
rd3k 628a586ea2 Tidy window flags 2015-06-13 22:16:14 +01:00
IntelOrca b2e9559d31 fix window issues, fixes #1306 2015-06-11 13:04:55 +01:00
Robert Jordan fb828afa1a Added RCT1 light tooltips 2015-06-10 11:47:54 -04:00
Robert Jordan d7a4474bcd Removed irrelevant comments stating false facts 2015-06-09 23:18:20 -04:00
Robert Jordan 32b79ea216 Fix ride works for all breakdown types 2015-06-09 23:17:08 -04:00
Robert Jordan 98501a51f3 Fix Ride is greyed out when it doesn't work 2015-06-09 23:05:43 -04:00
Robert Jordan e7332b2d94 Fixed maintenance bar 2015-06-09 22:43:14 -04:00
Robert Jordan bf2ac564fb Fixed merge conflicts 2015-06-09 20:19:19 -04:00
Robert Jordan 10c1c29c11 Can now force ride breakdowns 2015-06-09 20:18:04 -04:00
Robert Jordan 0f955d0d92 Decompiled toggle ride price 2015-06-09 17:00:11 -04:00
IntelOrca dc3fe2a6c8 remove commented out CALLPROCs and CALLFUNCs 2015-06-09 15:09:45 +01:00
Robert Jordan fcbe561ad8 Decompiled Ride Prices 2015-06-08 21:28:07 -04:00
Robert Jordan 21734bd71f Fixed open button y 2015-06-07 20:56:31 -04:00
Robert Jordan 9960c8d901 Fixed merge conflicts 2015-06-07 20:37:56 -04:00
Robert Jordan e90c724a3a Rewrote Themes 
Added rct1 styles and lights.
Themes are now easier to expand
Added features tab to themes window
 2015-06-07 20:31:54 -04:00
Duncan Frost 97966ac707 Implemented scenery_set_setup for research. 
I've also labelled ride_type->flags.
 2015-06-07 19:19:16 +01:00
IntelOrca 65377629e4 implement track save select nearby scenery 2015-06-07 16:02:43 +01:00
danidoedel 89e4b1c824 fix status label position 2015-06-04 17:27:56 +02:00
IntelOrca ab2e6a867f refactor ride names and show ride type/s on object selection window 2015-06-03 19:14:45 +01:00
IntelOrca 1d622ed3e2 add more ride rating calculations and refactor ride operation mode 2015-06-02 19:59:55 +01:00
Ted John 954db85e8c Merge pull request #1193 from zsilencer/bugfix 
#1192
 2015-06-01 21:36:54 +01:00
zsilencer 603233a583 #1192 2015-06-01 13:07:18 -06:00
Robert Jordan 765bf976ee Renamed Colour Schemes to Themes 
Themes window now opens to settings/presets tab so it's less confusing
for others.
Can no longer change default presets, you get a warning when you try.
now stores themes in themes folder.
Now clips theme names.
 2015-06-01 11:02:09 -04:00
Robert Jordan 41171aa304 Resolved Merge Conflicts 2015-05-30 16:00:13 -04:00
Duncan Frost b2caeaf531 Refactor of code slightly 
Since get_map_coordinates_from_pos returns sint16 values I changed it so that it didn't use sint32 values.
 2015-05-30 06:27:52 +01:00
Robert Jordan dc1e38180e Starting work on colour schemes config settings 2015-05-29 12:04:53 -04:00
IntelOrca 6426adb45d remove asm for set scroll size and add gCurrentAwards 2015-05-26 19:28:56 +01:00
Gymnasiast 121052b807 Add cheat to unlock both entry and ride prices, reordered misc tab on cheats window 2015-05-22 12:41:22 +02:00
Gymnasiast 36ccfe77e0 Add GUI option for switching to the RCT1 colour scheme, along with proper invalidation of the affected windows 2015-05-21 12:28:51 +02:00
Duncan Frost d3587c2fc5 Fix #1103 and #483 
Measurement close is now correctly called when the ride measurement window is closed.
When quiting a scenario tool_cancel is called to also reset the scnery selection mode
 2015-05-20 19:18:54 +01:00
Gymnasiast 257e330503 Increase maximum number of laps to 20 and maximum number of people in maze to 64. 2015-05-19 11:18:08 +02:00
Gymnasiast 8f82175fec Allow maxing out launch speed and many other operation settings as well 2015-05-17 17:26:07 +02:00
Gymnasiast 02ba241385 Add cheat option for lift hills up to 410 km/h, fix a comment and some spaces 2015-05-16 17:16:09 +02:00
Gymnasiast 8ed8b56abe Introduce a config-file option for a RCT1-like colour scheme 2015-05-12 16:13:30 +02:00
Robert Jordan c25ef45827 Named 2 input flags, and dropdown fix 
Named INPUT_FLAG_1 to INPUT_FLAG_DROPDOWN_STAY_OPEN
Named INPUT_FLAG_2 to INPUT_FLAG_DROPDOWN_MOUSE_UP

placed RCT2_ADDRESS_INPUT_FLAGS where valid and replaced all bitwise
references to it with appropriate input flags.

Changed ride view dropdown to hold only as it should be.
 2015-05-07 14:31:11 -04:00
Robert Jordan 1b269675d8 #1044 
Fixed drop downs not staying open and music dropdown not working first
time after game opened.
 2015-05-07 11:37:49 -04:00
Timmy Weerwag 10c4722a86 Deciphered flags and z param of get_map_coordinates_from_pos 2015-05-03 13:54:08 +02:00
zsilencer ea75926a6c game_command_set_ride_appearance 2015-04-25 09:20:47 -06:00
Duncan Frost 9d8983a5c7 Fix ride graphs and negative lengths 2015-04-14 19:00:29 +01:00
Duncan Frost a822301002 Fix vehicle tab from failing to reload new variables 2015-04-14 18:35:26 +01:00
Ted John e08e4b7f61 Merge pull request #988 from Garogolun/footpath-stuff 
Added two footpath functions
 2015-04-12 23:15:20 +01:00
IntelOrca 12edf8b4a0 rename unidentified ride entry struct members 2015-04-07 00:16:47 +01:00
Timmy Weerwag fe799f03a5 Added footpath_bridge_get_info_from_pos 2015-04-01 01:45:18 +02:00
IntelOrca 851b0819b9 clean up many CALL_PROCs and implement a few functions 2015-03-31 02:21:30 +01: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
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
Kevin Burke 6423c857a7 Name var_199 as the downtime parameter 2015-03-22 12:28:55 -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 1f718cda07 Merge pull request #924 from Gymnasiast/patch-2 
Fix negative ride ages
 2015-03-18 18:23:32 +00: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
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
Gericom 11b0646176 Added some viewport functions and refactoring 2015-03-11 19:13:14 +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
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
Adrian Wielgosik 7f10024b8e Decompiled window_guest_list_open_with_filter 2015-03-05 21:02:14 +01:00
Duncan Frost 9378f8698e Refactor of object_paint_ride. 2015-03-01 14:24:05 +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
IntelOrca ae69718b53 refactor ride_construct, fixes #725 2015-02-25 18:26:37 +00:00
IntelOrca 2ab48c998e Merge branch 'set-ride-status' into develop 
Conflicts:
	src/ride/track.h
 2015-02-17 17:00:47 +00:00
Duncan Frost a7f4d44ece Add check_for_entrance_exit. Fixed ride name not shown 2015-02-12 22:30:31 +00:00
Duncan Frost 719e23ec3b Fix bathrooms missing same price everywhere box. Fix #761 2015-02-12 18:58:16 +00:00
IntelOrca 0db1c88f2b refactor window hold down widgets (var_020) 2015-02-10 20:40:33 +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
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
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 1c18f80f07 implement game_command_set_ride_name 2015-01-27 02:05:54 +00:00
Duncan Frost 43550e2a7b Fix small offset bugs. Label ride offsets 2015-01-24 19:48:26 +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
Duncan Frost 007817f967 Fix bug in vehicle dropdown. Refactor track more 2015-01-22 21:08:45 +00:00
IntelOrca 8774731f03 refactor map element iteration 2015-01-22 00:19:05 +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 8cd6d51cea Fixed secondary item count. Labeled count offsets 2015-01-04 16:28:19 +00:00
Duncan Frost c3c8a73225 Fixed drawing issues when zoomed. 2014-12-28 13:29:26 +00:00
IntelOrca ff478b8673 implement editor objective options window 2014-12-10 23:07:11 +00:00
IntelOrca d00001fed2 remove unnecessary header includes 2014-11-30 20:27:14 +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
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 d111c715d6 implement viewport_interaction_get_item_left 2014-11-10 00:40:59 +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
Duncan Frost 40a26f689f Added demolish ride prompt 2014-11-02 08:39:01 +00: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
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 c91c4f7ea0 implement mine train coaster rating calculation 2014-10-11 23:07:20 +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 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
Renamed from src/window_ride.c (Browse further)