Commit Graph

3897 Commits

Author SHA1 Message Date
Ted John be4ba5ed1b Merge pull request #1584 from zsilencer/bugfixes
fix #1570 and possibly #1572
2015-07-09 16:59:26 +01:00
zsilencer 451bf7100b fix #1570 and possibly #1572 2015-07-09 09:04:24 -06:00
Ted John 6689a18b9a Merge pull request #1581 from Gymnasiast/improved-cheats-window
Reorder cheats window, use actual currency, add cheats to give guests money and to set goal to have fun, closes #1567, closes #1568
2015-07-09 15:54:25 +01:00
Ted John ba1548d6e1 Merge pull request #1582 from Gymnasiast/guilder-spacing
Fix guilder spacing
2015-07-09 15:52:45 +01:00
Gymnasiast 107de9bc20 Fix guilder spacing 2015-07-09 16:43:05 +02:00
Gymnasiast be635030bd Reorder cheats window, use actual currency, add cheats to give guests money and to set goal to have fun 2015-07-09 16:36:45 +02:00
IntelOrca 6527bc6ac2 add shortcut versions and rotate clockwise/anticlockwise shortcut 2015-07-09 13:50:33 +01:00
Ted John 232e0b11b3 Merge pull request #1580 from runelaenen/anti-clockwise-2
Anti clockwise 2
2015-07-09 13:33:20 +01:00
Runelaenen 15a4c958eb Changed 'wise' to 'direction' 2015-07-09 14:22:32 +02:00
Runelaenen dd24011b5d Fixed '<enter> to rotate'
Now uses less double code
2015-07-09 14:22:30 +02:00
Runelaenen bec1a52bba Changed function and occurences
It doesnt have to rotate three times to get an anti-clockwise return.
2015-07-09 14:22:28 +02:00
Runelaenen 624a402fa9 Removed comment 2015-07-09 14:22:26 +02:00
Runelaenen 8ec0024a4d Changed strings for #1495 2015-07-09 14:22:24 +02:00
Runelaenen 5109224ba0 Add submenu and anti-clockwise rotation 2015-07-09 14:22:22 +02:00
Duncan f25242a9be Merge pull request #1571 from duncanspumpkin/entrance_exit
Entrance/exit game commands
2015-07-08 20:51:34 +01:00
Duncan Frost 82b60c1a56 Implement game_command_remove_ride_entrance_or_exit
Fix bug in entrance placement that caused moving entrances/exits to fail
2015-07-08 20:47:27 +01:00
Duncan Frost b22f6f401a Implemented game_command_place_ride_entrance_or_exit 2015-07-08 20:12:17 +01:00
Duncan Frost 728e5d5e1c Fix multiple station platforms.
Small mistake was causing multiple station platforms to not be properly deleted from a rct_ride. Fixes #1566
2015-07-08 18:46:32 +01:00
IntelOrca 0ab33d67e8 implement footpath_connect_edges 2015-07-07 19:09:48 +01:00
Ted John ef7603013e Merge Localisation/master into OpenRCT2/develop. 2015-07-07 04:00:22 +01:00
IntelOrca 8113c9562b implement footpath_chain_ride_queue 2015-07-07 02:35:53 +01:00
IntelOrca 4acb7ff5e1 fix demolish of flat rides and unable to build it again 2015-07-06 22:53:16 +01:00
IntelOrca f859eefc4b implement footpath_remove_edges_at 2015-07-06 22:13:04 +01:00
Duncan 491915c5bd Merge pull request #1564 from duncanspumpkin/fix_1525
Fix issue with tracks on uneven ground.
2015-07-06 21:09:30 +01:00
Duncan Frost bcd80b3db8 Fix issue with tracks on uneven ground.
Fixes #1525
2015-07-06 21:09:01 +01:00
IntelOrca 181a2e6209 implement map_remove_walls_at 2015-07-06 20:30:03 +01:00
Duncan 01be8bb70e Merge pull request #1563 from duncanspumpkin/fix_track
Fix track bugs.
2015-07-06 19:02:15 +01:00
IntelOrca 0def7c0883 refactor invalidation of map tiles and viewports 2015-07-06 18:57:36 +01:00
Duncan Frost e898e4dfc4 Fix track bugs.
Fixed issue with ride demolishing where only the first tile of a ride would get demolished causing issues when the ride entries were removed.
Fixed issue with rotation 3 track pieces where invalid memory would be accessed.

Fixes #1506
Fixes #1556
2015-07-06 18:21:42 +01:00
IntelOrca 9e26a6149f implement sign_set_colour and fix gfx_invalidate_viewport_tile 2015-07-06 17:59:55 +01:00
Ted John db4101a91e Merge pull request #1562 from zsilencer/bugfixes
fix bug in hook which caused it not to work on other OSes
2015-07-06 17:04:34 +01:00
zsilencer 40a495cabc fix bug in hook which caused it not to work on other OSes 2015-07-06 09:28:16 -06:00
IntelOrca c366571a99 implement editor_check_object_selection 2015-07-06 15:37:40 +01:00
IntelOrca a4f93e694f Merge branch 'implement-editor-callprocs' into develop 2015-07-06 14:41:08 +01:00
IntelOrca 791c2391f5 implement-editor-callprocs, part 2 2015-07-06 14:40:37 +01:00
IntelOrca c4504323c8 implement-editor-callprocs, part 1 2015-07-06 12:49:30 +01:00
Ted John c0366aefdd Merge pull request #1559 from mzmiric5/libs-versioning
fix build.sh to actually unzip the downloaded libs
2015-07-06 12:21:42 +01:00
Ted John 294456daa1 Merge Localisation/master into OpenRCT2/develop. 2015-07-06 04:00:17 +01:00
Miso Zmiric (Mike Squinter) 995835f809 fix build.sh to actually unzip the downloaded libs 2015-07-06 02:16:31 +01:00
Ted John 99c4ccc811 Merge pull request #1557 from mzmiric5/libs-versioning
Libs versioning
2015-07-05 23:00:30 +01:00
Miso Zmiric (Mike Squinter) 87ea04c002 add libversion checks to mingw build 2015-07-05 22:39:35 +01:00
Duncan ac100179a8 Merge pull request #1554 from duncanspumpkin/refactor
Refactor and bug fix of track remove
2015-07-05 21:08:42 +01:00
Miso Zmiric (Mike Squinter) 946811068f add local libversion checks for VS (via powershell) 2015-07-05 21:08:16 +01:00
Duncan Frost da0368d1a3 Fix bug in track remove.
Fixes #1552
2015-07-05 20:57:14 +01:00
Duncan Frost f42ac4715a Refactor ride_get_refund_price 2015-07-05 20:31:25 +01:00
Duncan eec8696452 Merge pull request #1550 from zsilencer/bugfixes
fix bugs introduced in last commit
2015-07-05 19:09:31 +01:00
zsilencer 520d7840c0 fix bugs introduced in last commit 2015-07-05 09:50:03 -06:00
Duncan Frost 66430b41db Fix opening function passing incorrect parameters.
Fixes #1526
2015-07-05 16:44:51 +01:00
Duncan Frost f3ab7b6654 Merge branch 'develop' of https://github.com/OpenRCT2/OpenRCT2 into develop 2015-07-05 16:13:11 +01:00
Duncan Frost b374899bc8 Fix finance issues. Small refactor.
Fixes #1524
2015-07-05 16:13:04 +01:00