mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 23:33:04 +01:00
Code Issues Releases Wiki Activity
25,277 Commits 8 Branches 58 Tags
6d87e3e56d3db6465d25c4bf5246edab1f0526f8
Commit Graph

25277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matt
d9c19916dc Merge pull request #20853 from ZehMatt/plugin-owner 
Add owner property to tile elements for scripting
 2023-10-08 14:05:06 +03:00
ζeh Matt
34ed27b075 Update changelog.txt 2023-10-08 02:39:35 +03:00
ζeh Matt
0ffbd65576 Bump plugin API version 2023-10-08 02:30:55 +03:00
ζeh Matt
b4376ab590 Add owner property to tile elements for scripting 2023-10-08 02:30:43 +03:00
Matt
9b7ce95c05 Merge pull request #20840 from fidwell/invisibility-shortcut 
Fix #16453: Tile inspector invisibility shortcut does not use a game action
 2023-10-07 23:03:27 +03:00
fidwell
17489be61b Removed redundant code 2023-10-07 10:36:47 -04:00
fidwell
ce269e0d53 Merge remote-tracking branch 'origin/develop' into invisibility-shortcut 2023-10-07 10:07:50 -04:00
Spacek531
1a2cd1d186 revert some changes 2023-10-04 22:26:23 -07:00
Spacek531
87f246ed36 re-add whitespace 2023-10-04 22:02:01 -07:00
Spacek531
1b730e88da maybe fix it but better 2023-10-04 21:50:40 -07:00
Spacek531
1563004592 maybe fix it 2023-10-04 21:40:19 -07:00
Spacek531
9ef6d0e32e trying again 2023-10-04 16:58:50 -07:00
Spacek531
dd4826e0fa add extern struct 2023-10-04 16:05:53 -07:00
Spacek531
ae5230af69 fix wooden coaster sprite 2023-10-04 16:05:45 -07:00
Matt
4147e9ad73 Merge pull request #20847 from ZehMatt/fix-20846 
Fix #20843: Remove 0 padding from file path in scenario index filename
 2023-10-04 22:07:49 +03:00
Andrew
e17bca3b53 Made setting the game speed a game action (#20825) 
* Bare minimum for a game action

* Changelog entry

* Fixed formatting

* Consistent capitalization

* Committed wrong file

* Removing redundant toolbar invalidations

* Bump network version; remove redundant qualifier

* Fixed crash on starting server
 2023-10-04 16:13:40 +01:00
ζeh Matt
cdb9f4cd18 Fix #20843: Remove 0 padding from file path in scenario index filename 2023-10-04 04:37:27 +03:00