mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity
15,244 Commits 8 Branches 59 Tags
2e64bdbe264a503dfcdf4fb734d35f0935ff5bc3
Commit Graph

15244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OpenRCT2 git bot
2e64bdbe26 Merge Localisation/master into OpenRCT2/develop. 2018-08-17 04:00:24 +00:00
Michael Steenbeek
9f891bfdcc Allow opening SV7 files 2018-08-16 16:16:56 +02:00
Aaron van Geffen
0d99186085 Merge pull request #7903 from AaronVanGeffen/fix/7899 
Use localtime instead of gmtime in file browser
 2018-08-15 10:12:35 +02:00
OpenRCT2 git bot
84bdf1f9ac Merge Localisation/master into OpenRCT2/develop. 2018-08-15 04:00:23 +00:00
Aaron van Geffen
7cc5bc87e9 Check result of FileTimeToLocalFileTime; add to changelog. 2018-08-15 00:15:06 +02:00
Hielke Morsink
4a442d0d6d Convert filetime to local time on Windows 2018-08-15 00:14:47 +02:00
Aaron van Geffen
786806e116 Use localtime instead of gmtime in file browser. 2018-08-15 00:14:47 +02:00
Hielke Morsink
c0becabcb8 Fix converting of megapark file when path fails to resolve (#7904) 
This fixes a small regression from #7895.
 2018-08-14 21:45:53 +02:00
Michael Steenbeek
f9d60ea106 Allow loading CSS17.DAT and MP.DAT on all three RCT1 sources 
This should equalise the three in terms of supported features.
 2018-08-14 15:41:51 +02:00
OpenRCT2 git bot
6e7621b304 Merge Localisation/master into OpenRCT2/develop. 2018-08-14 04:00:35 +00:00
Michael Steenbeek
81b778f1c6 Merge pull request #7893 from Gymnasiast/fix/7804 2018-08-13 21:59:13 +02:00
Gymnasiast
6fc86d5766 Fix #7872: CJK tooltips are often cut off 2018-08-13 21:41:10 +02:00
Gymnasiast
3a8bf352ac Fix #7804: Russian ride descriptions cut off 2018-08-13 20:35:46 +02:00
Michael Steenbeek
6d530002bc Add ellipsis character 2018-08-13 19:57:43 +02:00
Michael Steenbeek
13c326eb50 Fix part of #7415: Korean scenario descriptions are mangled 
OpenRCT2 used to incorrectly write UTF-8 to SV6 names and descriptions. This fixes reading such scenarios. It should also fix the game crashing when attempting to load such a scenario.

What this doesn't do is add support for the encoding that vanilla used for CJK, or add support for creating scenarios with Korean descriptions. That will only be feasible when switching to our own format.
 2018-08-13 15:53:44 +02:00
Michael Steenbeek
dc02dde29f Add #7882 to changelog [ci skip] 2018-08-13 15:52:53 +02:00
Michael Steenbeek
0a1b53e1c2 Auto-detect RCT1 files location (#7882) 2018-08-13 15:50:45 +02:00
Aaron van Geffen
a0360124b7 Tweak staff list name columns a little (#7890) 2018-08-13 14:05:52 +02:00
OpenRCT2 git bot
dcd5224c46 Merge Localisation/master into OpenRCT2/develop. 2018-08-13 04:00:34 +00:00
Michael Steenbeek
9e517a52ff Add Turkish translation 2018-08-13 00:16:11 +02:00
Sijmen Schoon
56b174432d Implement platform_get_locale_date_format for Linux 
Note that this currently, this isn't implemented in the C++ standard
library. This means that date_order() will always return no_order,
causing this function to always return the default
DATE_FORMAT_DAY_MONTH_YEAR, as is the case before this commit too.

Once date_order() will be properly implemented in the standard library
someday, it will however start returning the right order for the current
locale, causing this function to start working as intended.
 2018-08-12 23:03:32 +02:00
Aaron van Geffen
a1072a2380 Merge pull request #7880 from LinusU/clamp 
Remove Math::Clamp in favour of std::clamp
 2018-08-12 18:52:23 +02:00
Michael Steenbeek
fea17bd3b0 Add #7440 to changelog [ci skip] 2018-08-12 18:48:14 +02:00
Linus Unnebäck
2b3370228b Remove the last usage of Math.hpp 2018-08-12 16:47:12 +01:00
Linus Unnebäck
fd07be587a Remove Math::Clamp in favour of std::clamp 2018-08-12 16:47:12 +01:00
Michael Steenbeek
54fe6a7590 Add #7204 to changelog [ci skip] 2018-08-12 16:44:38 +02:00
Michael Steenbeek
78e23e6690 Merge pull request #7845 from Gymnasiast/string-removal 
Remove many unused strings
 2018-08-12 16:34:14 +02:00
Gymnasiast
7af0609de0 Remove some more strings 2018-08-12 15:58:52 +02:00
Gymnasiast
a1a371cbad Fix whitespace [ci skip] 2018-08-12 15:56:47 +02:00
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
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