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
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
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
IntelOrca 926f6838b4 Merge branch 'pre-release-0.0.2' into develop 2015-06-20 16:26:56 +01:00
IntelOrca b5fcdcf32a fix placement of large scenery 2015-06-20 16:26:42 +01:00
IntelOrca 18f33f806c implement sub_68ADBC 2015-06-20 16:24:38 +01: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
zsilencer 2a82491514 #1396 2015-06-19 10:26:22 -06:00
Robert Jordan febe925f52 Added title restriction to new window 2015-06-19 10:58:56 -04:00
Robert Jordan 28f4774c92 Fixed merge conflicts 2015-06-19 10:58:12 -04:00
Robert Jordan 5127e65095 Console can be used on title screen 2015-06-19 10:51:54 -04: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 78a6e60083 fix path_get_extension, fixes #1368 2015-06-19 11:40:18 +01:00
IntelOrca 3140042b1d fix #1391 2015-06-18 22:35:08 +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 1556a168e4 fix #1380 2015-06-17 23:01:14 +01:00
IntelOrca 87c7a31fa4 fix #1367 2015-06-17 22:13:23 +01:00
IntelOrca 9e79add6ba Merge branch 'pre-release-0.0.2' into develop 2015-06-17 16:43:36 +01:00
IntelOrca dff788d1d8 fix peep.c sign issues 2015-06-17 16:39:09 +01:00
IntelOrca 4ebf6dd913 fix #1374 2015-06-17 16:32:50 +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 d1b806c20c fix #1370 2015-06-17 11:52:46 +01:00
IntelOrca f4c46c479d Merge branch 'pre-release-0.0.2' into HEAD 2015-06-17 11:41:08 +01:00
IntelOrca f2388d9b54 fix changelog from showing again in same session 2015-06-17 11:38:02 +01:00
JarnoVgr 92acfab160 Added build number support 2015-06-17 00:55:32 +02: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
Robert Jordan e9eeb36cdf Added location variable for console. 2015-06-16 14:57:55 -04:00
Ted John bfd813ac89 Merge pull request #1361 from Gymnasiast/guests-cheats 
Introduce a truckload of guest cheats, fixes #1160, closes #1187, fixes #1323, fixes #966
 2015-06-16 17:48:11 +01:00
Gymnasiast 79a6a989f0 Introduce a truckload of guest cheats. 2015-06-16 18:25:37 +02:00
IntelOrca 4a69ded1c7 fix get exe path issue 2015-06-16 14:55:09 +01: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 705efbeee9 add last_crash_type to ride struct 2015-06-16 00:16:59 +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
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
Robert Jordan b4cea081a0 Fixed secondary scroll thumb 2015-06-15 10:36:05 -04: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
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
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
Gymnasiast 95966f6346 Allow building large scenery outside park borders in sandbox mode. 2015-06-14 15:07:08 +02: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
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 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 26abb73b8e implement update_cursor_position 2015-06-12 23:29:26 +01:00
IntelOrca f316b423c4 fix scroll H&V issue 2015-06-12 20:10:27 +01:00
Ted John 285240a20b Merge pull request #1316 from trigger-death/input-scroll 
Decompiled input_scroll Functions
 2015-06-12 19:51:30 +01:00
Robert Jordan 927a2a48b5 decompiled input_scroll functions 2015-06-12 14:34:54 -04:00
Andrew Putlock a785ff3cad Autosave no longer changes scenario name to "autosave" 2015-06-11 19:36:56 -04: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
Ted John ae8464d31f Merge pull request #1310 from rd3k/debug-inspector 
Add debug toolbar menu, start tile inspector
 2015-06-11 21:15:42 +01:00
rd3k fb59dab59e Add debug toolbar menu, start tile inspector 2015-06-11 20:51:39 +01:00
Duncan Frost 499b5413f0 Fix graphical glitch when zoomed. 
Fixes #1088. I'm not completely sure why it works but it does.
 2015-06-11 19:33:48 +01:00
IntelOrca b2e9559d31 fix window issues, fixes #1306 2015-06-11 13:04:55 +01:00
IntelOrca 2547d38807 fix #1307 2015-06-11 02:27:19 +01:00
Ted John 65a706fcdd Merge pull request #1304 from trigger-death/fix-black-caption-bar 
Fixed black caption bar being green
 2015-06-10 21:32:06 +01:00
Robert Jordan 029f7cf664 One colour off 2015-06-10 16:13:32 -04:00
Robert Jordan 35cce1a4df Fixed black caption bar being green 2015-06-10 15:55:15 -04: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
Ted John f65ceff1d3 Merge pull request #1301 from runelaenen/develop 
Fixed Clear Loan cheat
 2015-06-10 18:39:19 +01:00
Gymnasiast e719ee02f9 Also update string ID 2015-06-10 19:38:24 +02: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 8a71ade8c6 Merge pull request #1300 from duncanspumpkin/fix_profit 
Fix profit
 2015-06-10 18:11:28 +01:00
Duncan Frost 792e70d00c Round the currency away from zero. 
Change the profit per hour to use 2dp currency. Fixes #1227
 2015-06-10 17:53:57 +01: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
Duncan Frost f6507f70bc Fix negative zero in currency display. 2015-06-10 17:26:37 +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
Ted John a90d5b43ec Merge pull request #1294 from trigger-death/fix-rct1-park-lights-disabled 
RCT1 lights now disabled properly
 2015-06-10 16:48:59 +01: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 a24ffd1f79 fix refactor error in lower_water 2015-06-10 16:38:27 +01:00
IntelOrca 91c73836a3 fix and improve raise and lower land / water / clear scenery 2015-06-10 15:41:50 +01:00
Ted John c01d3d4242 Merge pull request #1291 from Gymnasiast/fix-sound-continuing 
Fix sound continuing in title screen (hopefully), fixes #1290
 2015-06-10 13:05:18 +01:00
Gymnasiast 14e2afaacb Fix Italian config 2015-06-10 12:57:57 +02:00
Gymnasiast c3b394b7ef Don't stop sounds on canceling exit prompt 2015-06-10 12:25:14 +02:00
Gymnasiast 5b0ada3100 Fix sound continuing in title screen (hopefully) 2015-06-10 10:49:32 +02: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
Miso Zmiric (Mike Squinter) ce7b671a3b add missing log_info deffintion for the non ms build systems 2015-06-09 22:41:00 +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
Miso Zmiric (Mike Squinter) 628e634199 closes #1204, add log_info 2015-06-09 20:10:37 +01: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
IntelOrca 95d6bbaa43 fix dropdowns 2015-06-09 18:37:24 +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 322d45a5dd Prevent invalid sprite coordinates from breaking sprite list. 
Fixes @Gymnasiast 's issues in sandbox
 2015-06-09 18:16:27 +01:00
Duncan Frost 5184564e84 Fixed crash when entrance/exits have been moved by 8cars 
Code defaults to 0 direction if the entrance/exit was not found. Fixes #1258.
 2015-06-09 17:35:16 +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 72de8ad103 implement draw_string_centred_raw 2015-06-09 15:42:25 +01: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
oli414 a09b103895 Fixed crash when using land/water tool outside map 2015-06-09 14:24:02 +02: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
IntelOrca eb654a220d implement sub_6A7594 2015-06-09 02:36:02 +01:00
Robert Jordan fcbe561ad8 Decompiled Ride Prices 2015-06-08 21:28:07 -04:00
IntelOrca 12b01d6521 implement footpath_remove_litter and footpath_interrupt_peeps 2015-06-09 02:09:18 +01:00
IntelOrca 8cfc71ccae fix #1269 2015-06-09 01:24:02 +01:00
IntelOrca acfcf2c33b implement a bit of sub_66397F for sandbox mode 2015-06-08 22:19:06 +01:00
IntelOrca 2888494faa implement three functions used in save scenario 2015-06-08 21:35:09 +01:00
IntelOrca 999488d38c refactor scenario update and checks 2015-06-08 20:48:29 +01:00
Robert Jordan 8e526ac525 Switch RCT1 and RCT2 theme order 2015-06-08 14:21:07 -04:00
IntelOrca 909060b964 implement language fallback to English (UK) 2015-06-08 17:16:37 +01: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 c0f376aa77 fixed naming convention 2015-06-07 17:20:46 -05: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 75903ec2d9 Fixed opening save game not changing recommended name 
It was originally handled by load_game(), but was changed when the
loadsave window was implemented.
 2015-06-07 15:20:46 -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
Ted John 3cd961a3a0 Merge pull request #1257 from zsilencer/bugfixing 
fix whizzed screenshots
 2015-06-07 21:08:11 +01:00
zsilencer fbebd6527b fix whizzed screenshots 2015-06-07 13:02:17 -06: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 f4a4df1cb5 implement window_create_auto_pos 2015-06-07 18:14:33 +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 b79bc68af9 fix #1234 2015-06-07 14:01:32 +01:00
IntelOrca 2eea6bcd4b fix #1229 2015-06-07 13:51:27 +01:00
Ted John 0efd222eac Merge pull request #1252 from Gymnasiast/ownership-editor 
Added cheat to edit land ownership settings in-game
 2015-06-07 13:34:33 +01:00
Ted John ae15039171 Merge pull request #1251 from duncanspumpkin/fix_invis 
Correctly draw invisible entrances
 2015-06-07 13:34:01 +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
Duncan Frost 169628ddb0 Fix #1243. 
For a lengthy reason as to how this worked before see #1243. New version skips bad map_elements (and the next one).
 2015-06-07 10:53:08 +01:00
Duncan Frost 3977865089 Fix original windows crashing 
Due to the change in WWT_LAST assignment any windows that were not finished would access invalid memory and kick up a fuss causing #1249.
 2015-06-07 08:40:55 +01:00
IntelOrca f3821c4865 finish remaining ride calculations 2015-06-07 02:56:31 +01: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
Ted John c295e8bc2d Merge pull request #1241 from trigger-death/text-box-widget 
Textbox Widget
 2015-06-06 22:27:44 +01:00
Robert Jordan 9f9143a5c6 textbox widget 2015-06-06 17:04:53 -04:00
Ted John 076e7142e9 Merge pull request #1240 from duncanspumpkin/fix_1239 
Fix peep placement crash
 2015-06-06 20:29:16 +01:00
Duncan Frost 117526ec77 Fix #1239. Issue caused by sign extension. 2015-06-06 20:12:21 +01:00
IntelOrca dd84ee8340 implement more ride rating calculations 2015-06-06 14:30:43 +01:00
IntelOrca 859e7a3418 implement more ride rating calculations 2015-06-06 12:36:45 +01: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