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

428 Commits

Author SHA1 Message Date
Hielke Morsink 7e2e6e2b2f
Merge branch 'develop' into new-save-format 2021-10-19 22:26:08 +02:00
Hielke Morsink 9dd20ec619
Improve array formatting 
For most of these cases, adding a trailing comma to the array block makes clang-format put each item on a new line, and clang-format exception blocks could be reduced where clang-format does not handle them properly.
 2021-10-17 18:21:45 +02:00
Gymnasiast 5a0fa60b9e
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-01 18:45:51 +02:00
ζeh Matt eb2de0222b
Use GetLocation in more places 2021-09-28 03:16:04 +03:00
Gymnasiast c390e9f521
Merge remote-tracking branch 'upstream/develop' into new-save-format 
Some conflicts intentionally unresolved
 2021-09-17 10:15:09 +02:00
Ted John 8cdece0252
Fix incorrect objects in S6 import 2021-09-15 11:28:40 +02:00
ZehMatt 47b782ec2d
Use correct type in path finding code 2021-09-10 19:10:12 +03:00
Gymnasiast 93c656f91d
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-08-29 15:39:42 +02:00
Hielke Morsink 956e77f4c3
Use [[nodiscard]] for allocator and RAII functions (#15244) 2021-08-23 20:09:43 +02:00
Hielke Morsink be4159f9ac Create std::unique_ptr<ILanguagePack>instead of raw pointer 2021-08-21 00:28:21 +02:00
Gymnasiast d885c545d8
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-08-01 15:54:04 +02:00
Michael Steenbeek 86af7f486d
Fix spelling of “continuous” 2021-07-29 17:07:49 +03:00
ZehMatt cd43cab999
Add tests for EnumMap 2021-07-29 17:07:49 +03:00
Gymnasiast 14297da683
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-07-27 12:11:25 +02:00
Hielke Morsink c887a049d2
Fix various Cppcheck warnings (#15081) 2021-07-24 23:41:50 +02:00
Gymnasiast b2ffbb3639
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-07-19 19:04:19 +02:00
Hielke Morsink 617bb698ae
Use UK spelling of center 2021-06-29 00:03:45 +02:00
duncanspumpkin d4381ffeea Update ride rating test data 2021-06-27 09:36:55 +01:00
duncanspumpkin d8eb762a19 Merge branch 'develop' into HEAD 2021-06-10 12:46:34 +01:00
Jamie Quigley 4f6d0a00fd
Refactor RIDE_STATUS to use strong enum (#14840) 
* Refactor RIDE_STATUS to use strong enum

* Change platform-specific code to match RIDE_STATUS refactor

* Re-added check for valid RideStatus value

* Fixed errors in "g2" build target

* Use EnumValue instead of static_cast<uint8_t>

* Revert rct{1,2}.h to use uint8_t.

* Fix formatting

* Reverted from constexpr variable to additional enum variant

* Fix formatting
 2021-06-10 07:09:58 +01:00
duncanspumpkin 35fdcdb256 Merge branch 'develop' into HEAD 2021-06-08 13:02:16 +01:00
Duncan 072772af7b
Rework importexport test to use GameStateSnapshots (#14838) 
Rework importexport test to use GameStateSnapshots

Output errors

Rename function
 2021-06-08 08:35:31 +01:00
duncanspumpkin 08bd6080fd Add missing compare 
This should hopefully fail the test
 2021-06-08 07:46:56 +01:00
Ted John 81d7c3f02b Make tile elements dynamic and resizeable 2021-06-05 21:17:03 +01:00
duncanspumpkin 5bac7821c9 Merge develop 2021-06-04 13:11:47 +01:00
duncanspumpkin 3199029168 Split off EntityTweener into seperate file 2021-05-29 07:47:49 +01:00
Duncan 39fcc5d078
Split up Sprite header (#14764) 
* Remove fields from rct_sprite union

* more header fun

* Fix guest include
 2021-05-29 06:01:32 +01:00
Gymnasiast 080343c99d
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-05-24 19:30:05 +02:00
Silent 94da3cf422
Fix #13445: Make FileScanner::ScanDirectory return a unique_ptr 
Also fixes a resource leak in TitleSequence::GetSaves.
 2021-05-20 19:22:36 +02:00
Ted John 2b2159976d Merge branch 'develop' into new-save-format 2021-05-17 21:33:29 +01:00
ZxBiohazardZx 36b2742c19
Change Vehicle Rotation namings in accordance with OpenRCT2 Codestyle (#14616) 
* Code Refactor: Rename vehicle_sprite_type to Pitch 

In some of the issues the vehicle_sprite_type is used to check for properties in regards to the pitch of the vehicle.Similarly bank_rotation is used to provide information on the Roll property. This is not in alignment with the https://github.com/OpenRCT2/OpenRCT2/wiki/Coding-Style and makes it harder to refactor other elements of the codebase and makes for undesired nested logics.

This PR also includes the change from rename bank_rotation to Roll in alignment with the OpenRCT2 Coding Style


Related to PullRequest #11956

* Apply formatting

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2021-05-12 12:38:46 +01:00
Duncan 3fd8bee32b
Re-enable 32bit replay tests (#14614) 
After the changes made to the serialise functions the 32bit replay tests can now be re-enabled
 2021-05-10 09:42:18 +01:00
Ted John edad34d38f Update ride ratings test 
Due to footpath slot difference, excitement rating is different for test case.
 2021-04-27 22:20:24 +01:00
Ted John 6db0c01fdc Merge branch 'develop' into new-save-format 2021-04-25 15:03:45 +01:00
Duncan 8eabdf8c8f
Split guest and staff peep variables (#14462) 
* Split guest and staff peep variables

* Move variable location

* Increment network version

* Update replays
 2021-04-18 17:48:21 +01:00
Duncan a9e1f2e89c
Remove SpriteBase::flags (#14460) 
* Remove SpriteBase::flags

* Increment network version

* update replays
 2021-04-11 18:02:19 +01:00
Ted John 8180fb9ae1 Make tile elements dynamic and resizable 2021-04-09 02:09:08 +01:00
Ted John 8ff525270d Remove S6Exporter 2021-04-03 04:20:51 +01:00
Ted John fc357745d5 Implement compression and replays 2021-04-03 02:17:06 +01:00
Ted John 638bbebe59 Write new object identifiers to park file 2021-04-03 00:23:13 +01:00
Duncan 977d05ba29
Entity type5: Remove peep assigned type (#14380) 
* Remove users of AssignedPeepType

* Remove AssignedPeepType

Field no longer required due to changes to EntityType

* Move enum to the RCT12 header

* Increment network version

* Update replays
 2021-03-24 08:54:05 +00:00
Duncan ccfa22c230
Entity type4: Remove MiscEntityType and add FountainType (#14344) 
* Move jumpingfountain type out of misc entity type

* Remove SubType for MiscEntities as it is no longer required

* Update replays

* Apply review comments

* Increment network version
 2021-03-22 21:24:50 +00:00
Duncan df7a284822
Entity type 2: Remove sprite_identifier (#14334) 
* Start changing the underlying type

* Further work

* Complete refactor

* Further cleanup

* Remove pointless check

* Increment network and plugin versions

* Add defaults

* Further defaults

* Fix test paint

* Update replays
 2021-03-17 08:04:41 +00:00
Duncan 5474194905
Implement train view and remove linked_list_index (#13956) 
* Make train manager view

* Remove linked list index field

* Remove merge mistake

* Fix further rebase errors

* Rename and add comments

* Update replays

* Fix Xcode project

* Increment network version

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2021-03-15 08:13:00 +00:00
Michał Janiszewski 29a1cf018d Add negative tests for SawyerChunkReader 2021-03-03 21:55:05 +01:00
Michael Steenbeek 28c680f97f
Merge pull request #14163 from Gymnasiast/refactor/get-rtd 
Use GetRideTypeDescriptor() in more places
 2021-02-26 10:46:38 +01:00
Michał Janiszewski ac6e4fc0d6 Move SPRITE_INDEX_NULL, MAX_SPRITES to their new homes 2021-02-25 10:56:27 +01:00
Gymnasiast d63e3b1d9f
Replace RideTypeDescriptors[ride->type] with GetRideTypeDescriptor() 2021-02-24 14:10:30 +01:00
Matt 62baee3adb
Allow passing of destination tolerance via SetDestination 2021-02-21 09:52:33 +02:00
Matt 965041b437
Remove direct access to DirectionX and DirectionY 2021-02-21 09:52:33 +02:00