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

1749 Commits

Author SHA1 Message Date
Ted John a87ab47b1f Fix bobsleigh coaster painting 2016-10-09 18:26:11 +01:00
Michał Janiszewski 04782c257f Add generated LIM launched RC 2016-10-09 15:24:44 +02:00
Michał Janiszewski b2c068906d Add generated Mine ride 2016-10-09 15:24:44 +02:00
Michał Janiszewski e23f01be26 Add generated Mini RC 2016-10-09 15:24:43 +02:00
Michał Janiszewski 4fa2f4a351 Add generated Inverted impulse RC 2016-10-09 15:24:43 +02:00
Michał Janiszewski 1a0b5b7014 Add generated Inverted hairpin RC 2016-10-09 15:24:43 +02:00
Michał Janiszewski 56ca9ed0f5 Add generated Compact inverted coaster 2016-10-09 15:24:43 +02:00
Michał Janiszewski e16da47ef8 Add generated Giga coaster 2016-10-09 15:24:43 +02:00
Michał Janiszewski ec029877d1 Add generated Heartline twister coaster 2016-10-09 15:24:42 +02:00
Michał Janiszewski c8ae40332c Add generated Reverser RC 
Includes previous function `vehicle_visual_reverser`
 2016-10-09 15:24:42 +02:00
Michał Janiszewski 1ce3c28eee Add generated Suspended monorail 2016-10-09 15:24:42 +02:00
Michał Janiszewski 3e5d445b79 Add generated Lay down RC 2016-10-09 15:24:42 +02:00
Michał Janiszewski 6466916011 Add generated Flying RC 2016-10-09 15:24:41 +02:00
Michał Janiszewski ea485d86dd Add generated Multi dimension RC 2016-10-09 15:24:41 +02:00
Michał Janiszewski 8e4f9003b3 Add generated Side friction RC 2016-10-09 15:24:41 +02:00
Michał Janiszewski c56936adb8 Add generated Twister RC 2016-10-09 15:24:41 +02:00
Michał Janiszewski ef4a2f4106 Add generated Vertical drop RC 2016-10-09 15:24:40 +02:00
Michał Janiszewski 1d3c113439 Add generated Corkscrew RC 2016-10-09 15:24:40 +02:00
Michał Janiszewski 5c421ed6a4 Add generated Mine train RC 2016-10-09 15:24:40 +02:00
Michał Janiszewski 6f94e9fc6d Add generated Looping RC 2016-10-09 15:24:40 +02:00
Michał Janiszewski 4f091aac4d Add generated Bobsleigh RC 2016-10-09 15:24:40 +02:00
Michał Janiszewski 39cb42342a Add generated Steeplechase 2016-10-09 15:24:39 +02:00
Michał Janiszewski 3c110a3f3b Add generated Mini suspended RC 2016-10-09 15:24:39 +02:00
Michał Janiszewski 208fa6968c Add generated Inverted RC 2016-10-09 15:24:39 +02:00
Michał Janiszewski 9e946bce8e Add generated Suspended swinging RC 2016-10-09 15:24:39 +02:00
Michał Janiszewski 8b6f775cff Add generated Stand up RC 2016-10-09 15:24:39 +02:00
Michał Janiszewski 482e7c15f0 Add generated Spiral RC 2016-10-09 15:24:38 +02:00
Ted John 6348f281b7 Merge pull request #4567 from IntelOrca/paint/generate 
Generate ride paint code
 2016-10-09 12:24:59 +01:00
Michał Janiszewski f1c6ef94da Compilation fixes to latest testpaint 2016-10-09 09:54:20 +01:00
Ted John 157a93d7a5 Support multi-dimension coaster 2016-10-09 03:35:39 +01:00
Ted John 313f766fad Support mirror calls for turn eighth 2016-10-08 16:33:17 +01:00
Ted John ec082b4ac8 Generate set segment support height and other fixes 2016-10-07 23:55:17 +01:00
Manuel Vögele 7b9bfd6529 Fix #4549: Allow maze to be built in pause mode if build-while-paused-cheat is enabled 2016-10-07 23:23:39 +01:00
Michał Janiszewski 9966052ca7 Fix more configurations 2016-10-06 23:32:10 +02:00
Michał Janiszewski 4bfd5c6f4c Hide unused variables in some configurations 2016-10-06 23:13:28 +02:00
Michał Janiszewski c9b0d9e24d Initialise all variables flagged by -Wmaybe-uninitialized 2016-10-06 23:13:28 +02:00
Ted John 41f026e5e2 Fix wrong function case in wooden wild mouse paint 2016-10-05 22:17:48 +01:00
Ted John 4f247c16b2 Fix #4525: Track Designs Manager Crashing 
Handle tracks that use a vehicle object that can not be found, fall-back if possible to another object of the same ride type.
 2016-10-05 21:34:32 +01:00
Ted John c6efe8dabc Clean up 2016-10-05 18:39:25 +01:00
Ted John 8abd11f8bd Implement right quarter turn 3, 25 deg up and counterpart 2016-10-05 18:31:37 +01:00
Ted John 8f77790e4d Implement right quarter turn 3, 25 deg down and counterpart 2016-10-05 13:03:28 +01:00
zaxcav c68571392a Strengthen the checks for adjacent stations 
Existing checks only checked for a track piece of a snychronised ride at the adjacent location.  Add check that the track piece must also be a station platform.

Refactor common code for syncing stations and applying rating bonus for synchronised rides.
 2016-10-05 11:13:28 +02:00
Ted John 71cf498206 Implement quarter turn 3 2016-10-04 22:29:22 +01:00
Ted John 59cf534bbb Implement quarter turn 1 2016-10-04 22:13:48 +01:00
Ted John 78e7bdf4ea Implement steep to flat pieces 2016-10-04 21:45:03 +01:00
Ted John 53f613a30d Implement most slope pieces 2016-10-04 21:31:36 +01:00
Ted John d29bc09683 Implement rotation control toggle 2016-10-04 20:29:28 +01:00
Ted John 8f38a3b279 Implement brakes 2016-10-04 18:47:09 +01:00
Ted John 461680be46 Implement station 2016-10-04 18:39:22 +01:00
Ted John 67d04a26ee Implement flat 2016-10-04 18:29:03 +01:00
Ted John 497c99a2b8 Setup wild mouse paint function 2016-10-04 18:21:55 +01:00
zaxcav 5fdfb397d2 Fix typo 2016-10-04 15:50:23 +02:00
zaxcav 5217221067 Only add adjacent station rating bonus if ride actually has adjacent station(s). 2016-10-04 15:11:39 +02:00
Ted John 973765769d Remove unnecessary braces 2016-10-04 00:20:22 +01:00
Ted John ef81919f02 Implement quarter turn 3 2016-10-04 00:10:50 +01:00
Ted John c6a1ecab91 Implement quarter turn 1 2016-10-03 23:50:48 +01:00
Ted John 475a142bf7 Implement steep to flat pieces 2016-10-03 23:50:34 +01:00
Ted John 3c43bb5522 Implement most of the slope pieces 2016-10-03 22:35:06 +01:00
Ted John fc8bd70f93 Implement 25 and 60 deg up 2016-10-03 21:40:32 +01:00
Ted John e18233d71e Implement station 2016-10-03 21:40:32 +01:00
Ted John 041b286c8b Implement flat 2016-10-03 21:40:32 +01:00
Ted John 7c61b960b7 Setup paint function for wooden wild mouse coaster 2016-10-03 21:40:32 +01:00
Ted John 2ece5fbd64 Fix arrays, too many braces 2016-10-02 23:45:58 +01:00
Ted John 004cef2d0c Implement banked quarter turn 5 2016-10-02 23:32:15 +01:00
Ted John e7823df1e1 Implement quarter turn 5 2016-10-02 22:38:50 +01:00
Ted John 03e5f6b4f4 Implement vertical slopes 2016-10-02 21:44:07 +01:00
Ted John 62296c6558 Implement vertical up, down and top 2016-10-02 19:10:27 +01:00
Ted John ab7d38bc36 Add single tile banks 2016-10-02 18:00:30 +01:00
Ted John ecb48b8332 Implement brakes 2016-10-02 17:36:20 +01:00
Ted John 5accbe33b5 Implement station 2016-10-02 17:33:15 +01:00
Ted John d770c5d7f8 Implement flat 2016-10-02 17:24:54 +01:00
Ted John 64dcc5ccb6 Begin air powered vertical coaster painting 2016-10-02 17:14:27 +01:00
Michael Steenbeek 2f2c2beb7f Merge pull request #4375 from jensj12/trains-tooltip 
Allow 31 trains per ride (cheat and tooltip), solves #3537
 2016-10-02 10:08:57 +02:00
Ted John 362f143163 Merge pull request #4459 from IntelOrca/paint/water-rc 
Paint setup: Water Coaster
 2016-10-01 23:37:01 +01:00
Ted John 6d5a0da438 Implement covered turns 2016-10-01 23:26:34 +01:00
Ted John 0337cf7baa Implement quarter_turn_3 2016-10-01 23:08:15 +01:00
jensj12 44a53dd031 Allow 31 trains per ride (cheat and tooltip) 
Changes the disable train lenght limit cheat to also disable the limit on the number of trains and renames it to 'disable vehicle limits'. Now any tracked ride can have up to 31 trains with 255 cars each. To reduce confusion, I also added a tooltip to the spinners on the vehicle tab.
 2016-10-01 20:58:46 +02:00
Ted John a37679f5ef Implement quarter turn 5 2016-10-01 19:21:19 +01:00
Ted John 753ef64ac2 Implement S bend uncovered 2016-10-01 17:58:47 +01:00
Ted John 5c4e8d445f Implement S bend covered 2016-10-01 17:58:47 +01:00
Ted John 2b7612a922 Implement station 2016-10-01 17:58:47 +01:00
Ted John c8d3f591f3 Implement non covered versions of single tile tracks 2016-10-01 17:58:46 +01:00
Ted John 8959c5cf6a Implement single tile covered tracks 2016-10-01 17:58:46 +01:00
Ted John e5b2cac905 Implement flat 2016-10-01 17:58:45 +01:00
Ted John 8aa7c5ed2e Add dingy slide paint function 2016-10-01 17:58:44 +01:00
Ted John bec7713ad2 Fix flat_to_25_deg_up tunnels 2016-10-01 17:45:44 +01:00
Ted John 90d512683b fix tunnels for 25_deg_up 2016-10-01 17:38:35 +01:00
Ted John a715d27caa Implement down elements that have chain lift 2016-10-01 17:38:35 +01:00
Ted John 42c56dbcc5 Implement diagonals 2016-10-01 17:38:35 +01:00
Ted John 5d4e262a40 Add newly supported track pieces 2016-10-01 17:38:35 +01:00
Ted John 8f13c9019e Mark out pieces left to do 2016-10-01 17:38:35 +01:00
Ted John f68cd430f2 Implement chain lift pieces and reuse 2016-10-01 17:38:35 +01:00
Ted John f14788f74f Implement flat and flat water for water rc 2016-10-01 17:38:35 +01:00
Ted John ee896a481e Fix remaining Junior RC testpaint fails 2016-10-01 17:06:12 +01:00
Ted John 23094d25bb Fix #4265: Delete trackpiece bug 
Safely handle invalid track pieces when demolishing a ride.
 2016-10-01 14:12:52 +01:00
Ted John fffb4b1d7b Fix tunnels 2016-10-01 12:43:03 +01:00
Ted John 39de20e0a3 Implement remaining tracks 2016-10-01 12:43:03 +01:00
Ted John f2279984cb Implement half of splash boat tracks 2016-10-01 12:43:02 +01:00
Ted John f42fd74837 Use river rafts for shared track pieces 2016-10-01 12:43:02 +01:00
Ted John 4b453a3160 Add splash boats paint function 2016-10-01 12:43:01 +01:00
Ted John ae062dea69 Fix river raft painting 2016-10-01 12:33:03 +01:00
Ted John 16124f6d33 Only draw supports on even squares 2016-10-01 11:36:11 +01:00
Ted John b22d2d43f2 Define sprite IDs for s bend 2016-10-01 11:36:11 +01:00
Ted John ce03db20f9 Inverse s bend image arrays 2016-10-01 11:36:10 +01:00
Ted John a9cd816eb6 Define sprite IDs for 3 turn 2016-10-01 11:36:10 +01:00
Ted John 34ada367d5 Implement right quarter turn 3 2016-10-01 11:36:10 +01:00
Ted John a15b721d89 Implement left quarter turn 3 2016-10-01 11:36:09 +01:00
Ted John 417d4a94ca Implement S bend right 2016-10-01 11:36:09 +01:00
Ted John 1c371a7edd Implement S bend left 2016-10-01 11:36:08 +01:00
Ted John f04523283c Implement down tracks 2016-10-01 11:36:08 +01:00
Ted John d960f79c37 Implement up tracks 2016-10-01 11:36:08 +01:00
Ted John aaa4fd0e7d Implement reverser 2016-10-01 11:36:07 +01:00
Ted John 48ebfeeb83 Implement on ride photo 2016-10-01 11:36:07 +01:00
Ted John 91578fa50e Implement station 2016-10-01 11:36:07 +01:00
Ted John 209ec19c8c Implement track flat 2016-10-01 11:36:06 +01:00
Ted John 112c3d22d2 Setup log flume paint function 2016-10-01 11:36:05 +01:00
Marijn van der Werf 7693ba1af9 Partly fix Junior RC 2016-10-01 01:29:23 +02:00
Marijn van der Werf db85b413b5 Fix Circus Show 2016-10-01 01:08:12 +02:00
Marijn van der Werf 584ef402c7 Fix Ghost Train 2016-10-01 00:45:44 +02:00
Marijn van der Werf 142bb0ca22 Fix Lift 2016-10-01 00:28:23 +02:00
Marijn van der Werf 88235d1b0b Fix Roto Drop 2016-10-01 00:28:17 +02:00
Marijn van der Werf 95cae68e5f Fix Observation Tower 2016-10-01 00:28:11 +02:00
Ted John e26b2d4047 Fix #4462: Multiple Corkscrew RC track sprites missing in build window 
rct_trackdefinition.special should have been signed.
 2016-09-29 18:45:49 +01:00
Ted John 7987395444 Merge pull request #4471 from Gymnasiast/onride-photo-underground 
Allow building on-ride photo elements underground
 2016-09-26 12:24:05 +01:00
duncanspumpkin d953f25b96 Fix #4377. Entrances correctly saved for tracked rides 2016-09-25 12:17:27 +01:00
duncanspumpkin 7c42322f0c Fix likely cause of #4377. Track design entrance locations. 
During a refactor the entrance locations were incorrectly computed and this would cause issues. This would only happen when tracks were rotated so would not occur in some situations
 2016-09-25 11:06:19 +01:00
Ted John fcb0f2acd6 Fix #4468: Boats at the Boat hire dock move on top of each other 
Confusingly gSpriteSpatialIndex is indexed by .yx not .xy, all the more reason to use the dedicated helper method.
 2016-09-24 12:55:17 +01:00
Ted John 2429cd84df Fix remaining issues 2016-09-24 11:21:04 +01:00
Ted John 21bb6c507d Fix bugs spotted by testpaint 2016-09-24 11:20:12 +01:00
Ted John d94d2e5820 Clean up paint_reverse_freefall_rc_flat 2016-09-24 11:20:12 +01:00
Ted John df761fb64d Fix bound boxes and draw order 2016-09-24 11:20:12 +01:00
Ted John 09cb01b28a Implement vertical 2016-09-24 11:20:12 +01:00
Ted John 8e6871cf77 Correct name of SPR enum items 2016-09-24 11:20:12 +01:00
Ted John f713eb201a Implement slope 2016-09-24 11:20:12 +01:00
Ted John a62277c44f Implement flat 2016-09-24 11:20:12 +01:00
Ted John 12109993ae Implement station 2016-09-24 11:20:12 +01:00
Gymnasiast c84e2f3184 Name some constants 2016-09-24 11:08:52 +02:00
Michael Steenbeek d3197884d1 Allow building on-ride photo elements underground 2016-09-24 11:08:52 +02:00
Gymnasiast ffcd0cacd1 Convert tabs to spaces and split off switches into own function 2016-09-19 22:04:08 +02:00
Gymnasiast 5610b72394 Add drawing for missing B&M and mini RC pieces 2016-09-19 19:15:31 +02:00
Ted John 23b5af6145 Close #3981: Global configuration option/argument for RCT2 data path 
Add the command line option --rct2-data-path which allows the RCT2 data path to be set irrespective of the config file.
 2016-09-18 22:25:49 +01:00
Ted John 2258652e83 Wrap direction in vehicle_update_motion_collision_detection 2016-09-18 21:49:58 +01:00
Michał Janiszewski 453e508716 Check access to duck_move_offset 2016-09-18 20:01:22 +02:00
Marijn van der Werf 487d6d8f15 Remove unnecessary addresses.h imports 2016-09-17 20:59:55 +01:00
Ted John 665f5e794b Merge pull request #4442 from marijnvdwerf/integrate/vehicle 
Integrate vehicle data
 2016-09-17 19:15:27 +01:00
Marijn van der Werf a3a8484059 Complete integration of 0x009A3B04 2016-09-17 19:54:44 +02:00
Marijn van der Werf a76e21a767 Integrate data at 0x009A37C4 2016-09-17 19:49:52 +02:00
Marijn van der Werf 1a6392cbc9 Integrate data at 0x009A37E4 - 0x009A39C4 2016-09-17 19:08:30 +02:00
Ted John 9f847ca8bb Remove old RCT2 compatibility from vehicle paint 2016-09-17 15:58:59 +01:00
Ted John c2ca1316e8 Integrate / remove various GLOBALs 2016-09-17 15:51:06 +01:00
Marijn van der Werf 59d2c7a341 Integrate table at 0x009A36C4 2016-09-17 16:07:45 +02:00
Ted John 814f67fb3d Revert "Remove unoriginal junior RC tracks" 
This reverts commit 6d03980f20.
 2016-09-16 18:54:54 +01:00
Marijn van der Werf 8982d87e77 Add missing paint functions to track_data_old 2016-09-16 19:45:07 +02:00
Marijn van der Werf 6d03980f20 Remove unoriginal junior RC tracks 2016-09-16 19:44:20 +02:00
Marijn van der Werf 0935ac6ea9 Start drawing debug test 2016-09-16 19:42:53 +02:00
Marijn van der Werf 840ab4a1aa Fix Crooked House 2016-09-16 15:48:36 +02:00
Marijn van der Werf f185003060 Fix Submarine Ride 2016-09-16 15:48:36 +02:00
Marijn van der Werf d1e2a206c9 Fix Junior RollerCoaster 2016-09-16 15:48:36 +02:00
Marijn van der Werf 5ae8d40e16 Fix Mini Helicopters 2016-09-16 15:48:36 +02:00
Marijn van der Werf 4dea417470 Fix Viriginia Reel 2016-09-16 15:48:35 +02:00
Marijn van der Werf f0dd452fa3 Fix Maze 2016-09-16 15:48:35 +02:00
Marijn van der Werf 81b62a75ff Fix Mini Golf 2016-09-16 15:48:35 +02:00
Marijn van der Werf c434c80bb5 Fix Monorail Cycles 2016-09-16 15:48:34 +02:00
Marijn van der Werf 37b41da9f3 Fix Go Karts 2016-09-16 15:48:34 +02:00
Marijn van der Werf fbc85d8e4a Fix Pirate Ship 2016-09-16 15:48:34 +02:00
Marijn van der Werf 67539ed466 Fix Monorail 2016-09-16 15:48:34 +02:00
Marijn van der Werf f88ef72c7f Fix River Rapids 2016-09-16 15:48:34 +02:00
Ted John 0f8cd56c1a Conditionally integrate gUnk9DE568 and gUnk9DE56C 2016-09-14 23:43:30 +01:00
Ted John 931fc59506 Replace 0x009DE56A, 0x009DE56E with gPaintMapPosition 2016-09-14 22:07:42 +01:00
Marijn van der Werf f28c35712f Partially integrate 0x0141E9DB 2016-09-14 18:36:46 +01:00
Duncan 00e2d44264 Refactor sprite functions 2016-09-14 18:22:37 +01:00
Marijn van der Werf d3b7a0cbb9 Integrate addresses of old paint functions 2016-09-13 20:25:06 +01:00
Duncan 6e92df1299 Fix #4386: Wrong animation - Merry Go Round 
Issue caused by data integration. The rotation time to sprite maps had an extra 7 end bytes at the end of each array to account for the increased time increments during control failure. Without the extra end bytes the game would access invalid memory during a control failure.
Refactored code of vehicle update to remove register names.
 2016-09-13 19:47:31 +01:00
Ted John d8a2ee47b8 Remove unused globals in track.c 2016-09-12 20:51:57 +01:00
Ted John 8d5a553c0a Remove old config compatibility 
Note: This will stop paths from showing the correct height markers when in original drawing mode.
 2016-09-12 20:39:07 +01:00
Ted John a2bf35eee5 Remove old Junior RC paint hack 2016-09-12 19:51:30 +01:00
Marijn van der Werf 2232f63973 Integrate leftover references to gTrackColours 2016-09-12 13:02:32 +02:00
Ted John 64df46ba16 Integrate and remove unused globals 2016-09-11 01:02:16 +01:00
Ted John 4a6b2f2ef2 Integrate gRides and gRideMeasurements 2016-09-11 00:05:32 +01:00
Ted John 2f8b307ab7 Merge pull request #4405 from marijnvdwerf/integrate/various-paint 
Partially integrate various paint variables
 2016-09-10 23:02:15 +01:00
Marijn van der Werf b80377f5da Partially integrate track colours 2016-09-10 22:45:54 +01:00
Marijn van der Werf e490070a11 Partially integrate 0x009DEA58 2016-09-10 23:43:46 +02:00
Marijn van der Werf c5d947c1aa Partially integrate surface variables 2016-09-10 23:43:41 +02:00
Ted John ba453db01f Integrate vehicle globals, part 2 2016-09-10 22:32:01 +01:00
Ted John e234dcbb10 Integrate vehicle globals, part 1 2016-09-10 22:18:51 +01:00
Ted John 4350e53392 Integrate gS6Info 2016-09-10 18:30:53 +01:00
Ted John f36485557d Integrate remaining globals in ride window 2016-09-10 18:21:05 +01:00
Ted John 17198cfdb2 Integrate gTrackDesignSaveMode 2016-09-10 18:03:25 +01:00
Ted John 708efdd08c Integrate unknown game variables 2016-09-10 14:46:53 +01:00
Ted John f303642ceb Remove unused variables 2016-09-10 14:42:57 +01:00
Ted John c21a047331 Remove variable and integrate logic instead 2016-09-10 14:40:50 +01:00
Ted John 2db375fb32 Integrate some ride variables 2016-09-10 14:37:20 +01:00
Ted John 9f4a70d642 Integrate more ride construction variables 2016-09-10 14:30:16 +01:00
Ted John 1f0820f662 Integrate various ride construction variables 2016-09-10 14:13:36 +01:00
Ted John 3b0b8a12d1 Integrate ride count 2016-09-10 13:40:58 +01:00
Marijn van der Werf d00aa2c7bb Partially integrate vertical tunnels 2016-09-09 17:16:40 +01:00
duncanspumpkin 933d13ecde Fix jr rc up/down slope tunnels 2016-09-08 18:09:10 +01:00
Michał Janiszewski 163e314379 Remove unused or set-but-not-read variables 2016-09-07 13:39:29 +01:00
Ted John 669396e841 Remove RCT_GLOBALs from track_design.c 2016-09-05 21:45:50 +01:00
Michał Janiszewski 0d9fa13dc9 Integrate gTotalRideValue, gSamePriceThroughoutParkA and B 2016-09-04 21:19:19 +02:00