mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity
22,619 Commits 8 Branches 59 Tags
ff909cc28654d27691794de6c3385f4e9cd1e3fe
Commit Graph

22619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hielke Morsink
2b51b91524 Make peep argument const 2021-09-08 22:59:58 +02:00
Hielke Morsink
d3263ef6b7 Make smart follow functions easier to follow 
Opted for a switch case instead of if-else if-else if-else
Reuse entity - is already checked for null and doesn't change
Remove unnecessary else blocks after if-block that returns
 2021-09-08 22:55:08 +02:00
ζeh Matt
e00eb3ec52 Merge pull request #15381 from ZehMatt/fix-15376 
Fix #15376: Extend the X axis on rotation 0 to cover corners
 2021-09-08 13:52:31 -07:00
ζeh Matt
6a7fe6a5e2 Fix #15376: Extend the X axis on rotation 0 to cover corners 
Also make the code branchless
 2021-09-08 23:13:19 +03:00
Duncan
0fcef925b6 Fix #15375. Issue with entrance exit placement after refactor (#15380) 2021-09-08 21:58:11 +02:00
Michael Steenbeek
a3991085be Merge pull request #15363 from Gymnasiast/refactor/tile-element-path-nsf 
Add support for surface and railings objects to PathElement
 2021-09-08 15:41:02 +02:00
Michael Steenbeek
f9f027e219 Name word_F3F038 (#15373) 
Co-authored-by: IntelOrca <ted@brambles.org>
 2021-09-08 15:40:35 +02:00
Michael Steenbeek
3988261e8f Set RailingsEntryIndex to null for good measure 2021-09-08 13:39:11 +02:00
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
07a7946caf Remove redundant conversions 2021-09-07 22:36:16 +03:00
ζeh Matt
79ab832000 Fix overload resolution for map_get_first_element_at 2021-09-07 22:36:16 +03:00
ζeh Matt
a3b0c9ac81 Add overload for map_get_first_element_at to accept TileCoordsXY 2021-09-07 22:36:15 +03: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