1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Commit Graph

14440 Commits

Author SHA1 Message Date
Ted John
b8ae3f5e91 Fix cookie json item name 2018-03-28 21:13:59 +01:00
Ted John
025827809e Add more include paths to .vscode config [ci skip] 2018-03-28 13:10:40 +01:00
Ted John
21d9ea53db Add .vscode cpp config [ci skip] 2018-03-28 12:30:32 +01:00
Hielke Morsink
a2fe309be0 Merge pull request #7355 from Broxzier/fix/virtual-floor-zero-height
Fix #7303 Visual glitch with virtual floor near map edges
2018-03-28 12:48:39 +02:00
Hielke Morsink
8c23f16502 Merge pull request #7354 from Broxzier/fix/clip-height-assumes-order
Fix clipheight assuming tile order
2018-03-28 12:48:03 +02: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
a4fe3962f0 Add libopenrct2 as a dependency of openrct2-cli in VS solution 2018-03-27 22:16:13 +01:00
Hielke Morsink
8adfd9a87c Fix #7303 Visual glitch with virtual floor near map edges 2018-03-27 23:09:41 +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
Hielke Morsink
9f7d4f1bc4 Fix clipheight assuming tile order
Instead of breaking the loop when running into an element that's above the clip height, only skip it - the next element may still be below the clip height.
The check for the first tile could be removed entirely. The screen gets cleared every frame when the clip height flag is set already.
2018-03-27 22:17:58 +02: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
Duncan
1b2b020246 Merge pull request #7343 from ZehMatt/ga-stringbased
Implement some game actions for naming things
2018-03-27 18:55:28 +01:00
ZehMatt
bcbe6ecbff Remove unnecessary include 2018-03-27 16:29:56 +02:00
ZehMatt
adbe35b11c Increment network version. 2018-03-27 16:29:55 +02:00
ZehMatt
417a2586b6 Implement game action for banner naming. 2018-03-27 16:29:53 +02:00
ZehMatt
b45609a278 Implement game action for park naming. 2018-03-27 16:29:52 +02:00
Michael Steenbeek
515bc5aedd Add some missing entries to changelog [ci skip] 2018-03-27 14:08:53 +02:00
Michał Janiszewski
ad588218f0 Explicitly require libzip>=1.0.0 for debian 2018-03-27 11:42:26 +02:00
Michał Janiszewski
d9576e05c8 Drop libsdl2-ttf from debian libraries
Not required as of https://github.com/OpenRCT2/OpenRCT2/pull/5702
2018-03-27 11:39:18 +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