mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00
Code Issues Releases Wiki Activity
15,216 Commits 8 Branches 59 Tags
a1a371cbad515c2ab6813dc5977f0fb78dba10d5
Commit Graph

11630 Commits

Author SHA1 Message Date
Gymnasiast
45b8ca9421 Remove more strings, fix error 2018-08-12 15:56:47 +02:00
Gymnasiast
c615d08d78 Remove many unused strings 2018-08-12 15:56:47 +02:00
Michael Steenbeek
49c30600b7 Merge pull request #7755 from Gymnasiast/fix/7204 
Fix #7204: add a dedicated source parameter to JSON objects
 2018-08-12 15:47:39 +02:00
ζeh Matt
b25cb8c793 Scale mouse delta by zoom when using shift. (#7868) 
* Scale mouse delta by zoom when using shift.

* Clamp maximum height of object drag.

* Address code review comments; add changelog entry.
 2018-08-12 11:47:46 +02:00
ζeh Matt
228861c95f Release memory from json_dumps and decrement references (#7836) 2018-08-12 11:46:30 +02:00
TELK
688741428c Fix #7870: Tiny typo in console message (#7879) [ci skip] 2018-08-12 10:32:30 +02:00
ζeh Matt
b2005c3b9f Implement FootpathRemoveAction as a GameAction (#7867) 2018-08-12 10:31:00 +02:00
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
Sijmen Schoon
faa5cc2472 Fix #7823: You can build mazes while paused 2018-08-03 21:58:49 +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
Gymnasiast
0ba233efa4 Fix formatting 2018-07-31 22:27:00 +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
Hielke Morsink
0b03464186 Replace 0 and NULL with nullptr (#7827) 2018-07-25 22:49:20 +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
Gymnasiast
86aee96c3d Add sprite glyphs for Cyrillic/Russian 2018-07-23 18:34:59 +02:00
Hielke Morsink
25eea49983 Add trailing commas to some window source files 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
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
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