104 Commits

Author	SHA1	Message	Date
Michael Steenbeek	fcf507e051	Spin off shop item stuff to separate files	2018-05-14 19:21:43 +02:00
Michael Steenbeek	907d318e1c	Make Ride Groups more C++-like	2018-05-07 20:18:06 +02:00
duncanspumpkin	e954865b49	Fix waypoints for json changes	2018-04-11 18:16:16 +01:00
duncanspumpkin	376c40f1d4	Make peep loading positions nicer ... Change name to waypoints. Rework	2018-04-11 18:15:28 +01:00
Michael Steenbeek	92ba2dfb01	Make seatsInPairs default to true	2018-04-09 16:05:21 +02:00
Ted John	63e9275b60	Protect against unknown ride types	2018-03-30 16:58:12 +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
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
Ted John	617c14b868	Do not overwrite car.flags	2018-03-27 22:36:31 +01:00
Ted John	808296e91f	Change json shop names to OpenRCT2 names	2018-03-27 21:55:38 +01: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
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
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	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	ec446ac9d6	Return image and string table by reference	2018-03-26 21:37:23 +02:00
Ted John	900bc48efa	Write common JSON string loader	2018-03-26 21:37:22 +02:00
Michael Steenbeek	27a055653c	Fix rebase errors	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	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	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