1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Commit Graph

6198 Commits

Author SHA1 Message Date
Ted John
a9ba5eadd5 Merge pull request #2910 from Overv/automatic-player-name
Change default player name to use the OS username if available (resolves #2761)
2016-02-12 00:04:22 +00:00
Alexander Overvoorde
05c1aabc39 Move fallback name logic out of platform_get_username 2016-02-12 00:31:23 +01:00
Ted John
876c4d369a Merge pull request #2917 from Overv/fix-game-language-change
Fix objects and their localized string ids not being reloaded after changing language (fixes #2751)
2016-02-11 18:49:25 +00:00
Ted John
ed44d94050 Merge pull request #2904 from Overv/fix-2892
Fix user being able to enter formatting characters (fixes #2892)
2016-02-11 18:42:15 +00:00
Alexander Overvoorde
bb71d087b5 Fix objects and their localized string ids not being reloaded after changing language (fixes #2751) 2016-02-11 15:05:23 +01:00
OpenRCT2 git bot
d87bb01801 Merge Localisation/master into OpenRCT2/develop. 2016-02-11 04:00:17 +00:00
IntelOrca
08dc095028 add viewport to player window, closes #2817 2016-02-11 00:09:10 +00:00
Alexander Overvoorde
65f25f8340 Get fallback player name from language files 2016-02-10 22:46:25 +01:00
Alexander Overvoorde
a5b47a8481 Change lmcons.h include capitalization (breaks mingw) 2016-02-10 22:33:39 +01:00
Alexander Overvoorde
4f0fc1065b Change to more reliable way to access username on posix 2016-02-10 21:59:38 +01:00
Alexander Overvoorde
75b072d266 Change default player name to use the OS username if available (resolves #2761) 2016-02-10 21:49:41 +01:00
Alexander Overvoorde
417f78b3ea Use proper UTF-8 handling for formatting code detection 2016-02-10 19:52:36 +01:00
Ted John
113631f7d2 Merge pull request #2883 from danidoedel/fix
Fix two ride construction bugs
2016-02-10 18:49:46 +00:00
Ted John
e3c20969ba Merge pull request #2905 from Overv/fix-guest-staff-disparity
Fix staff lacking tile rectangle when picked up (fixes #2877)
2016-02-10 18:49:08 +00:00
OpenRCT2 git bot
629bb93e3e Merge Localisation/master into OpenRCT2/develop. 2016-02-10 04:00:14 +00:00
Alexander Overvoorde
06304799b6 Fix staff lacking tile rectangle when picked up (fixes #2877) 2016-02-09 22:06:49 +01:00
Alexander Overvoorde
5adb18528e Fix user being able to enter formatting characters (fixes #2892) 2016-02-09 21:31:01 +01:00
duncanspumpkin
2077c51e0b Fix #2902. Banner flags now correctly passed when re-colouring 2016-02-09 17:18:25 +00:00
OpenRCT2 git bot
03b34459dd Merge Localisation/master into OpenRCT2/develop. 2016-02-09 04:00:15 +00:00
Duncan
c2540edf37 Merge pull request #2891 from thyeggman/total_admissions
Moving total admissions from park finance tab to stats tab
2016-02-08 12:17:38 +00:00
OpenRCT2 git bot
4ae8d450e0 Merge Localisation/master into OpenRCT2/develop. 2016-02-07 04:00:12 +00:00
Jacob Wallraff
dbdf76649e Moving total admissions from park finance tab to stats tab 2016-02-05 19:32:07 -08:00
OpenRCT2 git bot
3a3b731db6 Merge Localisation/master into OpenRCT2/develop. 2016-02-05 04:00:11 +00:00
danidoedel
217047c1a6 Fix #2881 Disable banking for steep to flat track 2016-02-04 21:07:45 +01:00
danidoedel
55aa203aa7 Fix #2882 Helix up didn't work properly 2016-02-04 15:02:40 +01:00
OpenRCT2 git bot
45cf56167b Merge Localisation/master into OpenRCT2/develop. 2016-02-04 04:00:15 +00:00
Ted John
2ae6f1466e Merge pull request #2841 from OpenRCT2/theme-refactor
Theme refactor
2016-02-03 19:42:44 +00:00
IntelOrca
17a48db98c fix duplication of theme 2016-02-03 18:39:08 +00:00
IntelOrca
72bed4f677 fix theme window strings 2016-02-03 18:28:25 +00:00
LRFLEW
0b8567fa80 Updated Xcode Project for theme-refactor 2016-02-03 18:23:48 +00:00
Michał Janiszewski
d274abdcce Fixes for GCC
Makes jansson library required as well
2016-02-03 18:23:47 +00:00
IntelOrca
c99ec93295 add theme entries for new windows 2016-02-03 18:23:47 +00:00
IntelOrca
5c2e951d3f fix remaining issues with theme refactor branch 2016-02-03 18:23:45 +00:00
IntelOrca
7e1ce4fcc6 reinstate theme editor and fix bugs 2016-02-03 18:23:45 +00:00
IntelOrca
caf9bd9939 get game working with new theme manager
Theme editor currently unavailable.
2016-02-03 18:23:44 +00:00
IntelOrca
0eb57e5fb5 start work on theme manager 2016-02-03 18:23:43 +00:00
IntelOrca
de17eb7279 improve Theme to use List and Json 2016-02-03 18:23:42 +00:00
IntelOrca
b1b9741090 add JSON helpers 2016-02-03 18:23:42 +00:00
IntelOrca
d67d6a4831 add more core classes 2016-02-03 18:23:41 +00:00
IntelOrca
470ac384e2 refactor window themes and use JSON for format 2016-02-03 18:23:40 +00:00
Ted John
859c2ec8c7 Merge pull request #2871 from LRFLEW/confirmation_prompt
Changed general_configuration.confirmation_prompt to bool type
2016-02-03 08:07:43 +00:00
OpenRCT2 git bot
a2c607682c Merge Localisation/master into OpenRCT2/develop. 2016-02-03 04:00:11 +00:00
LRFLEW
6aa104721a Changed general_configuration.confirmation_prompt to bool type 2016-02-02 17:30:11 -07:00
Ted John
18151042ac Merge pull request #2862 from zsilencer/multiplayer
Enable cheats over multiplayer and fix some desync causes
2016-02-02 23:36:48 +00:00
zsilencer
c789449ea8 Change log_warning to log_verbose 2016-02-02 14:47:51 -07:00
zsilencer
41a52065fa Fix #2845: Remove file size limit on map send 2016-02-02 14:11:19 -07:00
zsilencer
b2083deed0 implement cheats over multiplayer 2016-02-02 14:08:59 -07:00
zsilencer
b23748c015 fix 2 sources of very common desyncs 2016-02-02 14:08:59 -07:00
duncanspumpkin
c53ce355fa Fix #2827. Chairlifts now create vehicles correctly.
Issue was caused by incorrectly returning on successfully finding the next track piece. This in turn would cause the chairlift to not realise it was on an end station piece.
2016-02-02 18:52:41 +00:00
Ted John
21faeaeba1 Merge pull request #2867 from flk92/fix-scenario-dialog-text-overflow
Fix scenario path overflowing dialog on RCT1 font
2016-02-02 14:25:21 +00:00