mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity
7,425 Commits 8 Branches 59 Tags
9e6df440b5804543df02aa615afd4d5dd22057f4
Commit Graph

7425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OpenRCT2 git bot
9e6df440b5 Merge Localisation/master into OpenRCT2/develop. 2016-05-19 04:00:20 +00:00
Ted John
3fd252a8c3 integrate some staff variables 2016-05-18 23:46:46 +01:00
Ted John
afc54aef63 Merge pull request #3511 from marijnvdwerf/paint-setup/chairlift 
Paint chairlift
 2016-05-18 23:07:19 +01:00
Ted John
48cb0e91e6 remove sub_679074 original check 2016-05-18 22:31:58 +01:00
Marijn van der Werf
a550e2e3b1 Apply suggested corrections 2016-05-18 23:31:37 +02:00
Marijn van der Werf
a32aad2274 Rebase onto develop and fix indentation 2016-05-18 23:28:13 +02:00
Ted John
0265a9c8a5 fix warnings 2016-05-18 22:24:12 +01:00
Marijn van der Werf
464fdc8efe Paint ferris wheel (#3657) 2016-05-18 22:14:41 +01:00
Marijn van der Werf
470f0a9dba Paint haunted house (#3652) 2016-05-18 22:13:53 +01:00
Marijn van der Werf
45df10dfd4 Fix abstract station covers 2016-05-18 23:08:08 +02:00
Marijn van der Werf
4ceb186ebf Implement NE<->SW station 2016-05-18 23:08:08 +02:00
Marijn van der Werf
de8b5b0aaf Finish drawing station for rot 0 and 2 2016-05-18 23:08:08 +02:00
Marijn van der Werf
4173a42060 Refactor station overlay 2016-05-18 23:08:08 +02:00
Marijn van der Werf
e4e9888352 [wip] station 2016-05-18 23:08:08 +02:00
Marijn van der Werf
bc6dd233ec Draw chairlift 2016-05-18 23:08:08 +02:00
Duncan
163c695a13 Merge pull request #3538 from marijnvdwerf/paint-setup/submarine-ride 
Paint Submarine Ride
 2016-05-18 22:06:03 +01:00
Ted John
16dbed03b5 Merge pull request #3498 from marijnvdwerf/paint-setup/wall 
Paint walls/fences
 2016-05-18 22:04:44 +01:00
Marijn van der Werf
1bf9dc26f9 Rename entrance flags to base_image_id 2016-05-18 23:00:26 +02:00
Marijn van der Werf
7c30f89a75 Draw fences underground 2016-05-18 22:57:43 +02:00
Marijn van der Werf
9bcc0d05ed Rebase branch 2016-05-18 22:53:29 +02:00
Marijn van der Werf
c863174814 [fixup] remove monorail stuff 2016-05-18 22:53:29 +02:00
Marijn van der Werf
b07349eae3 Draw ride pier 2016-05-18 22:53:29 +02:00
Marijn van der Werf
98e3eb059a Draw submarine ride track 2016-05-18 22:53:29 +02:00
Ted John
dd03cfc36f integrate more ride entrance / exit place variables 2016-05-18 21:52:39 +01:00
Martin Černáč
3bdc06dc25 Refactor hard-coded strings to use string_ids.h constants (and couple sprites too) (#3658) 2016-05-18 21:51:37 +01:00
Marijn van der Werf
ffa826976c Fix warnings 2016-05-18 22:50:44 +02:00
Marijn van der Werf
c84e23b9ea Clean up code and fix banner drawing 2016-05-18 22:46:24 +02:00
Marijn van der Werf
0a15ccc355 Make construction_markers extern 2016-05-18 22:46:24 +02:00
Marijn van der Werf
679db5e055 Use decompiled construction markers 2016-05-18 22:46:24 +02:00
Marijn van der Werf
aee8607f7a Fix offset for left bottom walls 2016-05-18 22:46:24 +02:00
Marijn van der Werf
bfaa2acf3f Update with changes in develop 2016-05-18 22:46:24 +02:00
Marijn van der Werf
201a01f126 Split up image ids 2016-05-18 22:46:24 +02:00
Marijn van der Werf
44021fdb0a Rename flag 2016-05-18 22:46:24 +02:00
Marijn van der Werf
00d16e7186 tertiaryColour 2016-05-18 22:46:24 +02:00
Marijn van der Werf
000f9cc9b4 Rename dword_141F708 to frameNum 2016-05-18 22:46:24 +02:00
Marijn van der Werf
a71c239b43 Rename dword_141F70C to sceneryEntry 2016-05-18 22:46:24 +02:00
Marijn van der Werf
748ed9ccb0 Update code to use proper function names 2016-05-18 22:46:24 +02:00
Marijn van der Werf
fda7dd6eea Fix fences in direction 0 2016-05-18 22:46:24 +02:00
Marijn van der Werf
564d6b2e12 Refactor other fence function 2016-05-18 22:46:24 +02:00
Marijn van der Werf
78b63b2c6e Refactor one paint function 2016-05-18 22:46:24 +02:00
Marijn van der Werf
ab255ae90d Decompile fence drawing 2016-05-18 22:46:24 +02:00
duncanspumpkin
f1fe46c52c Fix underground track styles. 2016-05-18 21:22:19 +01:00
Martin Černáč
2b6770bfad Fix redundat separator in ride's measurement & test data window tab (#3654) 2016-05-18 21:04:57 +01:00
Matte A
beb8e41056 Use white outlined letters in the console (#3642) 2016-05-18 20:57:11 +01:00
Ted John
d27658ca27 integrate entrance / exit place variables 2016-05-18 20:50:45 +01:00
Marijn van der Werf
5ee6855cdd Paint Merry-go-round (#3653) 2016-05-18 20:48:05 +01:00
Marijn van der Werf
1eb6a529bf Draw flying saucers (#3648) 2016-05-18 20:47:56 +01:00
Marijn van der Werf
811f24bfee Paint 3d cinema (#3651) 2016-05-18 18:18:05 +01:00
Marijn van der Werf
6d6bd0a129 Draw Circus Show (#3649) 2016-05-18 18:16:37 +01:00
Martin Černáč
feed51de27 Add correct tooltip entry for the no. circuits (#3650) 2016-05-18 12:56:30 +01:00