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 354 MiB
Commit Graph

1749 Commits

Author SHA1 Message Date
Marijn van der Werf 06b128bac7 Name more palettes 2016-11-13 01:51:27 +01:00
Marijn van der Werf 1ce2242bb3 Start cleaning up filters 2016-11-13 01:45:43 +01:00
duncanspumpkin 3da10b7d7d Use correct comparison for previous commit 2016-11-09 19:16:25 +00:00
duncanspumpkin 2f6f728200 Fix #4714. Prevent invalid peep access on closed golf rides. 
When a golf ride is closed it will remove the peep from the vehicle (the ball). Due to the way vehicles leave stations the vehicle would still travel to the next hole but when it tried to update the peeps action it would crash. This skips updating the peeps action but lets the ball still continue. This will cause a phantom ball to go around the golf course until all the vehicles are back in their closed state.
 2016-11-09 19:00:09 +00:00
Michał Janiszewski 9c818ea2dc Reorder fields to reduce padding (#4758) 
Reduces padding:
* In `rct_viewport` from 5 to 1
* In `rct_ride_entrance_definition` from 4 to 0
 2016-11-06 21:06:02 +01:00
Michał Janiszewski 3653baf720 Remove needless const for returned values 2016-11-04 09:44:13 +01:00
duncanspumpkin cc0803d466 Prevent crash #4694. Crash in ride_get_entrance with no station 
Issue is being caused by deleting the station track without removing the station track entry in the ride struct. This will prevent the crash but this should not happen in practice.
 2016-11-03 18:23:42 +00:00
Michał Janiszewski 593230b19c Rename 65DDD1 to turns_ratings 2016-10-30 22:09:59 +01:00
Michał Janiszewski ccc3297424 Rename 65E1C2 to sheltered_ratings 2016-10-30 22:08:51 +01:00
Michał Janiszewski ff8fa26eab Fix argument values to ride_ratings_apply_65E1C2 2016-10-30 22:06:35 +01:00
zsilencer 3d712ddc58 Give names to _currentTrackSelectionFlags flags 2016-10-26 16:19:56 -06:00
zsilencer 1b47bdd180 Fix desync caused by provisional track piece peep interaction 2016-10-26 15:38:54 -06:00
zsilencer 24bd56af02 Fix desync caused by provisional ride entrance/exit peep interaction 2016-10-26 15:01:50 -06:00
Ted John 5699b9e4ed Merge pull request #4685 from marijnvdwerf/fix/paint-5 
Combine Junior RC and Water RC drawing
 2016-10-25 12:14:03 +01:00
Ted John aef32c0fba Merge pull request #4696 from IntelOrca/render/night-lights 
The light effects mod branch #3798 by @JeroenDStout has become quite out of date. I plan to properly implement it, but first I want to merge in what we have already, so that I can branch off develop again and rebase (currently rebasing this branch is too difficult, far too many commits).

Most code that this is merging is protected by the __ENABLE_LIGHTFX__ directive, so it should not make any difference until its time to enable it via a new pull request.

I have isolated it as much as possible to lightfx.c.
 2016-10-25 12:12:48 +01:00
Michał Janiszewski 73aede6052 Fix memory leak in TrackDesignRepository 2016-10-23 22:46:59 +02:00
Marijn van der Werf e8e2039832 Fix GCC 2016-10-23 14:52:32 +02:00
Marijn van der Werf b868cccea2 Remove `pragma mark` 2016-10-23 14:41:47 +02:00
Marijn van der Werf 551962123a Reorganise file to minimise diffs 2016-10-23 14:40:11 +02:00
Marijn van der Werf 7d3cd99c0c Combine Junior RC and Water RC drawing 2016-10-23 14:13:11 +02:00
Ted John 712e062bcc Only load tracks if cache is invalid 2016-10-23 01:12:17 +01:00
Ted John 9eaf887546 Fix track manager issues 2016-10-23 00:42:22 +01:00
Ted John a9db9528ae Fix bitwise and expression 2016-10-22 22:36:45 +01:00
Ted John cdc45a2848 When renaming, don't change extension 2016-10-22 22:36:45 +01:00
Ted John 7834afb34a Re-write FileScanner for easier cross platform and multiple patterns 2016-10-22 22:36:45 +01:00
Ted John 9118f24778 Rename FileEnumerator to FileScanner 2016-10-22 22:36:45 +01:00
Ted John 16626eabb8 Convert FileEnumerator to IFileScanner 2016-10-22 22:36:45 +01:00
Ted John a17748eb41 Fix typo 2016-10-22 22:36:45 +01:00
Ted John 42d8324997 Prevent delete or rename on RCT2 tracks 2016-10-22 22:36:45 +01:00
Ted John 29f75a71fb Use new item structure with std::string 2016-10-22 22:36:45 +01:00
Ted John e666028e02 Convert track repository to C++ 2016-10-22 22:36:45 +01:00
Ted John 84e8b00900 Merge pull request #4678 from marijnvdwerf/fix/paint-4 
Track Paint fixes: segment support height
 2016-10-22 14:22:03 +01:00
Marijn van der Werf 1ce7f38785 Fix various segment heights 2016-10-22 14:42:31 +02:00
Marijn van der Werf 1ebfba60d9 Fix right vertical loop 2016-10-22 14:42:30 +02:00
Marijn van der Werf 5c0279f3e1 Fix general support heights 2016-10-22 02:42:02 +02:00
Marijn van der Werf 6f2b20d3c0 Fix lay down rc station tunnels 2016-10-22 01:51:55 +02:00
Marijn van der Werf b2177b137e Fix helix tunnels 2016-10-22 01:49:32 +02:00
Marijn van der Werf ce5831f9b4 Fix upward single-tile turns 2016-10-22 01:36:50 +02:00
Marijn van der Werf 76188d2c4c Fix station drawing 2016-10-22 00:22:05 +02:00
Duncan 912080c473 Merge pull request #4529 from zaxcav/adjacentStationRatingBonus 
Check for adjacent station(s) when applying rating bonus.
 2016-10-20 12:42:36 +01:00
Ted John 12cddd10bd Merge pull request #4653 from marijnvdwerf/paint/fix-1 
Various paint fixes
 2016-10-20 12:25:14 +01:00
Yaroslav Tretyakov 82b18ddaf3 Fix #4644: steam particle sprite crash 2016-10-18 20:59:53 +01:00
Marijn van der Werf 0c82651d97 Fix Lay Down RC 2016-10-18 19:37:56 +02:00
Marijn van der Werf 18a2cf1f73 Fix mine train coaster 2016-10-18 19:37:56 +02:00
Marijn van der Werf d678495f8b Fix Flying RC 2016-10-18 19:37:56 +02:00
Marijn van der Werf bd7b2c536e Fix 'left corkscrew up' track 2016-10-18 19:37:56 +02:00
Marijn van der Werf 75ab5548f7 Fix Dinghy Slide 2016-10-18 19:37:56 +02:00
Marijn van der Werf 2666088ce4 Fix station covers 2016-10-18 19:37:56 +02:00
Ted John b64f8861f4 Merge branch 'stout-expanded-rendering-2' into render/night-lights 2016-10-16 23:40:59 +01:00
Ted John 00e907d007 Merge pull request #4414 from Broxzier/extended_tile_inspector 
Extended tile inspector
 2016-10-16 21:12:21 +01:00