mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 08:12:53 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4685 from marijnvdwerf/fix/paint-5

Browse Source 
Combine Junior RC and Water RC drawing
This commit is contained in:
Ted John
2016-10-25 12:14:03 +01:00
committed by GitHub
parent aef32c0fba e8e2039832
commit 5699b9e4ed
4 changed files with 796 additions and 816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRCT2.xcodeproj/project.pbxproj
View File

@@ -641,6 +641,7 @@
C6B5A7D11CDFE4CB00C9C006 /* S6Exporter.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = S6Exporter.h; sourceTree = "<group>"; };
C6B5A7D21CDFE4CB00C9C006 /* S6Importer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = S6Importer.cpp; sourceTree = "<group>"; };
C6B5A7D31CDFE4CB00C9C006 /* S6Importer.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = S6Importer.h; sourceTree = "<group>"; };
C6FF1BAD1DBCE1A10078DCB5 /* junior_roller_coaster.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = junior_roller_coaster.h; sourceTree = "<group>"; };
D41B73EE1C2101890080A7B9 /* libcurl.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcurl.tbd; path = usr/lib/libcurl.tbd; sourceTree = SDKROOT; };
D41B741C1C210A7A0080A7B9 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
D41B74721C2125E50080A7B9 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = distribution/macos/Assets.xcassets; sourceTree = SOURCE_ROOT; };
@@ -1296,6 +1297,7 @@
C686F8C31CDBC3B7009F9BFC /* inverted_impulse_coaster.c */,
C686F8C41CDBC3B7009F9BFC /* inverted_roller_coaster.c */,
C686F8C51CDBC3B7009F9BFC /* junior_roller_coaster.c */,
C6FF1BAD1DBCE1A10078DCB5 /* junior_roller_coaster.h */,
C686F8C61CDBC3B7009F9BFC /* lay_down_roller_coaster.c */,
C686F8C71CDBC3B7009F9BFC /* lim_launched_roller_coaster.c */,
C686F8C81CDBC3B7009F9BFC /* looping_roller_coaster.c */,