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

356 Commits

Author SHA1 Message Date
Gymnasiast 0b159a0712
Update to objects release v1.2.2 2021-10-17 13:07:56 +02:00
ζeh Matt 57ec8424c9
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-14 19:13:35 +03:00
ζeh Matt ba96d6a7fd
Update replays 2021-10-12 21:44:30 +03:00
duncanspumpkin e5f9568180 Merge branch 'develop' into HEAD 2021-10-10 07:21:36 +01:00
adam-bloom bd99738e3c use new v29 release 2021-10-09 15:00:30 -06:00
adam-bloom 3efae5bff7 minor changes and point at alpha dependencies 2021-10-09 14:59:58 -06:00
duncanspumpkin 982b5b2cb3 Merge branch 'develop' into HEAD 2021-10-08 07:54:24 +01:00
Duncan fd18ac7f85
Modify StaffSetPatrolAreaAction to have three modes (#15494) 
* Modify StaffSetPatrolAreaAction to have three modes

* Actually serialise mode

* Apply review comments

* Increment network version

* Apply review comment

* Update replay
 2021-10-07 18:02:24 +01:00
ζeh Matt ac84b61eaf
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-30 00:21:02 +03:00
ζeh Matt afd5e8668f
Update replays 2021-09-29 19:49:15 +03:00
ζeh Matt f689b4e4c8
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-23 22:28:17 +03:00
ζeh Matt 7302cb806a
Update replays 2021-09-23 21:49:09 +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
duncanspumpkin b5eec55a05 Update replays 2021-09-13 14:50:58 +01:00
ζeh Matt 0cdd348428
Update replays 2021-09-10 19:10:14 +03:00
ζeh Matt 745885e78e
Update replays 2021-09-05 18:16:37 +03:00
Gymnasiast 612724e8f8
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-08-31 00:42:44 +02:00
ζeh Matt a2827dc50e
Update replays 2021-08-30 21:23:47 +03:00
duncanspumpkin 54bff59d90 Update replays 2021-08-29 14:52:43 -07:00
duncanspumpkin 0fae81c530 Merge branch 'develop' into HEAD 2021-08-17 21:55:39 +01:00
Duncan 223b926f8c
Use std::vector for ride use memory (#14884) 
* Use std::vector for ride use memory

* Use new system for import/export

* Remove legacy field

* Add replay entity size protection to prevent crash

* Increment network version

* Update replays

* Move function to header

* Move constant to RCT12 header as used for both 1 and 2

* Align naming with nsf
 2021-08-17 21:29:35 +01:00
Gymnasiast d885c545d8
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-08-01 15:54:04 +02:00
duncanspumpkin 26ce138996
Update replays again 2021-08-01 15:14:43 +02:00
duncanspumpkin b53b4d1952
Update replays 2021-08-01 15:14:43 +02:00
Gymnasiast 9f61748d95
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-07-28 11:00:36 +02:00
ZehMatt e596a379c0
Update replays 2021-07-27 23:06:57 +03:00
Gymnasiast b2ffbb3639
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-07-19 19:04:19 +02:00
WantDiscussion 06026ec55e
Improvement: Added lighting effects for shops and stalls. (#14169) 
* Improvement: Added lighting effects for shops and stalls.

* Moved offset rotations for lights to declaration.

* - Made function variables Const&, Const

- Fixed casing

- Removed direction variable from kiosk function

- Moved kiosk light offset rotation to declaration

* Ensure defines are only set for given target with cmake

Co-authored-by: Michał Janiszewski <janisozaur@gmail.com>
 2021-06-30 07:55:02 +01:00
Gymnasiast 153221df8e
Update objects version 2021-05-19 15:19:04 +02:00
Ted John 2b2159976d Merge branch 'develop' into new-save-format 2021-05-17 21:33:29 +01:00
Adam 5212117924
Fix #14523: suppress downloads if a directory exists 2021-05-12 09:38:47 +02:00
Duncan ae66592c2b
Remove old serialiser of steam particle (#14624) 
* Remove old serialiser of steam particle

accidentally missed this in the network serialiser branch

* Update replays
 2021-05-11 09:36:00 +01:00
Duncan d46e4a9bb1
Network serialiser for entities (#14541) 
* Start a network serialiser for entities

will be used only for checksums and replay diffs

* Continue work

* Use the new serailser for checksums

* Use new serialiser for replays

* keep compilers happy

* Try create checksum stream

* Fix compiling

* Split off class into seperate file

* Update Xcode project

* Increment network version

* Fix pragma mistake

* Fix none network builds

* Update replays

* Improve ChecksumStream and use FNV internally

* Small cleanups

* satisfy compilers

* Revert change of checksum size to simplfy rerecording

* Zero initialise data

* Fix serialiser

* Update replays again

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
Co-authored-by: Matt <m.moninger.h@gmail.com>
 2021-05-09 19:12:44 +01:00
Ted John 2b14cc0cb2 Use objects v1.2 for new footpath objects 2021-04-27 21:48:07 +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
adam-bloom d5e368a8d1 consistently use download_openrct2_zip 2021-04-01 22:00:43 -06:00
adam-bloom 753ac907f8 Refactor macOS CMakeLists for .app bundle as default 2021-04-01 22:00:04 -06:00
adam-bloom 77ea64a5ef function for downloading object/sequence/dependency zips 2021-04-01 22:00:04 -06:00
adam-bloom 06e0e3db51 add MACOS_BUNDLE cmake option to build self-contained app bundle 2021-04-01 22:00:04 -06:00
Michael Steenbeek 7344b7fbfd
Use 16-bit ride_id_t thoughout and raise RIDE_ID_NULL (#14411) 
* Replace RIDE_ENTRY_INDEX_NULL with OBJECT_ENTRY_INDEX_NULL

Ride entries are objects like any other, so there is little point having separate constants.

* Use ride_id_t in many more places

* Change RIDE_ID_NULL to 0xFFFF

* Increment network version

* Update replays

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2021-04-01 16:02:57 +01:00
Duncan 619b2afc15
Compute checksum by entity type (#14383) 
* Compute checksum by entity type

* Copy only the entity size

* Update replays and network version
 2021-03-27 09:36:41 +00: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
Michael Steenbeek f0dc28e9fc
Update objects to v1.0.21 2021-03-12 11:04:04 +01:00
Michael Steenbeek e40c0af9fd
Merge pull request #13682 from adam-bloom/macos_cmake_dylib 
macOS CMake with vcpkg dependencies
 2021-03-01 14:53:37 +01:00
adam-bloom 174297b6fc OpenRCT2/Dependencies v28 2021-02-28 15:48:30 -07:00
adam-bloom d73004357e fix install rpath with DESTDIR 2021-02-28 15:48:30 -07:00