1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Commit Graph

199 Commits

Author SHA1 Message Date
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
Robert Jordan
02a9f1b535 Fixed #1247 font issues. 2015-06-06 21:18:20 -04:00
Robert Jordan
9f9143a5c6 textbox widget 2015-06-06 17:04:53 -04:00
zsilencer
71ae580483 fixes #1230 and #1212 2015-06-05 01:02:02 -06:00
Duncan Frost
8351e56353 Fix small graphical bug on bottom arrow.
Caused by not setting the font style before using them.
Also the origin was one pixel off.
2015-06-04 20:15:26 +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
Duncan Frost
17abada57e Fix invalid locations breaking viewports
Fixes #1183. Note this isn't the same fix that rct2 uses. But I feel it solves the main issue
2015-06-03 19:00:16 +01:00
Duncan Frost
fb1c8c4e42 Check against invalid tiles correctly 2015-06-03 18:02:41 +01:00
IntelOrca
137c8c190d add giant screenshot to file menu 2015-06-02 14:12:36 +01: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
Robert Jordan
41171aa304 Resolved Merge Conflicts 2015-05-30 16:00:13 -04: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
IntelOrca
4bb4b197dd make small change to screenshot command line 2015-05-30 13:06:36 +01:00
IntelOrca
85bf7c77d0 Merge branch 'cmdline-screenshot' into develop 2015-05-30 13:03:16 +01:00
Ted John
e9f7ec0a6a Merge pull request #1172 from duncanspumpkin/cmdline-screenshot
Fix rotation issue
2015-05-30 13:02:38 +01:00
Ted John
b7d293f4dd Merge pull request #1171 from duncanspumpkin/toolbar_funcs
Toolbar Update Functions
2015-05-30 13:00:25 +01:00
IntelOrca
0b058cfab0 finish giant screenshots and bugs 2015-05-30 12:54:10 +01:00
Duncan Frost
3bd3fccb57 Fix rotation disapearing sprites
This was caused by the sprite quadrant assignment not being reset when a new rotation was assigned
2015-05-30 10:15:29 +01:00
Duncan Frost
0954687973 Refactor ofviewport code slightly
Fix potential water height bug
2015-05-30 10:00:33 +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
24f9898ce6 Fixed bug with land direction
This would cause the cursor to highlight the opposite tile when hovering over bottom left and bottom right
2015-05-30 06:27:50 +01:00
Robert Jordan
dbc1df308f Issues with Dropdown text 2015-05-29 16:42:57 -04:00
IntelOrca
c6aa17f053 add headless game support 2015-05-29 20:45:21 +01:00
Robert Jordan
dc1e38180e Starting work on colour schemes config settings 2015-05-29 12:04:53 -04:00
IntelOrca
31e0bdd76f add partial working screenshot by command line 2015-05-28 23:04:02 +01:00
IntelOrca
6f1cd77f3c implement textinput_cancel and refactor textinput event calls 2015-05-28 01:15:58 +01:00
IntelOrca
101fed0dd9 refactor g1Elements pointer and implement sub_68371D 2015-05-28 00:17:22 +01:00
Jackson Davis
e394c1d0d3 Fix compile error for non-windows 2015-05-26 18:29:31 -07:00
Robert Jordan
16105af1e7 Progress on window colour schemes 2015-05-26 16:59:25 -04:00
IntelOrca
6426adb45d remove asm for set scroll size and add gCurrentAwards 2015-05-26 19:28:56 +01:00
Miso Zmiric (Mike Squinter)
c2c9bbf4ef add twitch integration, part 2 2015-05-25 20:38:33 +01:00
IntelOrca
1ac93e44c9 add twitch integration, part 1 2015-05-25 20:36:40 +01:00
Ted John
ad4436ea4f Merge pull request #1142 from trigger-death/in-game-object-selection
Added in-game object selection
2015-05-24 03:52:53 +01:00
Robert Jordan
ab942236d7 Added in-game object selection
New console commands:
- open (opens a window)
- windows (lists windows usable with open)
- load_object (loads the specified obj with the given filename)
- object_count (lists the number of objects in the scenary)
Console commands now have a usage variable.

Use: "open object_selection" for the object selection window.
Once the object selection window is closed, all objects will
automatically be researched whether or not they were already in the base
scenario.
The object selection window will close any other windows when selecting
an object to prevent a crash.
2015-05-23 14:56:54 -04:00
Robert Jordan
37221f0aae Testing Improvements
Added test_unfinished_tracks and no_test_crashes
Both are enablable through the console and test_unfinished_tracks is
also an option.
Increased options window height.
Made it so "out" ride window is opened after a crash instead of RCT2's
ride window.
ride_is_valid_for_open has a counterpart: ride_is_valid_for_test
2015-05-22 14:18:48 -04:00
Michael Steenbeek
2a7926915c Declare window_invalidate_all() 2015-05-21 19:44:10 +02:00
Gymnasiast
36ccfe77e0 Add GUI option for switching to the RCT1 colour scheme, along with proper invalidation of the affected windows 2015-05-21 12:28:51 +02:00
Robert Jordan
dc38087f07 Fixed tooltip issue #1053
Tooltips should now behave more like RCT2.
2015-05-20 12:53:02 -04:00
IntelOrca
1339c9b493 fix console caret typo and invalidate screen on variable change 2015-05-20 02:37:44 +01:00
Robert Jordan
0fbeb9214e Finished improvements to console
Added commands: variables, get, and set
Added console scrolling
set console_small_font 1 will change the console font
Fixed issue with textinput incrementing the length twice in shared.c
2015-05-19 21:12:09 -04:00
Robert Jordan
61474ecd9a Progress on console 2015-05-19 13:46:05 -04:00
IntelOrca
8772cdd7aa add in game console 2015-05-19 03:54:09 +01:00
Robert Jordan
09cc46c1e6 Almost finished land rights tool 2015-05-15 11:28:27 -04:00
Robert Jordan
a8ec43f065 Select size strings now use args 2015-05-13 11:38:44 -04:00
Robert Jordan
e8faa5e304 Forgot viewport_interaction 2015-05-07 14:31:34 -04:00
Robert Jordan
c25ef45827 Named 2 input flags, and dropdown fix
Named INPUT_FLAG_1 to INPUT_FLAG_DROPDOWN_STAY_OPEN
Named INPUT_FLAG_2 to INPUT_FLAG_DROPDOWN_MOUSE_UP

placed RCT2_ADDRESS_INPUT_FLAGS where valid and replaced all bitwise
references to it with appropriate input flags.

Changed ride view dropdown to hold only as it should be.
2015-05-07 14:31:11 -04:00
Duncan Frost
503b330eb8 Fix bugs in viewport interaction and loadsave dialog
Part of the issue was comparing an int litteral when it should have been a short but the main issue was due to a wrong mask in the viewport interaction code.
Loadsave MS dialog box should now work correctly.

Fixes #1040.
Fixes #1039.
2015-05-05 19:11:35 +01:00
Timmy Weerwag
d09a6249ff Renamed sub_688697 to store_interaction_info 2015-05-03 13:54:08 +02:00