1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Commit Graph

3250 Commits

Author SHA1 Message Date
rd3k
3bd079a9f4 Add handy input windows to mapgen first tab 2015-05-30 20:10:10 +01: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
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
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
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
Ted John
9dc19c6bc2 Merge Localisation/master into OpenRCT2/develop. 2015-05-28 04:00:22 +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
Ted John
6c89274bb1 Merge Localisation/master into OpenRCT2/develop. 2015-05-27 04:00:13 +01:00
Ted John
6b50667f74 Merge pull request #1153 from jcdavis/asm-fix
Fix compile error for non-windows
2015-05-27 02:36:54 +01:00
Jackson Davis
e394c1d0d3 Fix compile error for non-windows 2015-05-26 18:29:31 -07:00
Ted John
9feec1d7ee Merge pull request #1151 from Gymnasiast/patch-3
Add changes to changelog
2015-05-26 21:06:48 +01:00
IntelOrca
6426adb45d remove asm for set scroll size and add gCurrentAwards 2015-05-26 19:28:56 +01:00
Michael Steenbeek
84516da4a8 Typo 2015-05-26 13:19:54 +02:00
Michael Steenbeek
5e51fc956b Add changes to changelog 2015-05-26 13:18:50 +02:00
Ted John
1fe3bacf43 Merge Localisation/master into OpenRCT2/develop. 2015-05-26 04:00:12 +01:00
Ted John
4bb39fcc9c Merge pull request #1150 from mzmiric5/develop
make libs pre-build step relative to project
2015-05-25 23:21:04 +01:00
Miso Zmiric (Mike Squinter)
858c098da2 make libs pre-build step relative to project 2015-05-25 23:13:01 +01:00
IntelOrca
a85bdf2ba8 Merge branch 'twitch-integration' into develop 2015-05-25 20:38:54 +01:00
Miso Zmiric (Mike Squinter)
c2c9bbf4ef add twitch integration, part 2 2015-05-25 20:38:33 +01:00