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

513 Commits

Author SHA1 Message Date
duncanspumpkin 983436d425 Implemented a insert corrupt element button on the tile inspector 2015-11-07 10:04:57 +00:00
Ted John 10674fe439 Merge Localisation/master into OpenRCT2/develop. 2015-11-07 04:00:18 +00:00
IntelOrca daf95940ac add warning message for two unstable cheats 2015-11-06 18:46:18 +00:00
Ted John f68e307c06 Merge pull request #2211 from Gymnasiast/open-new-window 
Correct 'Open new window'
 2015-11-06 18:35:30 +00:00
Michał Janiszewski 2d62c356c3 Early out and report error if langauge files are missing 
This is a common problem if you don't set up your paths properly on
Linux, so be nice and try to provide helpful message why we failed to
load instead of crashing on user a moment later.
 2015-11-05 22:41:20 +01:00
Michael Steenbeek 68aea9740d Update english_uk.txt 2015-11-05 14:43:06 +01:00
Michael Steenbeek b3c8a1d2b7 Correct 'Open new window' 2015-11-05 10:08:08 +01:00
Ted John 273293456c Merge Localisation/master into OpenRCT2/develop. 2015-11-03 04:00:16 +00:00
Ted John 1f9c02fc5f Merge Localisation/master into OpenRCT2/develop. 2015-10-30 04:00:17 +00:00
Ted John 0b66558852 Merge Localisation/master into OpenRCT2/develop. 2015-10-29 04:00:17 +00:00
Ted John 7ac22b3be5 Merge Localisation/master into OpenRCT2/develop. 2015-10-28 04:00:16 +00:00
Ted John 4865cedc59 Merge Localisation/master into OpenRCT2/develop. 2015-10-27 04:00:18 +00:00
Ted John 04eacc8904 Merge Localisation/master into OpenRCT2/develop. 2015-10-26 04:00:17 +00:00
Hielke Morsink dc8e197799 Added 10-minute inspections cheat. 2015-10-24 17:10:33 +02:00
Ted John 5e9912e880 Merge pull request #2038 from HaasJona/restart_required 
Require a restart after changing hardware rendering
 2015-10-24 14:44:01 +01:00
Jonathan Haas 475466dcd9 Require a restart after changing hardware rendering setting, decouple setting from active status 2015-10-24 12:50:28 +02:00
Ted John ad7d2b3c00 Merge Localisation/master into OpenRCT2/develop. 2015-10-20 04:00:17 +01:00
Ted John 516cb1f7c9 Merge Localisation/master into OpenRCT2/develop. 2015-10-18 04:00:17 +01:00
IntelOrca 341b658ed0 add gui option for stay_connected 2015-10-16 22:45:17 +01:00
IntelOrca 6c6fa1d444 add ability for server to kick player, closes #2071 2015-10-16 22:20:16 +01:00
Ted John 6068b361bc Merge Localisation/master into OpenRCT2/develop. 2015-10-16 04:00:16 +01:00
Ted John fdfe52fc19 Merge pull request #2057 from Gymnasiast/show-vehicles-from-other-track-types 
Show vehicles from other track types
 2015-10-15 12:57:57 +01:00
Ted John e6359f486b Merge Localisation/master into OpenRCT2/develop. 2015-10-14 04:00:16 +01:00
Ted John 2db3f4ee23 Merge Localisation/master into OpenRCT2/develop. 2015-10-13 04:00:16 +01:00
Gymnasiast 105280a082 Introduce cheat option to show vehicles from other track types 2015-10-12 15:58:15 +02:00
Ted John 66dd53dd36 Merge pull request #2050 from OpenRCT2/game-command-land-smooth 
Implement mountain tool + enhanced functionality.
 2015-10-11 18:11:18 +01:00
IntelOrca d5ae4a55ff allow 1 to 64 mountain tool size 2015-10-11 12:26:33 +01:00
Ted John fbd2598ac3 Merge Localisation/master into OpenRCT2/develop. 2015-10-11 04:00:16 +01:00
Ted John 06c33dfd8a Merge Localisation/master into OpenRCT2/develop. 2015-10-06 04:00:17 +01:00
Ted John 21c84375f4 Merge Localisation/master into OpenRCT2/develop. 2015-10-05 04:00:16 +01:00
Ted John 5405cf7efd Merge pull request #2012 from Overv/develop 
Add Steam overlay detection that pauses the game (#1903)
 2015-10-05 00:07:10 +01:00
Ted John 928ef24684 Merge Localisation/master into OpenRCT2/develop. 2015-10-04 04:00:17 +01:00
Alexander Overvoorde 51377fc960 Add setting for Steam overlay pausing and add extra check 2015-10-03 23:10:56 +02:00
Alexander Overvoorde 377650d9f5 Change autosave system to use wall-clock time based frequencies 
The autosave system will now use frequencies based on wall-clock
time rather than in-game time, for example every 15 minutes. This
frequency is not affected by pausing the game or changing the game
speed. The default frequency is every 5 minutes.
 2015-10-03 14:25:59 +02:00
Ted John 494869b22e Merge Localisation/master into OpenRCT2/develop. 2015-10-03 04:00:16 +01:00
Ted John d6631e182b Merge Localisation/master into OpenRCT2/develop. 2015-09-29 04:00:16 +01:00
Ted John adebebe2d4 Merge Localisation/master into OpenRCT2/develop. 2015-09-28 04:00:17 +01:00
Ted John 4643881389 Merge Localisation/master into OpenRCT2/develop. 2015-09-27 04:00:16 +01:00
IntelOrca a04663368e add two new date formats, y/m/d and y/d/m, closes #1900 2015-09-26 14:35:26 +01:00
Ted John 0bef4f3467 Merge Localisation/master into OpenRCT2/develop. 2015-09-20 04:00:15 +01:00
Ted John e4b7785bdd Merge Localisation/master into OpenRCT2/develop. 2015-09-19 04:00:15 +01:00
Gymnasiast 4909272a44 Add cheat option to show all operating modes; cleanup 2015-09-18 10:54:48 +02:00
Ted John 338855ba50 Merge Localisation/master into OpenRCT2/develop. 2015-09-15 04:00:15 +01:00
Ted John 597c9e19de Merge Localisation/master into OpenRCT2/develop. 2015-09-13 04:00:15 +01:00
Ted John f081f8430a Merge Localisation/master into OpenRCT2/develop. 2015-09-12 13:59:21 +01:00
Ted John 408665e4a4 Merge Localisation/master into OpenRCT2/develop. 2015-09-11 04:00:15 +01:00
Michael Steenbeek 2c71e8c419 Fix Condor Ride description, fixes #1021 2015-09-10 14:39:49 +02:00
Ted John 85bbdde056 Merge Localisation/master into OpenRCT2/develop. 2015-09-10 04:00:15 +01:00
Ted John d7a7a81cd0 Merge Localisation/master into OpenRCT2/develop. 2015-09-09 04:00:15 +01:00
Ted John a0d684a07d Merge Localisation/master into OpenRCT2/develop. 2015-09-07 04:00:15 +01:00
Ted John 54b08da98e Merge Localisation/master into OpenRCT2/develop. 2015-09-05 04:00:15 +01:00
Ted John 4c60112bd5 Merge Localisation/master into OpenRCT2/develop. 2015-09-04 04:00:15 +01:00
Ted John 8c2d0b3730 Merge Localisation/master into OpenRCT2/develop. 2015-09-03 04:00:15 +01:00
Ted John a8fbc479d0 Merge pull request #1869 from LRFLEW/color_labels 
Added tooltip to colour selector
 2015-09-02 17:49:33 +01:00
Ted John f16b740dca Merge Localisation/master into OpenRCT2/develop. 2015-09-02 04:00:15 +01:00
Michael Steenbeek 46dd7e0620 Add actual colours to colour tooltips 2015-09-01 14:06:24 +02:00
LRFLEW 7ef15a4326 Added tooltip to colour selector 2015-09-01 00:08:28 -06:00
Ted John 5abb923525 Merge Localisation/master into OpenRCT2/develop. 2015-09-01 04:00:16 +01:00
Gymnasiast 2ff3e33e3e Add cheat to disable vandalism 2015-08-31 11:13:19 +02:00
Ted John 580a6c7388 Merge Localisation/master into OpenRCT2/develop. 2015-08-25 04:00:15 +01:00
Ted John 2afd9b8a61 Merge Localisation/master into OpenRCT2/develop. 2015-08-24 04:00:17 +01:00
Ted John 972ae72d87 Merge Localisation/master into OpenRCT2/develop. 2015-08-23 04:00:15 +01:00
Ted John 3bfeddbee7 Merge Localisation/master into OpenRCT2/develop. 2015-08-21 04:00:16 +01:00
Gymnasiast 93d49e314e Fix file menu for editor, restore menu order, add shortcut for quick saving 2015-08-20 12:13:08 +02:00
Ted John 2500ee452e Merge Localisation/master into OpenRCT2/develop. 2015-08-20 04:00:15 +01:00
Runelaenen 2830cdd3a3 Capitalisation of 5512 2015-08-19 23:16:07 +02:00
Runelaenen 6ec01c6d65 Changed localisation strings 2015-08-19 22:35:20 +02:00
Runelaenen d34a446d61 Easier saving 
Replace Save game functionality and add 'save game as' function
 2015-08-19 22:02:06 +02:00
Ted John f836590a18 Merge Localisation/master into OpenRCT2/develop. 2015-08-19 04:00:15 +01:00
Gymnasiast 59202f97f8 Make the string for 'Default audio device' translatable, fix comment 2015-08-18 21:55:04 +02:00
Gymnasiast 4fa571a041 Add option to allow loading scenarios with an incorrect checksum 2015-08-18 10:47:31 +02:00
Ted John 3a8dd25020 Merge Localisation/master into OpenRCT2/develop. 2015-08-18 04:00:15 +01:00
Ted John e46cc379ab Merge pull request #1803 from medsouz/handymenmowdefault 
Add option for handymen to mow grass by default
 2015-08-17 08:05:18 +01:00
Ted John 00ab8be6af Merge Localisation/master into OpenRCT2/develop. 2015-08-17 04:00:16 +01:00
medsouz 3b845a67ed Add option for handymen to mow grass by default 2015-08-16 19:26:42 -04:00
xperia64 a629de4666 Correct String IDs 2015-08-16 16:03:23 -04:00
xperia64 4733ea28c0 Add a cheat so guests ignore intensity and nausea ratings 2015-08-16 16:02:41 -04:00
IntelOrca 094cc19411 allow joining of servers in server list window 2015-08-16 16:37:08 +01:00
Gymnasiast c00e044b6c Multiplayer interface improvements, cleanup 2015-08-16 13:14:04 +02:00
Ted John 905efcd412 Merge Localisation/master into OpenRCT2/develop. 2015-08-16 04:00:15 +01:00
IntelOrca f072440d18 add server list window (WIP) 2015-08-16 03:07:00 +01:00
IntelOrca 3f31221973 fix network merge issues, fix #1785 2015-08-14 22:06:15 +01:00
zsilencer d772f8b5fb measure and display ping 2015-08-14 09:13:39 -06:00
zsilencer 7ccb0eb655 basic player list 2015-08-14 09:13:38 -06:00
IntelOrca 99f2b87043 add chat feature 2015-08-14 09:13:29 -06:00
Ted John 80281e82ea Merge pull request #1778 from Gymnasiast/patch-2 
Mark former tutorial strings as unused
 2015-08-14 13:57:15 +01:00
Ted John e9c8d03bd9 Merge Localisation/master into OpenRCT2/develop. 2015-08-14 04:00:15 +01:00
Michael Steenbeek 5ee6d563d0 Mark former tutorial strings as unused 2015-08-13 10:40:37 +02:00
Ted John 76df9b156a Merge Localisation/master into OpenRCT2/develop. 2015-08-13 04:00:15 +01:00
Gymnasiast d01a53bd16 Add Inventions List and Scenario Options to the Debug menu 2015-08-12 15:31:52 +02:00
Ted John 16653b6f9f Merge Localisation/master into OpenRCT2/develop. 2015-08-12 04:00:14 +01:00
medsouz e0e9dedb8b Moved strings to english_uk.txt 2015-08-11 07:30:29 -04:00
medsouz db9ea4cdf3 Added toggle for audio disable on focus lost 
This closes #1758
 2015-08-11 07:06:00 -04:00
LRFLEW d10f5c8f06 Added tracked guests filter 2015-08-09 22:58:15 -05:00
Ted John 7395752ddf Merge Localisation/master into OpenRCT2/develop. 2015-08-10 04:00:15 +01:00
Ted John 5ae099c062 Merge Localisation/master into OpenRCT2/develop. 2015-08-08 04:00:15 +01:00
Ted John 2a9698c7c2 Merge Localisation/master into OpenRCT2/develop. 2015-08-07 04:00:14 +01:00
Ted John b081f27a92 Merge Localisation/master into OpenRCT2/develop. 2015-08-06 04:00:15 +01:00
IntelOrca 19f94b54e1 fix #1669 2015-08-05 13:44:47 +01:00
IntelOrca cec486839c add 'no entrance' style and refactor a few things 2015-08-05 01:24:18 +01:00