Commit graph

7516 commits

Author SHA1 Message Date
Ted John
e84c0d1c5a draw magic carpet vehicle 2016-05-22 01:02:49 +01:00
Ted John
98ebf66d15 paint magic carpet pendulum and refactor 2016-05-22 00:00:48 +01:00
Ted John
b1a652dc8c draw magic carpet frame 2016-05-21 23:35:39 +01:00
Ted John
9afdd0494e add original paint swap mechanism 2016-05-21 22:14:32 +01:00
Marijn van der Werf
3c1366eefd Draw swinging inverter ship (#3698) 2016-05-21 18:31:31 +01:00
Marijn van der Werf
8442de943d Paint Twist (#3694) 2016-05-21 18:30:11 +01:00
Ted John
d3b1254c22 Merge pull request #3687 from janisozaur/json-groups
Store groups as json
2016-05-21 16:48:21 +01:00
Michał Janiszewski
5e8867175b Fix crash on malformed permission name 2016-05-21 17:33:57 +02:00
Michał Janiszewski
8066ed6ecc Format to break long lines in network.cpp
[ci skip]
2016-05-21 17:33:50 +02:00
Marijn van der Werf
1374e9f257 Draw proper tunnels for Mini Golf hole E (#3696) 2016-05-21 16:12:12 +01:00
Ted John
8c5e5ecc01 implement paint motion simulator 2016-05-21 16:07:29 +01:00
Michał Janiszewski
bf24f5eef8 Use human-readable names for storing permissions 2016-05-21 16:23:20 +02:00
Michał Janiszewski
9d90a88461 Store groups as json 2016-05-21 14:54:00 +02:00
Ted John
4739eb2716 add variable macro for gPaintInteractionType 2016-05-21 13:24:51 +01:00
Marijn van der Werf
9154c9755d Draw Space Rings (#3692) 2016-05-21 13:20:02 +01:00
Ted John
fe23222d75 fix #3691: Swamp goo animates faster compared to RCT2 2016-05-21 13:16:56 +01:00
Ted John
ec04438b0d Merge pull request #3220 from marijnvdwerf/paint-setup/mini-golf
Paint Mini Golf
2016-05-21 12:10:02 +01:00
Marijn van der Werf
d4e9faaed0 Share enum for floors 2016-05-21 12:21:56 +02:00
Marijn van der Werf
f7b56da726 Draw hole E 2016-05-21 12:21:56 +02:00
Marijn van der Werf
90b22f0178 Draw hole D 2016-05-21 12:20:58 +02:00
Marijn van der Werf
97083cacad Draw holes A, B, C 2016-05-21 12:19:53 +02:00
Marijn van der Werf
4bd8049969 Draw corners 2016-05-21 11:39:33 +02:00
Marijn van der Werf
a38050da28 [fixup] right slopes 2016-05-21 11:39:32 +02:00
Marijn van der Werf
ae1a25a5ae Draw station 2016-05-21 11:39:32 +02:00
Marijn van der Werf
5c4f9c0e65 Draw upwards to flat track 2016-05-21 11:39:32 +02:00
Marijn van der Werf
e4e2506069 Draw flat to upwards track 2016-05-21 11:39:32 +02:00
Marijn van der Werf
73a07a33e5 Draw upwards slope 2016-05-21 11:39:32 +02:00
Marijn van der Werf
ed137f6fb8 Paint flat track 2016-05-21 11:39:32 +02:00
Marijn van der Werf
77bab8cd73 Rebase branch 2016-05-21 11:39:32 +02:00
OpenRCT2 git bot
2eeb20cb83 Merge Localisation/master into OpenRCT2/develop. 2016-05-21 04:00:20 +00:00
Ted John
25ac99e04a add variable for gS6Info 2016-05-20 23:26:19 +01:00
Ted John
781c422c76 integrate tick variables 2016-05-20 22:56:45 +01:00
Ted John
74d9ca4814 Merge pull request #3684 from marijnvdwerf/paint-setup/boat-ride
Paint boat ride
2016-05-20 22:31:09 +01:00
Martin Černáč
4d5b9c97fd Fix #3685. Also refactor related enum value. (#3686) 2016-05-20 22:29:33 +01:00
Marijn van der Werf
48935db3bf Draw quarter turns 2016-05-20 21:38:15 +02:00
Marijn van der Werf
be666436f5 Draw pier 2016-05-20 21:38:14 +02:00
Marijn van der Werf
790966d928 Draw flat track 2016-05-20 21:38:13 +02:00
Marijn van der Werf
c43e3ee471 Draw pirate ship (#3682) 2016-05-20 20:25:13 +01:00
Marijn van der Werf
8c6f248b41 Paint Enterprise (#3680) 2016-05-20 20:24:43 +01:00
Ted John
73e5d9d431 fix #3683: Clock Scenery Not Showing Correct Time 2016-05-20 20:23:45 +01:00
Martin Černáč
4944fe1836 Fix a Copy-paste induced mistake (#3679) 2016-05-20 09:49:08 +01:00
Ted John
9a09cb5dad Merge pull request #3639 from zsilencer/paint-setup/scenery
Decompile scenery_paint
2016-05-20 08:12:26 +01:00
Marijn van der Werf
8fbc3b72de Draw Lift (#3677) 2016-05-20 08:11:19 +01:00
Marijn van der Werf
b8383af253 Paint launched freefall (#3678) 2016-05-20 08:11:04 +01:00
Ted John
00aeaaff7e Merge pull request #3664 from marijnvdwerf/paint-setup/mini-helicopters
Paint mini helicopters
2016-05-20 08:09:36 +01:00
Marijn van der Werf
6cc35eb09d Fix #3674: Ferris Wheel rendering (#3676) 2016-05-20 08:09:23 +01:00
OpenRCT2 git bot
02152ae70e Merge Localisation/master into OpenRCT2/develop. 2016-05-20 04:00:17 +00:00
Marijn van der Werf
f015a9ae28 Refactor 3-tile turn 2016-05-20 01:00:38 +02:00
Marijn van der Werf
87f60b6ba4 Refactor 1-tile corner drawing 2016-05-20 01:00:38 +02:00
Marijn van der Werf
915c3a52b6 Fix indentation 2016-05-20 00:59:16 +02:00