1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Commit Graph

14335 Commits

Author SHA1 Message Date
Michał Janiszewski
4e44d6ef9c Validate alignment of peep_loading_positions at compile time 2018-03-30 13:16:26 +02:00
Ted John
bb5b531f0c Use resize instead of push_back 2018-03-29 17:59:49 +01:00
Ted John
bc5f253ce2 Update objects to latest v1.0 2018-03-29 17:56:03 +01:00
Michael Steenbeek
855baadd4c Remove incorrect sujeonggwa spelling 2018-03-29 14:31:17 +02:00
Michael Steenbeek
68545e22da Remove en-GB overrides for vanilla objects 2018-03-29 13:11:20 +02:00
Michael Steenbeek
cfb5a6b39d Correct spelling of 'sujonkwa' 2018-03-29 13:00:01 +02:00
Ted John
b163064f6c Update objects to v1.0 2018-03-28 23:15:32 +01:00
Michał Janiszewski
dcc834ae0a Mark ObjectJsonHelpers::GetFlags<T> as static 2018-03-28 23:45:48 +02:00
Ted John
0779859d2b Do not download objects if they already exist 2018-03-28 22:26:13 +01:00
Ted John
742edd45da Update loading object images to use inclusive ranges 2018-03-28 22:26:13 +01:00
Gymnasiast
5eeecd82bd Remove fixes to vanilla objects (moved to JSON) 2018-03-28 22:41:57 +02:00
Ted John
b8ae3f5e91 Fix cookie json item name 2018-03-28 21:13:59 +01:00
Michael Steenbeek
28067c0bad Add JSON object download to Xcode project 2018-03-28 09:42:15 +02:00
Ted John
617c14b868 Do not overwrite car.flags 2018-03-27 22:36:31 +01:00
Michał Janiszewski
ce06550b8f Fix mismatched deleter in ~ImageTable() 2018-03-27 23:17:35 +02:00
Ted John
0c03fe4dc5 Update objects to v1.0-beta.4 2018-03-27 22:06:16 +01:00
Ted John
808296e91f Change json shop names to OpenRCT2 names 2018-03-27 21:55:38 +01:00
Michał Janiszewski
fa11f05dba Remove unused variable 2018-03-27 20:46:12 +02:00
Michał Janiszewski
c4d5920140 Fix catching of polymorphic exception 2018-03-27 20:45:02 +02:00
Gymnasiast
566af0c4f7 Remove residual usages of rideEntry->enabledTrackPieces 2018-03-27 20:40:50 +02:00
Gymnasiast
d1a81b1ade Don't set now-unused SEPARATE_RIDE flag 2018-03-26 22:20:28 +02:00
Ted John
918562f622 Apply review fixes 2018-03-26 21:38:10 +02:00
Ted John
046199c660 Update objects download version to v1.0-beta.3 2018-03-26 21:38:10 +02:00
Ted John
6616ce0a67 Load new peep loading position json format 2018-03-26 21:38:10 +02:00
Ted John
04fecf64e4 Do not prepend the position data size 2018-03-26 21:38:10 +02:00
Ted John
be000f9ba6 Sort string table when loading strings from JSON 2018-03-26 21:38:10 +02:00
Michael Steenbeek
baedac2810 Fix Xcode project 2018-03-26 21:38:10 +02:00
Gymnasiast
860127e898 Fix rides selling balloons 2018-03-26 21:38:09 +02:00
Gymnasiast
195ca24086 Fix crash when spawning flat rides 2018-03-26 21:38:09 +02:00
Gymnasiast
f43937a0fd Fix initial car index values 2018-03-26 21:38:09 +02:00
Ted John
f91449190a Allow game to run without RCT2 install path 2018-03-26 21:38:09 +02:00
Ted John
f3c125853b Do not load images for objects if in headless mode 2018-03-26 21:38:09 +02:00
Ted John
c465b35037 Download and distribute objects 2018-03-26 21:38:09 +02:00
Gymnasiast
e7408f188c Fix train dropdown not being shown 2018-03-26 21:38:09 +02:00
Ted John
83ce94fd9e Search for object file, case insensitive 2018-03-26 21:38:09 +02:00
Ted John
dfa40ccd46 Read objects from OpenRCT2 data instead of RCT2 2018-03-26 21:38:09 +02:00
Ted John
668f9fd18b Correct some ride JSON names 2018-03-26 21:38:09 +02:00
Ted John
7ea5c1f099 Fix errors 2018-03-26 21:38:09 +02:00
Gymnasiast
b207797ad2 Fix rebase errors 2018-03-26 21:38:08 +02:00
Gymnasiast
81a2c28e1b Small fixes 2018-03-26 21:37:24 +02:00
Ted John
1d0799fc0d Import named car flags 2018-03-26 21:37:23 +02:00
Ted John
2917336e75 Fix import of ride type and category 2018-03-26 21:37:23 +02:00
Ted John
34168b6ecc Import sprite flags as named flags 2018-03-26 21:37:23 +02:00
Ted John
f700c661d8 Allow cars property to be a single object 2018-03-26 21:37:23 +02:00
Ted John
a695dc953e Fix import of JSON cars 2018-03-26 21:37:23 +02:00
Ted John
43c3eca185 Add remaining flags 2018-03-26 21:37:23 +02:00
Ted John
aec6da1420 Load loading positions from JSON and convert to vector 2018-03-26 21:37:23 +02:00
Ted John
7190894ec6 Read JSON colour presets for rides 2018-03-26 21:37:23 +02:00
Ted John
afbdb6dfc7 Continue work on ride JSON loading 2018-03-26 21:37:23 +02:00
Ted John
01067eebad Revert 287d97a8937eb4985da060063f09816291219b78
Caused all food stalls to incorrectly have colour tab.
2018-03-26 21:37:23 +02:00