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

25729 Commits

Author SHA1 Message Date
OpenRCT2 git bot 2d0a04ada9 Merge Localisation/master into OpenRCT2/develop 2024-02-14 04:01:42 +00:00
Gymnasiast 085a126bbf
Remove unnecessary arguments to TrackDesignSave{Add,Remove}TileElement 2024-02-13 23:31:09 +01:00
Gymnasiast 4b03275cff
Remove snake_case in TrackDesignSave.cpp 2024-02-13 23:26:41 +01:00
David Sungaila 89f83d6c0d
Fix #21288: Overlapping text in the About window 2024-02-13 23:10:39 +01:00
Harry Hopkinson 1c285dbf9f
Move gMaxBankLoan to GameState 2024-02-13 21:36:35 +01:00
Severin Paul Höfer 0c7b94255f
Fix #21318: VirtualFloor not properly invalidated (#21386) 
* Fix condition for setting VirtualFloor coordinates

* Update changelog.txt
 2024-02-13 16:53:55 -03:00
Michał Janiszewski 8cf393f971
Use libsawyer's gxc to build g2.dat (#21392) 2024-02-13 16:04:54 -03:00
Matt 19be093569
Fix #21208: Error messages disappear too quickly if the game runs for a while (#21394) 
* Reset gCurrentRealTimeTicks when the map is initialized

* Use 32 bit for gWindowUpdateTicks

* Update changelog.txt
 2024-02-13 16:03:30 -03:00
Matt 5ac347e9f6
Merge pull request #21389 from ZehMatt/error-update-1 
Don't close the error window if the new error will not show
 2024-02-13 15:54:14 +02:00
Matt 5ed5fece46
Merge pull request #21390 from Harry-Hopkinson/gMapSize-to-GameState_t 
Move gMapSize to GameState_t
 2024-02-13 14:14:57 +02:00
OpenRCT2 git bot 64787ff91f Merge Localisation/master into OpenRCT2/develop 2024-02-13 04:01:45 +00:00
Michael Steenbeek c3380e29dd
Fix #21286: Cannot build unbanking turns with RCT1 vehicles 2024-02-12 23:23:05 +01:00
Michael Steenbeek 48a8d484cf
en-GB: Remove old music style strings 
These are no longer used, as they have been moved to objects.
 2024-02-12 23:01:31 +01:00
Harry-Hopkinson ce8afe252a Use OpenRCT2 namespace in Map.cpp 2024-02-12 21:49:57 +00:00
Harry-Hopkinson b755c873e5 Move gMapSize to GameState_t 2024-02-12 21:32:08 +00:00
ζeh Matt c24657a7f7
Don't close the error window if the new error will not show 2024-02-12 23:02:31 +02:00
OpenRCT2 git bot 72ca04633e Merge Localisation/master into OpenRCT2/develop 2024-02-12 04:01:42 +00:00
Harry Hopkinson a55da09e1c
Move gMapBaseZ to GameState_t (#21370) 
* Move gMapBaseZ to GameState_t

* Fix fomatting
 2024-02-11 21:40:32 +00:00
Michael Steenbeek 1a13cdcc57
Fix #21220: Localised park name not used when loading SC4 2024-02-11 20:51:23 +00:00
Michael Steenbeek 70b9d0ca47
Add button to reload object 2024-02-11 20:45:31 +00:00
Matt 6626208695
Merge pull request #21355 from sungaila/readme-arm64 
Windows: Build g2.dat on Arm64 machines and update readme
 2024-02-11 22:29:08 +02:00
Michael Steenbeek c4be52644d
Fix #21358: Crash during RCT1 research import 2024-02-11 20:08:48 +00:00
David Sungaila 20eddc4d49
Windows: Build g2.dat on Arm64 machines and update readme 2024-02-11 19:03:55 +01:00
Michael Steenbeek 67a7614140
Merge pull request #21111 from Gymnasiast/refactor/goto-removal 
Remove more gotos in Vehicle.cpp
 2024-02-11 18:09:23 +01:00
OpenRCT2 git bot 26bdaebe4f Merge Localisation/master into OpenRCT2/develop 2024-02-11 04:01:39 +00:00
Matt c8b28ca457
Fix #21330: Tooltips from dropdown widgets have the wrong position 2024-02-10 18:47:40 +01:00
Matt 0c1991c004
Merge pull request #21361 from karst/opensfx-1.0.4 
Update OpenSFX to version 1.0.4
 2024-02-10 16:02:01 +02:00
David Sungaila 920e39fb34
Windows: add app manifest to enable PerMonitorV2 2024-02-10 14:08:16 +01:00
Karst da8594cec1 Update OpenSFX to version 1.0.4 2024-02-09 21:36:59 +01:00
Michael Steenbeek 776674af7a
Merge pull request #21130 from Gymnasiast/fix/research-table-size 
Fix: Research table in LL parks imported incompletely
 2024-02-08 22:05:09 +01:00
Michael Steenbeek 8a5e7d32f6
Update changelog 
[ci skip]
 2024-02-08 22:04:46 +01:00
Michael Steenbeek 4369709d19
Merge pull request #21349 from Gymnasiast/refactor/21193-gamestate-1 
Part of #21193: move three more globals to GameState_t
 2024-02-08 21:58:21 +01:00
Gymnasiast 61e8b6d206
Move _suggestedGuestMaximum to GameState_t 2024-02-08 21:47:31 +01:00
Gymnasiast 142d708cee
Move _guestGenerationProbability to GameState_t 2024-02-08 21:46:41 +01:00
Matt a20f2b04e9
Merge pull request #21352 from Harry-Hopkinson/move-gTotalRideValueForMoney-to-GameState_t 
Move gTotalRideValueForMoney to GameState_t
 2024-02-08 16:37:28 +02:00
Harry Hopkinson 6deac11916 Move gTotalRideValueForMoney to GameState_t 2024-02-08 09:39:28 +00:00
Gymnasiast c40a840f5b
Fix #18963: Too many items available in some RCT1 scenarios 2024-02-08 02:13:31 +01:00
Gymnasiast 8e64eaca94
Fix #18963: Razor Rocks and BPB import too few research items 2024-02-08 02:13:31 +01:00
Michael Steenbeek 6a9f9025ff
Fix: too many options are hidden if the platform has no file picker 
Mainly affects Android.

Co-authored-by: Basssiiie <Basssiiie@users.noreply.github.com>
 2024-02-07 22:38:45 +00:00
Harry Hopkinson ad5ef31a97
Move gTotalIncomeFromAdmissions to GameState_t (#21348) 2024-02-07 19:13:04 -03:00
ZeeMaji 1849c7de47
Fix mini helicopters & monorail bicycles being swapped in RCT1 2024-02-07 22:51:36 +01:00
Hielke Morsink c9fe19e0d9
Part of #21193: Move gParkRatingHistory to GameState_t 2024-02-07 11:04:10 +01:00
Michał Janiszewski 6e49a25a7b
Merge pull request #21326 from janisozaur/github-actions-update 
Update GitHub Actions versions
 2024-02-07 00:28:40 +01:00
Michał Janiszewski fd01a9a76a
Update gh-describe to v2 2024-02-06 23:29:23 +01:00
Harry Hopkinson 3eb9cf2264
Move gTotalAdmissions to GameState_t (#21341) 
Part of #21193.
 2024-02-06 21:42:05 +01:00
Matt 9363a459a2
Merge pull request #21331 from Harry-Hopkinson/move-gNumGuestsInParkLastWeek-to-GameState_t 
Move gNumGuestsInParkLastWeek to GameState_t.
 2024-02-06 16:46:23 +02:00
Harry Hopkinson fd17842291 Move gNumGuestsInParkLastWeek to GameState_t. 2024-02-05 09:50:58 +00:00
OpenRCT2 git bot 08fbdd1552 Merge Localisation/master into OpenRCT2/develop 2024-02-05 04:02:06 +00:00
Romain 80948c36bb
Fix and improve Linux appdata (#21328) 
* Fix appdata screenshot URL

* Add developer name to appdata

* Follow best practices for appdata summary

* Add caption to appdata screenshot
 2024-02-04 20:41:24 -03:00
Michael Steenbeek 9efe25c11c
Fix #20907: RCT1/AA scenarios use the 4-across train for the Inverted RC (#21303) 2024-02-04 20:39:52 -03:00