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

3708 Commits

Author SHA1 Message Date
Gymnasiast 6fade38d36 Fix remove all guests cheat 2015-06-25 07:57:18 +02:00
Ted John e32a7ab01a Merge Localisation/master into OpenRCT2/develop. 2015-06-25 04:00:16 +01:00
Ted John 5aa8b86106 Merge pull request #1463 from duncanspumpkin/fix_entrance_draw 
Fix incorrect drawing of entrance elements
 2015-06-24 23:17:18 +01:00
Ted John c03950ea6a Merge pull request #1466 from trigger-death/minimize-fullscreen-focus 
Option to not Minimize fullscreen on focus loss
 2015-06-24 23:16:12 +01:00
Robert Jordan 0a4ac08caa Minimize fullscreen on focus loss 2015-06-24 18:12:53 -04:00
Ted John e2d918faf3 Merge pull request #1464 from mzmiric5/fix_file-exists-path-check 
platform_file_exists now also checks for path not found errors
 2015-06-24 22:34:26 +01:00
Miso Zmiric (Mike Squinter) 80d524f78e platform_file_exists now also checks for path not found errors 
use GetLastError after the GetFileAttributes
 2015-06-24 22:30:39 +01:00
Duncan Frost c165811017 Fix incorrect drawing of entrance elements 
2 mistakes found.
1. Did not call the correct paint setup function. This caused the order of painting to be incorrect.
2. Used the wrong offset to the transparent image. This would cause little bits of transparency to appear on the top of the entrance image.

Fixes #1442.
 2015-06-24 20:20:54 +01:00
Ted John b4c6de4b63 Merge pull request #1460 from trigger-death/title-editor-fixes 
Title Sequence Editor fixes
 2015-06-24 18:54:02 +01:00
Robert Jordan 6918706680 One more error check 2015-06-24 13:53:13 -04:00
Robert Jordan 859d854758 Fixed title editor crashes/bugs 2015-06-24 13:52:29 -04:00
Ted John 1d02ebb091 Merge pull request #1459 from trigger-death/title-editor-3 
Title Sequence Editor
 2015-06-24 18:02:56 +01:00
Robert Jordan a3a993dabd Title Sequence editor 2015-06-24 12:25:54 -04:00
Ted John 1fe04e1f0d Merge pull request #1456 from honzi/develop 
fix broken links
 2015-06-24 17:17:30 +01:00
Ted John c24169912d Merge pull request #1447 from mzmiric5/fix_game-data-check 
fixes #1445, now checks for existance of g1.dat files in the game pat…
 2015-06-24 17:17:03 +01:00
Miso Zmiric (Mike Squinter) 21a15d0247 use platform_file_exists 2015-06-24 17:16:22 +01:00
Jan Hořava 9429d25eb8 fix broken links 2015-06-24 09:14:07 -07:00
IntelOrca 474d300578 change enabledTrackPieces to 64 bit integer in ride type struct 2015-06-24 16:43:21 +01:00
Miso Zmiric (Mike Squinter) 8c83cc24b1 use the game data check for existing config files as well, guard for data being moved 2015-06-24 15:36:42 +01:00
Miso Zmiric (Mike Squinter) f9d85b6959 fixes #1445, now checks for existance of g1.dat files in the game path rather than just for the folder 2015-06-24 15:28:06 +01:00
Ted John 196b6b2086 Merge pull request #1446 from Gymnasiast/select-by-track-type-3 
Prefer sportscars over racing cars in RCT1 mode
 2015-06-24 13:48:57 +01:00
Gymnasiast 293624dc36 Prefer sportscars over racing cars in RCT1 mode 2015-06-24 14:30:03 +02:00
Ted John 2e9e16e3f3 Merge pull request #1444 from Gymnasiast/select-by-track-type-3 
Add option to select by track type (RCT1 style); correct misspellings of 'separate', fixes #1308, closes #1363
 2015-06-24 12:27:16 +01: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 1dd55346a1 Merge pull request #1440 from sferrini/develop 
Added missing va_end call
 2015-06-24 02:09:17 +01:00
Ted John 562880cc24 Merge pull request #1441 from MaikelS11/cheat-windows-bottom-fix 
Fix border issue #1428
 2015-06-24 02:08:46 +01:00
Maikel Stuivenberg b40be2aba1 Fix border issue #1428 2015-06-24 01:54:59 +02:00
Simone Ferrini 6d05adb43f Added missing va_end 2015-06-23 22:23:30 +02:00
Ted John e39505e23d Merge Localisation/master into OpenRCT2/develop. 2015-06-23 04:00:15 +01:00
IntelOrca 086370a7fc fix #1429 2015-06-23 02:58:15 +01:00
IntelOrca 9701b1e0f6 fix warnings 2015-06-23 02:58:14 +01:00
Ted John 42035716a2 Merge pull request #1436 from trigger-death/develop 
Reserved more strings (up to 5440)
 2015-06-22 22:03:51 +01:00
Robert Jordan 592e266411 Reserved more strings (up to 5440) 2015-06-22 16:23:54 -04:00
Ted John 1908b1fe08 Merge pull request #1434 from trigger-death/develop 
Reserve Strings 5377-5426
 2015-06-22 20:56:10 +01: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 2fc23b0084 Add browsing drives on windows 2015-06-22 15:55:57 +02:00
Ted John a2e217f85f Merge pull request #1425 from Gymnasiast/fix-td4-import-colour 
Fix wrong colours in TD4 import, fixes #1420
 2015-06-22 14:20:21 +01:00
Gymnasiast 7ed390b8c4 Fix wrong colours in TD4 import, fixes #1420 2015-06-22 15:12:19 +02:00
Thomas 21ecd52af1 Fix for travis 2015-06-22 14:17:45 +02:00
Thomas c7781e272c Make sorting case insensitive 2015-06-22 13:54:09 +02:00
Thomas ce26812caa Add sorting based on date 2015-06-22 13:49:35 +02:00
Ted John 9d68aad6a1 Merge pull request #1419 from Gymnasiast/fix-td4-launch-import 
Keep RCT1 launch modes on TD4 import
 2015-06-22 11:31:37 +01:00
Gymnasiast 98253c8d21 Keep RCT1 launch modes on TD4 import 2015-06-22 08:41:47 +02:00
Ted John 8c16d60f0d Merge Localisation/master into OpenRCT2/develop. 2015-06-22 04:00:18 +01:00
Ted John 2c762e97f1 Merge pull request #1418 from duncanspumpkin/viewport_refactor 
Viewport refactor and further implementation
 2015-06-21 17:38:51 +01:00
Duncan Frost d5c19437ac Make generic version of 98197C rotations. Refactor. 
I've added a new function coordinate 3d to 2d. There are still quite a few different versions of this same code throughout the project that should be changed to use this function.
 2015-06-21 16:23:25 +01:00
Duncan Frost 2c6312a86d Implemented 2nd rotation. Small refactor of parameter list 2015-06-21 16:23:24 +01:00
Duncan Frost 48d3f6e7e3 Switch on setup_image_on_viewport rotation 0. 2015-06-21 16:23:24 +01:00