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

15358 Commits

Author SHA1 Message Date
moTechPlz 8784dfbf41 Fix #7462: Guest window goes beyond the map edge on a spiral slide. (#7752) 2018-08-07 16:20:51 +02:00
ζeh Matt e87e9f1b2e Update virtual floor to better indicate blocked areas (#7837) 2018-08-07 15:39:52 +02:00
Sijmen Schoon f3f4776afd Properly fix maze building when paused (#7852) 
Also fixes two relevant bugs:
- The error message having no title
- Fixes the controls in the construction window activating when the initial placement fails because of e.g. the game being paused.
 2018-08-04 14:30:13 +02:00
OpenRCT2 git bot 3ccad7c468 Merge Localisation/master into OpenRCT2/develop. 2018-08-04 04:00:25 +00:00
Sijmen Schoon faa5cc2472 Fix #7823: You can build mazes while paused 2018-08-03 21:58:49 +02:00
Gymnasiast 7d2569b5b6 Correct name of 'Extreme Hawaiian Island' [ci skip] 2018-08-03 18:46:34 +02:00
Gymnasiast ed7ca387da Correct identification of 'Extreme Hawaiian Island' 2018-08-03 18:45:23 +02:00
Gymnasiast 7f4bb206af Correct identification of 'Utopia Park' 
Utopia Park is the only scenario in RCT1 that uses different names in the scenario list and for the park. Since we use the former to identify scenarios, correct it.
Also add an alias to keep the very popular pack by Crappage working.
 2018-08-03 18:41:33 +02:00
OpenRCT2 git bot 1148db7226 Merge Localisation/master into OpenRCT2/develop. 2018-08-02 04:00:25 +00:00
Gymnasiast 0ba233efa4 Fix formatting 2018-07-31 22:27:00 +02:00
OpenRCT2 git bot a769ad6b55 Merge Localisation/master into OpenRCT2/develop. 2018-07-31 04:01:01 +00:00
Michael Steenbeek 3e596b3dde
openrct2.desktop: Add Japanese translations [ci skip] 2018-07-30 22:11:27 +02:00
Gymnasiast edaebd5163 Protect against Sources being null 2018-07-30 22:01:04 +02:00
Gymnasiast 8ff6831c57 Fix rebase errors 2018-07-30 21:52:45 +02:00
Gymnasiast c879bb5708 Modify SetSourceGames signature 2018-07-30 21:41: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 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