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
Robert Jordan
dbc1df308f
Issues with Dropdown text
2015-05-29 16:42:57 -04:00
Robert Jordan
dc1e38180e
Starting work on colour schemes config settings
2015-05-29 12:04:53 -04:00
Robert Jordan
16105af1e7
Progress on window colour schemes
2015-05-26 16:59:25 -04: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
Ted John
3f71502718
Merge pull request #1107 from zsilencer/decompiling
...
game_command_place_scenery
2015-05-21 21:20:22 +01:00
Ted John
4f4ecba402
Merge pull request #1125 from Gymnasiast/patch-1
...
Declare window_invalidate_all()
2015-05-21 20:09:04 +01:00
Michael Steenbeek
2a7926915c
Declare window_invalidate_all()
2015-05-21 19:44:10 +02:00
Jackson Davis
095fbfa21d
69A3A2: ride_update_satisfaction
2015-05-21 10:00:04 -07:00
Ted John
2ed1963d96
Merge pull request #1123 from Gymnasiast/powered-launch-availability
...
Allow both types of powered launch on every RC that supported one of them
2015-05-21 16:45:10 +01:00
Ted John
e4f8805999
Merge pull request #1121 from Gymnasiast/rct1-colour-scheme-button3
...
Add GUI option for switching to the RCT1 colour scheme
2015-05-21 16:43:47 +01:00
Gymnasiast
4a4e6a3b4f
Allow both types of powered launch on every RC that supported one of them.
2015-05-21 14:58:17 +02:00
Gymnasiast
36ccfe77e0
Add GUI option for switching to the RCT1 colour scheme, along with proper invalidation of the affected windows
2015-05-21 12:28:51 +02:00
Ted John
66b47d3339
Merge Localisation/master into OpenRCT2/develop.
2015-05-21 04:00:13 +01:00
IntelOrca
6135b9204d
fix #1118
2015-05-21 03:11:53 +01:00
IntelOrca
bdd712bc4b
fix config parsing bug
2015-05-21 02:52:32 +01:00
zsilencer
28c2451d97
move data into code, cleanup
2015-05-20 19:21:13 -06:00
zsilencer
9ee4b64fa1
game_command_place_scenery
2015-05-20 19:21:13 -06:00
IntelOrca
22212df32a
fix user error
2015-05-21 01:51:48 +01:00
