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

21739 Commits

Author SHA1 Message Date
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
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
ζeh Matt
976c614881 Reduce duplicate code 2021-09-03 14:45:47 +03:00
ζeh Matt
a44f3017dc Move the log print and remove optional parameter 2021-09-03 14:45:47 +03:00
ζeh Matt
1f4f0c015c Fix ownership of loaded object data 2021-09-03 14:45:47 +03:00
OpenRCT2 git bot
91ca2e58bc Merge Localisation/master into OpenRCT2/develop 2021-09-03 04:08:05 +00:00
spacek531
110ef368b0 update function to TitleCase 2021-09-02 19:51:35 -07:00
spacek531
ebc201aaf2 comment and rename
refactor to class method

fix formatting

rename function

rename another

rename sub_6C683D

rename loc_6CD18E

annotate ride_get_entrance_or_exit_position_from_screen_position

fix format

rename loop value

fix formatting again

rename functions to TitleCase
2021-09-02 19:47:22 -07:00
Ted John
3c451a4af4 Use music objects instead of IDs 2021-09-01 10:26:23 +02:00
Duncan
b2d0b54d13 Fix viewport interaction when zoomed (#15318)
Mistake made when increasing the type size from 16 to 32bit
2021-09-01 06:15:45 +01:00
spacek531
bb1d3ab637 swinging rides 2021-08-31 08:55:31 -07:00
spacek531
77d546f39d dodgems and flying saucers 2021-08-31 08:55:31 -07:00
spacek531
c248c8fada format spiralslide 2021-08-31 08:55:30 -07:00
spacek531
c8bed6fa87 tower rides and slide 2021-08-31 08:55:30 -07:00
ζeh Matt
0be585024f Merge pull request #15232 from ZehMatt/refactor/gNetwork
Move network instance to Context
2021-08-30 14:17:15 -07:00
Michael Steenbeek
481d40b270 Merge pull request #15309 from Gymnasiast/refactor/paths-from-nsf
Refactor/paths from nsf
2021-08-30 23:07:54 +02:00
ζeh Matt
9433b156a1 Merge pull request #15302 from ZehMatt/refactor/nsf-peep-thought
Refactor peep thoughts for bigger limits
2021-08-30 12:39:57 -07:00
ζeh Matt
a2827dc50e Update replays 2021-08-30 21:23:47 +03:00
ζeh Matt
9be3a39ddd Remove old constant PEEP_THOUGHT_ITEM_NONE 2021-08-30 21:13:35 +03:00
ζeh Matt
336372c7be Adjust InsertThought overloads to use correct constants 2021-08-30 21:13:35 +03:00
ζeh Matt
e9c959b187 Test correct fields in the gamestate snapshot 2021-08-30 21:13:34 +03:00