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

21517 Commits

Author SHA1 Message Date
duncanspumpkin
e45bcde09c Fix saves from corrupting due to old guests in park
RideTypesBeenOn and RidesBeenOn are not at this moment the type that they say they are so doing a check against that type gives invalid results.
2021-06-05 08:42:05 +01:00
duncanspumpkin
5bac7821c9 Merge develop 2021-06-04 13:11:47 +01:00
Duncan
c34079acee Refactor LargeSceneryEntry and remove rct_scenery_entry (#14816) 2021-06-04 12:41:23 +01:00
Duncan
12c5484f44 Refactor SmallSceneryEntry (#14815) 2021-06-03 22:14:41 -03:00
ζeh Matt
8fc7e06116 Move gLastStringPos into rct_drawpixelinfo (#14811) 2021-06-03 22:10:09 -03:00
Duncan
8f59fe91cb BannerSceneryEntry Refactor (#14810)
* Refactor BannerSceneryEntry to enforce type

* Remove old comment

* Fix incorrect renameing
2021-06-03 21:43:30 +01:00
Duncan
6f81248084 Rework and refactor PathBitEntry (#14809) 2021-06-03 21:23:00 +01:00
Duncan
425f968a67 Rearrange WallSceneryEntry to enforce types (#14808)
* Rearrange WallSceneryEntry to enforce types

* Clang format

Correct inverted nullptr check
2021-06-03 13:26:00 +01:00
KirilAngelov
97002cae5d Close #14804: Rename isBanner to isDoubleSided 2021-06-03 12:18:22 +02:00
Duncan
03378782ff Split off litter code to litter.cpp (#14799)
* Split off litter code to litter.cpp

* Use PATH_CLEARANCE
2021-06-03 08:27:03 +01:00
Duncan
7253b92cfd Use correct function call for WallPlaceAction plugin visitor (#14806)
* Use correct function call for WallPlaceAction plugin visitor

* Increment plugin version

* Update changelog
2021-06-02 21:30:49 +01:00
Ted John
cfaa823bd8 Fix import of S4 patrol areas 2021-06-02 20:01:32 +01:00
Ted John
c8be23cfa0 Fix footpath placement in multiplayer 2021-06-02 19:54:54 +01:00
Ted John
82ce872ad1 Move object id map to bottom of file 2021-06-02 19:24:51 +01:00
Duncan
fd4a798cfb Merge pull request #14805 from aemreaydin/max_circuits_refactor
Refactored code to use a constant for max circuits
2021-06-02 16:49:58 +01:00
Emre Aydin
ac80ca7b46 Refactored code to use a constant for max circuits 2021-06-02 17:48:09 +03:00
Duncan
b7e7915efa Merge pull request #14780 from duncanspumpkin/sprite2
Sprite Refactor 2: Moving around EntityTweener and misc
2021-06-01 20:10:17 +01:00
Duncan
b2451f00c4 Merge pull request #14644 from ZehMatt/refactor/peep2
Simplify code for Peep easter eggs
2021-05-31 16:48:11 +01:00
Duncan
cd9b427e55 Merge pull request #32 from ZehMatt/sprite2-xcode
Add files to xcode project
2021-05-31 16:46:33 +01:00
Matt
80ac0b93f7 Add files to xcode project 2021-05-31 18:21:17 +03:00
duncanspumpkin
fe939ece75 Fix static compile error 2021-05-30 19:53:25 +01:00
Gymnasiast
e46864a229 Add table to translate old object ids to new ones 2021-05-30 14:04:18 +02:00
Ted John
5b194974ef Add support for zoom offsets to parkobj 2021-05-29 18:33:39 +01:00
Ted John
87e7179650 Support multiple images per .png in parkobj 2021-05-29 18:26:02 +01:00
ζeh Matt
6cf44a6d19 Refactor explicit passing of Ride type in OnEnterRide/OnExitRide 2021-05-29 18:41:51 +02:00
Michael Steenbeek
31848b195e Close #14765: Rename gCheatsFastLiftHill 2021-05-29 18:41:16 +02:00
Matt
751db9f13e Simplify code for Peep easter eggs 2021-05-29 13:43:59 +03:00
duncanspumpkin
cff87c7d72 Include correct headers 2021-05-29 10:27:09 +01:00
duncanspumpkin
98f9f24909 Remove sprite.h includes where possible 2021-05-29 08:54:33 +01:00
duncanspumpkin
ee981e62e1 Move CreateEntity funcs to Entity header. Remove dead enum 2021-05-29 08:18:23 +01:00
duncanspumpkin
63bcb3c3e5 Move particle structs to particle files 2021-05-29 08:07:32 +01:00
duncanspumpkin
3199029168 Split off EntityTweener into seperate file 2021-05-29 07:47:49 +01:00
OpenRCT2 git bot
5b5aa0771e Merge Localisation/master into OpenRCT2/develop 2021-05-29 05:52:24 +00:00
Duncan
39fcc5d078 Split up Sprite header (#14764)
* Remove fields from rct_sprite union

* more header fun

* Fix guest include
2021-05-29 06:01:32 +01:00
Duncan
21bb949322 Fix 14774: Scenery research always unlocks on load (#14777)
* Fix #14774: Incorrect import of scenery research

Mistake during a refactor caused all scenery to be imported as already researched.

* Update changelog

* Update network version
2021-05-28 18:55:19 +01:00
Michael Steenbeek
380d3a6cbe Turn vehicle sprite flags into a 32-bit integer
At the request of X7123M3-256.
2021-05-28 19:16:16 +02:00
duncanspumpkin
3a0394440e Fix path find history logs 2021-05-28 17:51:10 +01:00
duncanspumpkin
35c8fee368 Fix peep thought desync issues and handle >255 rides 2021-05-28 17:38:44 +01:00
OpenRCT2 git bot
4c1ab8d934 Merge Localisation/master into OpenRCT2/develop 2021-05-28 05:22:13 +00:00
Gymnasiast
3e357e6148 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-05-27 22:40:34 +02:00
Michael Steenbeek
3fe910781a Merge pull request #14761 from Gymnasiast/backport-object-selection-improvements
Backport object selection improvements
2021-05-27 22:39:17 +02:00
Michael Steenbeek
e5c61f2a44 Close #14511: Unlock all music with 'Unlock operating limits' cheat 2021-05-27 22:38:35 +02:00
Gymnasiast
b214a9fd97 Show what a stall sells in Object Selection 2021-05-27 19:54:44 +02:00
Gymnasiast
1d693f9751 Fix display of number of items in scenery group 2021-05-27 19:54:44 +02:00
Gymnasiast
f2ac658935 Show tracks list of music styles in Object Selection 2021-05-27 19:53:52 +02:00
Michael Steenbeek
4be838a9b8 Reserve strings for the new-save-format branch
Avoiding constant merge conflicts
2021-05-27 19:52:11 +02:00
Gymnasiast
a9c03e3c11 Removed forgotten debug statement and fix MSVC compilation 2021-05-26 18:26:39 +02:00
Gymnasiast
7c6a92fed2 Unlock all music with 'Unlock operating limits' cheat 2021-05-26 18:10:27 +02:00
Matt
fec2b70f2b Use money64 for track design costs 2021-05-26 19:03:24 +03:00
Gymnasiast
8bc8a0df14 Remove Music Acknowledgements window
It was of limited use to us anyway since we didn’t license the music ourselves, but now the actual track names and composers are shown in the Object Selection, the window lost its last bit of usefulness.
2021-05-26 17:56:02 +02:00