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

2454 Commits

Author SHA1 Message Date
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
b488693a0b Merge pull request #1147 from trigger-death/fixed-whizzed-images
Fixed "whizzed" images #1070
2015-05-25 02:39:57 +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
Gymnasiast
81272f5ab7 Resolved merge conflict 2015-05-23 14:22:24 +02:00
Michael Steenbeek
89b0f81bfc Forgot the change string number 2015-05-23 02:43:38 +02: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
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
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
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
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
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
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
Ted John
a27a516e30 Merge pull request #1112 from trigger-death/sprite-build-command
Sprite build command
2015-05-21 01:45:30 +01:00
Ted John
18e1a53e42 Merge pull request #1117 from zsilencer/stuff
fix #1101 and reorganize the tune lists
2015-05-21 01:36:53 +01:00
IntelOrca
c0079919b4 implement user_string_allocate 2015-05-21 01:35:24 +01:00
zsilencer
86ce94f8e9 fix #1101 and reorganize the tune lists 2015-05-20 18:25:26 -06:00
Ted John
e2b53ddca6 Merge pull request #1115 from duncanspumpkin/fix_bugs
Fix #1103 and #483
2015-05-20 21:23:54 +01:00
IntelOrca
776c85db74 allow localisation of digit seperator and decimal point 2015-05-20 20:11:50 +01:00
Robert Jordan
ac17b52139 g2.dat is now updated every build.
data/g2.dat is now ignored.
2015-05-20 14:20:24 -04:00
Duncan Frost
d3587c2fc5 Fix #1103 and #483
Measurement close is now correctly called when the ride measurement window is closed.
When quiting a scenario tool_cancel is called to also reset the scnery selection mode
2015-05-20 19:18:54 +01:00
Robert Jordan
0a3d2b949c sprite build now uses parameters
Added batch file to build g2.dat
2015-05-20 13:17:08 -04:00
Ted John
56c3647215 Merge pull request #1114 from trigger-death/fix-tooltips
Fixed tooltip issue #1053
2015-05-20 17:54:29 +01:00
Robert Jordan
dc38087f07 Fixed tooltip issue #1053
Tooltips should now behave more like RCT2.
2015-05-20 12:53:02 -04:00
Robert Jordan
06449648b3 Possibly fixed issue #1056
Only resizes GUI and windows if not minimized.
2015-05-20 11:58:43 -04:00
Robert Jordan
c7e3639663 Sprite build command
build uses ../../data/g2.dat and all numbered images in
../../resources/g2/.
No other parameters needed.
Also changed speed button hyper arrows to support game speeds inbetween
4 and 8.
2015-05-20 11:52:40 -04:00
IntelOrca
1339c9b493 fix console caret typo and invalidate screen on variable change 2015-05-20 02:37:44 +01:00
IntelOrca
1fd7bd255f Merge branch 'develop' of https://github.com/trigger-death/OpenRCT2 into trigger-death-develop 2015-05-20 02:31:17 +01:00
Robert Jordan
0fbeb9214e Finished improvements to console
Added commands: variables, get, and set
Added console scrolling
set console_small_font 1 will change the console font
Fixed issue with textinput incrementing the length twice in shared.c
2015-05-19 21:12:09 -04:00
IntelOrca
d6e27c8241 fix #1097 2015-05-20 01:10:53 +01:00
Duncan Frost
ebcb4ba480 Refactor and bug fix of scenery removal.
Looks like I might have introduced a bug during my last refactor due to using the same name for multiple variables.
2015-05-19 22:08:51 +01:00
Duncan Frost
5e1ec9134d Fix #1102
Fixed tracks from failing to save due to mistake in reversing.
2015-05-19 21:22:09 +01:00
Robert Jordan
61474ecd9a Progress on console 2015-05-19 13:46:05 -04:00
Duncan Frost
2d956d2fc6 Fix rides been on displaying incorrectly 2015-05-19 18:35:02 +01:00
Duncan Frost
b681c98505 Fix #1099.
The middle news item was not being reset to empty as news update is not called when there is no news. Added in a reset when opening the bottom toolbar.
2015-05-19 18:04:58 +01:00
Duncan Frost
3008d56851 Fix #1098.
Forgot to increment the mapElement after during loop.
2015-05-19 17:41:32 +01:00