1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 06:23:04 +01:00
Commit Graph

502 Commits

Author SHA1 Message Date
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
Graham Edgecombe
8da01a1bf7 Fix building with -DDISABLE_TWITCH.
The gTwitchEnable variable was used in some places without being
wrapped around an #ifndef DISABLE_TWITCH block.
2015-05-28 11:52:40 +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
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
Robert Jordan
6bc081edca Added date format to culture options menu 2015-05-24 12:38:07 -04: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