1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Commit Graph

4649 Commits

Author SHA1 Message Date
duncanspumpkin
59cdff7055 Potential fix to #639.
The scenario name was missing its null to indicate the end of the string. This would cause scenarios to have odd fileNames that are compared against to compare a scenario against the scenario list
2015-10-09 22:11:28 +01:00
Ted John
33655afcf9 Merge pull request #2045 from Gymnasiast/name_peep_flags_5
Name PEEP_FLAGS_5
2015-10-08 12:14:47 +01:00
Gymnasiast
3590b1c1b9 Adjust comment 2015-10-08 10:58:17 +02:00
Gymnasiast
dfd0c52b7e Name PEEP_FLAGS_5 2015-10-08 10:47:14 +02:00
Ted John
bfc776b3dc Merge pull request #2040 from xperia64/develop
Add download function to install.sh that delegates to curl or wget
2015-10-07 23:02:31 +01:00
xperia64
24e13f73a9 Make curl follow redirects 2015-10-07 17:48:46 -04:00
xperia64
6403b0a47f Add download function to install.sh that delegates to curl or wget 2015-10-07 17:23:03 -04:00
Ted John
03c054b072 Merge pull request #2026 from xperia64/develop
Use wget to get orctlibs.zip in install.sh
2015-10-07 12:10:00 +01:00
Ted John
700f0c840f Merge pull request #2036 from zsilencer/decompiling
implement peep_give_real_name
2015-10-07 12:09:22 +01:00
zsilencer
468a6c15fa implement peep_give_real_name 2015-10-06 23:52:37 -06:00
Ted John
06c33dfd8a Merge Localisation/master into OpenRCT2/develop. 2015-10-06 04:00:17 +01:00
Ted John
21c84375f4 Merge Localisation/master into OpenRCT2/develop. 2015-10-05 04:00:16 +01:00
Ted John
a6a8ea7989 Merge pull request #2030 from duncanspumpkin/fix_1720
Ride train count miscalculation.
2015-10-05 00:08:12 +01:00
Ted John
5405cf7efd Merge pull request #2012 from Overv/develop
Add Steam overlay detection that pauses the game (#1903)
2015-10-05 00:07:10 +01:00
duncanspumpkin
cbbc4edd20 Fix #1720. Ride train count misscalculation.
Should now correctly allow more trains when car length reduced
2015-10-04 21:39:02 +01:00
Alexander Overvoorde
609dad157a Optimise Steam overlay check 2015-10-04 22:31:28 +02:00
duncanspumpkin
36917bd75a Fix #1661. Track direction now remembered when deleteing last section 2015-10-04 20:52:27 +01:00
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