Grog-Knight

some game in C++
Log | Files | Refs | Submodules | README | LICENSE | git clone https://git.ne02ptzero.me/git/Grog-Knight

commit 01c12afc076f69fc1a4aa44c8d227025c9fcae4f
parent 8e410caf1c2c6467cc7c2b8eb6602fce03002c34
Author: Louis Solofrizzo <louis@ne02ptzero.me>
Date:   Wed, 18 Feb 2015 11:57:52 +0100

Merge pull request #3 from Ne02ptzero/build

Rebasing Master #3
Diffstat:
DMACOSX/ClientGame.xcodeproj/project.pbxproj | 675-------------------------------------------------------------------------------
DMACOSX/ClientGame.xcodeproj/project.xcworkspace/contents.xcworkspacedata | 7-------
DMACOSX/ClientGame.xcodeproj/project.xcworkspace/xcshareddata/ClientGame.xccheckout | 41-----------------------------------------
DMACOSX/ClientGame.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings | 8--------
DMACOSX/ClientGame.xcodeproj/project.xcworkspace/xcuserdata/lsolofri.xcuserdatad/UserInterfaceState.xcuserstate | 0
DMACOSX/ClientGame.xcodeproj/xcshareddata/xcschemes/ClientGame.xcscheme | 86-------------------------------------------------------------------------------
DMACOSX/ClientGame.xcodeproj/xcuserdata/lsolofri.xcuserdatad/xcschemes/xcschememanagement.plist | 19-------------------
AMACOSX/Frameworks/libIL.dylib | 0
AMACOSX/Frameworks/libILU.dylib | 0
AMACOSX/Frameworks/libILUT.dylib | 0
AMACOSX/Frameworks/libjasper.dylib | 0
AMACOSX/Frameworks/libjpeg.dylib | 0
AMACOSX/Frameworks/liblcms.dylib | 0
AMACOSX/Frameworks/libmng.dylib | 0
AMACOSX/Frameworks/libpng.dylib | 0
AMACOSX/Frameworks/libtiff.dylib | 0
AMACOSX/Makefile | 75+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
DMACOSX/Resources/Scripts/autocomplete.lua | 87-------------------------------------------------------------------------------
DMACOSX/Resources/Scripts/conf_load.lua | 327-------------------------------------------------------------------------------
DMACOSX/Resources/Scripts/pref_load.lua | 81-------------------------------------------------------------------------------
DMACOSX/Resources/Scripts/start.lua | 94-------------------------------------------------------------------------------
DMACOSX/Resources/Scripts/sugar.lua | 101-------------------------------------------------------------------------------
DMACOSX/Resources/Scripts/util.lua | 69---------------------------------------------------------------------
AMACOSX/build/libfmodex.dylib | 0
AMACOSX/build/libfmodexL.dylib | 0
DMACOSX/platforms/ios/ClientGameInfo.plist | 51---------------------------------------------------
DMACOSX/platforms/ios/Default-568h@2x.png | 0
DMACOSX/platforms/ios/Default-Landscape.png | 0
DMACOSX/platforms/ios/Default-Landscape@2x.png | 0
DMACOSX/platforms/ios/Default.png | 0
DMACOSX/platforms/ios/Default@2x.png | 0
DMACOSX/platforms/ios/Icon-72.png | 0
DMACOSX/platforms/ios/Icon-72@2x.png | 0
DMACOSX/platforms/ios/Icon-Small-50.png | 0
DMACOSX/platforms/ios/Icon-Small-50@2x.png | 0
DMACOSX/platforms/ios/Icon-Small.png | 0
DMACOSX/platforms/ios/Icon-Small@2x.png | 0
DMACOSX/platforms/ios/Icon.png | 0
DMACOSX/platforms/ios/Icon@2x.png | 0
DMACOSX/platforms/ios/iPhoneMain.cpp | 29-----------------------------
DMACOSX/platforms/ios/iPhoneMain.h | 8--------
DMACOSX/platforms/ios/iTunesArtwork | 0
DMACOSX/platforms/ios/iTunesArtwork@2x | 0
DMACOSX/platforms/mac/ClientGameInfo.plist | 24------------------------
DMACOSX/platforms/mac/angel.icns | 0
DMACOSX/platforms/win/ClientGame.rc | 72------------------------------------------------------------------------
DMACOSX/platforms/win/angel.ico | 0
DMACOSX/platforms/win/resource.h | 16----------------
DMACOSX/stdafx.h | 10----------
MResources/Images/hero.png | 0
50 files changed, 75 insertions(+), 1805 deletions(-)

diff --git a/MACOSX/ClientGame.xcodeproj/project.pbxproj b/MACOSX/ClientGame.xcodeproj/project.pbxproj @@ -1,675 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXAggregateTarget section */ - 3401564D15A9199300E4C8BF /* LuaExe */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 3401564E15A9199300E4C8BF /* Build configuration list for PBXAggregateTarget "LuaExe" */; - buildPhases = ( - 3401565215A919B200E4C8BF /* Build Lua */, - ); - dependencies = ( - ); - name = LuaExe; - productName = LuaExe; - }; -/* End PBXAggregateTarget section */ - -/* Begin PBXBuildFile section */ - 342C29A20E2AFD3A0061D881 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3433A92B0E2AB09B00A02B4E /* IOKit.framework */; }; - 343C17421319544C003637EA /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 343C174013195432003637EA /* OpenAL.framework */; }; - 345AAF4A11CB39A3002B4471 /* libfmodex.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34810A050E679FE500246544 /* libfmodex.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 3462B41814FC67280049A886 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3462B41614FC67280049A886 /* Cocoa.framework */; }; - 34810A150E67A38B00246544 /* libfmodex.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34810A050E679FE500246544 /* libfmodex.dylib */; }; - 34974A330E2925BE0018A032 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34974A310E2925BE0018A032 /* main.cpp */; }; - 34974A3B0E2926460018A032 /* stdafx.h in Headers */ = {isa = PBXBuildFile; fileRef = 34974A2F0E2925BE0018A032 /* stdafx.h */; }; - 34974B2F0E2926FB0018A032 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A18C9B0E284445001C79A5 /* OpenGL.framework */; }; - 34974B3A0E2927E00018A032 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34974B390E2927E00018A032 /* AGL.framework */; }; - 34A6E2A71527568800BEA400 /* AngelLuaWrapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34A6E2A61527568800BEA400 /* AngelLuaWrapping.cpp */; settings = {COMPILER_FLAGS = "-w"; }; }; - 34A6E2C0152758E100BEA400 /* angel.icns in Copy Icon */ = {isa = PBXBuildFile; fileRef = 34A6E2AA1527573600BEA400 /* angel.icns */; }; - 34A6E51B1527811300BEA400 /* libAngel.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 34A6E3291527632500BEA400 /* libAngel.a */; }; - 34E7629C1338C70F00BA9A3C /* libIL.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34E7627C1338C6F600BA9A3C /* libIL.dylib */; }; - 34E7629D1338C70F00BA9A3C /* libILU.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34E7627D1338C6F600BA9A3C /* libILU.dylib */; }; - 34E7629E1338C70F00BA9A3C /* libILUT.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34E7627E1338C6F600BA9A3C /* libILUT.dylib */; }; - 34E7629F1338C70F00BA9A3C /* libjpeg.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34E7627F1338C6F600BA9A3C /* libjpeg.dylib */; }; - 34E762A11338C70F00BA9A3C /* libmng.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34E762811338C6F600BA9A3C /* libmng.dylib */; }; - 34E762A31338C70F00BA9A3C /* libtiff.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34E762831338C6F600BA9A3C /* libtiff.dylib */; }; - 34E762BE1338C7C500BA9A3C /* liblcms.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34E762BB1338C7C000BA9A3C /* liblcms.dylib */; }; - 34E762D31338CA9900BA9A3C /* libIL.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E7627C1338C6F600BA9A3C /* libIL.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34E762D41338CA9900BA9A3C /* libILU.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E7627D1338C6F600BA9A3C /* libILU.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34E762D51338CA9900BA9A3C /* libILUT.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E7627E1338C6F600BA9A3C /* libILUT.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34E762D61338CA9900BA9A3C /* libjpeg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E7627F1338C6F600BA9A3C /* libjpeg.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34E762D71338CA9900BA9A3C /* liblcms.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E762BB1338C7C000BA9A3C /* liblcms.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34E762D81338CA9900BA9A3C /* libmng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E762811338C6F600BA9A3C /* libmng.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34E762DA1338CA9900BA9A3C /* libtiff.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E762831338C6F600BA9A3C /* libtiff.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34E76405133979E000BA9A3C /* libpng.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E76403133979E000BA9A3C /* libpng.dylib */; }; - 34E76406133979EA00BA9A3C /* libpng.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34E76403133979E000BA9A3C /* libpng.dylib */; }; - 34EB439E15A59E1000CF9CD8 /* libjasper.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34EB439D15A59E1000CF9CD8 /* libjasper.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 34EB43A915A59E2800CF9CD8 /* libjasper.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34EB439D15A59E1000CF9CD8 /* libjasper.dylib */; }; - 34EB43AB15A59EA800CF9CD8 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 34E76381133967E200BA9A3C /* libz.dylib */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 34A6E3281527632500BEA400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34A6E3171527632500BEA400 /* Angel.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 345AAD0811CB3710002B4471; - remoteInfo = Angel; - }; - 34A6E32A1527632500BEA400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34A6E3171527632500BEA400 /* Angel.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 34A18BA70E284044001C79A5; - remoteInfo = Box2D; - }; - 34A6E32C1527632500BEA400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34A6E3171527632500BEA400 /* Angel.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 343C16CD13194490003637EA; - remoteInfo = Vorbis; - }; - 34A6E32E1527632500BEA400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34A6E3171527632500BEA400 /* Angel.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 343C16BB13194433003637EA; - remoteInfo = Ogg; - }; - 34A6E3301527632500BEA400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34A6E3171527632500BEA400 /* Angel.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 34A18C510E284362001C79A5; - remoteInfo = GLFW; - }; - 34A6E3321527632500BEA400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34A6E3171527632500BEA400 /* Angel.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 346E3BB90E28637A00E6C79E; - remoteInfo = FTGL; - }; - 34A6E3341527632500BEA400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34A6E3171527632500BEA400 /* Angel.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3406447911E7DE4200033B1D; - remoteInfo = FreeType; - }; - 34A6E3361527632500BEA400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34A6E3171527632500BEA400 /* Angel.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3433A8D10E2AADDE00A02B4E; - remoteInfo = HIDUtilities; - }; - 34A6E33A1527632500BEA400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34A6E3171527632500BEA400 /* Angel.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 34EECBDC11CB922100667B26; - remoteInfo = Lua; - }; - 34A6E33F1527633800BEA400 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34A6E3171527632500BEA400 /* Angel.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 3401560615A918BF00E4C8BF; - remoteInfo = LuaExe; - }; - 34FB48A71639001B002EB836 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 34A6E3171527632500BEA400 /* Angel.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 34FB467C1638F773002EB836; - remoteInfo = GWEN; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 34D6C173134763AD00D82C14 /* Copy Icon */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 7; - files = ( - 34A6E2C0152758E100BEA400 /* angel.icns in Copy Icon */, - ); - name = "Copy Icon"; - runOnlyForDeploymentPostprocessing = 0; - }; - 34F1FD350E5D27710065CD22 /* Copy Frameworks */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - 34E7629C1338C70F00BA9A3C /* libIL.dylib in Copy Frameworks */, - 34E7629D1338C70F00BA9A3C /* libILU.dylib in Copy Frameworks */, - 34E7629E1338C70F00BA9A3C /* libILUT.dylib in Copy Frameworks */, - 34EB43A915A59E2800CF9CD8 /* libjasper.dylib in Copy Frameworks */, - 34E762BE1338C7C500BA9A3C /* liblcms.dylib in Copy Frameworks */, - 34E7629F1338C70F00BA9A3C /* libjpeg.dylib in Copy Frameworks */, - 34E762A11338C70F00BA9A3C /* libmng.dylib in Copy Frameworks */, - 34E762A31338C70F00BA9A3C /* libtiff.dylib in Copy Frameworks */, - 34E76406133979EA00BA9A3C /* libpng.dylib in Copy Frameworks */, - 34810A150E67A38B00246544 /* libfmodex.dylib in Copy Frameworks */, - ); - name = "Copy Frameworks"; - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 3433A92B0E2AB09B00A02B4E /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; }; - 3433A9330E2AB0E000A02B4E /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; - 343C174013195432003637EA /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; - 3462B41614FC67280049A886 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; - 34713D900EA6D6F800AF58CA /* Config */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Config; path = ../Config; sourceTree = "<group>"; }; - 34713D990EA6D71100AF58CA /* Resources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Resources; sourceTree = "<group>"; }; - 347CFFE411DC239200761E0E /* script_interface.i */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c.preprocessed; name = script_interface.i; path = ../script_interface.i; sourceTree = "<group>"; }; - 347CFFF111DC243000761E0E /* build.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = build.lua; path = ../build.lua; sourceTree = "<group>"; }; - 34810A040E679FE500246544 /* libfmodexL.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfmodexL.dylib; path = ../Angel/Libraries/FMOD/libfmodexL.dylib; sourceTree = "<group>"; }; - 34810A050E679FE500246544 /* libfmodex.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfmodex.dylib; path = ../Angel/Libraries/FMOD/libfmodex.dylib; sourceTree = "<group>"; }; - 34974A2F0E2925BE0018A032 /* stdafx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stdafx.h; sourceTree = "<group>"; }; - 34974A310E2925BE0018A032 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../Sources/src/main.cpp; sourceTree = "<group>"; }; - 34974B390E2927E00018A032 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; }; - 34A18C9B0E284445001C79A5 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; - 34A6E2A61527568800BEA400 /* AngelLuaWrapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AngelLuaWrapping.cpp; path = ../Angel/Scripting/Interfaces/AngelLuaWrapping.cpp; sourceTree = "<group>"; }; - 34A6E2AA1527573600BEA400 /* angel.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = angel.icns; path = platforms/mac/angel.icns; sourceTree = SOURCE_ROOT; }; - 34A6E2AB1527573600BEA400 /* ClientGameInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = ClientGameInfo.plist; path = platforms/mac/ClientGameInfo.plist; sourceTree = SOURCE_ROOT; }; - 34A6E3171527632500BEA400 /* Angel.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Angel.xcodeproj; path = ../Angel/Angel.xcodeproj; sourceTree = "<group>"; }; - 34D34D980E2C34430053994C /* ForceFeedback.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ForceFeedback.framework; path = /System/Library/Frameworks/ForceFeedback.framework; sourceTree = "<absolute>"; }; - 34E7627C1338C6F600BA9A3C /* libIL.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libIL.dylib; path = "../Angel/Libraries/DevIL-SDK-1.7.8/mac/lib/libIL.dylib"; sourceTree = "<group>"; }; - 34E7627D1338C6F600BA9A3C /* libILU.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libILU.dylib; path = "../Angel/Libraries/DevIL-SDK-1.7.8/mac/lib/libILU.dylib"; sourceTree = "<group>"; }; - 34E7627E1338C6F600BA9A3C /* libILUT.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libILUT.dylib; path = "../Angel/Libraries/DevIL-SDK-1.7.8/mac/lib/libILUT.dylib"; sourceTree = "<group>"; }; - 34E7627F1338C6F600BA9A3C /* libjpeg.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjpeg.dylib; path = "../Angel/Libraries/DevIL-SDK-1.7.8/mac/lib/libjpeg.dylib"; sourceTree = "<group>"; }; - 34E762811338C6F600BA9A3C /* libmng.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmng.dylib; path = "../Angel/Libraries/DevIL-SDK-1.7.8/mac/lib/libmng.dylib"; sourceTree = "<group>"; }; - 34E762831338C6F600BA9A3C /* libtiff.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libtiff.dylib; path = "../Angel/Libraries/DevIL-SDK-1.7.8/mac/lib/libtiff.dylib"; sourceTree = "<group>"; }; - 34E762BB1338C7C000BA9A3C /* liblcms.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = liblcms.dylib; path = "../Angel/Libraries/DevIL-SDK-1.7.8/mac/lib/liblcms.dylib"; sourceTree = "<group>"; }; - 34E76381133967E200BA9A3C /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; - 34E76403133979E000BA9A3C /* libpng.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpng.dylib; path = "../Angel/Libraries/DevIL-SDK-1.7.8/mac/lib/libpng.dylib"; sourceTree = "<group>"; }; - 34EB439D15A59E1000CF9CD8 /* libjasper.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjasper.dylib; path = "../Angel/Libraries/DevIL-SDK-1.7.8/mac/lib/libjasper.dylib"; sourceTree = "<group>"; }; - 8D1107320486CEB800E47090 /* ClientGame.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ClientGame.app; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 8D11072E0486CEB800E47090 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 34A6E51B1527811300BEA400 /* libAngel.a in Frameworks */, - 345AAF4A11CB39A3002B4471 /* libfmodex.dylib in Frameworks */, - 34E762D31338CA9900BA9A3C /* libIL.dylib in Frameworks */, - 34E762D41338CA9900BA9A3C /* libILU.dylib in Frameworks */, - 34E762D51338CA9900BA9A3C /* libILUT.dylib in Frameworks */, - 34EB439E15A59E1000CF9CD8 /* libjasper.dylib in Frameworks */, - 34E762D61338CA9900BA9A3C /* libjpeg.dylib in Frameworks */, - 34E762D81338CA9900BA9A3C /* libmng.dylib in Frameworks */, - 34E762DA1338CA9900BA9A3C /* libtiff.dylib in Frameworks */, - 34E76405133979E000BA9A3C /* libpng.dylib in Frameworks */, - 34E762D71338CA9900BA9A3C /* liblcms.dylib in Frameworks */, - 34EB43AB15A59EA800CF9CD8 /* libz.dylib in Frameworks */, - 34974B2F0E2926FB0018A032 /* OpenGL.framework in Frameworks */, - 34974B3A0E2927E00018A032 /* AGL.framework in Frameworks */, - 342C29A20E2AFD3A0061D881 /* IOKit.framework in Frameworks */, - 343C17421319544C003637EA /* OpenAL.framework in Frameworks */, - 3462B41814FC67280049A886 /* Cocoa.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 19C28FACFE9D520D11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 8D1107320486CEB800E47090 /* ClientGame.app */, - ); - name = Products; - sourceTree = "<group>"; - }; - 29B97314FDCFA39411CA2CEA /* ClientGame */ = { - isa = PBXGroup; - children = ( - 347CFFE811DC23E100761E0E /* Angel Support */, - 34713D900EA6D6F800AF58CA /* Config */, - 34713D990EA6D71100AF58CA /* Resources */, - 347CFFE411DC239200761E0E /* script_interface.i */, - 347CFFF111DC243000761E0E /* build.lua */, - 34974A310E2925BE0018A032 /* main.cpp */, - 34A18C990E284421001C79A5 /* Frameworks */, - 19C28FACFE9D520D11CA2CBB /* Products */, - ); - name = ClientGame; - sourceTree = "<group>"; - }; - 347CFFE811DC23E100761E0E /* Angel Support */ = { - isa = PBXGroup; - children = ( - 34A6E3171527632500BEA400 /* Angel.xcodeproj */, - 34A6E2AA1527573600BEA400 /* angel.icns */, - 34A6E2AB1527573600BEA400 /* ClientGameInfo.plist */, - 34974A2F0E2925BE0018A032 /* stdafx.h */, - 34A6E2A61527568800BEA400 /* AngelLuaWrapping.cpp */, - ); - name = "Angel Support"; - sourceTree = "<group>"; - }; - 34A18C990E284421001C79A5 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 34E7627C1338C6F600BA9A3C /* libIL.dylib */, - 34E7627D1338C6F600BA9A3C /* libILU.dylib */, - 34E7627E1338C6F600BA9A3C /* libILUT.dylib */, - 34EB439D15A59E1000CF9CD8 /* libjasper.dylib */, - 34E7627F1338C6F600BA9A3C /* libjpeg.dylib */, - 34E762BB1338C7C000BA9A3C /* liblcms.dylib */, - 34E762811338C6F600BA9A3C /* libmng.dylib */, - 34E762831338C6F600BA9A3C /* libtiff.dylib */, - 34810A040E679FE500246544 /* libfmodexL.dylib */, - 34810A050E679FE500246544 /* libfmodex.dylib */, - 34E76403133979E000BA9A3C /* libpng.dylib */, - 34E76381133967E200BA9A3C /* libz.dylib */, - 3433A9330E2AB0E000A02B4E /* CoreFoundation.framework */, - 3433A92B0E2AB09B00A02B4E /* IOKit.framework */, - 34974B390E2927E00018A032 /* AGL.framework */, - 3462B41614FC67280049A886 /* Cocoa.framework */, - 34A18C9B0E284445001C79A5 /* OpenGL.framework */, - 34D34D980E2C34430053994C /* ForceFeedback.framework */, - 343C174013195432003637EA /* OpenAL.framework */, - ); - name = Frameworks; - sourceTree = "<group>"; - }; - 34A6E3181527632500BEA400 /* Products */ = { - isa = PBXGroup; - children = ( - 34A6E3291527632500BEA400 /* libAngel.a */, - 34A6E32B1527632500BEA400 /* libBox2D.a */, - 34A6E32D1527632500BEA400 /* libVorbis.a */, - 34A6E32F1527632500BEA400 /* libOgg.a */, - 34A6E3311527632500BEA400 /* libGLFW.a */, - 34FB48A81639001B002EB836 /* libGWEN.a */, - 34A6E3331527632500BEA400 /* libFTGL.a */, - 34A6E3351527632500BEA400 /* libFreeType.a */, - 34A6E3371527632500BEA400 /* libHIDUtilities.a */, - 34A6E33B1527632500BEA400 /* libLua.a */, - ); - name = Products; - sourceTree = "<group>"; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 34974A490E29265E0018A032 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 34974A3B0E2926460018A032 /* stdafx.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 8D1107260486CEB800E47090 /* ClientGame */ = { - isa = PBXNativeTarget; - buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "ClientGame" */; - buildPhases = ( - 34388F3B11E3EF61002A79B1 /* Generate Lua Wrapping */, - 34974A490E29265E0018A032 /* Headers */, - 8D11072C0486CEB800E47090 /* Sources */, - 34D6C173134763AD00D82C14 /* Copy Icon */, - 34F1FD350E5D27710065CD22 /* Copy Frameworks */, - 8D11072E0486CEB800E47090 /* Frameworks */, - 341822660E2B176D003EC89B /* Copy Resources */, - ); - buildRules = ( - ); - dependencies = ( - 34A6E3401527633800BEA400 /* PBXTargetDependency */, - ); - name = ClientGame; - productInstallPath = "$(HOME)/Applications"; - productName = ClientGame; - productReference = 8D1107320486CEB800E47090 /* ClientGame.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0500; - }; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ClientGame" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - ); - mainGroup = 29B97314FDCFA39411CA2CEA /* ClientGame */; - projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 34A6E3181527632500BEA400 /* Products */; - ProjectRef = 34A6E3171527632500BEA400 /* Angel.xcodeproj */; - }, - ); - projectRoot = ""; - targets = ( - 8D1107260486CEB800E47090 /* ClientGame */, - 3401564D15A9199300E4C8BF /* LuaExe */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXReferenceProxy section */ - 34A6E3291527632500BEA400 /* libAngel.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libAngel.a; - remoteRef = 34A6E3281527632500BEA400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 34A6E32B1527632500BEA400 /* libBox2D.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libBox2D.a; - remoteRef = 34A6E32A1527632500BEA400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 34A6E32D1527632500BEA400 /* libVorbis.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libVorbis.a; - remoteRef = 34A6E32C1527632500BEA400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 34A6E32F1527632500BEA400 /* libOgg.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libOgg.a; - remoteRef = 34A6E32E1527632500BEA400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 34A6E3311527632500BEA400 /* libGLFW.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libGLFW.a; - remoteRef = 34A6E3301527632500BEA400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 34A6E3331527632500BEA400 /* libFTGL.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libFTGL.a; - remoteRef = 34A6E3321527632500BEA400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 34A6E3351527632500BEA400 /* libFreeType.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libFreeType.a; - remoteRef = 34A6E3341527632500BEA400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 34A6E3371527632500BEA400 /* libHIDUtilities.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libHIDUtilities.a; - remoteRef = 34A6E3361527632500BEA400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 34A6E33B1527632500BEA400 /* libLua.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libLua.a; - remoteRef = 34A6E33A1527632500BEA400 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 34FB48A81639001B002EB836 /* libGWEN.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libGWEN.a; - remoteRef = 34FB48A71639001B002EB836 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - -/* Begin PBXShellScriptBuildPhase section */ - 3401565215A919B200E4C8BF /* Build Lua */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Build Lua"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cd \"${PROJECT_DIR}/Libraries/angel-lua-build\"\nmake -f Makefile-mac\n\n"; - }; - 341822660E2B176D003EC89B /* Copy Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Copy Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Set the FMOD library to be loaded properly\ninstall_name_tool -change ./libfmodex.dylib @executable_path/../Frameworks/libfmodex.dylib \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\"\n\n# Why on earth does this need to happen here?\nif [ ! -d \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\" ]; then\n\tmkdir -p \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"\nfi\n\n# Copy over all the images, sounds, fonts, and scripts\n\"${PROJECT_DIR}/../Angel/Libraries/angel-lua-build/lua\" \"${PROJECT_DIR}/../Tools/BuildScripts/mac-specific/CopyResources.lua\"\n\n# Run the publish step if we're building in Release\nif [ ${CONFIGURATION} == \"Release\" ]; then\n \"${PROJECT_DIR}/../Angel/Libraries/angel-lua-build/lua\" ../Tools/BuildScripts/publish_mac.lua -i \"${PROJECT_DIR}\" -o \"${PROJECT_DIR}/Published\" -g ClientGame.app\nfi"; - showEnvVarsInLog = 0; - }; - 34388F3B11E3EF61002A79B1 /* Generate Lua Wrapping */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Generate Lua Wrapping"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PROJECT_DIR}/../Angel/Libraries/angel-lua-build/lua\" ../Tools/BuildScripts/swig_wrap.lua -p \"${PROJECT_DIR}/..\""; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 8D11072C0486CEB800E47090 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 34974A330E2925BE0018A032 /* main.cpp in Sources */, - 34A6E2A71527568800BEA400 /* AngelLuaWrapping.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 34A6E3401527633800BEA400 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = LuaExe; - targetProxy = 34A6E33F1527633800BEA400 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin XCBuildConfiguration section */ - 3401564F15A9199300E4C8BF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 3401565015A9199300E4C8BF /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - C01FCF4B08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(PROJECT_DIR)/stdafx.h"; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = ( - "\"$(PROJECT_DIR)/../Angel/Libraries/Box2D-2.2.1\"", - "\"$(PROJECT_DIR)/../Angel/Libraries/FMOD/inc\"", - "\"$(PROJECT_DIR)/../Angel/Libraries/glfw-3.0.3/include\"", - "\"$(PROJECT_DIR)/../Angel/Libraries/libogg-1.3.0/include\"", - "\"$(PROJECT_DIR)/../Angel/Libraries/libvorbis-1.3.2/include\"", - "\"$(PROJECT_DIR)/../Angel/Libraries/lua-5.2.1/src\"", - "\"$(PROJECT_DIR)/../Angel/Libraries/HID Utilities\"", - "\"$(PROJECT_DIR)/../Angel\"", - ); - INFOPLIST_FILE = platforms/mac/ClientGameInfo.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "\"$(PROJECT_DIR)/../Angel/Libraries/FMOD\"", - "\"$(SRCROOT)/../Angel/Libraries/DevIL-SDK-1.7.8/mac/lib\"", - ); - PRODUCT_NAME = ClientGame; - }; - name = Debug; - }; - C01FCF4C08A954540054247B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - COMBINE_HIDPI_IMAGES = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_MODEL_TUNING = G5; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(PROJECT_DIR)/stdafx.h"; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = ( - "\"$(PROJECT_DIR)/../Angel/Libraries/Box2D-2.2.1\"", - "\"$(PROJECT_DIR)/../Angel/Libraries/FMOD/inc\"", - "\"$(PROJECT_DIR)/../Angel/Libraries/glfw-3.0.3/include\"", - "\"$(PROJECT_DIR)/../Angel/Libraries/libogg-1.3.0/include\"", - "\"$(PROJECT_DIR)/../Angel/Libraries/libvorbis-1.3.2/include\"", - "\"$(PROJECT_DIR)/../Angel/Libraries/lua-5.2.1/src\"", - "\"$(PROJECT_DIR)/../Angel/Libraries/HID Utilities\"", - "\"$(PROJECT_DIR)/../Angel\"", - ); - INFOPLIST_FILE = platforms/mac/ClientGameInfo.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ( - "\"$(PROJECT_DIR)/../Angel/Libraries/FMOD\"", - "\"$(SRCROOT)/../Angel/Libraries/DevIL-SDK-1.7.8/mac/lib\"", - ); - PRODUCT_NAME = ClientGame; - }; - name = Release; - }; - C01FCF4F08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "RELEASE=0", - "DEBUG=1", - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx10.8; - VALID_ARCHS = i386; - WARNING_CFLAGS = "-Wno-write-strings"; - }; - name = Debug; - }; - C01FCF5008A954540054247B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=0", - "RELEASE=1", - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.7; - ONLY_ACTIVE_ARCH = NO; - SDKROOT = macosx10.8; - VALID_ARCHS = i386; - WARNING_CFLAGS = "-Wno-write-strings"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 3401564E15A9199300E4C8BF /* Build configuration list for PBXAggregateTarget "LuaExe" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3401564F15A9199300E4C8BF /* Debug */, - 3401565015A9199300E4C8BF /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "ClientGame" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C01FCF4B08A954540054247B /* Debug */, - C01FCF4C08A954540054247B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ClientGame" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C01FCF4F08A954540054247B /* Debug */, - C01FCF5008A954540054247B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; -} diff --git a/MACOSX/ClientGame.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/MACOSX/ClientGame.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Workspace - version = "1.0"> - <FileRef - location = "self:ClientGame"> - </FileRef> -</Workspace> diff --git a/MACOSX/ClientGame.xcodeproj/project.xcworkspace/xcshareddata/ClientGame.xccheckout b/MACOSX/ClientGame.xcodeproj/project.xcworkspace/xcshareddata/ClientGame.xccheckout @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IDESourceControlProjectFavoriteDictionaryKey</key> - <false/> - <key>IDESourceControlProjectIdentifier</key> - <string>6B03EA37-2108-4294-ABEB-487EDCBBC0CF</string> - <key>IDESourceControlProjectName</key> - <string>ClientGame</string> - <key>IDESourceControlProjectOriginsDictionary</key> - <dict> - <key>41EEE985-9611-45CE-8678-E8A9A314B646</key> - <string>http://github.com/angel2d/angel2d</string> - </dict> - <key>IDESourceControlProjectPath</key> - <string>Code/ClientGame/ClientGame.xcodeproj/project.xcworkspace</string> - <key>IDESourceControlProjectRelativeInstallPathDictionary</key> - <dict> - <key>41EEE985-9611-45CE-8678-E8A9A314B646</key> - <string>../../../..</string> - </dict> - <key>IDESourceControlProjectURL</key> - <string>http://github.com/angel2d/angel2d</string> - <key>IDESourceControlProjectVersion</key> - <integer>110</integer> - <key>IDESourceControlProjectWCCIdentifier</key> - <string>41EEE985-9611-45CE-8678-E8A9A314B646</string> - <key>IDESourceControlProjectWCConfigurations</key> - <array> - <dict> - <key>IDESourceControlRepositoryExtensionIdentifierKey</key> - <string>public.vcs.git</string> - <key>IDESourceControlWCCIdentifierKey</key> - <string>41EEE985-9611-45CE-8678-E8A9A314B646</string> - <key>IDESourceControlWCCName</key> - <string>angel2d</string> - </dict> - </array> -</dict> -</plist> diff --git a/MACOSX/ClientGame.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/MACOSX/ClientGame.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key> - <false/> -</dict> -</plist> diff --git a/MACOSX/ClientGame.xcodeproj/project.xcworkspace/xcuserdata/lsolofri.xcuserdatad/UserInterfaceState.xcuserstate b/MACOSX/ClientGame.xcodeproj/project.xcworkspace/xcuserdata/lsolofri.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ. diff --git a/MACOSX/ClientGame.xcodeproj/xcshareddata/xcschemes/ClientGame.xcscheme b/MACOSX/ClientGame.xcodeproj/xcshareddata/xcschemes/ClientGame.xcscheme @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Scheme - LastUpgradeVersion = "0500" - version = "1.3"> - <BuildAction - parallelizeBuildables = "YES" - buildImplicitDependencies = "YES"> - <BuildActionEntries> - <BuildActionEntry - buildForTesting = "YES" - buildForRunning = "YES" - buildForProfiling = "YES" - buildForArchiving = "YES" - buildForAnalyzing = "YES"> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "8D1107260486CEB800E47090" - BuildableName = "ClientGame.app" - BlueprintName = "ClientGame" - ReferencedContainer = "container:ClientGame.xcodeproj"> - </BuildableReference> - </BuildActionEntry> - </BuildActionEntries> - </BuildAction> - <TestAction - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.GDB" - shouldUseLaunchSchemeArgsEnv = "YES" - buildConfiguration = "Debug"> - <Testables> - </Testables> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "8D1107260486CEB800E47090" - BuildableName = "ClientGame.app" - BlueprintName = "ClientGame" - ReferencedContainer = "container:ClientGame.xcodeproj"> - </BuildableReference> - </MacroExpansion> - </TestAction> - <LaunchAction - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - launchStyle = "0" - useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" - ignoresPersistentStateOnLaunch = "NO" - debugDocumentVersioning = "NO" - allowLocationSimulation = "NO"> - <BuildableProductRunnable> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "8D1107260486CEB800E47090" - BuildableName = "ClientGame.app" - BlueprintName = "ClientGame" - ReferencedContainer = "container:ClientGame.xcodeproj"> - </BuildableReference> - </BuildableProductRunnable> - <AdditionalOptions> - </AdditionalOptions> - </LaunchAction> - <ProfileAction - shouldUseLaunchSchemeArgsEnv = "YES" - savedToolIdentifier = "" - useCustomWorkingDirectory = "NO" - buildConfiguration = "Release" - debugDocumentVersioning = "YES"> - <BuildableProductRunnable> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "8D1107260486CEB800E47090" - BuildableName = "ClientGame.app" - BlueprintName = "ClientGame" - ReferencedContainer = "container:ClientGame.xcodeproj"> - </BuildableReference> - </BuildableProductRunnable> - </ProfileAction> - <AnalyzeAction - buildConfiguration = "Debug"> - </AnalyzeAction> - <ArchiveAction - buildConfiguration = "Release" - revealArchiveInOrganizer = "YES"> - </ArchiveAction> -</Scheme> diff --git a/MACOSX/ClientGame.xcodeproj/xcuserdata/lsolofri.xcuserdatad/xcschemes/xcschememanagement.plist b/MACOSX/ClientGame.xcodeproj/xcuserdata/lsolofri.xcuserdatad/xcschemes/xcschememanagement.plist @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>SuppressBuildableAutocreation</key> - <dict> - <key>3401564D15A9199300E4C8BF</key> - <dict> - <key>primary</key> - <true/> - </dict> - <key>8D1107260486CEB800E47090</key> - <dict> - <key>primary</key> - <true/> - </dict> - </dict> -</dict> -</plist> diff --git a/MACOSX/Frameworks/libIL.dylib b/MACOSX/Frameworks/libIL.dylib Binary files differ. diff --git a/MACOSX/Frameworks/libILU.dylib b/MACOSX/Frameworks/libILU.dylib Binary files differ. diff --git a/MACOSX/Frameworks/libILUT.dylib b/MACOSX/Frameworks/libILUT.dylib Binary files differ. diff --git a/MACOSX/Frameworks/libjasper.dylib b/MACOSX/Frameworks/libjasper.dylib Binary files differ. diff --git a/MACOSX/Frameworks/libjpeg.dylib b/MACOSX/Frameworks/libjpeg.dylib Binary files differ. diff --git a/MACOSX/Frameworks/liblcms.dylib b/MACOSX/Frameworks/liblcms.dylib Binary files differ. diff --git a/MACOSX/Frameworks/libmng.dylib b/MACOSX/Frameworks/libmng.dylib Binary files differ. diff --git a/MACOSX/Frameworks/libpng.dylib b/MACOSX/Frameworks/libpng.dylib Binary files differ. diff --git a/MACOSX/Frameworks/libtiff.dylib b/MACOSX/Frameworks/libtiff.dylib Binary files differ. diff --git a/MACOSX/Makefile b/MACOSX/Makefile @@ -0,0 +1,75 @@ +NAME = rogue-like +CC = g++ +CFLAGS = -std=c++0x -arch i386 -Wno-deprecated +ANGEL_FLAG = -D ANGEL +SRCS = ../Sources/src/Elements.cpp \ + ../Sources/src/Game.cpp \ + ../Sources/src/Hero.cpp \ + ../Sources/src/Maps.cpp \ + ../Sources/src/main.cpp \ + ../Angel/Scripting/Interfaces/AngelLuaWrapping.cpp + +INCLUDES = -I../Angel/Libraries/FTGL/include \ + -I../Angel/Libraries/freetype-2.4.8/include \ + -I../Angel/Libraries/glfw-3.0.3/include \ + -I../Angel/Libraries/gwen/include \ + -I../Angel/Libraries/Box2D-2.2.1/ \ + -I../Angel/Libraries/libogg-1.3.0/include \ + -I../Angel/Libraries/libvorbis-1.3.2/include \ + -I../Angel/Libraries/openal-soft-1.15-bin/include \ + -I../Angel/Libraries/FMOD/inc \ + -I../Angel/Libraries/HID\ Utilities \ + -I../Angel/Libraries/lua-5.2.1/src \ + -I../Tools/jsoncpp/include/ + +LIBS = ../Angel/build/libAngel.a \ + ../Angel/build/libBox2D.a \ + ../Angel/build/libFTGL.a \ + ../Angel/build/libFreeType.a \ + ../Angel/build/libGLFW.a \ + ../Angel/build/libGWEN.a \ + ../Angel/build/libHIDUtilities.a \ + ../Angel/build/libLua.a \ + ../Angel/build/libOgg.a + +FRAMEWORKS = -framework Cocoa \ + -framework IOKit \ + -framework OpenGL \ + -framework OpenAL \ + -framework CoreFoundation \ + -framework ForceFeedback \ + -framework AGL + +LIBS_FLAG = -lAngel -lFtgl -lGlfw -lBox2d -lFreetype -lLua -lOgg -lVorbis -lHidUtilities -lGwen -lJson -lfmodex -lfmodexL \ + -lILU -lIL -lILUT -ljpeg -llcms -lmng -ltiff -lpng -lz + +LIBS_DIRS = -L../Angel/build \ + -L../Angel/Libraries/FMOD \ + -L../Tools/jsoncpp/src/lib_json/ \ + -L../Angel/Libraries/DevIL-SDK-1.7.8/mac/lib + +all: $(NAME) + +$(NAME): angel json + $(CC) $(CFLAGS) $(ANGEL_FLAG) $(SRCS) $(INCLUDES) $(LIBS) $(FRAMEWORKS) $(LIBS_FLAG) $(LIBS_DIRS) -o build/$(NAME) + cd build/ && ./rogue-like + +json: + $(CC) $(CFLAGS) -I../Tools/jsoncpp/include/ -c $(wildcard ../Tools/jsoncpp/src/lib_json/*.cpp) \ + && ar rcs libjson.a ./json_reader.o ./json_value.o ./json_writer.o && mv libjson.a ../Tools/jsoncpp/src/lib_json/. + +json-clean: + rm -rf $(wildcard *.o) + +angel: + cd ../Angel && xcodebuild -scheme Angel -project Angel.xcodeproj CONFIGURATION_BUILD_DIR='build' build + +angel-clean: + cd ../Angel && xcodebuild -scheme Angel -project Angel.xcodeproj CONFIGURATION_BUILD_DIR='build' clean + +clean: angel-clean json-clean + +exec: + cd ../Angel/build/ && ./rogue-like + +re: clean all diff --git a/MACOSX/Resources/Scripts/autocomplete.lua b/MACOSX/Resources/Scripts/autocomplete.lua @@ -1,87 +0,0 @@ ------------------------------------------------------------------------------- --- Copyright (C) 2008-2014, Shane Liesegang --- All rights reserved. --- --- Redistribution and use in source and binary forms, with or without --- modification, are permitted provided that the following conditions are met: --- --- * Redistributions of source code must retain the above copyright --- notice, this list of conditions and the following disclaimer. --- * Redistributions in binary form must reproduce the above copyright --- notice, this list of conditions and the following disclaimer in the --- documentation and/or other materials provided with the distribution. --- * Neither the name of the copyright holder nor the names of any --- contributors may be used to endorse or promote products derived from --- this software without specific prior written permission. --- --- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" --- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE --- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE --- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE --- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR --- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF --- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS --- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN --- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) --- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE --- POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------- - -local tabSplits = "[%.%:]" - -function getAutoCompletions(inc) - local forReturn = {} - - local return_prefix = "" - local remainder = inc - local searchTab = _G - local break_ind = remainder:find(tabSplits) - while (break_ind ~= nil) do - return_prefix = return_prefix .. remainder:sub(1, break_ind) - local prefix = remainder:sub(1, break_ind-1) - remainder = remainder:sub(break_ind+1, -1) - local prefTab = searchTab[prefix] - if (prefTab ~= nil) then - if (type(prefTab) == "table") then - searchTab = prefTab - elseif (type(prefTab) == "userdata") then - -- check if we have a .fn table - local m = getmetatable(prefTab) - if (m == nil) then - searchTab = nil - break - end - if (type(m[".fn"]) == "table") then - searchTab = m[".fn"] - end - else - searchTab = nil - break - end - else - searchTab = nil - break - end - break_ind = remainder:find(tabSplits) - end - - if (searchTab ~= nil) then - for name, val in pairs(searchTab) do - if (name:sub(1, #remainder) == remainder) then - if (type(val) == "function") then - name = name .. "(" - end - table.insert(forReturn, return_prefix .. tostring(name)) - end - end - end - - return forReturn -end - -function printAutoCompletions(inc) - ac = getAutoCompletions(inc) - if (type(ac) == "table") then - table.foreach(ac, print) - end -end diff --git a/MACOSX/Resources/Scripts/conf_load.lua b/MACOSX/Resources/Scripts/conf_load.lua @@ -1,327 +0,0 @@ ------------------------------------------------------------------------------- --- Copyright (C) 2008-2014, Shane Liesegang --- All rights reserved. --- --- Redistribution and use in source and binary forms, with or without --- modification, are permitted provided that the following conditions are met: --- --- * Redistributions of source code must retain the above copyright --- notice, this list of conditions and the following disclaimer. --- * Redistributions in binary form must reproduce the above copyright --- notice, this list of conditions and the following disclaimer in the --- documentation and/or other materials provided with the distribution. --- * Neither the name of the copyright holder nor the names of any --- contributors may be used to endorse or promote products derived from --- this software without specific prior written permission. --- --- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" --- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE --- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE --- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE --- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR --- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF --- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS --- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN --- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) --- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE --- POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------- - -require "lfs" -require "util" - -TUNING_FILE_PATH = "Config/tuning.lua" - -local angelActorDefs = {} -setmetatable(angelActorDefs, {__index = _G}) - -local angelLevelDefs = {} - -local configUpdateTime = nil - - --- Load tuning variable definitions from Config/tuning.lua. -function LoadTuningVariables() - local loadedTuning = {} - - loadFileIn(TUNING_FILE_PATH, loadedTuning) - - for var_name, data in pairs(loadedTuning) do - -- Don't load this from the file if we've been tuning it from the console. - if not (theTuning:IsRuntimeTuned(var_name)) then - if (data.type == "float") then - theTuning:SetFloat(var_name, data.value) - elseif (data.type == "int") then - theTuning:SetInt(var_name, data.value) - elseif (data.type == "string") then - theTuning:SetString(var_name, data.value) - elseif (data.type == "vector") then - theTuning:SetVector(var_name, data.value) - else - print("WARNING: " .. var_name .. " of unknown variable type.") - end - end - end -end - --- Saves the current tuning variables back to the tuning.lua file, appending --- any new ones that have been declared. -function SaveTuningVariables() - local truth = {"true", "1", "one", "yes", "on", "t"} - local tabDataPat = "(VARNAME[%s*]=[%s*]%{)(.*)(%})" -- finds tables of given names - local valDataPat = "(value[%s*]=[%s*])([^%s,]*)([,%s]*)" -- gets the data from those tables - local vecPat = "^%{%s*[%d%.]+%s*,%s*[%d%.]+%s*%}$" -- tells if a string is expressing a Vector2 - - -- load the file's data again, for comparison - local fileTuning = {} - - loadFileIn(TUNING_FILE_PATH, fileTuning) - local f = assert(io.open(TUNING_FILE_PATH, "r")) - local fileString = f:read("*all") - f:close() - - for _, v in pairs(theTuning:GetVariables()) do - if (fileTuning[v] ~= nil) then - -- already in the config file; find and change - local readonly = false - - -- first check to see if we're readonly - if (fileTuning[v].readonly ~= nil) then - if (type(fileTuning[v].readonly) == "boolean") then - readonly = fileTuning[v].readonly - else - for _, truthtest in pairs(truth) do - if (truthtest == fileTuning[v].readonly) then - readonly = true - end - end - if (fileTuning[v].readonly == 1) then - readonly = true - end - end - end - - -- skip this variable if it's readonly - if (readonly ~= true) then - -- extract existing data - local mtabdata = tabDataPat:gsub("VARNAME", v) - local prefix, data, postfix = fileString:match(mtabdata) - - local newVal = nil - if (fileTuning[v].type == "vector") then - newVal = theTuning:GetVector(v) - elseif (fileTuning[v].type == "float") then - newVal = theTuning:GetFloat(v) - elseif (fileTuning[v].type == "int") then - newVal = theTuning:GetInt(v) - elseif (fileTuning[v].type == "string") then - newVal = theTuning:GetString(v) - end - - -- we've got a new value, and the variable is not readonly - if (newVal ~= nil) then - local before, val, after = data:match(valDataPat) - local inString = before .. val .. after - local outString = before - if (fileTuning[v].type == "vector") then - outString = outString .. tostring(newVal) - elseif (fileTuning[v].type == "float") then - outString = outString .. string.format("%f", newVal) - elseif (fileTuning[v].type == "int") then - outString = outString .. string.format("%i", newVal) - elseif (fileTuning[v].type == "string") then - outString = outString .. tostring(newVal) - end - outString = outString .. after - local oldValData = prefix .. data .. postfix - local newValData = prefix .. data:gsub(inString, outString) .. postfix - local _begin, _end = fileString:find(oldValData, 1, true) - fileString = fileString:sub(1, _begin-1) .. newValData .. fileString:sub(_end+1, -1) - else - -- wtf, it's not any kind of acceptable tuning variable - end - end - else - -- not in the config file; add to the end - local valString = theTuning:GetString(v) - local valType = nil - -- see if we can make a vector from it - if (valString:match(vecPat) ~= nil) then - valType = "vector" - end - -- or coerce it into a number - if (tonumber(valString) ~= nil) then - valType = "float" - -- do we care about seeing if it should be an int? I'm going to go ahead and say no... - end - -- oh well, it's just a string then - if (valType == nil) then - valType = "string" - valString = '"' .. valString .. '"' - end - local outString = string.format("\n\n%s = {\n type = \"%s\", \n value = %s, \n}\n", v, valType, valString) - fileString = fileString .. outString - end - end - - -- write out the changes - f = assert(io.open(TUNING_FILE_PATH, "w")) - f:write(fileString) - f:close() -end - --- Load actor definitions from Config/ActorDef/*.lua. --- --- Instantiate an Actor from a definition with Actor.Create(<name>) --- --- If called a second time, it will reload the file, so the definitions --- will be updated, but any existing Actors that were created from them --- remain the same. -function ReloadActorDefs() - cd = "Config/ActorDef/" - for f in lfs.dir(cd) do - if (not f:starts(".") and f:ends(".lua")) then - loadFileIn(cd .. f, angelActorDefs) - end - end -end - --- Apply a configuration value to an Actor. --- --- We check for different forms the name might take: --- If the config file listed "display_name", we would try to call --- SetDisplayName, DisplayName, and display_name. Once one is found, --- we stop trying. An error prints if no suitable match is found. -function _ApplyToActor(actor, config, value) - -- generate potential names - local pieces = config:split("_") - for i, piece in ipairs(pieces) do - pieces[i] = piece:gsub("^%l", string.upper) - end - local camel_case_name = table.concat(pieces) - local name_checks = {config, camel_case_name, "Set"..camel_case_name} - - -- see if any of those are in the actor's table - local fname = nil - for _, name in ipairs(name_checks) do - if ("function" == type(actor[name])) then - fname = name - break - end - end - - -- call the function if we can - if (nil == fname) then - print( string.format("WARNING: No method or attribute found for %s, %s, or %s", table.unpack(name_checks)) ) - else - actor[fname](actor, value) - end -end - --- Instantiate an Actor from a previously loaded definition file. --- --- Returns the Actor -- it still has to be added to the World to --- receive Update and Render calls. -function Actor_Create(actor_type) - local desc = angelActorDefs[actor_type] - if (desc == nil) then - print("ERROR: Actor definition " .. actor_type .. " not loaded.") - return nil - end - local class_name = desc.class - if (class_name == nil) then - class_name = "Actor" - end - if (type(_G[class_name][".constructor"]) ~= "function") then - print("ERROR: No class called " .. class_name .. " is available.") - return nil - end - local a = _G[class_name]() - - for config, value in pairs(desc) do - if (config ~= "class") then - _ApplyToActor(a, config, value) - end - end - - return a -end - --- Instantiate an Actor and pass it back to the engine for use. --- --- This is used internally by the engine so it can directly get --- at Actors that it instantiates with Create calls. (Otherwise --- we would have to jump through some hoops to find them in --- memory.) You probably shouldn't call this directly. --- NB: This function also disowns the Actor so Lua won't --- garbage-collect it. -function Actor_CreateAndRegister(actor_type) - a = Actor_Create(actor_type) - Actor_SetScriptCreatedActor(a) -end - --- Instantiate and add all Actors described in a previously loaded --- Level definition file. --- --- Call theWorld:ResetWorld() to remove all existing Actors beforehand --- if you want to start over. -function LoadLevel(levelName) - local levelDef = angelLevelDefs[levelName] - if (levelDef == nil) then - print("Level definition " .. levelName .. " not loaded.") - return - end - - for name, desc in pairs(levelDef) do - local a = nil - - if (desc["def"] ~= nil and desc["class"] ~= nil) then - print("Actor " .. name .. " has both class and definition attributes. Invalid.") - return - end - - if (desc["def"] ~= nil) then - a = Actor_Create(desc["def"]) - elseif (desc["class"]~= nil and type(_G[desc["class"]][".constructor"]) == "function") then - a = _G[desc["class"]]() - else - print("Actor " .. name .. " has no definition specified.") - end - - if (a ~= nil) then - a:SetName(name) - local layer = tonumber(desc["layer"]) - if (layer == nil) then - layer = 0 - end - for config, value in pairs(desc) do - if (config ~= "def" and config ~= "class") then - _ApplyToActor(a, config, value) - end - end - theWorld:Add(a, layer) - local mt = getmetatable(a) - if (type(mt[".fn"]["InitPhysics"]) == "function") then - a:InitPhysics() - end - end - end -end - --- Loads all levels in the Config/Level directory into the working --- definitions list. --- --- Can be called again to reload all the level definitions. -function ReloadLevelDefs() - ld = "Config/Level/" - for f in lfs.dir(ld) do - if (not f:starts(".") and f:ends(".lua")) then - levelName = f:sub(1, f:find(".lua")-1) - angelLevelDefs[levelName] = {} - setmetatable(angelLevelDefs[levelName], {__index = _G}) - loadFileIn(ld .. f, angelLevelDefs[levelName]) - end - end -end - - diff --git a/MACOSX/Resources/Scripts/pref_load.lua b/MACOSX/Resources/Scripts/pref_load.lua @@ -1,81 +0,0 @@ ------------------------------------------------------------------------------- --- Copyright (C) 2008-2014, Shane Liesegang --- All rights reserved. --- --- Redistribution and use in source and binary forms, with or without --- modification, are permitted provided that the following conditions are met: --- --- * Redistributions of source code must retain the above copyright --- notice, this list of conditions and the following disclaimer. --- * Redistributions in binary form must reproduce the above copyright --- notice, this list of conditions and the following disclaimer in the --- documentation and/or other materials provided with the distribution. --- * Neither the name of the copyright holder nor the names of any --- contributors may be used to endorse or promote products derived from --- this software without specific prior written permission. --- --- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" --- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE --- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE --- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE --- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR --- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF --- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS --- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN --- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) --- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE --- POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------- - --- set up paths -if (package.path == nil) then - package.path = "" -end -package.path = package.path .. ";./Resources/Scripts/?.lua" - -require "lfs" -require "util" - --- Load a file, and insert its values into the Angel preferences -function LoadAndInsertFile(prefPath) - local loadedPrefs = {} - - local attributes, err = lfs.attributes(prefPath) - if (attributes ~= nil) then - loadFileIn(prefPath, loadedPrefs) - - for category, var_list in pairs(loadedPrefs) do - for variable, value in pairs(var_list) do - if (type(value) == "number") then - if (math.floor(value) == value) then - angel.Preferences_GetInstance():SetInt(category, variable, value) - else - angel.Preferences_GetInstance():SetFloat(category, variable, value) - end - elseif (type(value) == "boolean") then - if (value) then - angel.Preferences_GetInstance():SetInt(category, variable, 1) - else - angel.Preferences_GetInstance():SetInt(category, variable, 0) - end - else - angel.Preferences_GetInstance():SetString(category, variable, value) - end - end - end - end -end - -function LoadPreferences() - -- Load base preferences file - LoadAndInsertFile(angel.Preferences_GetInstance():GetDefaultPath()) - - -- Load user overrides - LoadAndInsertFile(angel.Preferences_GetInstance():GetUserPrefsPath()) -end - -function errorHandler(err) - print(err) -end - -local status, err = xpcall(LoadPreferences, errorHandler) diff --git a/MACOSX/Resources/Scripts/start.lua b/MACOSX/Resources/Scripts/start.lua @@ -1,94 +0,0 @@ ------------------------------------------------------------------------------- --- Copyright (C) 2008-2014, Shane Liesegang --- All rights reserved. --- --- Redistribution and use in source and binary forms, with or without --- modification, are permitted provided that the following conditions are met: --- --- * Redistributions of source code must retain the above copyright --- notice, this list of conditions and the following disclaimer. --- * Redistributions in binary form must reproduce the above copyright --- notice, this list of conditions and the following disclaimer in the --- documentation and/or other materials provided with the distribution. --- * Neither the name of the copyright holder nor the names of any --- contributors may be used to endorse or promote products derived from --- this software without specific prior written permission. --- --- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" --- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE --- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE --- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE --- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR --- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF --- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS --- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN --- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) --- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE --- POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------- - --- set up paths -if (package.path == nil) then - package.path = "" -end -package.path = package.path .. ";./Resources/Scripts/?.lua" - -require "util" - -function catchExit() - print("Can't exit game from console.") -end - -if (ANGEL_MOBILE == false) then - function angelPrint(...) - local arg = {...} - local str - str = "" - for i=1, #arg do - if (str ~= "") then - str = str .. '\t' - end - str = str .. tostring(arg[i]) - end - LuaWrite(str) - end -end - -function angelStart() - -- merge everything into the global namespace - for k, v in pairs(angel) do - if (nil == _G[k]) then -- keep from overriding any built-ins - _G[k] = v - end - end - angel = nil - - -- override the built-in exit - os.exit = catchExit - - -- override printing to go to in-game console - if (ANGEL_MOBILE == false) then - print = angelPrint - io.write = angelPrint - end - - -- stir up some syntactic sugar - require("sugar") - - -- configuration loading - require("conf_load") - ReloadActorDefs() - ReloadLevelDefs() - - -- autocompletion - require("autocomplete") - - -- run the client code - require("client_start") -end - -function errorHandler(err) - print(err) -end - -local status, err = xpcall(angelStart, errorHandler) diff --git a/MACOSX/Resources/Scripts/sugar.lua b/MACOSX/Resources/Scripts/sugar.lua @@ -1,101 +0,0 @@ ------------------------------------------------------------------------------- --- Copyright (C) 2008-2014, Shane Liesegang --- All rights reserved. --- --- Redistribution and use in source and binary forms, with or without --- modification, are permitted provided that the following conditions are met: --- --- * Redistributions of source code must retain the above copyright --- notice, this list of conditions and the following disclaimer. --- * Redistributions in binary form must reproduce the above copyright --- notice, this list of conditions and the following disclaimer in the --- documentation and/or other materials provided with the distribution. --- * Neither the name of the copyright holder nor the names of any --- contributors may be used to endorse or promote products derived from --- this software without specific prior written permission. --- --- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" --- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE --- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE --- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE --- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR --- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF --- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS --- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN --- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) --- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE --- POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------- - -require "util" - --- Singleton shortcuts -theWorld = World_GetInstance() -theTagList = TagCollection_GetInstance() -theSwitchboard = Switchboard_GetInstance() -theCamera = Camera_GetInstance() -theSound = SoundDevice_GetInstance() -theTuning = Tuning_GetInstance() -thePrefs = Preferences_GetInstance() -if (ANGEL_MOBILE == false) then - theControllerManager = ControllerManager_GetInstance() - sysLog = CompoundLog_GetSystemLog() -end - --- Input accessors -if (ANGEL_MOBILE == false) then - theController = theControllerManager:GetController() - controllerOne = theController - controllerTwo = theControllerManager:GetController(1) -end - --- Convenience functions -function reset() - theWorld:ResetWorld() -end - -function tune(varName, newVal) - if (type(newVal) == "table") then - theTuning:SetVector(varName, newVal) - elseif (type(newVal) == "number") then - theTuning:SetFloat(varName, newVal) - else - theTuning:SetString(varName, tostring(newVal)) - end - - theTuning:AddToRuntimeTuningList(varName) -end - --- COLOR_MAP and paint form a convenience function for setting a color and tag --- at the same time. More importantly, it's a good goldspike to ensure that --- the scripting <-> engine glue is functioning. (Note that it passes a --- a table instead of a Color object, stress testing the input typemaps.) -COLOR_MAP = { - white = {1.0, 1.0, 1.0}, - black = {0.0, 0.0, 0.0}, - red = {1.0, 0.0, 0.0}, - green = {0.0, 1.0, 0.0}, - blue = {0.0, 0.0, 1.0}, - yellow = {1.0, 1.0, 0.0}, - magenta = {1.0, 0.0, 1.0}, - cyan = {0.0, 1.0, 1.0}, - purple = {0.5, 0.0, 1.0}, - orange = {1.0, 0.5, 0.0}, -} - -function paint(a, colorName) - colTable = COLOR_MAP[colorName] - - if (colTable == nil) then - print("No color " .. colorName .. " defined.") - return - end - - for name, val in pairs(COLOR_MAP) do - a:Untag(name) - end - a:SetColor(colTable) - a:Tag(colorName) -end - -addClassMethod("Actor", "Paint", paint) diff --git a/MACOSX/Resources/Scripts/util.lua b/MACOSX/Resources/Scripts/util.lua @@ -1,69 +0,0 @@ ------------------------------------------------------------------------------- --- Copyright (C) 2008-2014, Shane Liesegang --- All rights reserved. --- --- Redistribution and use in source and binary forms, with or without --- modification, are permitted provided that the following conditions are met: --- --- * Redistributions of source code must retain the above copyright --- notice, this list of conditions and the following disclaimer. --- * Redistributions in binary form must reproduce the above copyright --- notice, this list of conditions and the following disclaimer in the --- documentation and/or other materials provided with the distribution. --- * Neither the name of the copyright holder nor the names of any --- contributors may be used to endorse or promote products derived from --- this software without specific prior written permission. --- --- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" --- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE --- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE --- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE --- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR --- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF --- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS --- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN --- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) --- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE --- POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------- - -function string:split(sep) - local sep, fields = sep or " ", {} - local pattern = string.format("([^%s]+)", sep) - self:gsub(pattern, function(c) fields[#fields+1] = c end) - return fields -end - -function string:starts(startString) - return string.sub(self, 1, string.len(startString)) == startString -end - -function string:ends(endString) - return endString == '' or string.sub(self, -string.len(endString)) == endString -end - -function loadFileIn(filename, environment) - if (environment == nil) then - print "ERROR: Cannot load into nil environment." - end - local f, err = loadfile(filename, "bt", environment) - if (f == nil) then - print(err) - return - end - return f() -end - -function addClassMethod(className, methodName, method) - if ("function" ~= type(method)) then - print ("WARNING: " .. method .. " is not a function.") - end - local reg = debug.getregistry() - local classTable = reg["SWIG"][className] - if (classTable == nil) then - print("WARNING: No class called " .. className .. " to give " .. method .. ".") - return - end - classTable[".fn"][tostring(methodName)] = method -end - diff --git a/MACOSX/build/libfmodex.dylib b/MACOSX/build/libfmodex.dylib Binary files differ. diff --git a/MACOSX/build/libfmodexL.dylib b/MACOSX/build/libfmodexL.dylib Binary files differ. diff --git a/MACOSX/platforms/ios/ClientGameInfo.plist b/MACOSX/platforms/ios/ClientGameInfo.plist @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>en</string> - <key>CFBundleDisplayName</key> - <string>${PRODUCT_NAME}</string> - <key>CFBundleExecutable</key> - <string>${EXECUTABLE_NAME}</string> - <key>CFBundleIconFiles</key> - <array> - <string>Icon.png</string> - <string>Icon@2x.png</string> - <string>Icon-72.png</string> - <string>Icon-72@2x.png</string> - <string>Icon-Small.png</string> - <string>Icon-Small@2x.png</string> - <string>Icon-Small-50.png</string> - <string>Icon-Small-50@2x.png</string> - </array> - <key>CFBundleIdentifier</key> - <string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>${PRODUCT_NAME}</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>LSRequiresIPhoneOS</key> - <true/> - <key>UIRequiredDeviceCapabilities</key> - <array> - <string>armv7</string> - </array> - <key>UIStatusBarHidden</key> - <true/> - <key>UISupportedInterfaceOrientations</key> - <array> - <string>UIInterfaceOrientationLandscapeRight</string> - <string>UIInterfaceOrientationLandscapeLeft</string> - </array> - <key>UISupportedInterfaceOrientations~ipad</key> - <array> - <string>UIInterfaceOrientationLandscapeRight</string> - <string>UIInterfaceOrientationLandscapeLeft</string> - </array> -</dict> -</plist> diff --git a/MACOSX/platforms/ios/Default-568h@2x.png b/MACOSX/platforms/ios/Default-568h@2x.png Binary files differ. diff --git a/MACOSX/platforms/ios/Default-Landscape.png b/MACOSX/platforms/ios/Default-Landscape.png Binary files differ. diff --git a/MACOSX/platforms/ios/Default-Landscape@2x.png b/MACOSX/platforms/ios/Default-Landscape@2x.png Binary files differ. diff --git a/MACOSX/platforms/ios/Default.png b/MACOSX/platforms/ios/Default.png Binary files differ. diff --git a/MACOSX/platforms/ios/Default@2x.png b/MACOSX/platforms/ios/Default@2x.png Binary files differ. diff --git a/MACOSX/platforms/ios/Icon-72.png b/MACOSX/platforms/ios/Icon-72.png Binary files differ. diff --git a/MACOSX/platforms/ios/Icon-72@2x.png b/MACOSX/platforms/ios/Icon-72@2x.png Binary files differ. diff --git a/MACOSX/platforms/ios/Icon-Small-50.png b/MACOSX/platforms/ios/Icon-Small-50.png Binary files differ. diff --git a/MACOSX/platforms/ios/Icon-Small-50@2x.png b/MACOSX/platforms/ios/Icon-Small-50@2x.png Binary files differ. diff --git a/MACOSX/platforms/ios/Icon-Small.png b/MACOSX/platforms/ios/Icon-Small.png Binary files differ. diff --git a/MACOSX/platforms/ios/Icon-Small@2x.png b/MACOSX/platforms/ios/Icon-Small@2x.png Binary files differ. diff --git a/MACOSX/platforms/ios/Icon.png b/MACOSX/platforms/ios/Icon.png Binary files differ. diff --git a/MACOSX/platforms/ios/Icon@2x.png b/MACOSX/platforms/ios/Icon@2x.png Binary files differ. diff --git a/MACOSX/platforms/ios/iPhoneMain.cpp b/MACOSX/platforms/ios/iPhoneMain.cpp @@ -1,29 +0,0 @@ -// This file is only relevant to the iPhone build of Angel. If you're building -// a desktop app, you can ignore it. - - -#include "iPhoneMain.h" - - -// This function is called by the iPhone setup process -- it's put here -// so that you don't have to slog through a bunch of Objective-C UI code -// if you don't want to. -void AngelGameInit() -{ - //adds a grid so you can more easily place Actors - GridActor *g = new GridActor(); - g->SetMinCoord(Vector2(-20, -15)); - g->SetMaxCoord(Vector2( 20, 15)); - theWorld.Add(g, -1); - - - - //YOUR GAME SETUP CODE HERE - - - - - - - -} diff --git a/MACOSX/platforms/ios/iPhoneMain.h b/MACOSX/platforms/ios/iPhoneMain.h @@ -1,7 +0,0 @@ -// This file is only relevant to the iPhone build of Angel. If you're building -// a desktop app, you can ignore it. - - - -//Exporting the header for your initialization code -void AngelGameInit();- \ No newline at end of file diff --git a/MACOSX/platforms/ios/iTunesArtwork b/MACOSX/platforms/ios/iTunesArtwork Binary files differ. diff --git a/MACOSX/platforms/ios/iTunesArtwork@2x b/MACOSX/platforms/ios/iTunesArtwork@2x Binary files differ. diff --git a/MACOSX/platforms/mac/ClientGameInfo.plist b/MACOSX/platforms/mac/ClientGameInfo.plist @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleExecutable</key> - <string>${EXECUTABLE_NAME}</string> - <key>CFBundleIdentifier</key> - <string>com.yourcompany.${PRODUCT_NAME:identifier}</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleVersion</key> - <string>1.0</string> - <key>CFBundleIconFile</key> - <string>angel</string> - <key>NSHighResolutionCapable</key> - <true/> -</dict> -</plist> diff --git a/MACOSX/platforms/mac/angel.icns b/MACOSX/platforms/mac/angel.icns Binary files differ. diff --git a/MACOSX/platforms/win/ClientGame.rc b/MACOSX/platforms/win/ClientGame.rc @@ -1,72 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "WinResrc.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON "angel.ico" -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/MACOSX/platforms/win/angel.ico b/MACOSX/platforms/win/angel.ico Binary files differ. diff --git a/MACOSX/platforms/win/resource.h b/MACOSX/platforms/win/resource.h @@ -1,16 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by ClientGame.rc -// -#define IDI_ICON1 101 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 103 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/MACOSX/stdafx.h b/MACOSX/stdafx.h @@ -1,10 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - - -#include "Angel.h" - - -// TODO: reference additional headers your program requires here diff --git a/Resources/Images/hero.png b/Resources/Images/hero.png Binary files differ.