mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,605 Commits 8 Branches 40 Tags 376 MiB
Commit Graph

21605 Commits

Author SHA1 Message Date
Gymnasiast 8af70cf402
Correctly import ride profits 2021-08-01 15:14:42 +02:00
Ted John 74de598cc0
Fix money formatting on cheat window 2021-08-01 15:14:42 +02:00
Ted John 77a46a3d34
Another money64 fix 2021-08-01 15:14:42 +02:00
Ted John 407fafbced
Fix more money64 issues 2021-08-01 15:14:42 +02:00
Ted John 70d9c1438e
Change most things and formatting to money64 2021-08-01 15:14:42 +02:00
Kane 9ba19689d7
Fix #15148: Track Designs Manager delete confirmation window doesn't display properly (#15150) 
* Fix #15148: Track Designs Manager delete confirmation window doesn't display properly

* Fix #15148: Track Designs Manager delete window doesn't display properly

* More descriptive name for window size constants.

* More constants usage, and fixed code style.

* Fix code formatting.
 2021-08-01 11:55:44 +01:00
Kane bd8d3934e0
Close #15143: Add a shortcut key for Giant Screenshot 2021-08-01 09:20:34 +02:00
OpenRCT2 git bot 660a5f9b02 Merge Localisation/master into OpenRCT2/develop 2021-08-01 04:07:50 +00:00
ζeh Matt c0eade9c88
Merge pull request #15133 from SaadRehmanCS/bug-branch 
Fix #14918 refactor while loop and int variable size
 2021-07-31 12:10:30 -07:00
ζeh Matt 6b94e81622
Fix dereferencing memory from a temporary object (#15137) 2021-07-31 15:34:40 +01:00
Duncan 69f0020a62
Fix #8601: Revert fix to TT’s base blocks, for support blocker usage 2021-07-31 14:10:00 +02:00
Basssiiie 15423acf4a
Move ToonTowner mine roofs to mine theme instead of pirate theme 2021-07-31 11:00:41 +02:00
OpenRCT2 git bot 292b8b9ab7 Merge Localisation/master into OpenRCT2/develop 2021-07-31 04:07:58 +00:00
saad 0df5d3cdf2 add name to list of contributors 2021-07-31 02:07:35 +04:00
saad 2febffb721 Fix #14918 remove whitespace 2021-07-31 00:34:47 +04:00
Duncan 465d1c5414
Cleanup of Banner related actions (#15126) 
* Close #15107. Use correct type and provide appropriate error messages

* Add further error messages to actions

* Apply review comments
 2021-07-30 20:53:13 +01:00
ZehMatt 2a3b25af9a
Mark values constexpr in FileAudioSource 2021-07-30 21:31:10 +03:00
ZehMatt fbc689818e
Default initialize ErrorMessageArgs in GameAction Result 2021-07-30 21:31:10 +03:00
ZehMatt b111e104e3
Add missing return statement for the nullptr path 2021-07-30 21:31:10 +03:00
ZehMatt aeb68008fa
Fix uninitialized variable in Http.h 2021-07-30 21:31:10 +03:00
ZehMatt b992951bb2
Default initialize SortOrder in ListViewColumn 2021-07-30 21:31:10 +03:00
ZehMatt ee129db4e0
Move static initialization out and fix bounds check 2021-07-30 21:31:10 +03:00
ZehMatt 0f74591f40
Use std::vector<> instead of malloc/free in CursorRepository.cpp 2021-07-30 21:31:10 +03:00
ζeh Matt 07bfe11847
Merge pull request #15124 from ZehMatt/fuzzer-fixes 
Small network fixes
 2021-07-30 11:26:58 -07:00
ζeh Matt 43b7c3a204
Fix potential nullptr dereference (#15134) 2021-07-30 14:33:48 -03:00
saad ab96ca8516 Fix #14918 rename eax and refactor while loop to avoid overflow 2021-07-30 19:34:42 +04:00
saad fd823c8acb Fix #14918 refactor while loop and int variable size 2021-07-30 18:38:42 +04:00
andrewpratt64 62d66ca9d0
Add hook for vehicle crashes to plugin api (#15084) 
* Add initial implementation of "vehicle.crash" hook for the scripting api

The hook will fire whenever a vehicle crashes, i.e. an individual car
explodes and it's status becomes "Crashed!"

* Update contributors.md

Add name to contributors list under the "Additional implementation (OpenRCT2)" section.

- If the added line needs to be changed or removed entirely let me know

- I added this based off of the Github wiki: "If it's the first time you're contributing with the project, make sure to update the contributors.md file by appending your name at the end of the respective list."

* Move hook code into function

* Rename hook function

Renamed function, "FireVehicleCrashHook" to "InvokeVehicleCrashHook"

* Wrap InvokeVehicleCrashHook in #ifdef

Move the #ifdef from inside the function body to the outside

* Update changelog and api version

- Added entry to changelog
- Increment API version

* Fix whitespace

Replace tab character with four spaces

* Update src/openrct2/scripting/HookEngine.cpp

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2021-07-30 09:03:15 -03:00
OpenRCT2 git bot 2eb1ee631b Merge Localisation/master into OpenRCT2/develop 2021-07-30 04:08:04 +00:00
ZehMatt dd2ffec14b
Code review changes 2021-07-29 20:08:57 +03:00
ZehMatt 4f54aa5c42
Limit the count of packets processed per update 2021-07-29 20:06:38 +03:00
ZehMatt 6877b8214a
Fix unhandled exceptions during packet processing 2021-07-29 20:06:36 +03:00
Michael Steenbeek dac7d76e7a
Merge pull request #15058 from ZehMatt/enummap 
Refactor lookup tables to use EnumMap
 2021-07-29 16:51:10 +02:00
Michael Steenbeek 86af7f486d
Fix spelling of “continuous” 2021-07-29 17:07:49 +03:00
ZehMatt cd43cab999
Add tests for EnumMap 2021-07-29 17:07:49 +03:00
ZehMatt d9f9e7542a
Use EnumMap for HookEngine lookups 2021-07-29 17:07:49 +03:00
ZehMatt e520e4f991
Use EnumMap for RideObject lookup tables 2021-07-29 17:07:48 +03:00
ZehMatt e991c128dc
Use EnumMap for format token lookups 2021-07-29 17:07:48 +03:00
ZehMatt 3fbfa26dd3
Use EnumMap for Cursors string lookup 2021-07-29 17:07:48 +03:00
ZehMatt f44687b6b2
Use EnumMap for lookup tables in scripting 2021-07-29 17:07:48 +03:00
ZehMatt ce8040b858
Use EnumMap for string to colour conversion 2021-07-29 17:07:48 +03:00
ZehMatt a36e0a32f7
Add EnumMap container for bidirectional key, enum mapping 2021-07-29 17:07:48 +03:00
Michael Steenbeek 1ea9bbbb1b
Fix formatting 2021-07-29 13:32:48 +02:00
Kane dbdca55645
Fix #14316: Closing the Track Designs Manager window causes broken state 
When exiting the Track Design Manager window the user was placed into the scenario editor in a broken state.
User is now returned to the main menu when the window is closed.
 2021-07-29 12:44:24 +02:00
OpenRCT2 git bot d01a3a783a Merge Localisation/master into OpenRCT2/develop 2021-07-29 04:07:50 +00:00
Michael Steenbeek 71ff9bf6d6
Allow loading images from .pob files (#15122) 2021-07-28 21:25:51 +02:00
ζeh Matt 87007ba2a3
Change track paint signature to pass ride instead of ride index 2021-07-28 18:21:59 +02:00
Michael Steenbeek 193e9b0e11
Merge pull request #15118 from Gymnasiast/no-platforms 
"No platforms" stations from NSF
 2021-07-28 15:34:59 +02:00
Gymnasiast 6f9468a316
Implement invisible platforms on some tracked rides 2021-07-28 11:23:09 +02:00
Gymnasiast 5486dd3fa4
Hide wooden platforms when the “no platforms” station style is selected 2021-07-28 11:22:55 +02:00