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 |
|
ζ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 |
|
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 |
|
ζ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 |
|
ζeh Matt
|
77dccb995c
|
Use RCT12PeepThoughtItemNone for importers
|
2021-08-30 21:13:34 +03:00 |
|
ζeh Matt
|
bab646de6e
|
Add RCT12PeepThoughtItemNone constant
|
2021-08-30 21:13:34 +03:00 |
|
ζeh Matt
|
a5931921bf
|
Small clean up
|
2021-08-30 21:13:34 +03:00 |
|
ζeh Matt
|
483fb173f5
|
Adjust S6 import/export for different thought item type
|
2021-08-30 21:13:34 +03:00 |
|
ζeh Matt
|
1555a4da9f
|
Modify storage of PeepThought items to 16 bit for rides and shop items
|
2021-08-30 21:13:34 +03:00 |
|
ζeh Matt
|
b97ebc745f
|
Rename rct_peep_thought to PeepThought
|
2021-08-30 21:13:33 +03:00 |
|
ζeh Matt
|
5d2c9d8be4
|
Merge pull request #15267 from spacek531/remove-var-CA
Remove var ca
|
2021-08-30 11:13:20 -07:00 |
|
ζeh Matt
|
c39bf42510
|
Merge pull request #15311 from ZehMatt/fix-15306
Fix #15306: Fix track paint using the wrong bounding box offsets
|
2021-08-30 07:13:57 -07:00 |
|
Michael Steenbeek
|
1730673ca3
|
Merge pull request #15285 from duncanspumpkin/rct2
Move RCT2 structs into RCT2 header
|
2021-08-30 13:45:23 +02:00 |
|
duncanspumpkin
|
2f9e9e853e
|
Move further structs into correct headers
|
2021-08-30 12:27:23 +01:00 |
|
Duncan
|
8cc833f905
|
Strip RCT1 out of RCT1 struct names in namespace (#15284)
* Strip RCT1 out of struct names in namespace
* Remove RCT1:: where not required
|
2021-08-30 11:28:50 +01:00 |
|
spacek531
|
39b762aa78
|
fix sign error
|
2021-08-29 15:00:47 -07:00 |
|
spacek531
|
91099429c8
|
bump network
|
2021-08-29 14:52:43 -07:00 |
|
duncanspumpkin
|
54bff59d90
|
Update replays
|
2021-08-29 14:52:43 -07:00 |
|
spacek531
|
0f5075f024
|
fix triggers
|
2021-08-29 14:52:43 -07:00 |
|
spacek531
|
315070faaa
|
set value to 0
|
2021-08-29 14:52:43 -07:00 |
|
spacek531
|
199de52afe
|
quick removing this
|
2021-08-29 14:52:43 -07:00 |
|
spacek531
|
6d7fd57f5b
|
remove var_CA
|
2021-08-29 14:52:43 -07:00 |
|
ζeh Matt
|
51ad88c25d
|
Fix #15306: Fix track paint using the wrong bounding box offsets
|
2021-08-29 23:43:59 +03:00 |
|
Michael Steenbeek
|
4bbee1c6ae
|
Merge pull request #15261 from frutiemax/13874_refactor
Track Element Descriptor refactor (issue #13874)
|
2021-08-29 22:38:46 +02:00 |
|
ζeh Matt
|
b367f74496
|
Fix #15199: Construction window is not closed when a ride gets demolished
|
2021-08-29 22:20:30 +02:00 |
|
ζeh Matt
|
a75e07cde6
|
Merge pull request #15305 from ZehMatt/fix-15289
Fix #15289: Duplicated banner correction using the wrong index
|
2021-08-29 10:06:55 -07:00 |
|