1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 12:03:07 +01:00
Commit Graph

21663 Commits

Author SHA1 Message Date
Gymnasiast
eb2cb2fa4e Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-07-27 20:33:33 +02:00
Gymnasiast
2d85bb8ba3 Change all calls to DrawTextBasic to use Formatter 2021-07-27 20:32:27 +02:00
Duncan
d76611e0f2 Actually allocate a banner when using GetOrCreateBanner
When importing a file this function is used to create a banner at a certain index. Previously this was not assigning the id to the banner id. Luckily as banner id is a new field this did not cause any issues except in the nsf which does use the banner id more extensively
2021-07-27 19:58:09 +02:00
Michael Steenbeek
ada94dce37 Add #3417 to changelog 2021-07-27 18:03:33 +02:00
Michael Steenbeek
7b7744057e Merge pull request #15101 from ZehMatt/crashdumps
Dump crash dumps into a different directory and include version in reports
2021-07-27 18:02:47 +02:00
Gymnasiast
d7aa3906f1 Change gClearSceneryCost to money64 2021-07-27 17:59:49 +02:00
duncanspumpkin
b42a097672 Merge branch 'develop' into HEAD 2021-07-27 16:53:16 +01:00
ZehMatt
47287e7fb1 Save crash dumps into a separate directory 2021-07-27 18:39:13 +03:00
ζeh Matt
afc4cd7cba Refactor ride construction code into a new unit 2021-07-27 17:21:03 +02:00
Gymnasiast
49ed67abaf Implement invisible platforms on some tracked rides 2021-07-27 17:01:22 +02:00
Gymnasiast
ba2203c2ba Hide wooden platforms when the “no platforms” station style is selected 2021-07-27 16:45:06 +02:00
Gymnasiast
0de7f28c93 Hide brown base on flat rides if "no platform" station style is selected 2021-07-27 16:33:03 +02:00
Gymnasiast
33ce96b6d9 Fix formatting 2021-07-27 13:44:00 +02:00
Gymnasiast
2c04924678 Fix #14743: Scenery attaches to incorrect scenery group
Caused by confusion of tab id and object entry index.
2021-07-27 13:38:09 +02:00
Gymnasiast
03194d813e Fix #14974: too many dodgems not handled correctly
Properly check if all vehicles have been created, and clean them up properly if not.
2021-07-27 12:57:00 +02:00
Michael Steenbeek
9c2fb84a53 Invalidate screen when toggling transparent water flag
Pointed out here: https://github.com/OpenRCT2/OpenRCT2/issues/14753#issuecomment-849024680
2021-07-27 12:16:36 +02:00
Gymnasiast
14297da683 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-07-27 12:11:25 +02:00
ζeh Matt
13aee659f0 Fix #15096: Crash placing entrance near corner in scenario editor 2021-07-27 12:02:34 +02:00
Duncan
e9eb1b8304 Banner Refactor from NSF (#14788)
* Banner refactor

* Fix mistake in fix_duplicated_banners

* Reduce limit back

* Fix export

* Free banner on delete

* Increment network version

* Fix potential banner pointer crashes

Co-authored-by: Ted John <ted@brambles.org>
2021-07-27 10:25:58 +01:00
OpenRCT2 git bot
399bd15d5e Merge Localisation/master into OpenRCT2/develop 2021-07-27 04:07:29 +00:00
Michael Steenbeek
6405d0246c Fix #14612: Crash in research_insert_ride_entry() 2021-07-26 22:23:03 +02:00
Michael Steenbeek
ba6407f649 Fix #5465: improper types in Objective::CheckGuestsBy() 2021-07-26 21:23:41 +02:00
Michael Steenbeek
d880fbda56 Use constant for RCT1 max map size 2021-07-26 21:17:33 +02:00
Michael Steenbeek
4f80ef50ef Fix #15086: Crash in vehicle_create_trains() 2021-07-26 21:17:17 +02:00
ZehMatt
dab33b3347 Add version to the crash dump info 2021-07-26 00:39:39 +03:00
duncanspumpkin
c9731a8ba9 Start v0.3.4.1+1 2021-07-25 21:26:28 +01:00
duncanspumpkin
b77da4c364 Merge branch 'master' into develop 2021-07-25 21:25:01 +01:00
duncanspumpkin
5087e77032 Release v0.3.4.1
- Fix: [#15028] Crash when placing large scenery.
- Fix: [#15048] Crash when removing litter with cheats.
- Fix: [#15052] Crash when using banner window.
- Fix: [#15063] Crash when opening large scenery signs.
- Improved: [#12626] Allow using RCT2 saves to mark RCT Classic (.sea) parks as finished and vice versa.
v0.3.4.1
2021-07-25 20:16:08 +01:00
duncanspumpkin
f219247b19 Merge branch 'develop' 2021-07-25 20:05:41 +01:00
duncanspumpkin
e8e7bdb776 Update Backtrace.io token for v0.3.4.1 2021-07-25 20:04:58 +01:00
Hielke Morsink
c887a049d2 Fix various Cppcheck warnings (#15081) 2021-07-24 23:41:50 +02:00
Duncan
cd98ca0d8e Fix 15063 (#15064)
* Fix #15063. Sign window crash on open

* Update changelog
2021-07-23 19:37:24 +01:00
ζeh Matt
935e5b28dd Merge pull request #15059 from ZehMatt/fix-15048
Fix #15048: Crash removing litter from cheats
2021-07-22 22:37:58 +03:00
ZehMatt
8d273d6a3e Update changelog.txt 2021-07-22 22:14:40 +03:00
ZehMatt
c15f17c49a Fix potential null dereference 2021-07-22 22:14:12 +03:00
ZehMatt
e4758df2e9 Fix #15048: Crash removing litter from cheats 2021-07-22 22:14:12 +03:00
Duncan
90fbbe14ed Fix 15052 (#15054)
* Fix #15052. Crash when using banner window

Bug introduced during refactor. Refactor introduces a pointer that will go invalid. When the pointer was invalid the game would crash.

* Update changelog
2021-07-22 15:15:59 +01:00
Duncan
bbef85e752 Fix #15028, #15042. Crash when placing large scenery (#15043)
* Fix #15028, #15042. Crash when placing large scenery

When the fragmented tile element limit is reached whilst placing a large scenery ghost the game will perform a reorg of the map elements invalidating tile element pointers. As large scenery are multi tiled this can happen mid action invalidating the pointer that was allocated for the first tile element. Large scenery actions pass back the first tile element pointer to the calling function for use with ghost removal. When this pointer is invalid it causes the crash. The ultimate fix for this would be to create an undo function for actions. As an interim the function has been modified to return the first tile height.

* Update changelog
2021-07-21 13:01:09 +01:00
OpenRCT2 git bot
8b9129d9f3 Merge Localisation/master into OpenRCT2/develop 2021-07-21 04:07:43 +00:00
Michael Steenbeek
193be924d4 Merge pull request #15035 from Gymnasiast/refactor/remove-more-gotos
Remove more gotos
2021-07-20 18:19:42 +02:00
Gymnasiast
2a175e7678 Split off mini golf acceleration calculation 2021-07-20 15:01:18 +02:00
Gymnasiast
1965aaca73 Replace loc_6DBA33 with a loop 2021-07-20 14:48:18 +02:00
Gymnasiast
3966c6f7a4 Cleanup gotos to loc_6D8E36 2021-07-20 14:43:29 +02:00
Gymnasiast
d0436c7379 Rename unkF64E35 to stationBrakesWork 2021-07-20 14:35:01 +02:00
Michael Steenbeek
2a9481bb99 Add Œ ligature 2021-07-20 14:28:43 +02:00
Michael Steenbeek
3bb15d9067 Support drawing em-dashes
These are used in the French translation.
2021-07-20 13:34:22 +02:00
Michael Steenbeek
6a44b7cc5d Merge pull request #15024 from Gymnasiast/refactor/remove-gotos
Remove gotos from Map.cpp
2021-07-20 11:18:57 +02:00
Gymnasiast
b2ffbb3639 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-07-19 19:04:19 +02:00
Michael Steenbeek
4760642fd5 Clean up New Scenario window
Backported from https://github.com/OpenRCT2/OpenRCT2/pull/14919.
2021-07-19 17:24:12 +02:00
Struan Clark
aa69593064 Close #12626: Allow completing RCTC scenarios with RCT2 saves 2021-07-19 16:12:03 +02:00