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

20203 Commits

Author SHA1 Message Date
Michael Steenbeek 390adaaaf9
Changelog: fix typo 2020-10-28 20:59:04 +01:00
OpenRCT2 git bot 2e55b680c5 Merge Localisation/master into OpenRCT2/develop 2020-10-28 04:06:40 +00:00
Michael Steenbeek 6b4e942a58
Fix #13297: Missing null check in tile_element_get_banner_index() (#13313) 2020-10-27 22:49:06 -03:00
OpenRCT2 git bot 6df7958e54 Merge Localisation/master into OpenRCT2/develop 2020-10-27 04:06:35 +00:00
Michael Steenbeek 03ef249f94
Merge pull request #13304 from OpenRCT2/manuel-vo-desync-fixes 
Manuel vo desync fixes
 2020-10-26 23:18:27 +01:00
Gymnasiast da532f5f47
Update changelog 2020-10-26 23:17:01 +01:00
Gymnasiast 140e945a7b
Increase network version 2020-10-26 23:13:49 +01:00
Michael Steenbeek ddfafa9777
Merge pull request #13300 from manuelVo/13019-fix-ghost-train-opens-construction 
Fix #13019: Prevent ghost trains from opening the construction window when crashing
 2020-10-26 23:12:43 +01:00
Manuel Vögele 838cd4fc56
When placing a block brake perform full operation mode switch 2020-10-26 22:48:43 +01:00
Manuel Vögele d927fefb86
Fix #13019: Stop simulating when ghost train crashes in block mode 2020-10-26 21:37:51 +01:00
Manuel Vögele e4e7a0f2f2
Fix desync caused due to ghost tiles changing the ride mode 2020-10-26 21:36:09 +01:00
Manuel Vögele c440dac600
Fix #12368: Don't modify station properties when placing ghost tiles 2020-10-26 21:35:44 +01:00
Tulio Leao b0c273f478
Close #13267: Remove obsolete dockerfiles (#13275) 
Build docker files now here: https://github.com/OpenRCT2/openrct2-docker-build
Runtime docker files now here: https://github.com/OpenRCT2/openrct2-docker
 2020-10-26 12:55:03 -03:00
OpenRCT2 git bot dedb244cee Merge Localisation/master into OpenRCT2/develop 2020-10-26 04:06:30 +00:00
Tulio Leao 7b10fa57bb
Merge pull request #13280 from Broxzier/bugfix/filestream-file-nonexisting-folder 
Fix crash when using a writable FileStream to a file in non-existing folder
 2020-10-25 14:46:48 -03:00
Keith Stellyes f550f8f5a5
Fix #13282: Autosaves are not deleted when limit is reached 2020-10-25 09:35:42 +01:00
Bryan DiLaura 894be65b6d
Closes #12415: Refactor CURRENCY_TYPE to strong enum (#13276) 
* closes #12415 CURRENCY_TYPE enum refactor

* reverses unintended change in Linux.cpp

* closes #12415 CurrencyType strong enum
 2020-10-25 01:33:06 -03:00
OpenRCT2 git bot 7053413da5 Merge Localisation/master into OpenRCT2/develop 2020-10-25 04:06:17 +00:00
Aaron van Geffen 4c39ee9fb8
Merge pull request #13211 from janisozaur/npot-texture-2d 
Change GL_TEXTURE_RECTANGLE to NPOT GL_TEXTURE_2D
 2020-10-24 17:46:54 +02:00
Hielke Morsink 2275585795 Undef Windows.h macros that cause conflicts 
This caused errors on calls to Path::CreateDirectory in source files that include OpenGLAPI.h.
 2020-10-24 17:39:16 +02:00
Hielke Morsink b54574fe19 Ensure path exists for writable filestreams 2020-10-24 17:39:16 +02:00
Aaron van Geffen 40322d8df1 Add changelog entry 2020-10-24 17:28:27 +02:00
Michał Janiszewski 0aaac728b5 Change GL_TEXTURE_RECTANGLE to NPOT GL_TEXTURE_2D 
This improves GLES compatiblity due to missing rectangle textures, but
NPOT 2D ones being universally available.
 2020-10-24 17:28:05 +02:00
Michał Janiszewski 16b3a96e66 Change palette size to PoT square 2020-10-24 17:28:05 +02:00
Keith Stellyes 782fab93b4
Add compile-time check for nlohmann json (#13277) 2020-10-24 15:23:17 +02:00
OpenRCT2 git bot fe5ee422a2 Merge Localisation/master into OpenRCT2/develop 2020-10-24 04:05:55 +00:00
Michael Steenbeek 14512e72a3
en-GB: Remove overrides for JSON objects; add Panda World 2020-10-23 22:14:28 +02:00
Sadret 6c44fefcaa
Fix #13266: Plugin API Deleting key of shared storage not working 2020-10-23 14:18:51 +02:00
Tulio Leao f6de4b2e44
Fix #13263: SceneryGroup problems (#13270) 
* Fix #13263: Scenery group research not working

* ResearchCategory::Group to SceneryGroup
 2020-10-23 12:30:39 +01:00
Keith Stellyes 171132fb6d
Add Execute and FindApp to Platform class 2020-10-22 21:17:28 +02:00
Duncan 214f6992dd
Rename to TitleCase and name LastAttachedPS (#13260) 2020-10-22 18:13:54 +01:00
OpenRCT2 git bot dd7c27f4e6 Merge Localisation/master into OpenRCT2/develop 2020-10-22 04:05:53 +00:00
Simon J a017d3fa57
Fix #13215: lingering arrows after ride construction (#13245) 
Co-authored-by: Simon Jarrett <mwnciau@users.noreply.github.com>
 2020-10-21 23:45:53 -03:00
ζeh Matt 0c099be01c
Export loaded objects alongside inside the save for Backtrace reports (#13213) 2020-10-21 23:15:29 -03:00
aw20368 c81bf7b501
Refactor variable names in window_guest_stats_bars_paint (#13214) 
* Refactor variable names in window_guest_stats_bars_paint

Change the variables eax/ebp to timeInPark and barColor, respectively.

* Refactor guest stat UI calculations

Simplify guest stat calculations and move them to a new function NormalizeGuestStatValue.
 2020-10-21 07:38:44 +01:00
Bryan DiLaura 1f245b8288
Close #12436: refactor JUNIOR_RC_CHAINTYPE into strong enum (#13237) 
* Close #12436: refactor JUNIOR_RC_CHAINTYPE enum
 2020-10-20 21:48:29 -03:00
Hielke Morsink 257ada4617
Introduce constant for ticks per month (#13253) 2020-10-20 21:05:27 -03:00
Łukasz Pękalski 9dcbf6d4e6
Close #4865: Offer an option to disable inhibiting the monitor power (#13243) 
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
 2020-10-20 22:02:44 +02:00
rpstester 853f718aee
Close #12391: Refactor PeepUsingBinSubState to use strong enum (#13247) 
Changed it to enum class and updated references.
 2020-10-19 22:22:24 -03:00
Michael Steenbeek f5790dce6f
Changelog: mark #13222 as original bug 2020-10-19 23:35:10 +02:00
Haven Kim ce2f78bd51
Fix #13222 : Vehicle collision causes negative number of passengers 
When peep_sprite_remove is called, RemoveFromRide() will decrease ride's num_riders
 2020-10-19 23:33:54 +02:00
Haven Kim 4bce329a40
Fix #12940: Windows cause issues with snow drawing (#13238) 
Windows' left value inside of cosine function is causing glitch-feel
movement for snows but in fact, x_start can simply modified by another magic
numbers.
 2020-10-19 18:58:47 +02:00
Michael Steenbeek 59d785ef64
Merge pull request #13224 from Broxzier/feature/refactor-autosave 
Small autosave refactor
 2020-10-18 20:20:41 +02:00
Michael Steenbeek ac87dd5952
Add #7280 to changelog 2020-10-18 19:57:15 +02:00
Keith Stellyes 41c0395adb
Fix #13226: No error is shown when attempting to load a corrupted save 2020-10-18 19:54:26 +02:00
Michael Steenbeek 6c687f576d
Merge pull request #13230 from Gymnasiast/refactor/get-source-game-to-method 
Refactor legacy GetSourceGame() to method
 2020-10-18 17:48:31 +02:00
Aaron van Geffen 1c1b7c8d28
Merge pull request #13209 from X123M3-256/hybrid_fix 
Fix hybrid coaster
 2020-10-18 17:16:31 +02:00
OpenRCT2 git bot e2d3b1d3bc Merge Localisation/master into OpenRCT2/develop 2020-10-18 04:05:30 +00:00
Haven Kim be824e941f
Fix #7518: Water isn't cut down by view clipping tool (#13205) 
By comparing water level and clipping height, we just remove water from
rendering but keep the surface tiles at the bottom
 2020-10-17 23:13:40 +02:00
Gymnasiast b47163c06c
Remove orphaned declaration of object_entry_get_type() 2020-10-17 22:46:52 +02:00