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

3019 Commits

Author SHA1 Message Date
IntelOrca 5724567b15 implement ride_get_place_position_from_screen_position 2015-07-10 14:54:02 +01:00
Ted John 35d444e28f Merge pull request #1583 from Gymnasiast/fix-no-money-checkbox 
Fix display of 'No money' checkbox when opened in-game
 2015-07-10 12:12:33 +01:00
IntelOrca f906391c9d remove registers from window events and changed to typed signatures 2015-07-10 01:39:16 +01:00
IntelOrca e42a11efa3 fix cheats window warnings and improve spacing 2015-07-09 18:37:51 +01:00
Ted John 21021cb23b Merge pull request #1585 from zsilencer/bugfixes 
fix #1572
 2015-07-09 18:34:54 +01:00
zsilencer c971a260b7 fix #1572 2015-07-09 11:00:46 -06:00
IntelOrca 7377de0049 fix #1578 2015-07-09 17:19:55 +01:00
Ted John be4ba5ed1b Merge pull request #1584 from zsilencer/bugfixes 
fix #1570 and possibly #1572
 2015-07-09 16:59:26 +01:00
Gymnasiast 4ace6a6e1b Fix display of 'No money' checkbox when opened in-game 2015-07-09 17:05:14 +02: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
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
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 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
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
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 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
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
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
Ted John c0220df0ac Merge pull request #1549 from zsilencer/bugfixes 
fix #1002
 2015-07-05 16:07:01 +01:00
zsilencer 9eb4958dde fix #1002 2015-07-05 08:57:01 -06:00
Duncan Frost 79c8044156 Fix peep expenditure not adding to the correct type. 
Fixes #1547
 2015-07-05 15:34:15 +01:00
Duncan Frost 4acb73abfe Fix incorrect refund price for tracks. 
Fixes #1548.
 2015-07-05 15:22:56 +01:00
IntelOrca 57e059b167 fix invalidation issues with uncapped FPS 2015-07-05 12:12:55 +01:00
Duncan Frost 20f6b8731f Implemented track_remove 2015-07-05 11:50:43 +01:00
Duncan Frost dfb63ebe88 Fix track previous from not selecting corkscrews. 
Issue was caused by wrong order of adding up the z coordinates of the previous track block
 2015-07-05 10:55:02 +01:00
Ted John 2146a30a80 Merge pull request #1543 from duncanspumpkin/ride_funcs_p 
Implemented track block get next and previous.
 2015-07-04 23:51:40 +01:00
IntelOrca f0bba54e79 uncapped FPS: fix viewport chopiness and reset after park load 2015-07-04 23:51:23 +01:00
Duncan Frost e0ea2d9817 Implemented track block get next and previous. 
Minor refactor of ride functions as well.
 2015-07-04 22:50:48 +01:00
zsilencer 76b231c150 add option to uncap fps, and fix #1470 2015-07-04 13:14:14 -06:00
Duncan f3cc003691 Merge pull request #1535 from Gymnasiast/fix-new-ride-selection 
Fix selecting a newly invented ride when the user has selection by track type enabled
 2015-07-04 18:34:09 +01:00
Chris 930ab6ac53 Removed comment 
As requested
 2015-07-04 03:37:38 -06:00
Chris f230033eb0 Fixed #1538 "Meeting the condition of having x guests..." 2015-07-04 02:54:40 -06:00
Duncan Frost b947d11442 Fix animated track elements. 2015-07-03 21:40:26 +01:00
Duncan Frost 709a2c5ef1 Implement track_place. 2015-07-03 21:14:26 +01:00
Gymnasiast 97ce46dc04 Fix selecting a newly invented ride when the user has selection by track type enabled. 2015-07-03 12:57:25 +02:00
IntelOrca f729ed028f change callproc to actual implementation 2015-07-02 18:55:14 +01:00
IntelOrca 3d6988b0f7 isolate callprocs in rct1.c and add reset cash function 2015-07-02 18:39:32 +01:00
IntelOrca b66b503be8 isolate remaining callprocs in peep.c 2015-07-02 18:22:49 +01:00
Duncan 251121f041 Merge pull request #1530 from duncanspumpkin/fix_object_tab 
Prevent tab 0 from trying to be animated.
 2015-07-02 17:50:07 +01:00
Duncan Frost a757f39a8c Prevent tab 0 from trying to be animated. Fixes #1529 2015-07-02 17:41:17 +01:00
IntelOrca 30c1e4b6c9 Merge branch 'finish-map-window' into develop 2015-07-02 17:01:53 +01:00
IntelOrca 46178bb44f implement finish-map-window part 6 2015-07-02 17:00:39 +01:00
Duncan e54e74257d Merge pull request #1515 from MaikelS11/build-ride-improvement 
Back button on "Select Design" list #1346
 2015-07-02 12:45:45 +01:00
IntelOrca 55c509590f implement finish-map-window part 5 2015-07-02 01:50:13 +01:00
IntelOrca 6de7a38f53 implement finish-map-window part 4 2015-07-02 00:37:55 +01:00
IntelOrca 693e6127da implement finish-map-window part 3 2015-07-01 19:06:42 +01:00
IntelOrca c441ee2d1b implement finish-map-window part 2 2015-07-01 15:17:25 +01:00
IntelOrca 7be91a5fac implement finish-map-window part 1 2015-07-01 00:58:13 +01:00
Duncan Frost 0b60465b65 Fix map element reorganise crash. 
Fixes #1518. I've also refactored the code slightly. Issue was caused by memsetting the wrong buffer.
 2015-06-30 18:08:49 +01:00
IntelOrca cc54171443 remove / isolate several CALLPROCs 2015-06-30 17:13:34 +01:00
Maikel Stuivenberg 05e9cdd339 Tab to spaces (txt) and move item to end of list (strings_id) 2015-06-29 22:44:15 +02:00
zsilencer 9578606251 implement game_command_set_water_height 2015-06-29 11:49:17 -06:00
IntelOrca 19edd8a3bb refactor game command enum 2015-06-29 17:36:07 +01:00
IntelOrca 40ba6a3efa remove various callprocs 2015-06-29 17:22:01 +01:00
IntelOrca c3d5d5f6c2 implement game_command_set_ride_vehicles 2015-06-29 16:14:56 +01:00
IntelOrca 4ada15c972 implement ride_update_max_vehicles 2015-06-29 15:13:42 +01:00
IntelOrca c6e84181cb implement ride_entry_get_train_layout 2015-06-29 01:24:07 +01:00
IntelOrca 0da767fcea implement peep update real names and update ride vehicle colours 2015-06-29 00:51:03 +01:00
Maikel Stuivenberg 36b9d8de8a Merge with develop 2015-06-28 21:40:01 +02:00
Maikel Stuivenberg 952cbdebaf move string to id 5453 2015-06-28 21:33:54 +02:00
Maikel Stuivenberg d968a65701 Changed back-button location 2015-06-28 21:30:20 +02:00
Duncan Frost 2c3c8dc188 Fix incorrect pointer maths. Fixes #1511. 2015-06-28 19:46:08 +01:00
IntelOrca ed41c2b995 fix map_reorganise_elements 2015-06-28 18:59:55 +01:00
IntelOrca 3e200d0bd2 implement ride_fix_breakdown 2015-06-28 18:36:46 +01:00
Ted John b1b61e7df5 Merge pull request #1509 from duncanspumpkin/map_functions 
Map functions
 2015-06-28 18:03:53 +01:00
IntelOrca e2a694b96e implement format_string_toupper and litter_create 2015-06-28 17:45:19 +01:00
Duncan Frost 33c4698e06 Implemented map_reorganise_elements. 
Fixed a potential issue that would cause cursors to become stuck.
 2015-06-28 16:50:21 +01:00
IntelOrca b4f8d3b753 add new shortcuts to shortcut window and fix bottom toolbar hiding in editor 2015-06-28 13:59:38 +01:00
Duncan Frost 8167c24526 Implemented sub_68B044 some sort of check to make sure there is space for new element. 
If there isn't then it will try reorganise the elements to make room.
 2015-06-28 13:53:24 +01:00
Ted John 78c8ba09b3 Merge pull request #1490 from MaikelS11/toggle-top-bottom-toolbar 
Toggle top bottom toolbar
 2015-06-28 13:41:16 +01:00
IntelOrca f452b4d39a fix #1506 2015-06-28 13:36:52 +01:00
IntelOrca 48268d50cc implement a couple of ride subroutines and refactor 2015-06-28 13:36:51 +01:00
Duncan Frost 5e3df22414 Implemented map element remove. Small tidy of functions in game.c. 2015-06-28 13:31:46 +01:00
Thomas e72739dbd6 Add cheat to force park rating 2015-06-28 13:38:38 +02:00