Linus Unnebäck
fd07be587a
Remove Math::Clamp in favour of std::clamp
2018-08-12 16:47:12 +01:00
Gymnasiast
0ba233efa4
Fix formatting
2018-07-31 22:27:00 +02:00
Gymnasiast
8ff6831c57
Fix rebase errors
2018-07-30 21:52:45 +02:00
Gymnasiast
b257619418
Use vector for source games
2018-07-30 21:41:12 +02:00
Michael Steenbeek
2a64ec7aff
Use sourceGame parameter in JSON files instead of originalId
2018-07-30 21:39:27 +02:00
Michael Steenbeek
5ce76e1603
Attempt at showing secondary source game
2018-07-30 21:28:55 +02:00
Hielke Morsink
0b03464186
Replace 0 and NULL with nullptr ( #7827 )
2018-07-25 22:49:20 +02:00
clang-format
b02dfdbc93
Binpack function arguments together
...
Previously when the arguments of a function wouldn't fit on a single line, clang-format would put each argument on its own line instead. By enabling the binpack parameter setting, it tried to fit as many on one line as possible instead.
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com >
2018-07-23 16:00:22 +02:00
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
clang-format
a6a12af1ec
clang-format object
2018-07-23 16:00:06 +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
8c1ed596ce
Apply review changes
...
- Print warning/error code in log message
- Remove attribute from Object::SetSourceGame which has a FIXME comment already instead
2018-06-06 21:03:11 +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
Aaron van Geffen
8c3766288b
Address clang 6.0 compilation errors.
2018-05-13 23:22:40 +02:00
Ted John
4e86d18dad
Support loading images from zip
2018-05-13 12:04:45 +01:00
Ted John
580f1baff2
Get basic relative .png loading
2018-05-13 11:36:35 +01:00
Ted John
9aef466b9b
Fix bugs with zip and object manager changes
2018-05-13 11:36:35 +01:00
Ted John
23efe7f339
Load JSON from file or zip
2018-05-13 11:36:35 +01:00
Hielke Morsink
8d10bfb5a1
Add namespace closing comments
2018-05-04 22:54:43 +02:00
Ted John
edb9dc39ab
Pass object repository as a dependency when loading objects
2018-04-19 23:51:05 +01:00
Michał Janiszewski
c4d5920140
Fix catching of polymorphic exception
2018-03-27 20:45:02 +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
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
Gymnasiast
b207797ad2
Fix rebase errors
2018-03-26 21:38:08 +02:00
Ted John
a03b58501b
Add JSON loading for small scenery
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
971e2dcaa2
Add JSON loading for walls
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
12d2523752
Add JSON loading for footpath banners
2018-03-26 21:37:23 +02:00
Ted John
d56f1445f8
Add JSON loading for footpath items
2018-03-26 21:35:44 +02:00
Ted John
d27a90f068
Implement footpath JSON reading
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
773ab868fe
Parse new form of original id
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
e3b202989f
Read more from JSON, attempt at supporting more types of stalls
2018-03-26 21:35:44 +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
a408747c4c
Use object_entry_get_type() throughout
2018-02-13 16:42:18 +01:00
Ted John
02c58a6c5a
Remove custom base Exception class
2018-01-05 18:11:47 +00:00
Michael Steenbeek
347ff702d0
Refactor objects
2018-01-03 10:16:51 +01:00
Michael Steenbeek
bf69b2e682
Make terminology use more consistent
2017-11-20 11:20:04 +01:00
Michał Janiszewski
8fd2266bda
Refactor includes ( #6512 )
...
* Refactor Intent.h inclusion
* Use forward declaration of ITcpSocket
* Remove unused include
* Forward declare rct_ride_entry
* Remove unused headers
* Forward-declare rct_drawpixelinfo
* Remove unused headers
* Lower header include from header to source file
* Reduce included headers
* Reduce includes
2017-10-19 10:01:05 +02:00
Michał Janiszewski
00fd18809c
Move extern "C" {} blocks to headers ( #6282 )
2017-09-18 17:05:28 +02:00
Michał Janiszewski
79d76759bb
Fix #5516 : Update copyrights for 2017
...
Not all files were necessarily _changed_, but all were touched, see
https://github.com/OpenRCT2/OpenRCT2/pull/4932
2017-06-01 21:55:10 +02:00
Ted John
811ab88660
Refactor CreateObjectFromLegacyFile to use FileStream
2017-02-08 12:06:07 +00:00
Ted John
652cad15c4
Refactor memory stream
...
Clean up a few things.
2017-02-05 02:40:16 +00:00
