1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Commit Graph

6658 Commits

Author SHA1 Message Date
duncanspumpkin
ea056665a2 Fix #3113. Issue caused by incorrect assumption. Globals still in use 2016-03-08 20:25:41 +00:00
Ted John
09f0caf8c1 Merge pull request #3111 from janisozaur/ride-type
Be more careful when dealing with hacked rides. Fix #3109
2016-03-08 18:33:29 +00:00
IntelOrca
1c36392f8d fix #3115: Not able to create Themes - Missing folder
- Create the themes directory before saving a theme.
2016-03-08 18:03:07 +00:00
Michael Steenbeek
e6345c78e8 Merge pull request #3110 from Nubbiy/patch-1
Added myself as a contributor
2016-03-08 08:57:30 +01:00
OpenRCT2 git bot
50ef184772 Merge Localisation/master into OpenRCT2/develop. 2016-03-08 04:00:15 +00:00
Michał Janiszewski
02c5ece7b7 Be more careful when dealing with hacked rides. Fix #3109 2016-03-07 23:03:35 +01:00
Nubbiy
a20d1dc373 Added myself as a contributor
Added my name in the translation section as a Swedish translator/maintainer
2016-03-07 22:53:06 +01:00
IntelOrca
b8edcd50e1 fix #3107: Number of sold items is reset after some time
Number of sold items was being overwritten by a memmove on the field before it.
Queue time changed to only be drawn for rides.
2016-03-07 21:34:26 +00:00
Ted John
072aaa1451 Merge pull request #3105 from Overv/develop
Fix thunderstorm visuals being tied to sound update function (fixes #3088)
2016-03-07 20:37:43 +00:00
Alexander Overvoorde
76a65ee4dd Fix thunderstorm visuals being tied to sound update function (fixes #3088) 2016-03-07 20:38:22 +01:00
IntelOrca
e7d88416f4 fix #2850: Theme window is glitchy 2016-03-07 19:15:49 +00:00
duncanspumpkin
ff6bfdced3 Revert #3104. Fix #3100 2016-03-07 19:04:48 +00:00
Ted John
86206d83c5 Merge pull request #3104 from Wirlie/develop
Fixes #3100
2016-03-07 17:28:02 +00:00
Josue Acevedo
21c55fda03 Fix a bug that prevents connect footpaths to ride.
Fix a bug that prevents connect footpaths to the ride entrance/exit with multiple stations (Fixes #3100).
2016-03-07 10:18:53 -06:00
Michael Steenbeek
816828b834 Merge pull request #3103 from AaronVanGeffen/develop
Another one for the contributor list
2016-03-07 14:08:24 +01:00
Aaron van Geffen
c177e07704 Added myself to the list of contributors.
[ci skip]
2016-03-07 22:03:39 +09:00
Michael Steenbeek
98b026062b Merge pull request #3102 from octaroot/develop
add myself to contributors
2016-03-07 12:20:12 +01:00
Martin Černáč
97c7470274 add myself to contributors 2016-03-07 12:08:21 +01:00
OpenRCT2 git bot
b6c8917b3a Merge Localisation/master into OpenRCT2/develop. 2016-03-07 04:00:18 +00:00
OpenRCT2 git bot
25e536bb1c Merge Localisation/master into OpenRCT2/develop. 2016-03-06 04:00:13 +00:00
IntelOrca
45db398257 invalidate tile after modification in tile inspector 2016-03-05 23:39:49 +00:00
IntelOrca
bb7765fedf fix #2935: Construction window doesn't close automatically in multiplayer 2016-03-05 13:11:06 +00:00
IntelOrca
a99a2f0cf4 fix command line hosting of scenario files 2016-03-05 12:20:02 +00:00
Ted John
4c60c124c9 Merge pull request #3089 from janisozaur/integrate
Integrate 0x00F1AD14, 0x00F1AD18
2016-03-05 11:22:34 +00:00
Ted John
ad9124b8bf Merge pull request #3095 from telk5093/patch-4
Make chat history's line height to 15px
2016-03-05 11:21:36 +00:00
Ted John
822b3b8303 Merge pull request #3094 from janisozaur/assert
Remove unnecessary assert()
2016-03-05 11:20:53 +00:00
TELK
7f24629962 Update chat.c 2016-03-05 19:24:25 +09:00
TELK
d3e8a3e866 Update chat.c 2016-03-05 19:19:58 +09:00
Michał Janiszewski
c84e9fd943 Remove unnecessary assert() 2016-03-05 10:58:27 +01:00
OpenRCT2 git bot
dcf248a1d4 Merge Localisation/master into OpenRCT2/develop. 2016-03-05 04:00:14 +00:00
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
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
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