mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-09-11 20:12:51 +02:00
Code Issues Projects Releases Wiki Activity
7108 commits 9 branches 42 tags 373 MiB
Commit graph

705 commits

Author SHA1 Message Date
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
danidoedel
1fc7c0ecac fix recent messages toolbar tooltip 2015-08-04 17:56:12 +02:00
IntelOrca
d228d13918 implement utf8, part 23 (bug fixes) 2015-08-01 16:40:15 +01:00
IntelOrca
31eb758ba1 implement utf8, part 15 2015-08-01 10:20:57 +01:00
Ted John
c389228141 Merge Localisation/master into OpenRCT2/develop. 2015-08-01 04:00:15 +01:00
Ted John
192289de87 Merge Localisation/master into OpenRCT2/develop. 2015-07-30 04:00:13 +01:00
Michael Steenbeek
e16b6fb2d0 GB: Fix use of American English 2015-07-29 08:46:32 +02:00
Ted John
8282802574 Merge Localisation/master into OpenRCT2/develop. 2015-07-29 04:00:14 +01:00
Ted John
ea130a6126 Merge pull request #1694 from Gymnasiast/remove-six-flags-branding-and-limitations-2 
Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag
 2015-07-28 12:08:47 +01:00
Gymnasiast
9976b9673a Remove rest of Six Flags branding. 2015-07-28 10:13:16 +02:00
Ted John
c35d1ce65f Merge Localisation/master into OpenRCT2/develop. 2015-07-28 04:00:14 +01:00
Gymnasiast
5ed8948e4f Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag 2015-07-27 21:47:55 +02:00
Gymnasiast
65900982c4 Fix '1 weeks remaining' 2015-07-27 17:33:22 +02:00
Duncan
cfb8f3ae0a Merge pull request #1691 from Gymnasiast/more-obsolete-strings 
Mark more obsolete strings
 2015-07-27 12:23:30 +01:00
Gymnasiast
38f031655c Fix display of remaining marketing campaign weeks 2015-07-27 10:34:19 +02:00
Gymnasiast
c2fe82dcb7 Mark more obsolete strings 2015-07-27 10:16:08 +02:00
Ted John
0ef9627058 Merge Localisation/master into OpenRCT2/develop. 2015-07-27 04:00:15 +01:00
Ted John
30ee1096b7 Merge pull request #1684 from Gymnasiast/longer-marketing-campaigns-squash 
Allow running marketing campaigns for up to 12 weeks
 2015-07-26 21:48:39 +01:00
Gymnasiast
777065e6a6 Allow running marketing campaigns for up to 12 weeks 2015-07-26 22:36:12 +02:00
Ted John
8bfdbdec65 Merge pull request #1687 from Gymnasiast/fix-intro-option 
Remove Infogrames disclaimer from intro and fix config option
 2015-07-26 21:33:26 +01:00
Matt Layher
06f2adb9d6 Properly merge #1672: incorrect plural form for last inspection time, fixes #1513, closes #1672 2015-07-26 21:30:29 +01:00
Gymnasiast
ce7a0ac27b Remove Infogrames disclaimer from intro and fix config option 2015-07-26 16:07:58 +02:00
Gymnasiast
bcdfdcb7a0 Reorder Options window 2015-07-26 14:37:27 +02:00
Ted John
0d8d797f15 Merge Localisation/master into OpenRCT2/develop. 2015-07-26 04:00:14 +01:00
Ted John
f4216227f4 Merge pull request #1682 from Gymnasiast/upper-case-banners 
Add feature to make banners display text in all caps
 2015-07-25 20:50:02 +01:00
Gymnasiast
ae32b463c0 Add feature to make banners display text in all caps 2015-07-25 21:38:23 +02:00
Michael Steenbeek
290fbfb6e4 Fix typo 2015-07-25 18:09:30 +02:00
Michael Steenbeek
e3c275644b Update and mark obsolete strings 2015-07-25 18:07:38 +02:00
IntelOrca
5f69e6f37a add cycle day / night 2015-07-24 22:58:41 +01:00
IntelOrca
b12b1b5faf support map scroll keyboard shortcuts, e.g. WASD. Closes #757 2015-07-24 19:20:24 +01:00
IntelOrca
1f2502c8c2 add recent messages to toolbar, closes #1423 2015-07-22 18:13:35 +01:00
Ted John
18e492b898 Merge Localisation/master into OpenRCT2/develop. 2015-07-22 04:00:14 +01:00
Ted John
6d6ceccc97 Merge Localisation/master into OpenRCT2/develop. 2015-07-18 04:00:13 +01:00
Michael Steenbeek
57818c3835 Use standard spelling of 'tigre', closes #1637 2015-07-17 10:21:18 +02:00
IntelOrca
48028fcfc4 fix #1631, fix #1632 2015-07-16 16:42:46 +01:00
Ted John
f180ceb71c Merge Localisation/master into OpenRCT2/develop. 2015-07-15 04:00:16 +01:00
Michael Steenbeek
f7dd9859e4 Fix merge error in englush_uk.txt 2015-07-14 10:16:16 +02:00
Ted John
b04ba50400 Merge Localisation/master into OpenRCT2/develop. 2015-07-14 04:00:24 +01:00
Ted John
a1e67fd106 Merge Localisation/master into OpenRCT2/develop. 2015-07-11 04:00:40 +01:00
IntelOrca
c80475f7db allow disable clearance checks for footpaths 2015-07-10 21:38:05 +01:00
IntelOrca
9c8be6a483 allow disable clearance checks for footpaths 2015-07-10 21:33:32 +01:00
IntelOrca
d5ffaefdf0 add better disable clearance cheat 2015-07-10 21:32:11 +01:00
Gymnasiast
be635030bd Reorder cheats window, use actual currency, add cheats to give guests money and to set goal to have fun 2015-07-09 16:36:45 +02:00
IntelOrca
6527bc6ac2 add shortcut versions and rotate clockwise/anticlockwise shortcut 2015-07-09 13:50:33 +01:00
Runelaenen
8ec0024a4d Changed strings for #1495 2015-07-09 14:22:24 +02:00
Runelaenen
5109224ba0 Add submenu and anti-clockwise rotation 2015-07-09 14:22:22 +02:00
Ted John
ef7603013e Merge Localisation/master into OpenRCT2/develop. 2015-07-07 04:00:22 +01:00
Ted John
294456daa1 Merge Localisation/master into OpenRCT2/develop. 2015-07-06 04:00:17 +01:00
Michael Steenbeek
2c64609903 Properly differentiate between the Twister RC track and the Twister RC vehicle. 
Stops two different rides from showing up as 'Twister RC'.
 2015-07-05 11:01:20 +02:00
Ted John
8fe245721b Merge Localisation/master into OpenRCT2/develop. 2015-07-05 04:00:14 +01:00
zsilencer
76b231c150 add option to uncap fps, and fix #1470 2015-07-04 13:14:14 -06:00
Ted John
392c302d96 Merge Localisation/master into OpenRCT2/develop. 2015-07-04 04:00:14 +01:00
Duncan
e54e74257d Merge pull request #1515 from MaikelS11/build-ride-improvement 
Back button on "Select Design" list #1346
 2015-07-02 12:45:45 +01:00
Ted John
cbbf127185 Merge Localisation/master into OpenRCT2/develop. 2015-07-02 04:00:20 +01:00
Ted John
c0b45d8651 Merge Localisation/master into OpenRCT2/develop. 2015-07-01 04:00:15 +01:00
Ted John
ea88ae41a6 Merge Localisation/master into OpenRCT2/develop. 2015-06-30 04:00:16 +01:00
Maikel Stuivenberg
05e9cdd339 Tab to spaces (txt) and move item to end of list (strings_id) 2015-06-29 22:44:15 +02:00
Ted John
380d459dfb Merge Localisation/master into OpenRCT2/develop. 2015-06-29 04:00:15 +01:00
Maikel Stuivenberg
36b9d8de8a Merge with develop 2015-06-28 21:40:01 +02:00
Maikel Stuivenberg
952cbdebaf move string to id 5453 2015-06-28 21:33:54 +02:00
Maikel Stuivenberg
d968a65701 Changed back-button location 2015-06-28 21:30:20 +02:00
IntelOrca
b4f8d3b753 add new shortcuts to shortcut window and fix bottom toolbar hiding in editor 2015-06-28 13:59:38 +01:00
Duncan
9b4d375707 Merge pull request #1501 from Gymnasiast/patch-2 
Fix observation tower and launched freefall descriptions
 2015-06-28 13:55:11 +01:00
danidoedel
06ee0342b7 Fix window titles (cheats) 2015-06-28 14:52:05 +02:00
Thomas
e72739dbd6 Add cheat to force park rating 2015-06-28 13:38:38 +02:00
Michael Steenbeek
fb9fe6615b Fix typo 2015-06-28 11:11:07 +02:00
Ted John
0a1cd30597 Merge Localisation/master into OpenRCT2/develop. 2015-06-28 04:00:16 +01:00
Michael Steenbeek
a4322cb855 Fix observation tower and launched freefall descriptions 2015-06-27 16:25:42 +02:00
Duncan
2c58910f62 Merge pull request #1485 from OpenRCT2/object-selection-columns 
Object selection columns
 2015-06-27 09:16:57 +01:00
Ted John
c00df00801 Merge Localisation/master into OpenRCT2/develop. 2015-06-27 04:00:15 +01:00
Ted John
7527a74d7d Merge Localisation/master into OpenRCT2/develop. 2015-06-26 04:00:19 +01:00
IntelOrca
2e47f2a26a object-selection-columns: finish sorting and add ride tab animations 2015-06-26 01:11:24 +01:00
Maikel Stuivenberg
831bc6b3bd Added a back button on "Select Design" list #1346 2015-06-26 01:21:35 +02:00
Duncan
d11b8bc8fa Merge pull request #1478 from trigger-death/develop 
Added Get button to command editor
 2015-06-25 21:30:04 +01:00
Michael Steenbeek
a1c3de02b3 Correct typos and American English 2015-06-25 21:56:56 +02:00
Robert Jordan
31e8e604fe Added Get button to command editor 2015-06-25 14:27:09 -04:00
Robert Jordan
92a31a0fd7 Changed strings 2015-06-25 12:27:57 -04:00
Robert Jordan
e255310abf Fixed merge conflicts in english_uk 2015-06-25 11:22:11 -04:00
Robert Jordan
5645d8bd8a Added Game Speed command 2015-06-25 11:19:23 -04:00
Robert Jordan
937b887a91 Title Sequence Editor Improvements 2015-06-25 10:41:40 -04:00
Michael Steenbeek
e66ba829e1 Update tooltip 2015-06-25 12:19:38 +02:00
Ted John
e32a7ab01a Merge Localisation/master into OpenRCT2/develop. 2015-06-25 04:00:16 +01:00
Robert Jordan
0a4ac08caa Minimize fullscreen on focus loss 2015-06-24 18:12:53 -04:00
Robert Jordan
a3a993dabd Title Sequence editor 2015-06-24 12:25:54 -04:00
Gymnasiast
13106dba08 Only allow changing the option for select-by-ride-type in the title screen, to prevent strange behaviour 2015-06-24 13:22:10 +02:00
Gymnasiast
a6225ebf06 Add option to select by track type (RCT1 style); correct misspellings of 'separate' 2015-06-24 12:41:19 +02:00
Ted John
e39505e23d Merge Localisation/master into OpenRCT2/develop. 2015-06-23 04:00:15 +01:00
Robert Jordan
592e266411 Reserved more strings (up to 5440) 2015-06-22 16:23:54 -04:00
Robert Jordan
825b165db5 Reserve Strings 5377-5426 2015-06-22 15:49:19 -04:00
Ted John
473eea3bfc Merge pull request #1424 from ThomasdenH/load_save_sorting 
Load save sorting by date
 2015-06-22 16:00:41 +01:00
Thomas
ce26812caa Add sorting based on date 2015-06-22 13:49:35 +02:00
Ted John
8c16d60f0d Merge Localisation/master into OpenRCT2/develop. 2015-06-22 04:00:18 +01:00
Thomas
fd914094a7 Add option to invert viewport dragging (#1332) 2015-06-20 17:52:38 +02:00
IntelOrca
4d4a000117 add object selection to debug dropdown 2015-06-20 15:07:36 +01:00
Ted John
218b654537 Merge Localisation/master into OpenRCT2/develop. 2015-06-20 04:00:16 +01:00
Duncan Frost
15b2360e13 Implemented object_create_identifier_name and start of last func. 
Note requires modification of the strings.
 2015-06-19 21:34:41 +01:00
Gymnasiast
0491d971f3 Add cheat to edit park parameters/scenario options in-game 2015-06-19 14:59:48 +02:00
Ted John
ef3d7c2080 Merge Localisation/master into OpenRCT2/develop. 2015-06-19 04:00:15 +01:00
Gymnasiast
37e80b68f0 Add cheat to reset crash status 2015-06-18 15:42:09 +02:00
Gymnasiast
c3417e12f5 Add cheat for staff speed 2015-06-18 15:10:53 +02:00
Ted John
032a5c03ca Merge Localisation/master into OpenRCT2/develop. 2015-06-18 04:00:15 +01:00
IntelOrca
34924963b9 Merge branch 'pre-release-0.0.2' into develop 2015-06-16 21:29:34 +01:00
Robert Jordan
bb6df7e67e Added Dusty Greens to title sequence 2015-06-16 15:07:13 -04:00
Ted John
bfd813ac89 Merge pull request #1361 from Gymnasiast/guests-cheats 
Introduce a truckload of guest cheats, fixes #1160, closes #1187, fixes #1323, fixes #966
 2015-06-16 17:48:11 +01:00
Gymnasiast
79a6a989f0 Introduce a truckload of guest cheats. 2015-06-16 18:25:37 +02:00
Ted John
8a2a59dea0 Merge Localisation/master into OpenRCT2/develop. 2015-06-16 04:00:14 +01:00
LRFLEW
b588e519c4 Some Cleanup of Past PRs 2015-06-14 16:36:17 -05:00
Ted John
6b9a64577e Merge pull request #1340 from trigger-death/develop 
Filters should sort properly now
 2015-06-14 21:31:23 +01:00
IntelOrca
ce924b4b1b add new custom title sequence to celebrate 0.0.2 release 2015-06-14 21:01:48 +01:00
Robert Jordan
06525fc83b Removed duplicate strings 2015-06-14 14:51:24 -04:00
Robert Jordan
9ae22b5938 Fixed merge conflicts 2015-06-14 12:21:13 -04:00
Robert Jordan
cbf27687cb Added ride filters in object selection 2015-06-14 12:19:54 -04:00
Ted John
ba36150d1b Merge Localisation/master into OpenRCT2/develop. 2015-06-14 04:00:14 +01:00
rd3k
6f28010e87 Add cheat window per-tab titles 2015-06-13 18:59:38 +01:00
IntelOrca
b69487cbba add changelog window 2015-06-13 13:30:50 +01:00
Ted John
b84322ad62 Merge Localisation/master into OpenRCT2/develop. 2015-06-13 04:00:13 +01:00
Ted John
e9d5489758 Merge Localisation/master into OpenRCT2/develop. 2015-06-12 04:00:14 +01:00
LRFLEW
09d6d9be1c Automatic staff placement 
This will automatically place hired staff near a random guest (with
fallbacks if no guests are in the park). The setting can be toggled in
the options or by holding SHIFT when hiring.
 2015-06-11 15:39:47 -05:00
rd3k
fb59dab59e Add debug toolbar menu, start tile inspector 2015-06-11 20:51:39 +01:00
IntelOrca
9dec3b09f4 reserve string IDs for new title sequence 2015-06-11 12:41:01 +01:00
Ted John
b10dffeac8 Merge Localisation/master into OpenRCT2/develop. 2015-06-11 04:00:15 +01:00
IntelOrca
125c01a147 Merge branch 'build-in-pause-mode-3' of https://github.com/Gymnasiast/OpenRCT2 into Gymnasiast-build-in-pause-mode-3 
Conflicts:
	data/language/english_uk.txt
 2015-06-10 18:44:38 +01:00
Ted John
f65ceff1d3 Merge pull request #1301 from runelaenen/develop 
Fixed Clear Loan cheat
 2015-06-10 18:39:19 +01:00
Gymnasiast
732319514f Allow building in pause mode via a cheat 2015-06-10 19:35:53 +02:00
Runelaenen
829e0712e4 Fixed Clear Loan cheat 
The function already existed in the codebase. I've fixed it and added a
button.
 2015-06-10 19:23:10 +02:00
Ted John
8a71ade8c6 Merge pull request #1300 from duncanspumpkin/fix_profit 
Fix profit
 2015-06-10 18:11:28 +01:00
Duncan Frost
792e70d00c Round the currency away from zero. 
Change the profit per hour to use 2dp currency. Fixes #1227
 2015-06-10 17:53:57 +01:00
Robert Jordan
f16c120200 Quick fire staff button 2015-06-10 12:17:42 -04:00
Robert Jordan
fb828afa1a Added RCT1 light tooltips 2015-06-10 11:47:54 -04:00
Ted John
472d546542 Merge pull request #1288 from trigger-death/force-ride-breakdown 
Force ride breakdown and fix ride options
 2015-06-10 10:34:59 +01:00
Ted John
90d5c07b88 Merge Localisation/master into OpenRCT2/develop. 2015-06-10 04:00:14 +01:00
Robert Jordan
10c1c29c11 Can now force ride breakdowns 2015-06-09 20:18:04 -04:00
LRFLEW
816944f78b EXPLODE!!! 
Because why not
 2015-06-09 18:14:28 -05:00
Michael Steenbeek
340627859a Correct newline in tooltip 2015-06-09 20:39:32 +02:00
Gymnasiast
7ed434a804 Rework land ownership cheat into sandbox mode 2015-06-09 17:19:05 +02:00
Ted John
aae1288332 Merge Localisation/master into OpenRCT2/develop. 2015-06-09 04:00:13 +01:00
Ted John
37471ee1b9 Merge Localisation/master into OpenRCT2/develop. 2015-06-08 04:00:12 +01:00
Robert Jordan
e90c724a3a Rewrote Themes 
Added rct1 styles and lights.
Themes are now easier to expand
Added features tab to themes window
 2015-06-07 20:31:54 -04:00
Gymnasiast
c15da4370a Added cheat to edit land ownership settings in-game 2015-06-07 12:45:55 +02:00
Ted John
00d8b2c463 Merge Localisation/master into OpenRCT2/develop. 2015-06-07 04:00:15 +01:00
Ted John
886f7f3a46 Merge Localisation/master into OpenRCT2/develop. 2015-06-06 04:00:13 +01:00
Robert Jordan
a4a0b5f4fd Renumbered strings AGAIN 2015-06-05 20:16:40 -04:00
Robert Jordan
a490284569 Renumbered strings 2015-06-05 20:16:01 -04:00
Robert Jordan
6179888231 Renamed strings and removed warnings 2015-06-05 18:59:07 -04:00
Robert Jordan
c9c3e66289 Object selection search 
Can now search for objects in the object selection window.
 2015-06-05 18:54:47 -04:00
Ted John
cb9630e30b Merge Localisation/master into OpenRCT2/develop. 2015-06-05 04:00:14 +01:00
Robert Jordan
4b0d005e0f Options window now uses paged widgets 
Widgets now are defined by page.
Fixed options window flashing text colour when first opened.
Fixed themes window gfx_invalidate happening every step.
 2015-06-04 14:51:39 -04:00
Ted John
3d207d80f3 Merge Localisation/master into OpenRCT2/develop. 2015-06-04 04:00:13 +01:00
IntelOrca
ab2e6a867f refactor ride names and show ride type/s on object selection window 2015-06-03 19:14:45 +01:00
Robert Jordan
ee00962ac9 Object Selection Filters 
Can now filter objects in the selection window by source. (RCT2, WW, TT,
Custom)
Object selection window now displays source above dat name.
 2015-06-03 12:37:07 -04:00
Ted John
f0c97c0fa8 Merge Localisation/master into OpenRCT2/develop. 2015-06-03 04:00:12 +01:00
IntelOrca
137c8c190d add giant screenshot to file menu 2015-06-02 14:12:36 +01:00
Ted John
bf39fc36b1 Merge Localisation/master into OpenRCT2/develop. 2015-06-02 04:00:13 +01:00
Robert Jordan
80aaae3c8d Changed preset to theme 2015-06-01 11:06:07 -04:00
Robert Jordan
765bf976ee Renamed Colour Schemes to Themes 
Themes window now opens to settings/presets tab so it's less confusing
for others.
Can no longer change default presets, you get a warning when you try.
now stores themes in themes folder.
Now clips theme names.
 2015-06-01 11:02:09 -04:00
Ted John
0a5236be1c Merge Localisation/master into OpenRCT2/develop. 2015-06-01 04:00:13 +01:00
Ted John
da532dd7f0 Merge Localisation/master into OpenRCT2/develop. 2015-05-31 04:00:13 +01:00
rd3k
395773cdd6 Add cheat to make all guests feel nauseous 2015-05-31 02:04:01 +01:00
Robert Jordan
41171aa304 Resolved Merge Conflicts 2015-05-30 16:00:13 -04:00
Robert Jordan
eb19ae7995 Final changes 2015-05-30 12:43:24 -04:00
Robert Jordan
53a241d197 Finished ini file loading and removed warnings 2015-05-30 11:52:08 -04:00
Michael Steenbeek
b1e94bf110 Consistently use colons after labels that are followed by a dropdown 2015-05-30 14:35:59 +02:00
Ted John
7c29d781dc Merge Localisation/master into OpenRCT2/develop. 2015-05-30 04:00:13 +01:00
rd3k
257d3b8469 proper cheat and Twitch window tooltips, fix #1167 2015-05-30 02:51:20 +01:00
Robert Jordan
dbc1df308f Issues with Dropdown text 2015-05-29 16:42:57 -04:00
rd3k
3a55c060f7 fix #1163 2015-05-29 20:59:16 +01:00
Robert Jordan
dc1e38180e Starting work on colour schemes config settings 2015-05-29 12:04:53 -04:00
Ted John
12d5542861 Merge Localisation/master into OpenRCT2/develop. 2015-05-29 04:00:17 +01:00
Ted John
9dc19c6bc2 Merge Localisation/master into OpenRCT2/develop. 2015-05-28 04:00:22 +01:00
Ted John
6c89274bb1 Merge Localisation/master into OpenRCT2/develop. 2015-05-27 04:00:13 +01:00
Ted John
1fe3bacf43 Merge Localisation/master into OpenRCT2/develop. 2015-05-26 04:00:12 +01:00
Miso Zmiric (Mike Squinter)
c2c9bbf4ef add twitch integration, part 2 2015-05-25 20:38:33 +01:00
Ted John
b26e546171 Merge Localisation/master into OpenRCT2/develop. 2015-05-25 04:00:14 +01:00
Robert Jordan
6bc081edca Added date format to culture options menu 2015-05-24 12:38:07 -04:00
Gymnasiast
81272f5ab7 Resolved merge conflict 2015-05-23 14:22:24 +02:00
Ted John
d145711d37 Merge Localisation/master into OpenRCT2/develop. 2015-05-23 04:00:13 +01:00
Gymnasiast
0a093be3b1 Resolve merge conflict 2015-05-23 02:24:07 +02:00
Gymnasiast
7868d19522 Add option to exit Openrct2 2015-05-23 02:21:05 +02:00
Robert Jordan
37221f0aae Testing Improvements 
Added test_unfinished_tracks and no_test_crashes
Both are enablable through the console and test_unfinished_tracks is
also an option.
Increased options window height.
Made it so "out" ride window is opened after a crash instead of RCT2's
ride window.
ride_is_valid_for_open has a counterpart: ride_is_valid_for_test
 2015-05-22 14:18:48 -04:00
Gymnasiast
121052b807 Add cheat to unlock both entry and ride prices, reordered misc tab on cheats window 2015-05-22 12:41:22 +02:00
Ted John
05d709143c Merge Localisation/master into OpenRCT2/develop. 2015-05-22 04:00:13 +01:00
IntelOrca
0013310f0d add hardware display 2015-05-22 03:17:46 +01:00
Gymnasiast
36ccfe77e0 Add GUI option for switching to the RCT1 colour scheme, along with proper invalidation of the affected windows 2015-05-21 12:28:51 +02:00
Ted John
66b47d3339 Merge Localisation/master into OpenRCT2/develop. 2015-05-21 04:00:13 +01:00
IntelOrca
bdd712bc4b fix config parsing bug 2015-05-21 02:52:32 +01:00
Ted John
a27a516e30 Merge pull request #1112 from trigger-death/sprite-build-command 
Sprite build command
 2015-05-21 01:45:30 +01:00
IntelOrca
776c85db74 allow localisation of digit seperator and decimal point 2015-05-20 20:11:50 +01:00
Robert Jordan
c7e3639663 Sprite build command 
build uses ../../data/g2.dat and all numbered images in
../../resources/g2/.
No other parameters needed.
Also changed speed button hyper arrows to support game speeds inbetween
4 and 8.
 2015-05-20 11:52:40 -04:00
Ted John
86a1ba3994 Merge Localisation/master into OpenRCT2/develop. 2015-05-20 04:00:14 +01:00
Robert Jordan
d764927fe2 Changed "Ludicrous Speed" to "Hyper Speed" 2015-05-19 11:56:47 -04:00
Robert Jordan
0a71b633c7 Added game speed button sprites 
Also added empty.png to resources to fill in g2 sprites reserved by
other contributors.
 2015-05-19 11:51:59 -04:00
Ted John
8f19ecbdef Merge pull request #1094 from trigger-death/new-title-logo 
Changed Title Logo
 2015-05-19 14:18:22 +01:00
Robert Jordan
c48645a67a Changed Title Logo 
Started placing g2.dat sprites in resources/g2
 2015-05-18 23:33:21 -04:00
Ted John
e2ba2696ee Merge Localisation/master into OpenRCT2/develop. 2015-05-19 04:00:13 +01:00
IntelOrca
c1260fc11f add command line sprite editor and additional custom graphics (g2.dat) 2015-05-19 00:26:31 +01:00
Robert Jordan
6faaca53aa Added game speed button and other changes 
Game speed button with up to 4/5 speeds.
Debugging tools option to enable non-playable changes.
Cheat window is now a setting.
Game speeds 5-7 are removed.
Game speed 8 added with enabling debugging tools.
Windows and news ticker update once per tick instead of based on game
speed.
 2015-05-18 18:15:43 -04:00
Ted John
694b86da16 Merge Localisation/master into OpenRCT2/develop. 2015-05-18 04:00:12 +01:00
Ted John
7a22ff57cf Merge pull request #1085 from Gymnasiast/disable-all-breakdowns 
Add cheat option to disable breakdowns completely.
 2015-05-17 23:01:58 +01:00
Ted John
14db9a78cd Merge pull request #1081 from Gymnasiast/allow-high-launch-speeds 
Allow maxing out launch speed and many other operation settings as well
 2015-05-17 18:21:08 +01:00
Gymnasiast
dc524c1b6a Add cheat option to disable breakdowns completely. 2015-05-17 18:55:57 +02:00
Ted John
65ff82b187 Merge pull request #1076 from Gymnasiast/disable-brakes-failure 
Add a cheat option to disable brakes failure
 2015-05-17 16:50:52 +01:00
Gymnasiast
8f82175fec Allow maxing out launch speed and many other operation settings as well 2015-05-17 17:26:07 +02:00
Ted John
2fa9b1a5a0 Merge pull request #1075 from Gymnasiast/develop 
Extend the RCT1 colour scheme to the scenario select and start new campaign window
 2015-05-17 13:45:12 +01:00
Gymnasiast
f79c9811c9 Add string for 'Disable brakes failure' 2015-05-17 14:28:33 +02:00
Gymnasiast
8d0ab82d65 Extend the RCT1 colour scheme to the scenario select and start new campaign window 2015-05-17 12:55:26 +02:00
Ted John
f1e3668127 Merge Localisation/master into OpenRCT2/develop. 2015-05-17 04:00:11 +01:00
Gymnasiast
02ba241385 Add cheat option for lift hills up to 410 km/h, fix a comment and some spaces 2015-05-16 17:16:09 +02:00
IntelOrca
cad8295c53 Merge Localisation/master into OpenRCT2/develop. 2015-05-16 10:27:15 +01:00
IntelOrca
f7972f0d48 Merge branch 'land-rights-tool' of https://github.com/trigger-death/OpenRCT2 into trigger-death-land-rights-tool 
Conflicts:
	data/language/english_uk.txt
 2015-05-15 22:10:13 +01:00
Robert Jordan
3940bf4538 Fixed spelling error in tooltip 2015-05-15 16:09:25 -04:00
Robert Jordan
730d2bb2e8 Added Buy to land rights tooltip 2015-05-15 16:08:37 -04:00
Robert Jordan
e3451df703 Fixed up strings 2015-05-15 16:06:59 -04:00
Robert Jordan
6d5a07f7ef Finished cleaning up land rights tool code 2015-05-15 15:19:36 -04:00
Runelaenen
fc7cae9e57 Updated tab and language 
Removed the string from US.
Changed tab to 4 spaces in UK.

I'll add it to the /OpenRCT2/Language repo.
 2015-05-15 18:53:31 +02:00
Robert Jordan
09cc46c1e6 Almost finished land rights tool 2015-05-15 11:28:27 -04:00
Runelaenen
2144d9e787 Cheat fix all rides 2015-05-15 16:49:46 +02:00
IntelOrca
b8dcb71bc6 Merge Localisation/master into OpenRCT2/develop. 2015-05-14 17:24:37 +01:00
Robert Jordan
a8ec43f065 Select size strings now use args 2015-05-13 11:38:44 -04:00
Robert Jordan
ceaa97c321 Land tool paint mode, and text input sizes 2015-05-12 11:37:16 -04:00
Robert Jordan
b49676a887 Added option for random title music in main menu 
Added STR_5126 to UK and US languages
rand() is seeded in rct2_init()
 2015-05-11 13:17:33 -04:00