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

3593 Commits

Author SHA1 Message Date
Duncan Frost 499b5413f0 Fix graphical glitch when zoomed. 
Fixes #1088. I'm not completely sure why it works but it does.
 2015-06-11 19:33:48 +01:00
IntelOrca b2e9559d31 fix window issues, fixes #1306 2015-06-11 13:04:55 +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 2547d38807 fix #1307 2015-06-11 02:27:19 +01:00
Ted John 65a706fcdd Merge pull request #1304 from trigger-death/fix-black-caption-bar 
Fixed black caption bar being green
 2015-06-10 21:32:06 +01:00
Robert Jordan 029f7cf664 One colour off 2015-06-10 16:13:32 -04:00
Robert Jordan 35cce1a4df Fixed black caption bar being green 2015-06-10 15:55:15 -04:00
IntelOrca 0d6afb97c0 Merge branch 'Gymnasiast-build-in-pause-mode-3' into develop 2015-06-10 18:44:50 +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 e719ee02f9 Also update string ID 2015-06-10 19:38:24 +02: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
Ted John 723fcafd51 Merge pull request #1298 from trigger-death/quick-fire-staff 
Quick fire staff button
 2015-06-10 17:30:31 +01:00
Duncan Frost f6507f70bc Fix negative zero in currency display. 2015-06-10 17:26:37 +01:00
Robert Jordan f16c120200 Quick fire staff button 2015-06-10 12:17:42 -04:00
Ted John 966e82a31a Merge pull request #1295 from trigger-death/fix-fire-prompt-transparency 
Fixed fire prompt transparency issue
 2015-06-10 16:58:31 +01:00
Robert Jordan 9ffedd598a Fixed fire prompt transparency issue 2015-06-10 11:54:26 -04:00
Ted John a90d5b43ec Merge pull request #1294 from trigger-death/fix-rct1-park-lights-disabled 
RCT1 lights now disabled properly
 2015-06-10 16:48:59 +01:00
Robert Jordan fb828afa1a Added RCT1 light tooltips 2015-06-10 11:47:54 -04:00
Robert Jordan 5466ab3e39 RCT1 lights now disabled properly 2015-06-10 11:43:09 -04:00
IntelOrca a24ffd1f79 fix refactor error in lower_water 2015-06-10 16:38:27 +01:00
IntelOrca 91c73836a3 fix and improve raise and lower land / water / clear scenery 2015-06-10 15:41:50 +01:00
Ted John c01d3d4242 Merge pull request #1291 from Gymnasiast/fix-sound-continuing 
Fix sound continuing in title screen (hopefully), fixes #1290
 2015-06-10 13:05:18 +01:00
Ted John ff314f7664 Merge pull request #1293 from Gymnasiast/fix-italian 
Fix Italian config
 2015-06-10 13:05:00 +01:00
Gymnasiast 14e2afaacb Fix Italian config 2015-06-10 12:57:57 +02:00
Gymnasiast c3b394b7ef Don't stop sounds on canceling exit prompt 2015-06-10 12:25:14 +02: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
Gymnasiast 5b0ada3100 Fix sound continuing in title screen (hopefully) 2015-06-10 10:49:32 +02:00
Robert Jordan d7a4474bcd Removed irrelevant comments stating false facts 2015-06-09 23:18:20 -04:00
Robert Jordan 32b79ea216 Fix ride works for all breakdown types 2015-06-09 23:17:08 -04:00
Robert Jordan 98501a51f3 Fix Ride is greyed out when it doesn't work 2015-06-09 23:05:43 -04:00
Ted John 90d5c07b88 Merge Localisation/master into OpenRCT2/develop. 2015-06-10 04:00:14 +01:00
Robert Jordan e7332b2d94 Fixed maintenance bar 2015-06-09 22:43:14 -04:00
Robert Jordan bf2ac564fb Fixed merge conflicts 2015-06-09 20:19:19 -04:00
Robert Jordan 10c1c29c11 Can now force ride breakdowns 2015-06-09 20:18:04 -04:00
Ted John d040e8bb52 Merge pull request #1287 from LRFLEW/explode 
EXPLODE!!!
 2015-06-10 01:00:18 +01:00
LRFLEW 816944f78b EXPLODE!!! 
Because why not
 2015-06-09 18:14:28 -05:00
Ted John dbb7ae8e15 Merge pull request #1284 from trigger-death/decompile-toggle-price 
Decompiled toggle ride price and fixed ride price
 2015-06-09 23:07:20 +01:00
Ted John 92daca54b8 Merge pull request #1283 from Gymnasiast/sound-settings-remnants 
Force best sound quality and software buffering
 2015-06-09 23:06:44 +01:00
Ted John 21d6697ff8 Merge pull request #1286 from mzmiric5/develop 
add missing log_info deffintion for the non ms build systems
 2015-06-09 23:06:19 +01:00
Miso Zmiric (Mike Squinter) ce7b671a3b add missing log_info deffintion for the non ms build systems 2015-06-09 22:41:00 +01:00
Robert Jordan 0f955d0d92 Decompiled toggle ride price 2015-06-09 17:00:11 -04:00
Gymnasiast a62e1c02c2 Force best sound quality and software buffering 2015-06-09 22:56:47 +02:00
Ted John fa49e5745e Merge pull request #1281 from mzmiric5/develop 
closes #1204, add log_info
 2015-06-09 20:17:43 +01:00
Miso Zmiric (Mike Squinter) 628e634199 closes #1204, add log_info 2015-06-09 20:10:37 +01:00
Ted John 74ec48364b Merge pull request #1279 from Gymnasiast/patch-1 
Correct newline in tooltip
 2015-06-09 19:46:58 +01:00