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

4682 Commits

Author SHA1 Message Date
duncanspumpkin 9017e5ff86 Fix #1899. Prevent mountain tool from being possible for land ownership tool. 2015-10-04 20:44:17 +01:00
duncanspumpkin 7297fc86e9 Fix #2029. Issue with 1x1 land ownership tool 2015-10-04 20:22:50 +01:00
Alexander Overvoorde af6a6bb8be Rewrite platform_is_steam_overlay_attached for Unix to detect all possible situations 2015-10-04 16:43:22 +02:00
Alexander Overvoorde 84bf968b23 Fix flags in dlopen call for steam overlay check 2015-10-04 15:46:15 +02:00
Ted John 928ef24684 Merge Localisation/master into OpenRCT2/develop. 2015-10-04 04:00:17 +01:00
xperia64 9124d0257a Use wget to get orctlibs.zip 2015-10-03 22:36:47 -04:00
Ted John c1ecf3c531 Merge pull request #2024 from duncanspumpkin/set_land_ownership 
Implemented game_command_set_land_ownership.
 2015-10-04 01:06:29 +01:00
duncanspumpkin 625e051d35 Fix #2025. Issue caused by failing to check if coordinates outside of map 2015-10-04 00:35:26 +01:00
duncanspumpkin 3f77a6778a Implemented game_command_set_land_ownership. 
Refactored map buy land rights for tile as it was partially broken and used a very odd style.
 2015-10-04 00:07:22 +01:00
Alexander Overvoorde 8321b14a33 Link with libdl 2015-10-04 00:10:55 +02:00
Duncan 930d5dd129 Merge pull request #2021 from janisozaur/docker 
Use OpenRCT2's docker repository
 2015-10-03 22:47:25 +01:00
Alexander Overvoorde f6b7121c23 Implement platform_is_steam_overlay_attached for unix 2015-10-03 23:10:56 +02:00
Alexander Overvoorde 51377fc960 Add setting for Steam overlay pausing and add extra check 2015-10-03 23:10:56 +02:00
Alexander Overvoorde c03cec721e Add Steam overlay detection that pauses the game (#1903) 
The Steam overlay is detected by checking if the center pixel of
the framebuffer is changed between rendering and presenting to the
screen. This happens when the Steam overlay draws the gray fade on
the screen.

This does not affect other overlays like FRAPS, MSI Afterburner and
OBS overlays that don't obstruct the center of the screen.
 2015-10-03 23:10:56 +02:00
Duncan 7e8ed696a0 Merge pull request #2019 from zsilencer/develop 
fix #2009
 2015-10-03 22:04:55 +01:00
Duncan 38df2db696 Merge pull request #2020 from ccfreak2k/develop 
Fixed typo of peep_udpate_ride_sub_state_13
 2015-10-03 22:04:32 +01:00
Michał Janiszewski 81925af219 Use OpenRCT2's docker repository 2015-10-03 22:50:50 +02:00
Andrew Waters b77e8f5146 Fixed typo of peep_udpate_ride_sub_state_13 2015-10-03 13:39:15 -07:00
zsilencer 7aebdcd534 fix #2009 2015-10-03 13:22:59 -06:00
Ted John 6228c782da Merge pull request #2016 from HaasJona/debug_createrenderer 
Handle SDL_CreateRenderer error
 2015-10-03 19:31:13 +01:00
Ted John 68f98663c9 Merge pull request #2018 from HaasJona/addresses 
Define some tick related addresses
 2015-10-03 19:26:04 +01:00
Ted John bac7c7fc4a Merge pull request #1995 from janisozaur/cleanup 
Remove leftover porting hack
 2015-10-03 19:22:53 +01:00
Jonathan Haas 8463e58922 Define some tick related addresses 2015-10-03 20:00:29 +02:00
Jonathan Haas d6a5d78742 Handle SDL_CreateRenderer error 2015-10-03 18:22:05 +02:00
Ted John eec515c9a8 Merge pull request #2011 from janisozaur/speex 
Require speex, use zipped version only when targetting mingw
 2015-10-03 16:39:03 +01:00
Ted John 34d4211c71 Merge pull request #2013 from HaasJona/rename_w_flag 
Rename window flags
 2015-10-03 16:33:40 +01:00
Jonathan Haas ae82ffcd96 Rename window flags 2015-10-03 17:20:53 +02:00
Michał Janiszewski 33857d287b Require speex, use zipped version only when targetting mingw 2015-10-03 15:04:21 +02:00
Ted John 75c964d68c Merge pull request #2008 from Overv/develop 
Change autosave system to use wall-clock time based frequencies (#1960)
 2015-10-03 13:38:39 +01:00
Alexander Overvoorde 377650d9f5 Change autosave system to use wall-clock time based frequencies 
The autosave system will now use frequencies based on wall-clock
time rather than in-game time, for example every 15 minutes. This
frequency is not affected by pausing the game or changing the game
speed. The default frequency is every 5 minutes.
 2015-10-03 14:25:59 +02:00
Duncan 3cd51f6aa5 Merge pull request #2001 from nightroan/develop 
Fixed #1948
 2015-10-03 09:43:04 +01:00
Ted John 494869b22e Merge Localisation/master into OpenRCT2/develop. 2015-10-03 04:00:16 +01:00
nightroan 1963749c58 Fixed #1948 by clearing ebx when setting ride price 2015-10-02 19:14:01 -07:00
nightroan ef186a5ee0 Added name to contributor list 2015-10-02 19:10:54 -07:00
Ted John fe4b4516fd Merge pull request #2006 from zsilencer/develop 
linux fixes
 2015-10-02 23:20:45 +01:00
Ted John 2dfcbd82a1 Merge pull request #2007 from janisozaur/platform 
Platform name
 2015-10-02 23:19:00 +01:00
zsilencer ffee5229b5 fix directories in linux 2015-10-02 14:48:10 -06:00
Michał Janiszewski 8a5d9bf614 Platform name 2015-10-02 21:19:20 +02:00
zsilencer 5793ded423 mouse drag in linux 2015-10-02 09:51:34 -06:00
Ted John a9b3b8fe8e Merge pull request #2003 from JarnoVgr/develop 
Improved support for VS version selector
 2015-10-02 13:31:07 +01:00
Ted John dbeaed692b Merge pull request #2004 from runelaenen/save-ask-filename 
Fix issue 1942
 2015-10-02 13:29:23 +01:00
Rune Laenen 7934e2efd2 Fix issue 1942 2015-10-02 14:16:02 +02:00
JarnoVgr 00949686c2 Improved support for VS version selector 
Version selector defaulted to VS2013 (12.0) instead of VS2015 (14.0).
 2015-10-02 14:04:42 +02:00
Duncan 1590fa730b Merge pull request #2002 from runelaenen/var_2A-outside_of_park 
var_2A to outside_of_park
 2015-10-02 12:53:02 +01:00
Rune Laenen 7ac930c318 errorfix guest_list 2015-10-02 13:49:13 +02:00
Rune Laenen 1b5e55d346 newPeep fix 2015-10-02 13:45:17 +02:00
Rune Laenen 5d75fa4464 var_2A to outside_of_park 2015-10-02 13:41:13 +02:00
Duncan 35dbf5adcf Merge pull request #1998 from duncanspumpkin/place_park 
Implement game_command_place_park_entrance
 2015-10-01 22:04:14 +01:00
duncanspumpkin 33e04b8bd6 Implement game_command_place_park_entrance 2015-10-01 21:24:24 +01:00
Ted John 0da5deff29 Merge pull request #1996 from janisozaur/hooks 
Add hooks for Linux
 2015-10-01 18:39:15 +01:00