1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 13:33:02 +01:00
Commit Graph

459 Commits

Author SHA1 Message Date
duncanspumpkin
d9a188bcba Merge branch 'develop' into HEAD 2021-09-18 21:31:46 +01:00
Duncan
81051f2d21 Add crypt files from NSF 2021-09-18 20:31:23 +00: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
Gymnasiast
1dde081468 Bump Xcode deployment target to macOS 10.14 2021-09-13 21:38:31 +03:00
ζeh Matt
f999b0acb2 Remove Nullable and use std::optional instead 2021-09-12 16:55:56 +03:00
ζeh Matt
2daa356fbf Move ZipStream into new header 2021-09-11 19:06:17 +03:00
Gymnasiast
bcba227430 Add footpath surface and railings objects from NSF 2021-08-29 17:07:38 +02: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
ZehMatt
6d1f730359 Update xcode project 2021-08-11 22:15:37 +03:00
ZehMatt
d558920606 Move ScParkMessage into its own files 2021-08-11 22:15:36 +03:00
ZehMatt
437321ac8f Move ScMap code into cpp 2021-08-11 22:15:36 +03:00
ZehMatt
2bd348c39e Move ScRide into a cpp file 2021-08-11 22:15:36 +03:00
ZehMatt
fe57dece6b Move ScRideStation into its own files 2021-08-11 22:15:36 +03:00
ZehMatt
99eee53c60 Move ScNetwork and ScPlayer into their own files 2021-08-11 22:15:35 +03:00
ZehMatt
64b57734e1 Move ScPlayerGroup into its own files 2021-08-11 22:15:35 +03:00
ZehMatt
371bbc0675 Move ScLitter to its own files 2021-08-11 22:15:35 +03:00
ZehMatt
2e951877cb Move ScPeep ScGuest and ScStaff to their own files 2021-08-11 22:15:35 +03:00
ZehMatt
33e2878d2d Move ScVehicle into its own files 2021-08-11 22:15:35 +03:00
ZehMatt
adf5829cd6 Re-arrange structure of scripting 2021-08-11 22:15:34 +03:00
Gymnasiast
ad7d5387f9 Bump Xcode deployment target to macOS 10.14 2021-08-07 12:54:13 +02:00
Gymnasiast
d885c545d8 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-08-01 15:54:04 +02:00
ZehMatt
a36e0a32f7 Add EnumMap container for bidirectional key, enum mapping 2021-07-29 17:07:48 +03:00
Michael Steenbeek
ab18612882 Remove Music Acknowledgements window (#15116)
It was of limited use to us anyway since we didn’t license the music ourselves, but now the actual track names and composers are shown in the Object Selection, the window lost its last bit of usefulness.
2021-07-28 10:26:35 +02:00
duncanspumpkin
b42a097672 Merge branch 'develop' into HEAD 2021-07-27 16:53:16 +01:00
ζeh Matt
afc4cd7cba Refactor ride construction code into a new unit 2021-07-27 17:21:03 +02:00
duncanspumpkin
5bac7821c9 Merge develop 2021-06-04 13:11:47 +01:00
Duncan
03378782ff Split off litter code to litter.cpp (#14799)
* Split off litter code to litter.cpp

* Use PATH_CLEARANCE
2021-06-03 08:27:03 +01:00
Matt
80ac0b93f7 Add files to xcode project 2021-05-31 18:21:17 +03:00
Gymnasiast
8bc8a0df14 Remove Music Acknowledgements window
It was of limited use to us anyway since we didn’t license the music ourselves, but now the actual track names and composers are shown in the Object Selection, the window lost its last bit of usefulness.
2021-05-26 17:56:02 +02: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
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
Michael Steenbeek
8f8ff7a04d Update Xcode project 2021-04-28 13:06:53 +02:00
Ted John
2b14cc0cb2 Use objects v1.2 for new footpath objects 2021-04-27 21:48:07 +01:00
Ted John
6db0c01fdc Merge branch 'develop' into new-save-format 2021-04-25 15:03:45 +01:00
Margen67
3188865313 Script improvements (#14452)
shebang:
 Move parameters from set.
 Add newline after for consistency.
curl:
 Add -f;
  Prevents output on error.
 Use -O where applicable;
  -o with the same filename as the URL is pointless.
 Add -S after -s:
  Makes curl still error despite being silent.
build-symbols:
 Add zip fallback.
get-discord-rpc:
 Move git clone parameters before repository for readability.
 Use --depth 1 to speed up cloning.
install-nsis:
 Use ProgramData environment variable.
build-appimage-docker.sh:
 Add -e to docker run.
 Run script directly.
build-appimage.sh:
 Make if more consistent.
Remove unused Travis scripts.
setenv:
 unset instead of blanking variables.
vstool.cmd:
 Use ProgramFiles(x86) environment variable.
2021-04-12 19:01:15 -03:00
Ted John
8ff525270d Remove S6Exporter 2021-04-03 04:20:51 +01:00
Michael Steenbeek
135c2a6446 Update Xcode project 2021-04-03 00:20:45 +01:00
Michael Steenbeek
4ac3fd4b49 Merge pull request #14307 from adam-bloom/xcode_v28_dependencies
Xcode v28 dependencies
2021-03-15 14:10:21 +01: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
adam-bloom
d8f9f38576 Dependencies v28 in Xcode build 2021-03-13 11:41:28 -07:00
Sébastien LeBlanc
642fe8e62e Fix #13436: Update MacOS Icon for Big Sur 2021-03-08 05:55:17 -07:00
Ted John
966129dd7c Remove network traffic window
Now available in the DevTools plugin.
2021-03-06 14:47:06 +01:00
Adam
212a0c1e49 Revert Xcode to v26 dependencies 2021-03-03 22:56:03 +01:00
adam-bloom
174297b6fc OpenRCT2/Dependencies v28 2021-02-28 15:48:30 -07:00
adam-bloom
f51fea47df Point Xcode and cmake at new dependencies
Update Xcode project to handle new library file names

Remove static discord-rpc library from Xcode build,
use dylib instead
2021-02-28 15:48:30 -07:00
Michael Steenbeek
f2b8a13087 Update Xcode project 2021-02-21 03:14:19 +00:00
majchrzamemil
903bde7299 Fixed xcode configuration for TileBaseElement (#36)
Signed-off-by: Emil Majchrzak <majchrzakemil@gitlab.com>

Co-authored-by: Emil Majchrzak <majchrzakemil@gitlab.com>
2021-02-15 12:44:37 +01:00
Michael Steenbeek
2aa2a94a7e Update Xcode project 2021-01-27 18:45:27 +00:00