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

21707 Commits

Author SHA1 Message Date
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
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
Gymnasiast bcba227430
Add footpath surface and railings objects from NSF 2021-08-29 17:07:38 +02:00
frutiemax 450bf61ee4 Part of #13874: TrackSequenceProperties, Pricing and MirrorMap renamed 2021-08-29 10:45:17 -04:00
Gymnasiast b6b792f874
Add GetImage() method to rct_footpath_entry 2021-08-29 16:22:51 +02:00
spacek531 cba52b240e
Bird animation (#15294) 
* initial implementation;

progress 1

progress 2

refactor to chain start

progress 3

begin walking

finish bird

remove walking

remove unused functions

refactor track element getting

fix formatting

refactor and add comments

remove brackets from simple if-else statements

invalidate vehicle

refactor again

fix format and refactor

please satisfy clang format

fix fallthrough

invalidate default case

remove redundant falltrhough

network bump

use std::max

refactor animation again

fix modulus

* move array declaration

* satisfy clang-format

* add changelog entry
 2021-08-29 10:30:34 +01:00
ζeh Matt 763d086c85
Update changelog.txt 2021-08-29 12:23:48 +03:00
ζeh Matt 4ada04c7ca
Fix #15289: Duplicated banner correction using the wrong index 2021-08-29 12:20:17 +03:00
frutiemax b3744f129f Part of #13874: Avoid copies of ted 2021-08-28 18:57:46 -04:00
Hielke Morsink e0751d707f
Fix #15298: Crash on map.getAllEntities from in-game console (#15301) 2021-08-28 17:43:11 +02:00