mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,581 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

7581 Commits

Author SHA1 Message Date
Ted John 1e4a8d6fba Merge pull request #3701 from IntelOrca/paint/magic-carpet 
Paint Magic Carpet ride
 2016-05-22 10:18:32 +01:00
duncanspumpkin 0e38c5a2d1 Fix low scenery items drawing box 2016-05-22 07:32:23 +01:00
OpenRCT2 git bot 804568f3c8 Merge Localisation/master into OpenRCT2/develop. 2016-05-22 04:00:20 +00:00
Ted John 0d4ec74ef0 Merge pull request #3700 from marijnvdwerf/paint-setup/virginia-reel 
Paint virginia reel
 2016-05-22 01:42:56 +01:00
Ted John 229d0915db add sprite ID constants 2016-05-22 01:36:49 +01:00
Ted John 5ceba87e5b integrate magic carpet draw data 2016-05-22 01:19:14 +01:00
Ted John e84c0d1c5a draw magic carpet vehicle 2016-05-22 01:02:49 +01:00
Marijn van der Werf 783715cc7b Fix wrong height of station covers 2016-05-22 01:26:20 +02:00
Marijn van der Werf c4d2a3f7ae Draw station 2016-05-22 01:26:20 +02:00
Marijn van der Werf e95aefe15c Draw 3-tile turns 2016-05-22 01:26:20 +02:00
Marijn van der Werf 0ff972a0d6 Draw 1-tile turns 2016-05-22 01:26:20 +02:00
Marijn van der Werf b8218a0546 Draw upwards/downwards track 2016-05-22 01:26:20 +02:00
Marijn van der Werf 914a320dae Draw up-flat / flat-down 2016-05-22 01:26:20 +02:00
Marijn van der Werf 447dc19db5 Draw flat-up / down-flat 2016-05-22 01:26:19 +02:00
Marijn van der Werf 0522241b01 Draw flat track 2016-05-22 01:26:19 +02: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
Marijn van der Werf 60bdda7b72 Add empty paint functions 2016-05-21 23:18:56 +02: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