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
Ted John
12d5542861
Merge Localisation/master into OpenRCT2/develop.
2015-05-29 04:00:17 +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
IntelOrca
1ac93e44c9
add twitch integration, part 1
2015-05-25 20:36:40 +01:00
Ted John
b26e546171
Merge Localisation/master into OpenRCT2/develop.
2015-05-25 04:00:14 +01:00
Ted John
b488693a0b
Merge pull request #1147 from trigger-death/fixed-whizzed-images
...
Fixed "whizzed" images #1070
2015-05-25 02:39:57 +01:00
Ted John
08e6285197
Merge pull request #1146 from trigger-death/date-format
...
Added date format to culture options menu
2015-05-25 02:39:34 +01:00
Robert Jordan
7121c8c097
Fixed "whizzed" images #1070
...
In reset_type_to_ride_entry_index_map() we were simply reseting every
up-to but excluding LIM launched (the last ride type)
2015-05-24 16:48:56 -04:00
Robert Jordan
6bc081edca
Added date format to culture options menu
2015-05-24 12:38:07 -04:00
Ted John
ad4436ea4f
Merge pull request #1142 from trigger-death/in-game-object-selection
...
Added in-game object selection
2015-05-24 03:52:53 +01:00
Robert Jordan
ab942236d7
Added in-game object selection
...
New console commands:
- open (opens a window)
- windows (lists windows usable with open)
- load_object (loads the specified obj with the given filename)
- object_count (lists the number of objects in the scenary)
Console commands now have a usage variable.
Use: "open object_selection" for the object selection window.
Once the object selection window is closed, all objects will
automatically be researched whether or not they were already in the base
scenario.
The object selection window will close any other windows when selecting
an object to prevent a crash.
2015-05-23 14:56:54 -04:00
Ted John
36204e5fba
Merge pull request #1137 from Gymnasiast/exit_openrct2
...
Add option to exit OpenRCT2 directly
2015-05-23 15:08:06 +01:00
Gymnasiast
81272f5ab7
Resolved merge conflict
2015-05-23 14:22:24 +02:00
Ted John
d145711d37
Merge Localisation/master into OpenRCT2/develop.
2015-05-23 04:00:13 +01:00
Ted John
51b7c4a880
Merge pull request #1136 from Gymnasiast/patch-2
...
Forgot the change string number
2015-05-23 02:28:32 +01:00
Michael Steenbeek
89b0f81bfc
Forgot the change string number
2015-05-23 02:43:38 +02:00
Ted John
27d8990017
Merge pull request #1132 from Gymnasiast/unlock-all-prices
...
Add cheat to unlock both entry and ride prices, reordered misc tab on cheats window
2015-05-23 01:26:57 +01:00
Gymnasiast
0a093be3b1
Resolve merge conflict
2015-05-23 02:24:07 +02:00
Gymnasiast
7868d19522
Add option to exit Openrct2
2015-05-23 02:21:05 +02:00
Ted John
6f3e389c2f
Merge pull request #1134 from trigger-death/testing_improvements
...
Testing Improvements
2015-05-22 22:51:58 +01:00
Robert Jordan
37221f0aae
Testing Improvements
...
Added test_unfinished_tracks and no_test_crashes
Both are enablable through the console and test_unfinished_tracks is
also an option.
Increased options window height.
Made it so "out" ride window is opened after a crash instead of RCT2's
ride window.
ride_is_valid_for_open has a counterpart: ride_is_valid_for_test
2015-05-22 14:18:48 -04:00
IntelOrca
d0a50c43f4
fix #1129
2015-05-22 13:49:18 +01:00
IntelOrca
fdb19e677c
update changelog
2015-05-22 13:18:36 +01:00
Ted John
93ad445c1e
Merge pull request #1131 from Gymnasiast/patch-1
...
Create changelog.txt
2015-05-22 13:17:55 +01:00
Gymnasiast
121052b807
Add cheat to unlock both entry and ride prices, reordered misc tab on cheats window
2015-05-22 12:41:22 +02:00
Michael Steenbeek
caab911dc0
Create changelog.txt
2015-05-22 11:10:26 +02:00
Ted John
05d709143c
Merge Localisation/master into OpenRCT2/develop.
2015-05-22 04:00:13 +01:00
IntelOrca
0013310f0d
add hardware display
2015-05-22 03:17:46 +01:00
Ted John
25c5c8cbaa
Merge pull request #1124 from jcdavis/69A3A2
...
69A3A2: ride_update_satisfaction
2015-05-21 21:22:31 +01:00
