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

21858 Commits

Author SHA1 Message Date
seanmajorpayne 33fbad9726
Fix #15257: Chat widgets removed from Scenario Editor (#15365) 
* Update TopToolbar.cpp

Removed else statement which caused the game to skip toolbar element deactivations.

* Update contributors.md

Adding name to contrib.md

* Update changelog.txt

Updated changelog

* Update changelog.txt

Fixing changelog item position
 2021-09-08 12:39:34 +02:00
spacek531 dba4518d11
refactor entrance hut finding function (#15360) 2021-09-08 07:33:48 +01:00
ζeh Matt 75c2dbcf74
Merge pull request #15366 from ZehMatt/fix/quadrant-buckets 
Fix hash bucketing of paint entries
 2021-09-07 12:35:39 -07:00
ζeh Matt 876329da87
Fix hash bucketing of paint entries 2021-09-07 18:04:09 +03:00
OpenRCT2 git bot c6e4dc5ef1 Merge Localisation/master into OpenRCT2/develop 2021-09-07 04:08:07 +00:00
Gymnasiast a9e0eeccc4
Add support for surface and railings objects to PathElement 
Co-authored-by: IntelOrca <ted@brambles.org>
 2021-09-06 22:16:28 +02:00
Michael Steenbeek 2f90b83a11
Merge pull request #15352 from Gymnasiast/refactor/surface-railings-descriptor 
Rework path surface and railings descriptor handling
 2021-09-06 21:56:10 +02:00
ζeh Matt 4e46fa4f6d
Enable parallel builds for debug configuration (#15324) 2021-09-06 12:35:20 +01:00
Duncan 454eabe3a7
Merge pull request #15351 from ZehMatt/fix/dataserializer-enum 
Fix enum serialization not using byte swap
 2021-09-06 08:41:33 +01:00
OpenRCT2 git bot fc189f8c7d Merge Localisation/master into OpenRCT2/develop 2021-09-06 04:08:02 +00:00
Daniel Karandikar 613c309f93
Close #13407 Allow building covered lift hill when cheat enabled 2021-09-05 21:57:08 +02:00
Gymnasiast 6f2e20f8db
Add #13912 to changelog 2021-09-05 21:03:55 +02:00
Michael Steenbeek e9049117f2
Merge pull request #14651 from zrowny/fix-image-importer 
Fix issues with Image Importer
 2021-09-05 20:57:41 +02:00
Gymnasiast e26c4bdd4e
Fix US spelling 2021-09-05 20:40:01 +02:00
Gymnasiast fa0efd67c1
Update changelog 2021-09-05 20:38:33 +02:00
zrowny c381a97d66
Fix ImageImporter for colors outside of palette (#14649:) 
When converting to the internal palette, if a color is not in the palette, the ImageImporter now re-maps it only to those non "special" color indices ("special," meaning those for water effects, font, chain lift and so on, as well as the primary remappable color).

Additionally, if the Importer is told to dither the image, it now does not dither colors that are already in the OpenRCT2 palette, or dither between remappable colors and non-remappable colors.
 2021-09-05 20:08:00 +02:00
zrowny c4aaae1a07
Correct ImageImporter palette index 255 to white 
Reflects the change that was made in 5035492f8c to the renderer to fix #1749 and #6535
 2021-09-05 20:08:00 +02:00
zrowny 2d34fe3972
Update description of palette colors in ImageImporter 2021-09-05 20:08:00 +02:00
Gymnasiast 4cc717ccdb
Rework path surface and railings descriptor handling 2021-09-05 19:09:09 +02:00
Gymnasiast 2282f24404
Rename path surface and railings descriptors 2021-09-05 19:09:09 +02:00
ζeh Matt 745885e78e
Update replays 2021-09-05 18:16:37 +03:00
ζeh Matt c844bf9142
Bump up network version 2021-09-05 18:16:37 +03:00
ζeh Matt b8d1f86f3f
Use correct underlying type for Vehicle::Status enum 2021-09-05 18:16:37 +03:00
ζeh Matt 23f4f72047
Fix enum serialization not using byte swap 2021-09-05 18:16:37 +03:00
Michael Steenbeek a40cfae0ff
Merge pull request #15313 from frutiemax/13874_TrackDefinitions 
Part of #13874: Add definition field in TrackElementDescriptor
 2021-09-05 16:10:11 +02:00
Michael Steenbeek 7b2554cdae
Addendum to #15340: guard size of object_entry_group_counts 2021-09-05 16:06:34 +02:00
Michael Steenbeek bdf300bcdb
Merge pull request #15349 from Broxzier/feature/bug-report-link 
Add a bug-report item in file dropdown menu
 2021-09-05 15:34:39 +02:00
Hielke Morsink 8ae918118a
Add a bug-report item in file dropdown menu 2021-09-05 15:25:44 +02:00
Hielke Morsink b2dfeaf1b9
Introduce String::URLEncode 2021-09-05 15:25:44 +02:00
Hielke Morsink c23775bf8c
Remove hardcoded dropdown indices 2021-09-05 15:25:43 +02:00
Michael Steenbeek e62fabf607
Merge pull request #15317 from spacek531/more-no-platform 
even fewer platforms
 2021-09-05 13:40:46 +02:00
Michael Steenbeek 2f3d4c6861
Merge pull request #15327 from spacek531/rename-ride-validate-function 
Some housekeeping
 2021-09-05 13:26:56 +02:00
spacek531 e3af9982a9 rework grid entrance rotation finder 2021-09-04 14:06:02 -07:00
spacek531 c527bd87fe remove more hutts 2021-09-04 13:47:30 -07:00
Hielke Morsink f1fbe07ded
Avoid redefining WIN32_LEAN_AND_MEAN (#15342) 2021-09-04 21:17:08 +02:00
ζeh Matt 5868071fbc
Merge pull request #15335 from ZehMatt/refactor/object-load 
Fix ownership of loaded object data
 2021-09-04 09:13:45 -07:00
Michael Steenbeek b1ecd9e89e
Merge pull request #15337 from ZehMatt/refactor/s4-ridetype 
Make S4 RideType a strong enum
 2021-09-04 15:23:53 +02:00
Michael Steenbeek 60d596d1f8
Merge pull request #15339 from Broxzier/bugfix/15319-object-selection-hang 
Fix #15319: Clicking on Object Selection Cheat Freezes the Game
 2021-09-04 01:38:59 +02:00
Hielke Morsink fd2a572f9a
Fix #15319: Clicking on Object Selection Cheat Freezes the Game 
This fixes it by adding limits for the missing path types.

Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
 2021-09-04 01:09:09 +02:00
Michael Steenbeek d71b4e8381
Merge pull request #15338 from Gymnasiast/refactor/backport-park-vars 
Use real values for gGuestsInParkHistory (from NSF)
 2021-09-04 00:31:12 +02:00
Michael Steenbeek a526caa1cb
Use std::copy for gParkRatingHistory 
Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
 2021-09-04 00:03:24 +02:00
IntelOrca 600ce959d7
Use real values for gGuestsInParkHistory 2021-09-03 23:43:43 +02:00
ζeh Matt 8f5fb9d179
Convert switch to two conditional scopes 2021-09-03 23:53:04 +03:00
ζeh Matt 481f7565dc
Rename enum members 2021-09-03 23:48:35 +03:00
ζeh Matt af99bc28c7
Make S4 RideType a strong enum 2021-09-03 23:35:07 +03:00
Michael Steenbeek 26a26e9e34
Merge pull request #15321 from Gymnasiast/refactor/backport-music-nsf-2 
Use music objects instead of IDs
 2021-09-03 21:55:52 +02:00
spacek531 0794dbf112 rename huts 2021-09-03 10:08:01 -07:00
ζeh Matt 6186b29675
Apply review suggestion 2021-09-03 18:03:19 +03:00
ζeh Matt cf0425d953
Fix building 2021-09-03 14:45:48 +03:00
ζeh Matt a118b16912
Remove unused functions 2021-09-03 14:45:47 +03:00