Ted John
d3ae912748
Merge pull request #1225 from mzmiric5/develop
...
don't build g2 on ci
2015-06-04 22:41:46 +01:00
Miso Zmiric (Mike Squinter)
05b8e7b7b1
don't build g2 on ci
2015-06-04 22:02:38 +01: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
Ted John
6f4854222e
Merge pull request #1221 from duncanspumpkin/fix_bugs
...
Fix bugs
2015-06-04 20:24:14 +01: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
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
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
9f6f7c8b9e
Move cheat tab tips
2015-06-04 19:58:16 +02:00
Thomas
9ddd655b20
Refactor cheat window and fix #1084
2015-06-04 19:52:35 +02:00
Ted John
86dc6fd30d
Merge pull request #1216 from danidoedel/patch-3
...
fix label position and mapgen background bugs
2015-06-04 16:50:54 +01: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
Ted John
55ede367bd
Merge pull request #1215 from ThomasdenH/develop
...
Fix #1214
2015-06-04 14:18:02 +01:00
Thomas
70edd18a36
Fix #1214
2015-06-04 15:13:18 +02:00
IntelOrca
67c6e899c1
fix motion simulator ride rating calculation
2015-06-04 12:56:24 +01:00
IntelOrca
41250f350c
Merge branch 'marcotc-develop' into develop
2015-06-04 12:48:20 +01:00
IntelOrca
bb309f34c6
refactor test project and add ride ratings test
2015-06-04 12:46:17 +01:00
IntelOrca
f6eec3725c
Merge branch 'develop' of https://github.com/marcotc/OpenRCT2 into marcotc-develop
...
Conflicts:
src/openrct2.c
2015-06-04 11:54:27 +01:00
Ted John
3d207d80f3
Merge Localisation/master into OpenRCT2/develop.
2015-06-04 04:00:13 +01:00
IntelOrca
43f54cd729
implement more ride rating calculations
2015-06-04 02:08:52 +01:00
IntelOrca
efcfbf9a26
implement more ride rating calculations and fix bugs
2015-06-03 22:36:47 +01: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
21b57e90a3
Stop plain clothes handymen.
...
Accidentally was not reseting the image offset whenever a peep changed sprite.
2015-06-03 19:14:07 +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
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
danidoedel
578d676b7f
fix entry price label position
2015-06-03 19:25:16 +02:00
Ted John
0910f97fdf
Merge pull request #1208 from trigger-death/object-selection-filter
...
Object Selection Filters
2015-06-03 18:13:25 +01: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
IntelOrca
463131117c
fix edit command line function
2015-06-03 17:11:52 +01:00
Ted John
f0c97c0fa8
Merge Localisation/master into OpenRCT2/develop.
2015-06-03 04:00:12 +01:00
Ted John
baf9a416de
Merge pull request #1206 from mzmiric5/g2-mingw
...
build g2.dat as part of mingw build
2015-06-03 03:16:45 +01:00
Miso Zmiric (Mike Squinter)
4c06ffa2a0
build g2.dat as part of mingw build
2015-06-03 03:13:35 +01:00
IntelOrca
899c563d35
improve sprite compiler
2015-06-03 03:11:54 +01:00
Ted John
3e9e17e679
Merge pull request #1203 from trigger-death/MOM-saftey-checks
...
Added some M.O.M. safety checks.
2015-06-02 22:41:57 +01:00
Robert Jordan
d1bc98e121
Added some M.O.M. safety checks.
...
Parks using M.O.M. and other hackish features should be less likely to
crash now.
2015-06-02 17:31:45 -04:00
