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
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
Maikel Stuivenberg 9feff63c6d Remove viewport flag 2015-06-28 13:36:46 +02:00
IntelOrca 36d6ea7a6e fix setting brakes speed on current track and implement game command 2015-06-28 11:44:46 +01:00
IntelOrca b8fa25bcb6 fix brakes speed not being set when building track 2015-06-28 11:44:45 +01:00
Maikel Stuivenberg 4f7fbaaeb7 Merge remote-tracking branch 'upstream/develop' into toggle-top-bottom-toolbar 2015-06-28 12:06:47 +02:00
IntelOrca 63698761fd remove some small callprocs 2015-06-28 01:57:50 +01:00
IntelOrca 2e1c449e91 use TRACK_BLOCK_END instead of random 255 arrays 2015-06-27 22:58:03 +01:00
IntelOrca 97e4a4d663 add track block and possible ride configuration tables 2015-06-27 22:53:52 +01:00
IntelOrca 457e7862b3 prepare track place and remove game commands 2015-06-27 17:53:28 +01:00
IntelOrca d45cf519e3 fix warnings 2015-06-27 15:21:32 +01:00
IntelOrca 57fd914a52 implement ride construction 2015-06-27 15:17:54 +01:00
Gymnasiast 2ac872dd56 Drop duplicate track names in list; use track categories when in select-by-track-type-mode 2015-06-27 13:08:29 +02:00
Duncan Frost a8a8385899 Fix memory not being freed. 
This was breaking the installed object list creation as it would quickly run out of rct2 memory. Scenario text was incorrectly using rct2_free this has also been fixed.
 2015-06-27 10:30:33 +01:00
Duncan 2c58910f62 Merge pull request #1485 from OpenRCT2/object-selection-columns 
Object selection columns
 2015-06-27 09:16:57 +01:00
Ted John d9adf21434 Merge pull request #1492 from duncanspumpkin/object 
Implemented object unload.
 2015-06-26 20:08:54 +01:00
Duncan Frost ab7e1da84e Implemented object unload. 
Refactored calls to the function. No need to pass the object type.
 2015-06-26 17:45:38 +01:00
Robert Jordan c20b60652c Removed printfs 2015-06-26 11:47:03 -04:00
Maikel Stuivenberg 18008c2cc6 remove unneeded string 2015-06-26 17:44:17 +02:00
Robert Jordan 9ad21599a3 Decompiled top_toolbar tool events 
Also fixed bug with land rights tool gridlines
 2015-06-26 11:40:37 -04:00
Maikel Stuivenberg 1f5fd4fe67 Reorder shortcut 2015-06-26 17:26:29 +02:00
Maikel Stuivenberg d74885cc18 show/hide UI #1402 2015-06-26 17:01:50 +02:00
IntelOrca 2e47f2a26a object-selection-columns: finish sorting and add ride tab animations 2015-06-26 01:11:24 +01:00
Maikel Stuivenberg 831bc6b3bd Added a back button on "Select Design" list #1346 2015-06-26 01:21:35 +02:00
IntelOrca 210ba2a04d object-selection-columns: add ride type with sort 2015-06-25 23:35:18 +01:00
Ted John a22d7837ce Merge pull request #1477 from ThomasdenH/wine-date-fix 
Change stat usage to GetFileAttributesEx
 2015-06-25 23:33:08 +01:00
Ted John 96c61dcba5 Merge pull request #1482 from duncanspumpkin/sub_6847BA 
Implemented set_vehicle_type_image_max_sizes
 2015-06-25 23:32:38 +01:00
Ted John 1e2ee5bf7e Merge pull request #1483 from trigger-death/themes-fix-3 
Fixed theme features on duplication
 2015-06-25 23:32:30 +01:00
Robert Jordan 760f0853ea Fixed incorrect filter data 2015-06-25 18:15:25 -04:00
Robert Jordan a05ad7319e Fixed themes features duplicate bug 2015-06-25 16:42:12 -04:00
Duncan Frost 132236f9c8 Tidied up function and labelled. 
Unsure when this information is used so not completely convinced this has been done correct.
 2015-06-25 21:06:50 +01:00
Robert Jordan 31e8e604fe Added Get button to command editor 2015-06-25 14:27:09 -04:00
Thomas 4b0c84ed20 Change stat usage to GetFileAttributesEx 2015-06-25 19:46:48 +02:00
Duncan Frost 18879e48eb Start implmenting sub_6847BA. 
Possibly finds drawing center for vehicle?
 2015-06-25 18:12:21 +01:00
Robert Jordan 92a31a0fd7 Changed strings 2015-06-25 12:27:57 -04:00
Robert Jordan e255310abf Fixed merge conflicts in english_uk 2015-06-25 11:22:11 -04:00
Robert Jordan 5645d8bd8a Added Game Speed command 2015-06-25 11:19:23 -04:00
Ted John a0f3438538 Merge pull request #1469 from Gymnasiast/fix-remove-all-guests 
Fix remove all guests cheat, improve select by track type, fixes #1462, fixes #1388
 2015-06-25 16:12:15 +01:00
Robert Jordan 937b887a91 Title Sequence Editor Improvements 2015-06-25 10:41:40 -04:00
Gymnasiast 770bfa2721 Another typo 2015-06-25 14:45:33 +02:00
Gymnasiast 8ec3f60f2e Typo 2015-06-25 14:40:46 +02:00
Gymnasiast ca1b88fc53 Don't modify flags when in select_by_track_type mode; make it switchable in-game again. 2015-06-25 11:46:17 +02:00
Gymnasiast 6fade38d36 Fix remove all guests cheat 2015-06-25 07:57:18 +02:00
Krutonium 5895dcd9b1 Corrected issue with saving tracks not having file extensions when user removes it from the save dialog. Fixes #1467 2015-06-24 20:26:50 -04: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
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
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
Robert Jordan a3a993dabd Title Sequence editor 2015-06-24 12:25:54 -04: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
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
Gymnasiast 293624dc36 Prefer sportscars over racing cars in RCT1 mode 2015-06-24 14:30:03 +02: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
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
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 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
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
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
Duncan Frost 8554d2183c Implemented more of the paint_struct setup code 2015-06-21 16:23:23 +01:00
Duncan Frost eac5cea701 Implement left and right parts of the entrance. 2015-06-21 16:23:22 +01:00
Duncan Frost dc7f83d667 Implement more of park entrance paint setup 
I've changed the order of some of this code so its possible this wont display quite the same. Will need extensive testing.
 2015-06-21 16:23:22 +01:00
Duncan Frost 4911ad5a9d Started implementing entrance_paint_setup 2015-06-21 16:23:21 +01:00
Duncan Frost cb7d579c9a Refactor of sprite_paint_setup and litter_setup. 
Also generalized entrance_setup so that it can be used for exits as well
 2015-06-21 16:23:20 +01:00
Duncan Frost 3781918957 Added viewport_ride_entrance_paint_setup 2015-06-21 16:23:20 +01:00
Duncan Frost b20513187c Start viewport_entrance_paint_setup 2015-06-21 16:23:19 +01:00
Duncan Frost 5ba52e3688 Refactor of map_element_paint_setup 2015-06-21 16:23:18 +01:00
Duncan Frost c004d0e73f Refactor viewport_paint_setup 2015-06-21 16:23:17 +01:00
Duncan Frost 55d3b67cfe Refactor of scrolling_text_setup 2015-06-21 16:23:17 +01:00
Duncan Frost 9958ffc0f7 Started refactor of viewport drawing 
Renabled banner paint setup
 2015-06-21 16:23:16 +01:00
IntelOrca d5bf01e22c refactor ride type flags 2015-06-21 15:32:28 +01:00
Ted John 9a1b09f022 Merge pull request #1416 from Gymnasiast/portuguese 
Add support for Portuguese, closes #711
 2015-06-21 14:29:05 +01:00
Gymnasiast 0dfdb33028 Complete support, read .DAT entries from correct table 2015-06-21 15:13:40 +02:00
IntelOrca c6b7ab2ff4 Merge branch 'pre-release-0.0.2' into develop 2015-06-21 13:56:07 +01:00
Gymnasiast d10d38a128 First version (crashy) 2015-06-21 14:53:04 +02:00
Ted John e28f44f480 Merge pull request #1415 from duncanspumpkin/place_fence 
Implement Place fence
 2015-06-21 12:55:49 +01:00
IntelOrca d193348792 fix game_command_set_fence_colour 2015-06-21 12:42:31 +01:00
Gymnasiast 858faa3303 Adjust game_command_place_fence for sandbox mode and build in pause mode. 2015-06-21 13:40:44 +02:00
Duncan Frost b1183757ec Fix banner bug. Small refactor 2015-06-21 12:07:44 +01:00
Duncan Frost f36d17651d Implemented game_command_place_fence. 
There are a couple of bugs involveing signs.
 2015-06-21 11:43:52 +01:00
Duncan Frost 2ab1e316a9 Fix using object selection during scenario 
Made a small mistake where it would unload the selected objects instead of unloading the unselected objects.
 2015-06-21 11:38:58 +01:00
Ted John 6dbdce88d4 Merge pull request #1409 from trigger-death/console-fix 
Fixed console open and set commands
 2015-06-20 22:44:02 +01:00
Robert Jordan eea2a9f7c4 Fixed console open command 2015-06-20 17:39:40 -04:00
Ted John fe31d92654 Merge pull request #1406 from ThomasdenH/load-save-window-improvement 
Load save window improvement (#1378)
 2015-06-20 17:58:34 +01:00
Ted John 0381b0e1f6 Merge pull request #1407 from ThomasdenH/invert-drag 
Add option to invert viewport dragging (#1332)
 2015-06-20 17:57:50 +01:00