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

3708 Commits

Author SHA1 Message Date
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
IntelOrca c3afb498da Merge branch 'pre-release-0.0.2' into develop 2015-06-15 16:28:45 +01:00
Ted John 7e48a6abb9 Merge pull request #1350 from trigger-death/fix-scroll-thumb-2 
Fixed secondary+ scroll thumbs
 2015-06-15 16:19:13 +01:00
Robert Jordan b4cea081a0 Fixed secondary scroll thumb 2015-06-15 10:36:05 -04:00
Ted John a46311fc06 Merge pull request #1343 from LRFLEW/develop 
Some Cleanup of Past PRs
 2015-06-14 23:43:53 +01:00
Ted John 73a49f6298 Merge pull request #1345 from zsilencer/bugfixs 
fix animation invalidation in large scenery
 2015-06-14 23:33:38 +01:00
zsilencer 28f58b768c fix animation invalidation in large scenery 2015-06-14 15:59:34 -06:00
LRFLEW b588e519c4 Some Cleanup of Past PRs 2015-06-14 16:36:17 -05:00
IntelOrca 0f1b178b96 set version to 0.0.2 2015-06-14 21:36:56 +01: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
Ted John e54cfacda6 Merge pull request #1341 from zsilencer/bugfixs 
fix a crash in large scenery placement
 2015-06-14 21:31:03 +01:00
zsilencer 9419e3a2ec fix a crash in large scenery placement 2015-06-14 14:23:18 -06:00
IntelOrca ce924b4b1b add new custom title sequence to celebrate 0.0.2 release 2015-06-14 21:01:48 +01:00
Robert Jordan aec68a72d7 Excess space no longer created in filter list 2015-06-14 14:52:24 -04:00
Robert Jordan 06525fc83b Removed duplicate strings 2015-06-14 14:51:24 -04:00
Robert Jordan 91bd595326 forgot changes to other tabs 2015-06-14 14:47:08 -04:00
Robert Jordan f988e990ea Reset selection when changing ride tab 2015-06-14 14:43:01 -04:00
Robert Jordan 7f98dba63a Filters sort properly now 2015-06-14 14:41:27 -04:00
Ted John 9f0c8afb4b Merge pull request #1339 from trigger-death/develop 
Added ride filters in object selection
 2015-06-14 18:07:56 +01:00
Robert Jordan 3ad9a1a74a Removed printf's 2015-06-14 12:25:41 -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 bb5293b57b Merge pull request #1338 from Gymnasiast/sandbox-large-scenery 
Allow building large scenery outside park borders in sandbox mode.
 2015-06-14 15:29:59 +01:00
Gymnasiast 95966f6346 Allow building large scenery outside park borders in sandbox mode. 2015-06-14 15:07:08 +02:00
Ted John 12d6f3b20c Merge pull request #1337 from zsilencer/decompile 
game_command_place_large_scenery
 2015-06-14 13:20:59 +01:00
zsilencer d2b565b283 game_command_place_large_scenery 2015-06-14 05:56:41 -06:00
IntelOrca beb2b23afb use log functions instead of printf and RCT2_ERROR (now removed) 2015-06-14 12:03:32 +01:00
Ted John 949d195c95 Merge pull request #1335 from duncanspumpkin/bugs 
Fix incorrect string text colour.
 2015-06-14 09:49:32 +01:00
Duncan Frost adea7cb9ad Fix incorrect string text colour. 
With the change in how text box colouring is done during the first drawing of any window it would default to the wrong colour due to not calling invalidate before setting the window colour global variables.
 2015-06-14 09:10:56 +01:00
Ted John ba36150d1b Merge Localisation/master into OpenRCT2/develop. 2015-06-14 04:00:14 +01:00
Ted John 74784cd7f3 Merge pull request #1330 from rd3k/window-flags 
Tidy window flags
 2015-06-13 22:28:33 +01:00
rd3k 628a586ea2 Tidy window flags 2015-06-13 22:16:14 +01:00
IntelOrca ee7a2c47f4 refactor map size 2015-06-13 19:11:26 +01:00
Ted John 411d5f0752 Merge pull request #1328 from rd3k/cheat-window-titles 
Add cheat window per-tab titles
 2015-06-13 19:03:42 +01:00
rd3k 6f28010e87 Add cheat window per-tab titles 2015-06-13 18:59:38 +01:00
Ted John 9b6eaa25d6 Merge pull request #1327 from trigger-death/tile-inspector-cursor 
Tile Inspector Appropriate Cursor
 2015-06-13 16:10:10 +01:00