Commit graph

5154 commits

Author SHA1 Message Date
Michael Steenbeek
68aea9740d Update english_uk.txt 2015-11-05 14:43:06 +01:00
Ted John
4f68684e28 Merge pull request #2212 from HaasJona/loc
Fix screen location on resize/alt+tab
2015-11-05 13:38:04 +00:00
Jonathan Haas
3be79fd738 Fix screen location on resize/alt+tab 2015-11-05 10:16:13 +01:00
Michael Steenbeek
b3c8a1d2b7 Correct 'Open new window' 2015-11-05 10:08:08 +01:00
Duncan
36b8c1ce98 Merge pull request #2193 from duncanspumpkin/fix_2082
Fixed #2082. Sub_6D31A6 now working.
2015-11-04 19:43:58 +00:00
Duncan
0f14d33cc6 Merge pull request #2184 from duncanspumpkin/fix_2151
fix #2151.
2015-11-04 19:42:34 +00:00
duncanspumpkin
96a1f0c6f7 Refactor.
Labelled the known flags and used functions for setting and clearing them.
2015-11-04 19:28:45 +00:00
Ted John
c3ec45b25f Add more entries to changelog. 2015-11-04 18:27:33 +00:00
Ted John
e2ce5ee49e Merge pull request #2202 from HaasJona/fixrotation
Fix Bug #2201
2015-11-04 12:06:01 +00:00
Duncan
569a1f34cc Merge pull request #1993 from AaronVanGeffen/develop
Partially fix compilation on OS X
2015-11-04 12:05:28 +00:00
Jonathan Haas
96d71ac174 Fix Bug #2201 2015-11-04 12:51:00 +01:00
Aaron van Geffen
36f5d089df Add OS X as a platform. 2015-11-04 18:57:13 +09:00
Aaron van Geffen
aa0ab945ce Replaced backticks with POSIX style commands. 2015-11-04 18:55:59 +09:00
Aaron van Geffen
c40ed08406 Fix sha256sum generation on OS X. 2015-11-04 18:13:38 +09:00
Ted John
d0836ef63b Merge pull request #2188 from kmdreko/decompile_683359
decompiled sub_683359
2015-11-04 00:19:35 +00:00
kmdreko
2db198e7c4 Remove unneeded call 2015-11-03 18:14:22 -06:00
kmdreko
d951bebf88 move range checks 2015-11-03 18:13:49 -06:00
kmdreko
a35472befe properly format function comment 2015-11-03 18:13:11 -06:00
IntelOrca
a859cdb9c7 Merge branch 'fix-2181' into develop 2015-11-03 23:28:57 +00:00
IntelOrca
0b7544dbce fix error in linux.c and double .config/.config 2015-11-03 23:18:10 +00:00
IntelOrca
800e80aeb3 fix demolish track piece as client on multiplayer 2015-11-03 22:58:30 +00:00
Ted John
6cb91812c6 Merge pull request #2197 from Gymnasiast/changelog-update-0.0.3
Update changelog
2015-11-03 22:32:06 +00:00
Michael Steenbeek
6c6cf27dec Update changelog 2015-11-03 23:30:39 +01:00
IntelOrca
e177be305b allow user data path to be specified by command line, closes #2182
Also changed default path under linux to be ~/.config/OpenRCT2.
2015-11-03 22:20:35 +00:00
Flukiestemperor
c8701ef01e partially fix #2181
create common function
2015-11-03 16:11:11 -06:00
duncanspumpkin
5b54ad18e9 Fixed #2082. Sub_6D31A6 now working.
Small mistake in track previous meant the x/y coordinates didn't match the map element. There were also a few other issues that presented themselves once that was fixed.
2015-11-03 20:03:21 +00:00
IntelOrca
025f36ec28 fix #2187
Title sequence now maintains central position from script if window size changes.
2015-11-03 19:20:32 +00:00
duncanspumpkin
d5688cdc4e Fix #2189. Map owned area not shown correctly.
Issue was caused by doubling up a bit of code and combining it with the next line when implementing it.
2015-11-03 18:19:23 +00:00
duncanspumpkin
9bf40ffd83 Fix #1504. Correct curvature for previous lift hill piece.
Note this is an original bug that is fixed in the GOG version.
2015-11-03 15:20:25 +00:00
duncanspumpkin
bbe2a34714 Fix #2151.
I think this fixes the issue but its hard to understand from the original
issue.
2015-11-03 14:39:33 +00:00
Ted John
dc3542e349 Merge pull request #2119 from e-foley/fix-heartline-twister-airtime-ratings
fix heartline twister airtime ratings
2015-11-03 08:15:09 +00:00
kmdreko
1293325699 decompiled sub_683359 2015-11-02 23:30:48 -06:00
e-foley
5f799ac6c4 contain rating mods in pp directives 2015-11-02 20:23:22 -08:00
Ted John
273293456c Merge Localisation/master into OpenRCT2/develop. 2015-11-03 04:00:16 +00:00
Duncan
08de1cd55e Merge pull request #2166 from janisozaur/security
Security
2015-11-02 22:10:28 +00:00
Michał Janiszewski
a911ff09d0 Some more checks, make sure gVehicleHierarchies are counted properly 2015-11-02 22:58:15 +01:00
Michał Janiszewski
c0e2a5c7be Add get_current_rotation function and DEBUG_LEVEL macros 2015-11-02 22:58:15 +01:00
Michał Janiszewski
be32b5e5f4 Init all fields in audio classes 2015-11-02 22:58:15 +01:00
Ted John
51cdf5bc34 Merge pull request #1714 from janisozaur/news_item_fix
Play sound when message first appears, not later
2015-11-02 21:35:38 +00:00
IntelOrca
a0909a242d fix several safe_strncpy calls 2015-11-02 21:23:01 +00:00
IntelOrca
2c58e1d894 use internal load window for convert saved game to scenario, closes #2121 2015-11-02 21:10:07 +00:00
IntelOrca
45bfdad4e3 fix #1144 2015-11-02 20:43:55 +00:00
duncanspumpkin
4c72710e02 Fix issue introduced in last commit 2015-11-02 20:08:55 +00:00
duncanspumpkin
ddd6b63d09 Fix #2173. Entrance fee too high can no longer be a news item if no money is on.
This is kind of an original bug because the game doesn't check normally to see if money is on during this. I didn't want to reset the entrance fee as then it would be annoying switching between the two states. The peeps don't pay if no money is on so nothing is lost.
2015-11-02 20:03:06 +00:00
duncanspumpkin
eaffec651c Fix #2178. Failure to load a scenario no longer causes intro to be playable. 2015-11-02 19:45:18 +00:00
Ted John
5914558575 Merge pull request #2180 from janisozaur/safe_strncpy
Fixes to safe_strncpy
2015-11-01 22:52:17 +00:00
Michał Janiszewski
0f9bc229b4 Fixes to safe_strncpy
* don't touch memory at all if size passed is 0
* use original address instead of now-changed `destination`
* fix one of the calls having improper size passed
2015-11-01 23:33:02 +01:00
IntelOrca
61b7c77be3 add colour enum 2015-11-01 22:21:46 +00:00
duncanspumpkin
d21e5a3b8c Fix #2136. Issue caused by missing branch. 2015-11-01 21:03:50 +00:00
duncanspumpkin
f1cdc99afc Fix #2079. Scroll windows no longer have incorrect tooltips
There was an issue with forgetting to reset the x/y variable introduced when I fixed a different bug. Possibly fixes #2136
2015-11-01 20:55:54 +00:00