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
