mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,039 Commits 7 Branches 39 Tags 354 MiB
Commit Graph

3039 Commits

Author SHA1 Message Date
Michael Steenbeek e17986fbd6 Merge pull request #12 from IntelOrca/develop 
Fast forward
 2015-05-12 14:29:58 +02:00
Ted John 8d57305bb3 Merge pull request #1051 from trigger-death/develop 
Last windowed size is now remembered
 2015-05-11 21:57:34 +01:00
Robert Jordan 37ff266fc6 Only checks window size during platform_resize() now 
Removed platform_update_config_window_size()
 2015-05-11 14:51:13 -04:00
Robert Jordan 40efb2c0d6 Last windowed size is now remembered 
Added funciton platform_update_config_window_size() to shared.c
Window size is not updated if the window is maximized
 2015-05-11 14:33:24 -04:00
Ted John 09c05d95b1 Merge pull request #1050 from trigger-death/develop 
Added option for random title music in main menu
 2015-05-11 18:26:04 +01:00
Robert Jordan b49676a887 Added option for random title music in main menu 
Added STR_5126 to UK and US languages
rand() is seeded in rct2_init()
 2015-05-11 13:17:33 -04:00
Robert Jordan d8f30b94b2 Merge pull request #1 from IntelOrca/develop 
Update from original
 2015-05-11 12:05:31 -04:00
Ted John ea30e0986f Merge pull request #1045 from trigger-death/develop 
#1044
 2015-05-11 16:57:20 +01:00
Robert Jordan 9e5cb40ab4 Added INPUT_FLAG_VIEWPORT_SCROLLING check 
Before it was checking if any flags were set, and not just
INPUT_FLAG_VIEWPORT_SCROLLING.
 2015-05-08 12:14:10 -04:00
Ted John 85daa7c5ac Merge pull request #1047 from duncanspumpkin/fix_scenery_bugs 
Fix scenery bugs
 2015-05-07 22:01:49 +01:00
Robert Jordan e8faa5e304 Forgot viewport_interaction 2015-05-07 14:31:34 -04:00
Robert Jordan c25ef45827 Named 2 input flags, and dropdown fix 
Named INPUT_FLAG_1 to INPUT_FLAG_DROPDOWN_STAY_OPEN
Named INPUT_FLAG_2 to INPUT_FLAG_DROPDOWN_MOUSE_UP

placed RCT2_ADDRESS_INPUT_FLAGS where valid and replaced all bitwise
references to it with appropriate input flags.

Changed ride view dropdown to hold only as it should be.
 2015-05-07 14:31:11 -04:00
Duncan Frost a768d3dc96 Fix large scenery removal bug. 
Issue was caused by comparing the height value to the wrong number. I've rejigged the function to make it easier to follow and added in an error message if an element fails to be found.
 2015-05-07 19:16:00 +01:00
Duncan Frost 6b8709aed0 Scenery now works correctly in scenario editor 
There were a couple bugs that were causing functions to return unsuccessful if you were in scenario editor.
 2015-05-07 18:57:14 +01:00
Robert Jordan 1b269675d8 #1044 
Fixed drop downs not staying open and music dropdown not working first
time after game opened.
 2015-05-07 11:37:49 -04:00
Ted John d9cd873ad7 Merge pull request #1043 from zsilencer/develop 
bugs
 2015-05-07 13:46:14 +01:00
zsilencer bcad8c200e #1042 2015-05-06 19:15:00 -06:00
zsilencer 9296cfd334 fix audio panning 2015-05-06 19:15:00 -06:00
Ted John 6fcc2853f9 Merge pull request #1041 from duncanspumpkin/bugs 
Fix bugs in viewport interaction and loadsave dialog
 2015-05-05 19:39:17 +01:00
Duncan Frost 503b330eb8 Fix bugs in viewport interaction and loadsave dialog 
Part of the issue was comparing an int litteral when it should have been a short but the main issue was due to a wrong mask in the viewport interaction code.
Loadsave MS dialog box should now work correctly.

Fixes #1040.
Fixes #1039.
 2015-05-05 19:11:35 +01:00
Ted John eedce459cb Merge pull request #1026 from Garogolun/proc-688217 
Viewport interaction
 2015-05-03 15:40:23 +01:00
Timmy Weerwag d09a6249ff Renamed sub_688697 to store_interaction_info 2015-05-03 13:54:08 +02:00
Timmy Weerwag 10c4722a86 Deciphered flags and z param of get_map_coordinates_from_pos 2015-05-03 13:54:08 +02:00
Timmy Weerwag 5f7c7828a5 Despaghettified sub_68862C 2015-05-03 13:47:58 +02:00
Timmy Weerwag 002619c1f6 Decompiled 68862C and 688697 2015-05-03 13:47:58 +02:00
Timmy Weerwag 591fbb6dd1 Deciphered table at 0x0098185C 2015-05-03 13:47:57 +02:00
Timmy Weerwag d6fd030702 Decompiled sub_688217 2015-05-03 13:47:56 +02:00
Ted John f83047c8ba Merge pull request #1036 from duncanspumpkin/fix_inline_sprite 
Fix inline sprite colours.
 2015-05-01 23:25:31 +01:00
Duncan Frost 937e4f2e05 Fix inline sprite colours. 
There was a small mistake in inline sprites that would cause the colour variable to be masked out when displayed.
 2015-05-01 17:38:39 +01:00
Ted John 3ba5522cea Merge pull request #1035 from JarnoVgr/develop 
Corrected installer version & added basic support for downgrading
 2015-05-01 12:00:36 +01:00
JarnoVgr ac6a32ba81 Add basic support for installer downgrading 2015-05-01 11:39:00 +02:00
JarnoVgr 1d650523e2 Corrected installer version number 2015-05-01 11:33:10 +02:00
Ted John 8ebf027256 Merge pull request #1033 from duncanspumpkin/scenery_bugs 
Scenery secondary colour bug
 2015-04-30 17:14:07 +01:00
Duncan Frost ebf9bb67ec Fix #1032 scenery secondary colour 
Forgot to pass the colour variable to the create scenery command.
 2015-04-30 17:02:21 +01:00
Ted John 6b3b1c9284 Merge pull request #1031 from Gymnasiast/patch-1 
Fix land tool size staying in window after unselect land ownership tool
 2015-04-29 18:25:33 +01:00
Michael Steenbeek d21cc0f731 Add extra comment 2015-04-29 12:09:52 +02:00
Michael Steenbeek 67656a46a9 Fix land tool size staying in window after unselect land ownership tool 2015-04-29 12:03:18 +02:00
Ted John d50a297981 Merge pull request #1028 from duncanspumpkin/bugs 
Bug Fixes
 2015-04-29 01:49:02 +01:00
Duncan Frost 1728aebb8c Fix #958. 
Issue was caused by an old bit of code that had been added in the force weather cheat to keep it sunny for longer before realising how the climate operated correctly. Instead now it sets the weather to the desired value and starts a normal amount of waiting time before returning to the normal weather cycle.
 2015-04-28 17:11:46 +01:00
Duncan Frost 0816a5fdf5 Fix footpath bit placement failing. 
Fixes #1025
 2015-04-28 17:07:36 +01:00
Ted John 54cf1c4371 Merge pull request #1009 from zsilencer/develop 
Decompile 6CB7FB, 6B49D9, 6C0BB5, 6C09D1, 6C0B83
 2015-04-28 15:07:09 +01:00
zsilencer 71e21c2a6c refactor mixer, add support for streamed music 2015-04-25 09:28:28 -06:00
zsilencer 3b416a646e create_new_banner done by duncanspumpkin 2015-04-25 09:21:35 -06:00
zsilencer a8a434e261 game_command_place_banner 2015-04-25 09:21:35 -06:00
zsilencer c40a6f4789 game_command_remove_banner 2015-04-25 09:21:11 -06:00
zsilencer b8657da99f game_command_set_banner_colour 2015-04-25 09:21:11 -06:00
zsilencer 4379df67c4 game_command_set_large_scenery_colour 2015-04-25 09:21:11 -06:00
zsilencer 1782a62055 game_command_set_fence_colour 2015-04-25 09:21:11 -06:00
zsilencer e7d3d8b19d game_command_set_scenery_colour 2015-04-25 09:21:11 -06:00
zsilencer ed709b8353 game_command_remove_large_scenery 2015-04-25 09:21:11 -06:00