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

14290 Commits

Author SHA1 Message Date
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
Ted John 85f9f3ad09 Read a shape property instead of individual flags 2018-03-26 21:37:23 +02:00
Ted John a03b58501b Add JSON loading for small scenery 2018-03-26 21:37:23 +02:00
Ted John 7d26492961 Fix removal price for large scenery 2018-03-26 21:37:23 +02:00
Ted John 44e2f1d577 Add JSON loading for 3D fonts in large scenery 2018-03-26 21:37:23 +02:00
Ted John 1668374d2c Fix loading of JSON large scenery tiles 2018-03-26 21:37:23 +02:00
Ted John 1e3ce8754e Add JSON loading for large scenery 2018-03-26 21:37:23 +02:00
Ted John 7c05e22cd0 Refactor large scenery tile flags field 2018-03-26 21:37:23 +02:00
Ted John f11973f692 Fix typo, hasGrass -> hasGlass 2018-03-26 21:37:23 +02:00
Ted John 971e2dcaa2 Add JSON loading for walls 2018-03-26 21:37:23 +02:00
Ted John 1d12fc7963 Update launch.json 2018-03-26 21:37:23 +02:00
Ted John f6a6169ca2 Don't report object conflicts 2018-03-26 21:37:23 +02:00
Ted John ede51ded86 Add JSON loading for scenery groups 2018-03-26 21:37:23 +02:00
Ted John 3ead0f4289 Finish loading water JSON objects 2018-03-26 21:37:23 +02:00
Ted John 40f775c39a Add JSON loading for water 2018-03-26 21:37:23 +02:00
Ted John 12d2523752 Add JSON loading for footpath banners 2018-03-26 21:37:23 +02:00
Ted John ec446ac9d6 Return image and string table by reference 2018-03-26 21:37:23 +02:00
Ted John c3f075d18c Write helper method for parsing flags 2018-03-26 21:37:23 +02:00
Ted John 900bc48efa Write common JSON string loader 2018-03-26 21:37:22 +02:00
Ted John d56f1445f8 Add JSON loading for footpath items 2018-03-26 21:35:44 +02:00
Michael Steenbeek e8b28965cc Fix extracting ranges from object .DATs 2018-03-26 21:35:44 +02:00
Ted John d27a90f068 Implement footpath JSON reading 2018-03-26 21:35:44 +02:00
Michael Steenbeek 27a055653c Fix rebase errors 2018-03-26 21:35:44 +02:00
Ted John 2d037fb3ae Read JSON for park entrance objects 2018-03-26 21:35:44 +02:00
Ted John 1e4a8c0da7 Refactor common JSON methods to new helper namespace 2018-03-26 21:35:44 +02:00
Ted John 4fdbf1ca93 Parse category and shop item 2018-03-26 21:35:44 +02:00
Ted John a7a7b2f1b4 Fix memory corruption in ImageTable::AddImage 2018-03-26 21:35:44 +02:00
Ted John ddd0df4a60 Parse ride type with lookup table 2018-03-26 21:35:44 +02:00
Ted John 5eba067aba Load images from OBJDATA DATs 2018-03-26 21:35:44 +02:00
Ted John 773ab868fe Parse new form of original id 2018-03-26 21:35:44 +02:00
Ted John bf7c3931e7 Parse images from JSON 2018-03-26 21:35:44 +02:00
Ted John f6fd79eca4 Move length calculation to ImageTable.cpp 2018-03-26 21:35:44 +02:00
Ted John 32d588d765 Fix toilets image loading 2018-03-26 21:35:44 +02:00
Michael Steenbeek ad21e962ee Allow import of RCT1 Ice Cream Stall 2018-03-26 21:35:44 +02:00
Michael Steenbeek 7d3489a151 Avoid toilets selling balloons 2018-03-26 21:35:44 +02:00
Michael Steenbeek e3b202989f Read more from JSON, attempt at supporting more types of stalls 2018-03-26 21:35:44 +02:00
Michael Steenbeek 3ffdfd1e5d Draw the building 2018-03-26 21:35:43 +02:00
Michael Steenbeek 9ab0164b6f Fix compiling and loading on macOS, load description 2018-03-26 21:35:43 +02:00
Ted John a1f360ab7d Spike 1: Add RCT1 toilets JSON 2018-03-26 21:35:43 +02:00
Michael Steenbeek beb352d97a Increase network version 2018-03-26 20:36:16 +02:00
Michael Steenbeek 695d3762e5 Remove last usages of SEPARATE_RIDE flag 2018-03-26 20:36:16 +02:00
Michael Steenbeek 3d86ec2bc0 Remove dead code from research 2018-03-26 20:36:16 +02:00
Hielke Morsink d7c198388e Fix #7327: Draw transparent images see-through too 
This removes the check for transparent images before applying the hardcoded colours. It sets the transparency flag anyway.
 2018-03-26 10:28:10 +02:00
Gymnasiast ca17f03ff2 Add large half loops to the Vertical Drop Roller Coaster 2018-03-25 16:32:06 +02:00
Hielke Morsink aefb2adc05
Merge pull request #7273 from Broxzier/fix/5210-no-system-dialog 
Refactor browse function in LoadSave.cpp - fixes #3596 and #5210
 2018-03-24 13:59:36 +01:00
Hielke Morsink 9ddda9ac77 Move comment 2018-03-24 13:34:05 +01:00