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

11013 Commits

Author SHA1 Message Date
Duncan 0ab3d0955c
Merge pull request #7310 from OpenRCT2/json-objects 
Add support for new JSON object format
 2018-04-08 10:45:55 +01:00
Ted John 4c9d047b52 Update android build to download objects 2018-04-06 10:45:08 +01:00
Michał Janiszewski b26d484726 Fix remaining headers 2018-03-31 23:48:15 +02:00
Hielke Morsink b62017657b Fix header dependencies for openrct2-ui 2018-03-31 23:07:14 +02:00
Hielke Morsink a51462b0fd Include necessary files for compiling headers 
This commits works towards #7289. It includes files that it depends on, or forward declares types when possible. It may seem like this only increases compilation time, but before this commit they depended on the other includes of the source files that use them.
 2018-03-31 23:07:14 +02:00
Fusxfaranto 69bb1cdf82 Use STR_NONE over magic number, and conform to style guide 2018-03-31 10:54:41 +02:00
Fusxfaranto 74361dcf87 Add different titles for multiplayer window tabs (#2989) 2018-03-31 10:54:41 +02:00
Ted John 63e9275b60 Protect against unknown ride types 2018-03-30 16:58:12 +01:00
Ted John 375deb0c9f Include string not cstring 2018-03-30 16:53:55 +01:00
Hielke Morsink aa7fb35839 Remove use of 'using namespace' from headers 2018-03-30 17:14:10 +02:00
Michał Janiszewski 3b7864957a Cleanly shutdown in case of invalid g1.dat (#7361) 2018-03-30 15:38:22 +01:00
Michał Janiszewski 7443c66025 Fix validation of rct_ride_entry_vehicle for 32 bit builds 
Also enables packing only for testpaint
 2018-03-30 14:06:33 +02:00
Michał Janiszewski 64af3d25d4
Provide error message for older version of static_assert 2018-03-30 13:42:25 +02:00
Michał Janiszewski 4e44d6ef9c
Validate alignment of peep_loading_positions at compile time 2018-03-30 13:16:26 +02:00
deurklink e960b3f150 Increment network version (#7359) 
Both PRs #7343 and #7347 changed the network version from '1' to '2'.
 2018-03-29 21:20:26 +02:00
Ted John bb5b531f0c Use resize instead of push_back 2018-03-29 17:59:49 +01:00
Michael Steenbeek 855baadd4c Remove incorrect sujeonggwa spelling 2018-03-29 14:31:17 +02:00
Michael Steenbeek cfb5a6b39d Correct spelling of 'sujonkwa' 2018-03-29 13:00:01 +02:00
Michał Janiszewski dcc834ae0a
Mark ObjectJsonHelpers::GetFlags<T> as static 2018-03-28 23:45:48 +02: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
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
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
Hielke Morsink 8adfd9a87c Fix #7303 Visual glitch with virtual floor near map edges 2018-03-27 23:09:41 +02: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
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 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
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
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