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 355 MiB
Commit Graph

3593 Commits

Author SHA1 Message Date
IntelOrca 2dc03cd45a refactor research window / extract common code 2015-06-18 22:20:49 +01:00
Ted John 0632398dfd Merge pull request #1390 from Gymnasiast/reset_crash_status 
Cheats for fast staff and resetting crash status, closes #1383
 2015-06-18 16:13:01 +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
Ted John f0fc1a6983 Merge pull request #1385 from PFCKrutonium/patch-1 
Added Subverse to readme
 2015-06-17 23:36:26 +01:00
Krutonium 6285a69e3c Added Subverse to readme 
http://www.voat.co/v/openrct2
 2015-06-17 18:33:53 -04:00
IntelOrca 9e79add6ba Merge branch 'pre-release-0.0.2' into develop 2015-06-17 16:43:36 +01:00
IntelOrca dff788d1d8 fix peep.c sign issues 2015-06-17 16:39:09 +01:00
IntelOrca 4ebf6dd913 fix #1374 2015-06-17 16:32:50 +01:00
IntelOrca 542eb057d9 set font when drawing checkboxes, extracted draw string left centred to new method 2015-06-17 16:21:50 +01:00
Ted John 2a6a4fae0c Merge pull request #1372 from Gymnasiast/patch-1 
Update changelog, eliminate duplicates, reorder
 2015-06-17 12:48:59 +01:00
Michael Steenbeek b39fa10f4f Update changelog, eliminate duplicates, reorder 2015-06-17 13:08:24 +02:00
IntelOrca d1b806c20c fix #1370 2015-06-17 11:52:46 +01:00
IntelOrca f4c46c479d Merge branch 'pre-release-0.0.2' into HEAD 2015-06-17 11:41:08 +01:00
IntelOrca f2388d9b54 fix changelog from showing again in same session 2015-06-17 11:38:02 +01:00
Ted John f2158f5f52 Merge pull request #1369 from JarnoVgr/develop 
Added build number support
 2015-06-17 00:02:11 +01:00
JarnoVgr 92acfab160 Added build number support 2015-06-17 00:55:32 +02:00
IntelOrca 9021a97206 fix #1358 2015-06-16 23:37:29 +01:00
IntelOrca 13244b8333 Merge branch 'pre-release-0.0.2' into develop 2015-06-16 23:27:42 +01:00
IntelOrca 18ae4b534f fix changelog bug, fixes #1359 2015-06-16 23:27:22 +01:00
IntelOrca 133c0de23d refactor cheats and improve checkbox drawing 2015-06-16 23:24:48 +01:00
Ted John 61fbdf9424 Merge pull request #1366 from tsunamistate/README 
README stuff
 2015-06-16 22:33:31 +01:00
Aleksandr Kalko a2dc83b6eb README stuff 
- Removed redundant RCT2 prerequisite
- Added Powershell 4.0 as prerequiste
- Added MacPorts as Homebrew alternative
- Changed build instructions up-to-date
 2015-06-17 00:08:08 +03:00
IntelOrca 34924963b9 Merge branch 'pre-release-0.0.2' into develop 2015-06-16 21:29:34 +01:00
Ted John 97a9c22126 Merge pull request #1365 from trigger-death/develop-2 
Added Dusty Greens to title sequence
 2015-06-16 20:21:59 +01:00
Robert Jordan bb6df7e67e Added Dusty Greens to title sequence 2015-06-16 15:07:13 -04:00
Ted John 8e9b982c91 Merge pull request #1364 from trigger-death/develop 
Added location variable for console.
 2015-06-16 19:59:32 +01:00
Robert Jordan e9eeb36cdf Added location variable for console. 2015-06-16 14:57:55 -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 c06476dfac Merge pull request #1360 from mzmiric5/patch_dist-installer-build 
allow the dist installer build to be called from a relative path
 2015-06-16 15:25:11 +01:00
Miso Zmiric (Mike Squinter) 27e149bd64 allow the dist installer build to be called from a relative path 2015-06-16 15:18:59 +01:00
IntelOrca 4a69ded1c7 fix get exe path issue 2015-06-16 14:55:09 +01:00
IntelOrca 3c1b9289ff Merge branch 'mzmiric5-pre-release-0.0.2' into pre-release-0.0.2 2015-06-16 14:10:21 +01:00
Miso Zmiric (Mike Squinter) be98d6d850 closes #1305, uses absolute paths for all file loads 
edit and update the distribution readme

clean up the variables mess

improve the set_exe_path and cleanup

final fixes
 2015-06-16 14:05:25 +01:00
Ted John 8a2a59dea0 Merge Localisation/master into OpenRCT2/develop. 2015-06-16 04:00:14 +01:00
IntelOrca 705efbeee9 add last_crash_type to ride struct 2015-06-16 00:16:59 +01:00
IntelOrca 5b4715685d update NSIS script 2015-06-15 23:21:12 +01:00
IntelOrca 3feacc3400 fix #1356 2015-06-15 22:08:03 +01:00
IntelOrca 32046c3c0a improve saving of S6 data and remove ghost banners / user strings 2015-06-15 22:08:03 +01:00
Ted John df491e58b9 Merge pull request #1354 from JarnoVgr/develop 
Installer copies curl ca file, version update
 2015-06-15 20:08:38 +01:00
JarnoVgr 6956a2cf94 Installer copies curl ca file, version update 2015-06-15 21:02:30 +02:00
IntelOrca 2eb39d4a31 Merge branch 'pre-release-0.0.2' into develop 
Conflicts:
	src/util/util.c
 2015-06-15 19:04:10 +01:00
Ted John 40591fda50 Merge pull request #1353 from duncanspumpkin/bugs 
Fix rotation and rides been on
 2015-06-15 18:39:04 +01:00
Duncan Frost 9886bb5d48 Fix peep rides been on displaying incorrectly. 
Made a mistake when changing from an array of 32bit values to an array of 8bit values. Fixes #1336.
 2015-06-15 18:33:21 +01:00
Duncan Frost b997b8bf14 Fix large scenery rotation button missing 
Button was missing when the large scenery item was in position 0. Missing a compare. Scenery window needs to be refactored at some point. Fixes #1342.
 2015-06-15 18:15:15 +01:00
IntelOrca fef88695a0 improve version handling 2015-06-15 18:01:13 +01:00
IntelOrca b206a31cae fix #1145 by removing ghost map elements and trackless rides when saving 2015-06-15 17:27:11 +01:00
IntelOrca ce300c8cb8 set version to develop 2015-06-15 16:29:15 +01:00