Commit graph

6854 commits

Author SHA1 Message Date
Michał Janiszewski
6dbe78b318 Integrate 0x00F1AD14, 0x00F1AD18 2016-03-05 00:40:06 +01:00
IntelOrca
2cd7f2d507 fix warning 2016-03-04 23:12:52 +00:00
Ted John
57052d69f6 Merge pull request #3087 from danidoedel/disable-lightning-effect
Add ability to disable lightning effect, resolves #1299
2016-03-04 22:55:29 +00:00
danidoedel
57b7934b83 Add ability to disable lightning effect, resolves #1299 2016-03-04 23:13:20 +01:00
Duncan
fc2d48d0bb Merge pull request #3079 from Wirlie/develop
Fix a miscalculation on the track cost (Fixes #3074)
2016-03-04 18:08:46 +00:00
Josue Acevedo
cf8bb1971c add myself to contributors
[ci skip]
2016-03-03 23:13:15 -06:00
OpenRCT2 git bot
9ef4af548b Merge Localisation/master into OpenRCT2/develop. 2016-03-04 04:00:15 +00:00
Josue Acevedo
ff87b90b8f Make code more clean.
Removed an unnecessary "else" code and a unnecessary division with the variable cost.
2016-03-03 17:40:44 -06:00
duncanspumpkin
1033e988d3 Fix #2887. Queues now correctly invalidate when breaking a chain 2016-03-03 22:01:11 +00:00
IntelOrca
4c6c354093 fix unable to place entrance / exit as a client 2016-03-03 21:53:07 +00:00
Josue Acevedo
df5670e097 Fix a miscalculation on the track cost (Fixes #3074) 2016-03-03 14:57:44 -06:00
IntelOrca
6ec5fc8cec fix #3075: default inspection Interval does not work when building track designs 2016-03-03 17:39:11 +00:00
Ted John
1867ddf281 Merge pull request #3076 from kexplo/feature/fix-osx-hangul-ime
Fix a bug that cannot delete characters after typing korean on osx
2016-03-03 15:14:57 +00:00
Marijn van der Werf
93b190b54d Clean up asserts 2016-03-03 14:38:11 +01:00
Chanwoong Kim
f05da9d312 Disactive IME when text input ends 2016-03-03 22:34:08 +09:00
Chanwoong Kim
6df34c13aa Fix a bug that IME did not disappeared after typing korean on osx 2016-03-03 22:34:06 +09:00
Marijn van der Werf
ea87812fe7 Don't store data in 0x9E3D08 2016-03-03 14:33:10 +01:00
Marijn van der Werf
6ce6ad9166 Add comments 2016-03-03 14:33:10 +01:00
Marijn van der Werf
0db00cdc75 Add helper function for retrieving g1 element 2016-03-03 14:33:08 +01:00
Marijn van der Werf
6a368b1960 Update function docblocks 2016-03-03 14:32:28 +01:00
Marijn van der Werf
cfed9fd1c0 Clean up variable declarations 2016-03-03 14:32:28 +01:00
Marijn van der Werf
daee674894 Inline loc_6791B8_6795E4_679A8F_679F73 2016-03-03 14:32:27 +01:00
Marijn van der Werf
d8dbd8decf Use power of two for calculating round level 2016-03-03 14:32:27 +01:00
Marijn van der Werf
99555a1b81 Merge branches and don't use deprecated globals 2016-03-03 14:32:27 +01:00
Marijn van der Werf
32d45d3018 Fix zoom level check 2016-03-03 14:32:27 +01:00
Marijn van der Werf
6e59f2c02b Start code cleanup 2016-03-03 14:32:27 +01:00
Marijn van der Werf
dbd3c4942c Add assert to check whether address is ever reached 2016-03-03 14:32:27 +01:00
Marijn van der Werf
bf7092e2f9 Add comparison function 2016-03-03 14:32:27 +01:00
Marijn van der Werf
859e5cfdde Clena up code 2016-03-03 14:32:27 +01:00
Marijn van der Werf
c84681b8ee Refactor sub_679C4A 2016-03-03 14:32:27 +01:00
Marijn van der Werf
8f50003697 Refactor code 2016-03-03 14:32:26 +01:00
Marijn van der Werf
ce4590f914 Attempt to decompile sub_679C4A 2016-03-03 14:32:26 +01:00
Marijn van der Werf
a0e08146bb Make function uniform and apply fixes 2016-03-03 14:32:26 +01:00
Marijn van der Werf
6a2134896f Decompile zoom level 3 2016-03-03 14:32:26 +01:00
Marijn van der Werf
68229904e1 Decompile zoom level 2 2016-03-03 14:32:26 +01:00
Marijn van der Werf
0519130b94 Complete dpi->zoom_level == 0 2016-03-03 14:32:26 +01:00
Marijn van der Werf
ebb2ab3b0c Decompile dpi->zoom_level == 0 && image->flags & 4 2016-03-03 14:32:26 +01:00
Marijn van der Werf
cdf4b596e4 Implement further 2016-03-03 14:32:26 +01:00
Marijn van der Werf
db7b624b6e Clean up leftmost branch 2016-03-03 14:32:26 +01:00
Marijn van der Werf
8f1c7ff064 Continue decompiling 2016-03-03 14:32:25 +01:00
Marijn van der Werf
5fd4025b9b Decompile first path 2016-03-03 14:32:25 +01:00
OpenRCT2 git bot
da631e9009 Merge Localisation/master into OpenRCT2/develop. 2016-03-03 04:00:16 +00:00
IntelOrca
e4372cca5e fix #3069: unable to edit some rides
Issue caused by ride index being used instead of the ride entry id for get_ride_entry.
2016-03-03 00:17:53 +00:00
IntelOrca
c60e05fc99 add default ride inspection interval option, closes #1455 2016-03-02 19:27:54 +00:00
IntelOrca
d324084fa2 Merge branch 'develop' of https://github.com/OpenRCT2/OpenRCT2 into develop 2016-03-02 19:24:01 +00:00
Ted John
411e98b778 Merge pull request #3061 from kexplo/feature/fix-issue-2221
fix issue #2221
2016-03-02 19:23:41 +00:00
Michael Steenbeek
846d72cc06 Merge pull request #3073 from Wirlie/patch-2
Update contributors.md
2016-03-02 20:21:37 +01:00
IntelOrca
646deebd3a re-order misc options 2016-03-02 19:00:33 +00:00
Ted John
84e387c45e Update ISSUE_TEMPLATE.md
Give original bug checkbox a more meaningful description.
2016-03-02 17:37:37 +00:00
Josue Acevedo
51beed8354 Update contributors.md
I have added me to the list of "translation contributors".
2016-03-02 11:30:18 -06:00