115 Commits

Author	SHA1	Message	Date
clang-format	95ce592579	Enforce not breaking before assignments and function names ... Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>	2018-07-23 16:00:19 +02:00
Hielke Morsink	9bfa8bdbe8	Apply format on new/updated code before rebase	2018-07-23 16:00:17 +02:00
Hielke Morsink	fdc6e52da1	Correct formatting in files from network to paint	2018-07-23 16:00:15 +02:00
clang-format	a6a12af1ec	clang-format object	2018-07-23 16:00:06 +02:00
Gymnasiast	5128737666	Rename some flags, move FLAG_16 to ride groups	2018-06-23 17:39:38 +02:00
spacek531	0861481cb6	First iteration	2018-06-23 16:24:01 +02:00
Michael Steenbeek	1b08fb4e69	Replace our own integer types with standard ones	2018-06-20 17:30:40 +02:00
Hielke Morsink	0cf256ac9e	Ready copyright notice for clang-format ... Clang-format sees the text behind `#pragma region` as code and formats it. Instead of stating the copyright and date there, it's now in the comment block right below it. The text "Copyright" is left in the `#pragma region` line, as clang-format sees it as a single identifier. I took the opportunity to normalize the dates, and add the copyright notice to the source files where it was missing them (except for third-party and the generated resources.h file).	2018-06-15 14:07:34 +02:00
Hielke Morsink	204dd4439b	Mark unused arguments in the libopenrct2 project ... For dummy classes and functions with empty bodies I've only commented out the arguments, for all others I used C++17's [[maybe_unused]].	2018-06-06 21:03:11 +02:00
Hielke Morsink	5d0022a5cb	Remove argument list from zero-initializers with zero/false/nullptr value	2018-06-04 19:50:46 +02:00
Ted John	6f00e6aafe	Make ObjectRepositoryItem C++	2018-05-15 00:36:35 +01:00
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