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

25294 Commits

Author SHA1 Message Date
Gymnasiast 7f458f5b46
Call WoodenA/B functions directly in MiniatureRailway.cpp 2023-11-14 20:30:10 +01:00
Gymnasiast f47cfa79c0
Use WoodenBSupportsSetupRotated() for scenery supports drawing 2023-11-14 20:30:09 +01:00
OpenRCT2 git bot 3ab33d3ca9 Merge Localisation/master into OpenRCT2/develop 2023-11-13 04:01:49 +00:00
Fredrik Tegnell af7086e283
Close #12078: Add shortcut key for sloping walls (#20860) 
* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Close OpenRCT2/OpenRCT2#12078: New shortcut key for sloping walls

* Apply code formatting fixes

* Apply code formatting fixes

* Apply modulus operator to make code more concise

* Change string ID

* Apply code formatting fix

* Apply code formatting fix
 2023-11-12 08:10:56 -03:00
KawkMob 135c8b9f9b
Fix #20747: handle staff speed permanency/serialization/apply for new staff (#20756) 2023-11-12 08:06:51 -03:00
Maciek d6a481b066
Close #20881: Replace monorail_diag_blocked_segments with DiagBlockedSegments (#20961) 
Removed monorail_diag_blocked_segments. Replaced the references with DiagBlockedSegments.
 2023-11-12 08:04:25 -03:00
Matt da1fa18523
Merge pull request #20966 from ZehMatt/fix-20964 
Fix #20964: Crash when invalid network group id is used
 2023-11-11 23:48:48 +02:00
ζeh Matt d4419ea89a
Update changelog.txt 2023-11-11 19:03:54 +02:00
ζeh Matt 37cdc40799
Fix #20964: Crash when invalid network group id is used 2023-11-11 18:59:46 +02:00
Sjoerd de Bruin b12d659db3
Clarify launcher wording (#20957) 
Although the launcher is available for more than one platform the word "cross platform" might confuse users of macOS and other platforms
 2023-11-09 21:31:57 -03:00
OpenRCT2 git bot f1fdeb1f2b Merge Localisation/master into OpenRCT2/develop 2023-11-08 04:01:45 +00:00
Matt 3b6b6e080f
Merge pull request #20946 from davesmits/feature/update-launcher-in-readme 
Update readme.md to link to IntelOrca's launcher
 2023-11-05 19:10:21 +02:00
Dave Smits 5afe3a85f5
Update readme.md 2023-11-04 22:20:06 +01:00
Dave Smits 97cb3125c9
Use IntelOrca's launcher 2023-11-04 22:17:25 +01:00
mrmbernardi e914ffedaf
Fix #20944: Add cstdint to EnumMap and EntryList (#20945) 2023-11-04 19:55:35 +00:00
Matt 9300e33ac9
Merge pull request #20922 from Gymnasiast/feature/remove-park-fences-multiplayer 
Make remove_park_fences multiplayer-safe
 2023-11-03 17:08:05 +02:00
Gymnasiast 56933d3cdc
Bump network version 2023-11-02 22:40:35 +01:00
Gymnasiast 6d87e3e56d
Make remove_park_fences multiplayer-safe 2023-11-02 22:40:11 +01:00
spacek531 e24b59e939
Upload macos-x64 artifacts before tests (#20936) 
This allows for artifact upload even when tests fail.

Other targets already upload artifacts before tests.
 2023-11-02 18:43:00 +01:00
OpenRCT2 git bot 162b17ddc8 Merge Localisation/master into OpenRCT2/develop 2023-11-01 04:01:53 +00:00
Michał Janiszewski 68575ba165
Merge pull request #20930 from janisozaur/v12-docker-build 
Update Android project to more recent tools
 2023-10-31 06:34:52 +01:00
OpenRCT2 git bot f5649870ee Merge Localisation/master into OpenRCT2/develop 2023-10-31 04:01:51 +00:00
Michał Janiszewski 78f4860bfe Update Android project to use more recent tools 
Tested manually on my Android 13 device
 2023-10-30 23:20:49 +01:00
Michał Janiszewski f7b2fddbe3 Use v12 docker build images 2023-10-30 23:20:49 +01:00
AuraSpecs f1bcbd97c2
Allow vertical pieces on the giga when vehicle allows (#20802) 
* Allow vertical pieces on the giga when drawable

* Update NetworkBase.cpp

* Re-Add Diag Brakes

seem to have gotten lost with rebasing.
 2023-10-30 20:44:06 +00:00
Ted John daf03e4511
Merge pull request #20897 from Gymnasiast/refactor/station-supports 
Use common methods for station and on-ride photo support drawing
 2023-10-27 21:47:53 +01:00
Gymnasiast d88abab74b
Move MetalSupportTypeCount to Supports.cpp 2023-10-25 19:43:35 +02:00
Gymnasiast 3b074be920
Confine RotatedMetalSupports to Supports.cpp 2023-10-25 19:43:34 +02:00
Gymnasiast 2d16df1072
Create TrackPaintUtilOnridePhotoPlatformPaint() 2023-10-25 19:43:34 +02:00
Gymnasiast 0e5c413385
Merge TrackPaintUtilDrawStationMetalSupports() and ...2() 2023-10-25 19:43:28 +02:00
Gymnasiast 4ee088e27d
Also include the thick supports in RotatedMetalSupports 2023-10-25 19:37:49 +02:00
Gymnasiast 7cf75ab11d
Use common method for station/on-ride supports 2023-10-25 19:37:49 +02:00
Matt a19879ac1f
Merge pull request #20900 from ZehMatt/fix-20748 
Calculate guests heading towards park after importing the save file
 2023-10-24 14:57:44 +03:00
ζeh Matt 897579b5de
Print a warning if there is a disagreement with the imported data 2023-10-20 15:02:28 +03:00
ζeh Matt b43af1cf14
Remove obsolete code in s4 importer 2023-10-20 14:28:10 +03:00
ζeh Matt 37bc7238e6
Remove unnecessary scope 2023-10-20 14:27:02 +03:00
ζeh Matt 4e7587db13
Re-calculate the amount of guests heading to the park on import 2023-10-20 14:26:30 +03:00
ζeh Matt a45d72f562
Extract functions out of GameFixSaveVars 2023-10-20 14:22:14 +03:00
Michael Steenbeek 3f5be95972
Use strong enum for metal support placement (#20855) 
Co-authored-by: tupaschoal <tupaschoal@noreply.github.com>
 2023-10-18 06:09:44 -03:00
Michał Janiszewski 3fb29b327c
Merge pull request #20894 from janisozaur/android-fix-0.4.6 
Fix Android startup code
 2023-10-18 00:10:30 +02:00
Michał Janiszewski 929e2e5790 Let gradle use 4GB 2023-10-17 23:55:31 +02:00
Michał Janiszewski beb28ff32a Properly initialize class loader on Android 
https://github.com/OpenRCT2/OpenRCT2/pull/20502 changed how startup is
handled. This affected Android as well and changed AndroidClassLoader to
be initialized statically, but this turns out to be problematic due to
JVM not being fully initialized in our context by this time.

To fix this, move AndroidClassLoader initialization to JNI_OnLoad call,
where JVM is fully available.

Additionally, guard against multiple calls to JNI_OnLoad, an issue
present on Linux-like systems (including Android).
 2023-10-17 23:55:31 +02:00
mawjMobi 519421d3a3
Ref: #11159 Reduce malloc() and free() usage (#20872) 2023-10-17 08:51:52 +01:00
Matt c2fe9ef96a
Filter certain game actions from being used in the replay system (#20886) 2023-10-15 07:22:00 +01:00
AuraSpecs 88608e0b7e
Fix 20866: Boosters for the Mini and B&M track are swapped (#20867) 
* Fix 20866: Boosters are swapped

* Update sprites.h

* Bump network version
 2023-10-12 07:58:49 +01:00
Silent 6bc6b63ed4
Fix #18199: Dots in the game save's name get truncated (#20691) 2023-10-11 21:45:43 +01:00
Matt f773adc508
Merge pull request #19919 from spacek531/track/diagonal-brakes 
Diagonal brakes and block brakes
 2023-10-10 02:39:09 +03:00
Spacek531 85810708b3 bump parkfile min version 2023-10-09 10:27:06 -07:00
Duncan b9c7637c83
Fix #20807: Copy the tertiary colour with the scenery eye dropper (#20820) 
* Fix #20807: Copy the tertiary colour with the scenery eye dropper

* Add changelog entry and fix order of entries
 2023-10-09 05:46:09 -03:00
Vlad Rakhmanin 177061ba1d
Close #19455: Factor out hardcoded constants in EditorObjectiveOptions (#20857) 2023-10-08 15:17:06 -03:00