Ted John
bf39fc36b1
Merge Localisation/master into OpenRCT2/develop.
2015-06-02 04:00:13 +01:00
IntelOrca
f827234dc8
fix sprite compile issue, entry offsets were not updated when data was reallocated.
2015-06-02 00:53:51 +01:00
Ted John
954db85e8c
Merge pull request #1193 from zsilencer/bugfix
...
#1192
2015-06-01 21:36:54 +01:00
Ted John
a63b7906c8
Merge pull request #1191 from ThomasdenH/develop
...
Add dithering to sprite importer
2015-06-01 21:36:14 +01:00
Ted John
cea0f77c03
Merge pull request #1190 from trigger-death/themes-rename
...
Renamed Colour Schemes to Themes
2015-06-01 21:35:23 +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
80aaae3c8d
Changed preset to theme
2015-06-01 11:06:07 -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
Thomas
a3368c4a54
Fix issue
2015-06-01 15:14:15 +02:00
Thomas
f262ef977d
Fix warning and remove debugging
2015-06-01 14:04:35 +02:00
Thomas
c266c21c9c
Fix overflow issue
2015-06-01 13:19:40 +02:00
Ted John
0a5236be1c
Merge Localisation/master into OpenRCT2/develop.
2015-06-01 04:00:13 +01:00
Thomas
55456559bb
Added dithering and closest pixel conversion for sprite tool
2015-05-31 20:35:40 +02:00
Ted John
15791a2921
Merge pull request #1186 from rd3k/fix-parksize
...
Use uint16 for park size, fix #1162
2015-05-31 13:08:49 +01:00
rd3k
9d7dc3bacc
Use uint16 for park size
2015-05-31 13:00:39 +01:00
Ted John
da532dd7f0
Merge Localisation/master into OpenRCT2/develop.
2015-05-31 04:00:13 +01:00
Ted John
505216e82f
Merge pull request #1182 from rd3k/peep-sick-cheat
...
Add cheat to make all guests feel nauseous
2015-05-31 02:13:11 +01:00
rd3k
395773cdd6
Add cheat to make all guests feel nauseous
2015-05-31 02:04:01 +01:00
Ted John
4cd81766f5
Merge pull request #1180 from jcdavis/build_g2_sh
...
build_g2 for OS X/Linux
2015-05-31 00:26:25 +01:00
IntelOrca
1fdf1f57f7
add zoom button images to viewport window
2015-05-31 00:20:42 +01:00
Jackson Davis
ebc8d798b8
build_g2 for OS X/Linux
2015-05-30 16:20:15 -07:00
Ted John
9f74eecb50
Merge pull request #1179 from mzmiric5/improve-build
...
Improve build
2015-05-30 22:18:06 +01:00
Miso Zmiric (Mike Squinter)
aad8c8771e
delete old batch pre-build
2015-05-30 22:12:03 +01:00
Miso Zmiric (Mike Squinter)
21a5c02333
use powershell pre-build, switch back to /MT
2015-05-30 22:11:06 +01:00
Ted John
121c3a1575
Merge pull request #1174 from trigger-death/window-colour-schemes-2
...
Window Colour Schemes
2015-05-30 21:18:00 +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
Ted John
ea2082b0a0
Merge pull request #1175 from rd3k/mapgen-inputwindows
...
Add handy input windows to mapgen first tab
2015-05-30 20:11:06 +01: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
Ted John
039227b3df
Merge pull request #1173 from Gymnasiast/patch-3
...
Consistently use colons after labels that are followed by a dropdown
2015-05-30 13:54:49 +01:00
Michael Steenbeek
b1e94bf110
Consistently use colons after labels that are followed by a dropdown
2015-05-30 14:35:59 +02: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
Ted John
ba48b474b9
Merge pull request #1170 from zsilencer/bugfixes
...
#1165
2015-05-30 12:59:45 +01:00
IntelOrca
8bc877ad27
Merge branch 'cmdline-screenshot' into develop
2015-05-30 12:54:45 +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
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
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
