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

15764 Commits

Author SHA1 Message Date
Matt 8721bef807 Fix TileElementWantsFootpathConnection test not releasing context. 2018-12-30 12:24:41 +01:00
OpenRCT2 git bot 4654e2fc19 Merge Localisation/master into OpenRCT2/develop. 2018-12-29 04:00:24 +00:00
Michał Janiszewski 54403aca06 Fix the no-HTTP builds 2018-12-28 22:27:33 +01:00
Michał Janiszewski 5b467ffc68
Fix rendering of text shadows with TTF (#8533) 
Only render shadow if it is within the bounds of allocated buffer.
This fixes most if not all crashes seen with rendering TTF. The cause of
the problem is rendering of shadows which is done by taking a solid
rendered text and moving it by one pixel to up, left, right and *down*.
In some cases rendering the shadow in the one-down offset will write
past the allocated surface (see
8d9fcb7f98/src/openrct2/drawing/Drawing.String.cpp (L594))
it can easily happen when trying to render a shadowed text (e.g. map
tooltip) on a peep that's just above the bottom of the viewport.
 2018-12-28 11:47:08 -08:00
ζeh Matt 8d9fcb7f98
Merge pull request #8337 from ZehMatt/fix-8333 
Fix #8333: Replace assert with in-game error.
 2018-12-23 22:48:17 +01:00
Matt 727ba2d7d0 Fix #8333: Replace assert with in-game error. 2018-12-23 22:28:59 +01:00
Michael Steenbeek 16b9c533d4
Update used objects version to v1.0.8 2018-12-23 13:12:28 +01:00
Michał Janiszewski a34957eb41 Add ride type check to rct_peep::ShouldGoOnRide 2018-12-22 15:35:26 +01:00
Michael Steenbeek 2530cd1ac3
Fix #8426: Queue banner left behind after ride demolition 2018-12-22 15:34:17 +01:00
Gymnasiast 958f287bb7 Fix typo, fix nullptr check notation 2018-12-22 15:31:28 +01:00
Ted John fa3374c827 Fix #8484: Object selection doesn't work 
Revert change to _filter_object_counts from d145ae6922
 2018-12-22 11:18:17 +00:00
Michael Steenbeek 65dcdf77ea
Fix #8508: Underground roto-drop is not going up 2018-12-22 11:56:00 +01:00
Tobias 73345b414b Fix #7985: Giant Screenshot ignores 'Map rendering' settings 2018-12-21 21:27:06 +01:00
Michael Steenbeek 764fdf0648
Merge pull request #8491 from ZehMatt/preview-placement-hints 
Use different colours for entrance/exit on track design previews.
 2018-12-21 20:46:22 +01:00
OpenRCT2 git bot ec06a9a7e8 Merge Localisation/master into OpenRCT2/develop. 2018-12-21 04:00:23 +00:00
ζeh Matt b572fffafa
Merge pull request #8457 from ZehMatt/refactor/game-action-name 
Automatically expose game action name via macro.
 2018-12-20 23:17:49 +01:00
Matt 4dce91e027 Move defines into Colour.h 2018-12-20 22:29:16 +01:00
Matt c4c4f46b78 Use different colours for entrance/exit on track design previews. 2018-12-20 22:27:01 +01:00
ζeh Matt c457de1ece Fix #8402: prevent dereferencing invalid iterator (#8504) 2018-12-20 22:25:10 +01:00
Matt 4ff2dbd108 Automatically expose game action name via macro. 2018-12-20 22:20:58 +01:00
Michał Janiszewski c0fc5142ac
Merge pull request #8321 from ZehMatt/simulate-cmd 
Add "simulate" command.
 2018-12-20 22:08:17 +01:00
Ted John 92bb4a5897 Fix #8498: Advertisement campaigns less effective than they used to be 
0x8000 was being checked instead of 0xFFFF when importing and exporting peep spawns to and from S4, S6.
 2018-12-20 09:25:31 +00:00
OpenRCT2 git bot 4430784326 Merge Localisation/master into OpenRCT2/develop. 2018-12-20 04:00:24 +00:00
Michał Janiszewski 05ede45b8e
Fix ICU include dirs for tests (#8499) 2018-12-19 23:31:24 +01:00
ζeh Matt 7568123a9d Fix #8482: Pending player list not being reset. (#8483) 2018-12-19 20:34:41 +01:00
OpenRCT2 git bot cb7821ab7f Merge Localisation/master into OpenRCT2/develop. 2018-12-19 04:00:26 +00:00
Michael Steenbeek 38b26e0ac4
Fix #8456: Junior booster track piece doesn't connect properly 2018-12-18 22:41:01 +01:00
Umdlye 5463dde932 Update Gitter links in "Contributing" section [ci skip] 2018-12-18 07:17:40 +01:00
ζeh Matt 183e508c4d
Merge pull request #8465 from ZehMatt/fix-8464 
Fix #8464: Crash on game shutdown.
 2018-12-18 00:55:22 +01:00
Michał Janiszewski ea61be5ebe
Prevent logging from using already-freed game command (#8473) 
gc variable is held by reference in the scope above, pointing to the
queue's beginning.
 2018-12-17 23:56:01 +01:00
Matt 8e2e60b117 Fix #8464: Crash on game shutdown. 2018-12-17 23:51:43 +01:00
ζeh Matt 3cc6e1ab15 Fix #8469: Crash modifying colour on hacked rides. (#8470) 2018-12-17 16:27:45 +01:00
OpenRCT2 git bot ce7311d68f Merge Localisation/master into OpenRCT2/develop. 2018-12-17 04:00:26 +00:00
Ted John abbdab9b6d
Merge pull request #8452 from IntelOrca/change-structures 
Change a few structures from fixed to C++
 2018-12-16 19:01:36 +00:00
Ted John 1d6d734c1c Fix build 2018-12-16 19:01:15 +00:00
Ted John 08b02943d3 Use std::string for scenario name, details etc. 2018-12-16 19:01:14 +00:00
Ted John 4195f0d9c9 Change gPeepSpawns to a vector so we can now have more than 2 2018-12-16 19:00:16 +00:00
Ted John 19a687f2fa Change gParkEntrance to a vector so we can now have more than 4 2018-12-16 19:00:16 +00:00
Michael Steenbeek 59f9476ecd
Change 'entrance style' to 'station style' 2018-12-16 19:38:30 +01:00
Michael Steenbeek e2a91e55e5
Fix compile error in EditorObjectSelection.cpp 2018-12-16 17:10:45 +01:00
Gymnasiast 6031a9bc27 Fix SV4 import error 2018-12-16 12:49:30 +01:00
Gymnasiast 75d094e135 Fix another omission from #8453 2018-12-16 10:10:26 +01:00
Michael Steenbeek d145ae6922
Fix #8450: Track designer window has drawing problems and crashes 2018-12-16 10:02:40 +01:00
ζeh Matt 7d19a5bc77 Refactor memcpy to std::memcpy and memset to std::memset (#8408) 2018-12-15 22:23:31 +01:00
Gymnasiast 748da25f78 Fix omission from #8453 2018-12-15 21:34:14 +01:00
Michael Steenbeek 7d7e8e2638
Merge pull request #8453 from Gymnasiast/fix/8033 
Fix #8033: Crash when placing 64th sign
 2018-12-15 21:24:09 +01:00
Michael Steenbeek 6d0f0334d7
Merge pull request #8339 from ZehMatt/realtime-ticks 
Use real time ticks for UI effects.
 2018-12-15 21:00:44 +01:00
Gymnasiast 806073ec59 Fix 'Object index exceeds maximum' spam 2018-12-15 20:34:28 +01:00
Gymnasiast 600d32807d Fix #8033: Crash when placing 64th sign 2018-12-15 20:34:28 +01:00
Gymnasiast 0d775f48ec Clean up scenery ghost flags 2018-12-15 20:31:41 +01:00