mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,690 Commits 9 Branches 41 Tags 386 MiB
Commit Graph

912 Commits

Author SHA1 Message Date
IntelOrca 4acb7ff5e1 fix demolish of flat rides and unable to build it again 2015-07-06 22:53:16 +01:00
Duncan Frost bcd80b3db8 Fix issue with tracks on uneven ground. 
Fixes #1525
 2015-07-06 21:09:01 +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
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
zsilencer 9eb4958dde fix #1002 2015-07-05 08:57:01 -06: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
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
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
IntelOrca cc54171443 remove / isolate several CALLPROCs 2015-06-30 17:13:34 +01: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 d968a65701 Changed back-button location 2015-06-28 21:30:20 +02:00
IntelOrca 3e200d0bd2 implement ride_fix_breakdown 2015-06-28 18:36:46 +01:00
IntelOrca e2a694b96e implement format_string_toupper and litter_create 2015-06-28 17:45:19 +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
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
Thomas e72739dbd6 Add cheat to force park rating 2015-06-28 13:38:38 +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
IntelOrca 63698761fd remove some small callprocs 2015-06-28 01:57:50 +01:00
IntelOrca 97e4a4d663 add track block and possible ride configuration tables 2015-06-27 22:53:52 +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 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 9ad21599a3 Decompiled top_toolbar tool events 
Also fixed bug with land rights tool gridlines
 2015-06-26 11:40:37 -04: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
Robert Jordan 31e8e604fe Added Get button to command editor 2015-06-25 14:27:09 -04: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
Robert Jordan 937b887a91 Title Sequence Editor Improvements 2015-06-25 10:41:40 -04: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
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
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
IntelOrca 474d300578 change enabledTrackPieces to 64 bit integer in ride type struct 2015-06-24 16:43:21 +01: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
Maikel Stuivenberg b40be2aba1 Fix border issue #1428 2015-06-24 01:54:59 +02:00
Thomas 2fc23b0084 Add browsing drives on windows 2015-06-22 15:55:57 +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
IntelOrca d5bf01e22c refactor ride type flags 2015-06-21 15:32:28 +01:00
Ted John e28f44f480 Merge pull request #1415 from duncanspumpkin/place_fence 
Implement Place fence
 2015-06-21 12:55:49 +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 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
IntelOrca 8416596bf8 implement park_update_histories 2015-06-20 17:28:17 +01:00
Thomas fd914094a7 Add option to invert viewport dragging (#1332) 2015-06-20 17:52:38 +02:00
Thomas cb89f040b4 Remove debugging 2015-06-20 16:42:34 +02:00
Thomas b8eab9ec93 Add path abbreviation for load/save window 2015-06-20 16:31:06 +02:00
IntelOrca 4d4a000117 add object selection to debug dropdown 2015-06-20 15:07:36 +01:00
Duncan Frost 895d4a81e4 finish implementing remove_selected_objects_from_research 
Fixed bug due to freeing rct2 memory.
 2015-06-19 21:34:42 +01:00
Duncan Frost 15b2360e13 Implemented object_create_identifier_name and start of last func. 
Note requires modification of the strings.
 2015-06-19 21:34:41 +01:00
Duncan Frost d67d9349b9 Implement setup in use selection flags. 2015-06-19 21:34:40 +01:00
Duncan Frost 07752aa1b4 Implemented free object selection flags 2015-06-19 21:34:39 +01:00
Duncan Frost 468806337c Implement more of the setup functions. 
Fix bug in object counting.
Split up required and optional objects.
Corrected optional objects.
 2015-06-19 21:34:39 +01:00
Duncan Frost bed75bb2cf Refactor and start implementing setup functions for object selection 2015-06-19 21:34:38 +01:00
Duncan Frost f7bbfa80a8 Start refactoring 2015-06-19 21:34:37 +01:00
Duncan Frost 7a5887f67a Fix size bug. 
Implemented reset_required_object_flags and reset_selected_object_count_and_size.
 2015-06-19 21:34:36 +01:00
Duncan Frost 8935503b86 Implemented select object in object selection window. 2015-06-19 21:34:35 +01:00
Ted John 7cf82ee5ef Merge pull request #1395 from Gymnasiast/cheat-park-parameters 
Make the park parameters dialog behave and invalidate better in-game.
 2015-06-19 15:12:33 +01:00
Gymnasiast e546e5038e Make the park parameters dialog behave and invalidate better in-game. 2015-06-19 16:02:54 +02:00
Ted John 742193a886 Merge pull request #1394 from Gymnasiast/cheat-park-parameters 
Add cheat to edit park parameters/scenario options in-game
 2015-06-19 14:43:52 +01:00
Gymnasiast 0491d971f3 Add cheat to edit park parameters/scenario options in-game 2015-06-19 14:59:48 +02:00
IntelOrca 2452767fdd Merge branch 'pre-release-0.0.2' into develop 2015-06-19 11:42:19 +01:00
IntelOrca 2dc03cd45a refactor research window / extract common code 2015-06-18 22:20:49 +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
IntelOrca 87c7a31fa4 fix #1367 2015-06-17 22:13:23 +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
IntelOrca f4c46c479d Merge branch 'pre-release-0.0.2' into HEAD 2015-06-17 11:41:08 +01: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
IntelOrca 34924963b9 Merge branch 'pre-release-0.0.2' into develop 2015-06-16 21:29:34 +01:00
Gymnasiast 79a6a989f0 Introduce a truckload of guest cheats. 2015-06-16 18:25:37 +02: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
IntelOrca 3feacc3400 fix #1356 2015-06-15 22:08:03 +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
LRFLEW b588e519c4 Some Cleanup of Past PRs 2015-06-14 16:36:17 -05: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
IntelOrca ce924b4b1b add new custom title sequence to celebrate 0.0.2 release 2015-06-14 21:01:48 +01: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 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
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 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
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
Robert Jordan 89a2cc9468 Tile Inspector Appropriate Cursor 2015-06-13 11:05:56 -04:00
IntelOrca b69487cbba add changelog window 2015-06-13 13:30:50 +01:00
IntelOrca f316b423c4 fix scroll H&V issue 2015-06-12 20:10:27 +01:00
LRFLEW 09d6d9be1c Automatic staff placement 
This will automatically place hired staff near a random guest (with
fallbacks if no guests are in the park). The setting can be toggled in
the options or by holding SHIFT when hiring.
 2015-06-11 15:39:47 -05:00
rd3k fb59dab59e Add debug toolbar menu, start tile inspector 2015-06-11 20:51:39 +01:00
IntelOrca b2e9559d31 fix window issues, fixes #1306 2015-06-11 13:04:55 +01:00
IntelOrca 125c01a147 Merge branch 'build-in-pause-mode-3' of https://github.com/Gymnasiast/OpenRCT2 into Gymnasiast-build-in-pause-mode-3 
Conflicts:
	data/language/english_uk.txt
 2015-06-10 18:44:38 +01:00
Gymnasiast 732319514f Allow building in pause mode via a cheat 2015-06-10 19:35:53 +02:00
Runelaenen 829e0712e4 Fixed Clear Loan cheat 
The function already existed in the codebase. I've fixed it and added a
button.
 2015-06-10 19:23:10 +02:00
Ted John 723fcafd51 Merge pull request #1298 from trigger-death/quick-fire-staff 
Quick fire staff button
 2015-06-10 17:30:31 +01:00
Robert Jordan f16c120200 Quick fire staff button 2015-06-10 12:17:42 -04:00
Robert Jordan 9ffedd598a Fixed fire prompt transparency issue 2015-06-10 11:54:26 -04:00
Robert Jordan fb828afa1a Added RCT1 light tooltips 2015-06-10 11:47:54 -04:00
Robert Jordan 5466ab3e39 RCT1 lights now disabled properly 2015-06-10 11:43:09 -04:00
IntelOrca 91c73836a3 fix and improve raise and lower land / water / clear scenery 2015-06-10 15:41:50 +01:00
Robert Jordan d7a4474bcd Removed irrelevant comments stating false facts 2015-06-09 23:18:20 -04:00
Robert Jordan 32b79ea216 Fix ride works for all breakdown types 2015-06-09 23:17:08 -04:00
Robert Jordan 98501a51f3 Fix Ride is greyed out when it doesn't work 2015-06-09 23:05:43 -04:00
Robert Jordan e7332b2d94 Fixed maintenance bar 2015-06-09 22:43:14 -04:00
Robert Jordan bf2ac564fb Fixed merge conflicts 2015-06-09 20:19:19 -04:00
Robert Jordan 10c1c29c11 Can now force ride breakdowns 2015-06-09 20:18:04 -04:00
LRFLEW 816944f78b EXPLODE!!! 
Because why not
 2015-06-09 18:14:28 -05:00
Ted John dbb7ae8e15 Merge pull request #1284 from trigger-death/decompile-toggle-price 
Decompiled toggle ride price and fixed ride price
 2015-06-09 23:07:20 +01:00
Ted John 92daca54b8 Merge pull request #1283 from Gymnasiast/sound-settings-remnants 
Force best sound quality and software buffering
 2015-06-09 23:06:44 +01:00
Robert Jordan 0f955d0d92 Decompiled toggle ride price 2015-06-09 17:00:11 -04:00
Gymnasiast a62e1c02c2 Force best sound quality and software buffering 2015-06-09 22:56:47 +02:00
Ted John 59e2080c64 Merge pull request #1278 from duncanspumpkin/bugs 
Change order of load_save code
 2015-06-09 19:35:00 +01:00
Ted John d0c0170858 Merge pull request #1277 from Gymnasiast/sandbox-mode-4 
Rework land ownership cheat into sandbox mode
 2015-06-09 19:34:46 +01:00
Gymnasiast afb49855dd Correct &-operation not in brackets 2015-06-09 20:11:48 +02:00
Duncan Frost 1fde5e53f9 Change order of load_save code 
This prevents the window from appearing for a millisecond when you press x.
Fixes #1264
 2015-06-09 19:05:59 +01:00
Ted John e0d480fa6b Merge pull request #1276 from duncanspumpkin/bugs 
Bugs
 2015-06-09 18:31:05 +01:00
IntelOrca 0dd749baac refactor window event calls 2015-06-09 18:29:02 +01:00
Duncan Frost 62bdd8a0ab Fix options disabled_widgets 
There was a bug that caused the first widget on each page to appear disabled due to not being reset when changing page / invalidating. Fixes #1275
 2015-06-09 17:14:57 +01:00
Gymnasiast 7ed434a804 Rework land ownership cheat into sandbox mode 2015-06-09 17:19:05 +02:00
IntelOrca dc3fe2a6c8 remove commented out CALLPROCs and CALLFUNCs 2015-06-09 15:09:45 +01:00
IntelOrca ed86db0635 fix sign issues with selection rectangle 2015-06-09 14:47:26 +01:00
Ted John 22c13f9f93 Merge pull request #1271 from trigger-death/decompile-ride-prices 
Decompiled Ride Prices
 2015-06-09 02:38:32 +01:00
Robert Jordan fcbe561ad8 Decompiled Ride Prices 2015-06-08 21:28:07 -04:00
Robert Jordan 8e526ac525 Switch RCT1 and RCT2 theme order 2015-06-08 14:21:07 -04:00
Robert Jordan e471592d16 Fixed themes features tab glitch 2015-06-07 21:11:47 -04:00
Robert Jordan 21734bd71f Fixed open button y 2015-06-07 20:56:31 -04:00
Robert Jordan 9960c8d901 Fixed merge conflicts 2015-06-07 20:37:56 -04:00
Robert Jordan e90c724a3a Rewrote Themes 
Added rct1 styles and lights.
Themes are now easier to expand
Added features tab to themes window
 2015-06-07 20:31:54 -04:00
LRFLEW d3a6965f95 Made window_loadsave_open accept a default file name 
This fixes #1231, #1245, and adds room for future work, such as porting
track saving.
 2015-06-07 17:12:17 -05:00
LRFLEW 73acb02946 Code Cleanup 
thanks trigger-death
 2015-06-07 15:20:45 -05:00
LRFLEW 66bf2abd37 A fix for #1231 
This has the side-effect of incorrect default names in the scenario
editor, but that can be patched separately.
 2015-06-07 15:20:45 -05:00
Duncan Frost 4f03b0c997 Refactor of research. 
Fix bug that would cause a crash on a scenario that had rides with same base type
 2015-06-07 19:19:17 +01:00
Duncan Frost 9ad775625a Fix small bugs in the inventions window. 
I think there might have been a case where the list could get corrupted that this may prevent.
 2015-06-07 19:19:16 +01:00
Duncan Frost 97966ac707 Implemented scenery_set_setup for research. 
I've also labelled ride_type->flags.
 2015-06-07 19:19:16 +01:00
Duncan Frost cd22f9bd08 Implement the reset ride research function 2015-06-07 19:18:50 +01:00
IntelOrca 65377629e4 implement track save select nearby scenery 2015-06-07 16:02:43 +01:00
IntelOrca 28a122ac5c don't show tab image unless tab is shown in new ride window 2015-06-07 14:35:15 +01:00
IntelOrca 2eea6bcd4b fix #1229 2015-06-07 13:51:27 +01:00
Gymnasiast 90ac515a9b Fix bug introduced in refactor 2015-06-07 13:34:17 +02:00
Gymnasiast c15da4370a Added cheat to edit land ownership settings in-game 2015-06-07 12:45:55 +02:00
Ted John 5fb44a443e Merge pull request #1248 from trigger-death/text-box-widget 
Fixed #1247 font issues.
 2015-06-07 02:56:00 +01:00
Robert Jordan 02a9f1b535 Fixed #1247 font issues. 2015-06-06 21:18:20 -04:00
Ted John ad6ccc2553 Merge pull request #1246 from trigger-death/themes-fix 
Fixed themes "editor" tooltip
 2015-06-07 02:09:41 +01:00
Robert Jordan c0df70a9b0 Fixed themes "editor" tooltip 2015-06-06 21:04:14 -04:00
Robert Jordan 9f9143a5c6 textbox widget 2015-06-06 17:04:53 -04:00
Robert Jordan 4e43b04524 Fixed english_uk conflicts 2015-06-05 20:19:53 -04:00
Robert Jordan a490284569 Renumbered strings 2015-06-05 20:16:01 -04:00
Robert Jordan c3d36c96ef Now resets scroll properly 2015-06-05 19:02:20 -04:00
Robert Jordan 6179888231 Renamed strings and removed warnings 2015-06-05 18:59:07 -04:00
Robert Jordan c9c3e66289 Object selection search 
Can now search for objects in the object selection window.
 2015-06-05 18:54:47 -04:00
Robert Jordan 83fda8fc56 Clear scenery tool now as options 
Can now choose to clear small scenery, large scenery, and/or footpaths.
 2015-06-05 12:38:52 -04:00
zsilencer c6e63d5d25 add volume control in options 2015-06-04 16:31:54 -06:00
Ted John dfcea20443 Merge pull request #1222 from ThomasdenH/develop 
Change use of gfx_draw_string() to gfx_draw_string_left()
 2015-06-04 20:40:41 +01:00
Thomas e9a33e0de6 Change use of gfx_draw_string() to gfx_draw_string_left() 2015-06-04 21:27:38 +02:00
Duncan Frost 47e41b5d82 Fix bug introduced in previous bug fixing! 
Accidently switched two functions. Small refactor as well.
 2015-06-04 20:15:27 +01:00
Duncan Frost 44d4ff4d03 Fix cross hatching graphical glitch. 
Forgot to Xor the value before clearing it. Fixes #1177
 2015-06-04 20:15:25 +01:00
Duncan Frost 2765f15584 Cheats showing pressed after tab change 
Fixes #1084
 2015-06-04 20:15:24 +01:00
Duncan Frost cd753e13e4 Fix #1213 once and for all. 
Forgot to check that the tool in use was the set land rights tool.
 2015-06-04 20:15:23 +01:00
Ted John b688b1eb5f Merge pull request #1220 from trigger-death/options-window-pages 
Options window now uses paged widgets
 2015-06-04 20:04:11 +01:00
Robert Jordan 319fe2b6a2 Didn't commit one file. 2015-06-04 14:51:54 -04:00
Robert Jordan 4b0d005e0f Options window now uses paged widgets 
Widgets now are defined by page.
Fixed options window flashing text colour when first opened.
Fixed themes window gfx_invalidate happening every step.
 2015-06-04 14:51:39 -04:00
Ted John 3e12e9502f Merge pull request #1218 from ThomasdenH/develop 
Refactor cheat window and fix #1084
 2015-06-04 19:08:46 +01:00
Thomas 9ddd655b20 Refactor cheat window and fix #1084 2015-06-04 19:52:35 +02:00
danidoedel bcbc05e9a2 fix mapgen background bug 2015-06-04 17:39:07 +02:00
danidoedel c481905d0a fix research label position 2015-06-04 17:34:47 +02:00
danidoedel d9807221b8 fix number of selected items label position 2015-06-04 17:33:29 +02:00
danidoedel a57e4587f1 fix number of designs label position 2015-06-04 17:31:42 +02:00
danidoedel c736face55 fix status label position 2015-06-04 17:29:47 +02:00
danidoedel 89e4b1c824 fix status label position 2015-06-04 17:27:56 +02:00
Thomas 70edd18a36 Fix #1214 2015-06-04 15:13:18 +02:00
Ted John 3e08ada75e Merge pull request #1210 from duncanspumpkin/fix_bugs 
Fix bugs
 2015-06-03 21:13:50 +01:00
Duncan Frost c9543005de Fix small issues with scrolling. 
I've found the cause of the cursors not correctly changing. It would appear ebx is popped to its previous value as the call function returns. This causes the cursor value to never change. This can be solved when all windows are complete. Fixes points i, ii, iii, iv of #1127 (Fixed by reseting scroll positions when the height is 0. And actually passing the scroll index to the calling function)
 2015-06-03 20:54:28 +01:00
Ted John 0cc54ca1f1 Merge pull request #1209 from danidoedel/patch-2 
Scenario Editor: fix entry price label position
 2015-06-03 19:19:19 +01:00
IntelOrca ab2e6a867f refactor ride names and show ride type/s on object selection window 2015-06-03 19:14:45 +01:00
Duncan Frost 9dfa9b1461 Fix #1161 
In the editor map window the string displaying the current tool size was not checking to make sure the tool was active before displaying the size.
 2015-06-03 19:04:13 +01:00
danidoedel 578d676b7f fix entry price label position 2015-06-03 19:25:16 +02:00
Duncan Frost fb1c8c4e42 Check against invalid tiles correctly 2015-06-03 18:02:41 +01:00
Robert Jordan ee00962ac9 Object Selection Filters 
Can now filter objects in the selection window by source. (RCT2, WW, TT,
Custom)
Object selection window now displays source above dat name.
 2015-06-03 12:37:07 -04:00
Robert Jordan 44e5af5fe0 Removed unecissary usage of clear scenery tool 2015-06-02 16:43:21 -04:00
IntelOrca 1d622ed3e2 add more ride rating calculations and refactor ride operation mode 2015-06-02 19:59:55 +01:00
Thomas 857e104153 Add new map generation icons and make description wider 2015-06-02 16:52:00 +02:00
IntelOrca 137c8c190d add giant screenshot to file menu 2015-06-02 14:12:36 +01:00
Ted John 954db85e8c Merge pull request #1193 from zsilencer/bugfix 
#1192
 2015-06-01 21:36:54 +01:00
zsilencer 603233a583 #1192 2015-06-01 13:07:18 -06:00
Robert Jordan c0ea64b83d Minor visual improvements 2015-06-01 11:38:27 -04:00
Robert Jordan 765bf976ee Renamed Colour Schemes to Themes 
Themes window now opens to settings/presets tab so it's less confusing
for others.
Can no longer change default presets, you get a warning when you try.
now stores themes in themes folder.
Now clips theme names.
 2015-06-01 11:02:09 -04:00
rd3k 9d7dc3bacc Use uint16 for park size 2015-05-31 13:00:39 +01:00
rd3k 395773cdd6 Add cheat to make all guests feel nauseous 2015-05-31 02:04:01 +01:00
IntelOrca 1fdf1f57f7 add zoom button images to viewport window 2015-05-31 00:20:42 +01:00
Robert Jordan 3fae3c2017 Resolved more conflicts 2015-05-30 16:03:39 -04:00
Robert Jordan 41171aa304 Resolved Merge Conflicts 2015-05-30 16:00:13 -04:00
rd3k 3bd079a9f4 Add handy input windows to mapgen first tab 2015-05-30 20:10:10 +01:00
Robert Jordan eb19ae7995 Final changes 2015-05-30 12:43:24 -04:00
Robert Jordan 53a241d197 Finished ini file loading and removed warnings 2015-05-30 11:52:08 -04:00
Duncan Frost 2532e9aad2 Added try_place_ghost_scenery. 
Ghost scenery placement is now performed by OpenRCT2 game commands.
 2015-05-30 07:04:15 +01:00
Duncan Frost e04f649d2a Added scenery_large_update 
From quick test seems to be working
 2015-05-30 06:27:55 +01:00
Duncan Frost eef779378e Added more of update_scenery 
Only large scenery missing
 2015-05-30 06:27:54 +01:00
Duncan Frost 5578a16663 Started update_scenery 2015-05-30 06:27:54 +01:00
Duncan Frost b2caeaf531 Refactor of code slightly 
Since get_map_coordinates_from_pos returns sint16 values I changed it so that it didn't use sint32 values.
 2015-05-30 06:27:52 +01:00
Duncan Frost a59fd26b3d Added update_water 
Refactored up/down water commands so that it used more standard layout.
Not tested.
 2015-05-30 06:27:51 +01:00
Duncan Frost 5fa982f08b Added tool_update_land 
Not tested
 2015-05-30 06:27:49 +01:00
Duncan Frost 573a632e43 Fix bugs in scenery_clear update 
Note make a new version of land update to fix cost issue
 2015-05-30 06:27:48 +01:00
Duncan Frost 54a37edb44 Implemented clear scenery update 
Not tested.
 2015-05-30 06:27:47 +01:00
rd3k 257d3b8469 proper cheat and Twitch window tooltips, fix #1167 2015-05-30 02:51:20 +01:00
Robert Jordan dbc1df308f Issues with Dropdown text 2015-05-29 16:42:57 -04:00
rd3k 3a55c060f7 fix #1163 2015-05-29 20:59:16 +01:00
Robert Jordan dc1e38180e Starting work on colour schemes config settings 2015-05-29 12:04:53 -04:00