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
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
zsilencer
5c7dc6bb9a
#1165
2015-05-29 21:50:32 -06:00
Ted John
7c29d781dc
Merge Localisation/master into OpenRCT2/develop.
2015-05-30 04:00:13 +01:00
Ted John
71c19c4232
Merge pull request #1169 from rd3k/fix_cheat_tooltips
...
proper cheat and Twitch window tooltips, fix #1167
2015-05-30 03:00:24 +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
Ted John
61974b2656
Merge pull request #1166 from rd3k/localise-fullscreen
...
fix #1163
2015-05-29 21:07:47 +01:00
rd3k
3a55c060f7
fix #1163
2015-05-29 20:59:16 +01: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
Ted John
12d5542861
Merge Localisation/master into OpenRCT2/develop.
2015-05-29 04:00:17 +01:00
IntelOrca
31e0bdd76f
add partial working screenshot by command line
2015-05-28 23:04:02 +01:00
Ted John
f9aee39206
Merge pull request #1159 from duncanspumpkin/fix_station_abuse
...
OpenRCT2 no longer crashes after station abuse.
2015-05-28 21:33:58 +01:00
Duncan Frost
8c27be2357
OpenRCT2 no longer crashes after station abuse.
...
Certain 8cars functions would move station track pieces that would cause the game to crash as they would not be at the correct location. OpenRCT2 will just skip trying to update the tiles of station track that has been modified this way
2015-05-28 19:46:59 +01:00
Ted John
cf0ce5f1ba
Merge pull request #1158 from grahamedgecombe/fix-disable-twitch
...
Fix building with -DDISABLE_TWITCH.
2015-05-28 16:16:25 +01:00