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

15193 Commits

Author SHA1 Message Date
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 71bd110526 Fix filtering 2018-07-30 21:33:31 +02:00
Ted John ec0d35bac7 Add new source field to ORI struct 2018-07-30 21:32:07 +02:00
Michael Steenbeek 5ce76e1603 Attempt at showing secondary source game 2018-07-30 21:28:55 +02:00
Michael Steenbeek 674b2a628a Require new version of objects 2018-07-30 21:22:33 +02:00
Michael Steenbeek 7f1960d375 Remove old source game tables 2018-07-30 21:22:32 +02:00
Michael Steenbeek fdd18dd29b
Fix #7830: Add font sprites for Romanian characters 2018-07-30 17:54:02 +02:00
Michael Steenbeek 1d5c20d98a
en-GB: Fix typo [ci skip] 2018-07-30 11:54:54 +02:00
Michael Steenbeek 13f8d31ef3
en-GB: Small corrections [ci skip] 
Corrected spelling of Franz von Suppé's name, corrected quotes around the film modes
 2018-07-30 11:53:43 +02:00
Michael Steenbeek eb59e05853
Add Muhhan to contributors.md [ci skip] 2018-07-29 16:35:22 +02:00
OpenRCT2 git bot 5c2dd3643b Merge Localisation/master into OpenRCT2/develop. 2018-07-28 04:00:24 +00:00
Hielke Morsink 0b03464186
Replace 0 and NULL with nullptr (#7827) 2018-07-25 22:49:20 +02:00
OpenRCT2 git bot 80f67247dc Merge Localisation/master into OpenRCT2/develop. 2018-07-24 21:29:32 +00:00
Michael Steenbeek eea728e4bb
Merge pull request #7821 from Gymnasiast/even-more-sprites 
Even more sprites
 2018-07-24 21:53:14 +02:00
Gymnasiast c48e204813 Add #7817 to changelog [ci skip] 2018-07-24 21:32:00 +02:00
Gymnasiast 99a110dfe5 Amend changelog 2018-07-24 21:10:30 +02:00
Gymnasiast 8481c4ec58 Add sprite font glyph for interpunct 2018-07-24 21:07:02 +02:00
Michael Steenbeek e6472eec00 Add Turkish sprite font glyphs 2018-07-24 13:54:19 +02:00
Gymnasiast 00a8f41341 Use Russian name for Russian language. 
This is possible now the sprite font supports it.
 2018-07-23 23:44:13 +02:00
Gymnasiast ad3528a7f1 Add sprite font glyph for the guilder sign 2018-07-23 23:44:13 +02:00
Michael Steenbeek fd133aae8a
Fix #4039: Add sprite font glyph for German opening quotes (#7811) 2018-07-23 22:02:28 +02:00
Michael Steenbeek a89121a37b
Merge pull request #7802 from Gymnasiast/russian-sprite 
Add Russian sprite font
 2018-07-23 19:30:53 +02:00
Gymnasiast 0609568b30 Add cyrillic banner font characters 2018-07-23 18:34:59 +02:00
Gymnasiast 58fdb4d9a8 Amend changelog 2018-07-23 18:34:59 +02:00
Gymnasiast 86aee96c3d Add sprite glyphs for Cyrillic/Russian 2018-07-23 18:34:59 +02:00
Hielke Morsink f6b5f9e3ae
Merge pull request #7718 from OpenRCT2/bulk-clang-format 
clang-format
 2018-07-23 16:57:16 +02:00
Hielke Morsink 25eea49983 Add trailing commas to some window source files 2018-07-23 16:00:23 +02:00
clang-format 7eafeaa971 Apply clang-format changes to tests 2018-07-23 16:00:23 +02:00
clang-format d787872cbe Indent preprocessor directives 2018-07-23 16:00:23 +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
Hielke Morsink 9bfa8bdbe8 Apply format on new/updated code before rebase 2018-07-23 16:00:17 +02:00
Hielke Morsink 73a7e935c3 Correct formatting for files in the project root 2018-07-23 16:00:17 +02:00
Hielke Morsink 7c6002cb26 Correct formatting in remaining files in libopenrct2 2018-07-23 16:00:17 +02:00
Hielke Morsink 9cf4ea675f Correct formatting for source files up to the rct2 folder 2018-07-23 16:00:16 +02:00
Hielke Morsink 3bb57f7efd exclude thirdparty folder from run-clang-format 2018-07-23 16:00:16 +02:00
Hielke Morsink fdc6e52da1 Correct formatting in files from network to paint 2018-07-23 16:00:15 +02:00
Hielke Morsink 472320d8f3 Correct formatting up to the management folder 
I went over the commits ab7f22f..8726712 (bulk format commits for game actions to management inclusive) and corrected all mistakes I found. Most of them have to do with arrays missing trailing commas, making clang-format indent the entire array or not add breaks between the values.
 2018-07-23 16:00:15 +02:00
Hielke Morsink 6fd9843dc3 Add trailing commas and clang-format comments to tests 2018-07-23 16:00:14 +02:00
Ted John 6753d860c7 Use docker container for clang-format 2018-07-23 16:00:14 +02:00
clang-format c57bbca827 clang-format root 2018-07-23 16:00:14 +02:00
clang-format 9c022606f1 clang-format UI root 2018-07-23 16:00:14 +02:00
clang-format e558660860 clang-format UI windows 2018-07-23 16:00:14 +02:00
clang-format f13e3e83d7 clang-format UI title 2018-07-23 16:00:13 +02:00
clang-format 949a34646e clang-format UI interface 2018-07-23 16:00:13 +02:00
clang-format 2151b8d75a clang-format UI input 2018-07-23 16:00:13 +02:00
clang-format 16720f0182 clang-format UI drawing 2018-07-23 16:00:13 +02:00
clang-format ebb17929a7 clang-format UI audio 2018-07-23 16:00:12 +02:00
clang-format 5c55fd6132 clang-format world 2018-07-23 16:00:12 +02:00