1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Commit Graph

4892 Commits

Author SHA1 Message Date
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
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
Flukiestemperor
c8701ef01e partially fix #2181
create common function
2015-11-03 16:11:11 -06: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
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
duncanspumpkin
428613a804 Fix #2122. Mechanics default to blue and guards yellow. 2015-11-01 20:04:24 +00:00
Duncan
414c94c9e0 Merge pull request #2177 from janisozaur/memory
Fix variable not being shifted
2015-11-01 18:49:32 +00:00
Michał Janiszewski
9a981ef68f Fix variable not being shifted
When decompiled, at 0x6AA8ED, there's `shr edi,0x4`, which is not
reflected in sources.

The `type` without that shift could easily become a value large enough
to point to memory beyond object entries and modify those values. In my
case, it was modifying `RCT2_ADDRESS_OBJECT_LIST_NO_ITEMS` from 2122 to
2123 (by setting lowest bit), which luckily, is used later in
`setup_in_use_selection_flags`. For this reason, I believe it could be a
major source of other problems, possibly also recent `MAP_ANIMATION`
ones, although I haven't checked.

I also put an assert in place to validate type against max available
count.
2015-11-01 18:53:47 +01:00
Ted John
caa5f870c5 Merge pull request #2175 from zsilencer/network
Network
2015-11-01 11:24:04 +00:00
Ted John
0730ece1ec Merge pull request #2176 from HaasJona/Fix2138
Fix Bug #2138
2015-11-01 11:18:31 +00:00
Jonathan Haas
d2ec665ae4 Fix Bug #2138 2015-11-01 09:59:13 +01:00
zsilencer
34dff6f46b address #2073, graceful KickPlayer with message, disconnect reason messages, chat player name and text different color 2015-11-01 01:50:44 -06:00
zsilencer
d18adc80de fix small error 2015-10-31 17:43:36 -06:00
Ted John
aa67539120 Merge pull request #2172 from zsilencer/network
Network
2015-10-31 18:04:13 +00:00
zsilencer
a95357a32d signs and banners editable in multiplayer 2015-10-31 11:07:36 -06:00
zsilencer
6c5acdde6a fix #2161 2015-10-30 19:41:49 -06:00
Duncan
476280cdf3 Merge pull request #2170 from duncanspumpkin/fix_entrance
Fix entrance drawing issue
2015-10-30 23:40:16 +00:00