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

481 Commits

Author SHA1 Message Date
IntelOrca
1fdf1f57f7 add zoom button images to viewport window 2015-05-31 00:20:42 +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
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
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
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
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
rd3k
3a55c060f7 fix #1163 2015-05-29 20:59:16 +01:00
Robert Jordan
dc1e38180e Starting work on colour schemes config settings 2015-05-29 12:04:53 -04: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
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
Robert Jordan
16105af1e7 Progress on window colour schemes 2015-05-26 16:59:25 -04:00
IntelOrca
6426adb45d remove asm for set scroll size and add gCurrentAwards 2015-05-26 19:28:56 +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
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
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
3f71502718 Merge pull request #1107 from zsilencer/decompiling
game_command_place_scenery
2015-05-21 21:20:22 +01: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
zsilencer
9ee4b64fa1 game_command_place_scenery 2015-05-20 19:21:13 -06: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
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
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
d6e27c8241 fix #1097 2015-05-20 01:10:53 +01: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
Robert Jordan
0a71b633c7 Added game speed button sprites
Also added empty.png to resources to fill in g2 sprites reserved by
other contributors.
2015-05-19 11:51:59 -04:00
Ted John
8f19ecbdef Merge pull request #1094 from trigger-death/new-title-logo
Changed Title Logo
2015-05-19 14:18:22 +01:00
Ted John
8ab5fec68a Merge pull request #1096 from Gymnasiast/increase-num-laps
Increase max circuits to 20 and max number of people in maze to 64
2015-05-19 14:17:50 +01:00
Gymnasiast
257e330503 Increase maximum number of laps to 20 and maximum number of people in maze to 64. 2015-05-19 11:18:08 +02:00