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

198 Commits

Author SHA1 Message Date
Gymnasiast 0a093be3b1 Resolve merge conflict 2015-05-23 02:24:07 +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
IntelOrca 82dd805823 Merge Localisation/master into OpenRCT2/develop. 2015-04-17 10:24:51 +01:00
IntelOrca 2a463b9909 Merge Localisation/master into OpenRCT2/develop. 2015-04-01 21:26:27 +01:00
Michael Steenbeek 59c913222f Two small fixes for UK English 
Explanation:
- OpenRCT2 changed Dfl. into the correct fl. for guilders last year, except in the dropdown menu in the Options window, which this PR fixes.
- Since the Music option is no longer followed by a dropdown (as it's turned into a checkbox), the colon after it should be dropped, which this PR does.
 2015-03-30 17:52:38 +02:00
Michael Steenbeek d9f31ba058 Add cheat to make all rides destructible 2015-03-28 19:29:51 +01:00
IntelOrca 43d90e8eb0 Merge branch 'develop' of https://github.com/Gymnasiast/OpenRCT2 into Gymnasiast-develop 2015-03-28 17:14:00 +00:00
Duncan Frost ac23ef2787 Research now resets funding when all rides finished. New string to indicate reasearch complete 2015-03-28 12:42:09 +00:00
Michael Steenbeek 9828b93e18 Add a cheat to remove Six Flags status from rides 2015-03-26 21:53:29 +01:00