Skip to content

Commit

Permalink
Merge pull request #378 from rherriman/asset-management
Browse files Browse the repository at this point in the history
  • Loading branch information
@rherriman
rherriman authored Dec 29, 2023
2 parents 262f852 + d0d045f commit 06c2346
Show file tree
Hide file tree
Showing 57 changed files with 1,521 additions and 1,018 deletions.
54 changes: 53 additions & 1 deletion Avara.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,22 @@
objects = {

/* Begin PBXBuildFile section */
944F2F702B323F1900856E53 /* LocalAssetRepository.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 944F2F6F2B323F1900856E53 /* LocalAssetRepository.cpp */; };
944F2F712B323F1900856E53 /* LocalAssetRepository.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 944F2F6F2B323F1900856E53 /* LocalAssetRepository.cpp */; };
9465BFD22B30C2A00050681C /* AssetManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9465BFD12B30C2A00050681C /* AssetManager.cpp */; };
9465BFD32B30C2A00050681C /* AssetManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9465BFD12B30C2A00050681C /* AssetManager.cpp */; };
9465BFD72B30EF680050681C /* PackageManifest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9465BFD52B30EF680050681C /* PackageManifest.cpp */; };
9465BFD82B30EF680050681C /* PackageManifest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9465BFD52B30EF680050681C /* PackageManifest.cpp */; };
948CBF142B335A1400147E80 /* BaseAssetStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 948CBF132B335A1400147E80 /* BaseAssetStorage.cpp */; };
948CBF152B335A1400147E80 /* BaseAssetStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 948CBF132B335A1400147E80 /* BaseAssetStorage.cpp */; };
94924EAF2B3A894900197378 /* OggFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94924EAE2B3A894900197378 /* OggFile.cpp */; };
94924EB02B3A894900197378 /* OggFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94924EAE2B3A894900197378 /* OggFile.cpp */; };
94F17DDD29920D90001F5950 /* ARGBColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94F17DDC29920D90001F5950 /* ARGBColor.cpp */; };
E20752EF2A003EC600DCC210 /* Tags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E20752EE2A003EC600DCC210 /* Tags.cpp */; };
E20A3C562991CC72005741F7 /* KeyFuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E20A3C552991CC72005741F7 /* KeyFuncs.cpp */; };
E2210CC12A1C9D9C000712AA /* Tags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E20752EE2A003EC600DCC210 /* Tags.cpp */; };
E247DE242A0EB51B001CA630 /* PlayerRatingsSimpleElo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E247DE222A0EB51B001CA630 /* PlayerRatingsSimpleElo.cpp */; };
E247DE252A0EB51B001CA630 /* PlayerRatingsSimpleElo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E247DE222A0EB51B001CA630 /* PlayerRatingsSimpleElo.cpp */; };
E2210CC12A1C9D9C000712AA /* Tags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E20752EE2A003EC600DCC210 /* Tags.cpp */; };
E517F053299713DB0036B206 /* tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E2B62D7D2997052B00600401 /* tests.cpp */; };
E517F054299713DB0036B206 /* CBasicSound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5890C7529895118007A875D /* CBasicSound.cpp */; };
E517F055299713DB0036B206 /* CRateSound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5890C7029895118007A875D /* CRateSound.cpp */; };
Expand Down Expand Up @@ -355,6 +365,18 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
944F2F6D2B32379C00856E53 /* AssetRepository.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AssetRepository.h; sourceTree = "<group>"; };
944F2F6E2B323E2100856E53 /* LocalAssetRepository.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LocalAssetRepository.h; sourceTree = "<group>"; };
944F2F6F2B323F1900856E53 /* LocalAssetRepository.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LocalAssetRepository.cpp; sourceTree = "<group>"; };
9465BFD02B30C2790050681C /* AssetManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AssetManager.h; sourceTree = "<group>"; };
9465BFD12B30C2A00050681C /* AssetManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = AssetManager.cpp; sourceTree = "<group>"; };
9465BFD52B30EF680050681C /* PackageManifest.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PackageManifest.cpp; sourceTree = "<group>"; };
9465BFD92B30EFB40050681C /* PackageManifest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PackageManifest.h; sourceTree = "<group>"; };
948CBF112B33581D00147E80 /* AssetStorage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AssetStorage.h; sourceTree = "<group>"; };
948CBF122B3359D700147E80 /* BaseAssetStorage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseAssetStorage.h; sourceTree = "<group>"; };
948CBF132B335A1400147E80 /* BaseAssetStorage.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = BaseAssetStorage.cpp; sourceTree = "<group>"; };
94924EAD2B3A893900197378 /* OggFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OggFile.h; sourceTree = "<group>"; };
94924EAE2B3A894900197378 /* OggFile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = OggFile.cpp; sourceTree = "<group>"; };
94F17DDB2991FACE001F5950 /* ARGBColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARGBColor.h; sourceTree = "<group>"; };
94F17DDC29920D90001F5950 /* ARGBColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ARGBColor.cpp; sourceTree = "<group>"; };
E20752ED29FF1EC500DCC210 /* Tags.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Tags.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1005,6 +1027,23 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
9465BFCF2B30C2130050681C /* assets */ = {
isa = PBXGroup;
children = (
9465BFD12B30C2A00050681C /* AssetManager.cpp */,
9465BFD02B30C2790050681C /* AssetManager.h */,
9465BFD52B30EF680050681C /* PackageManifest.cpp */,
9465BFD92B30EFB40050681C /* PackageManifest.h */,
944F2F6D2B32379C00856E53 /* AssetRepository.h */,
948CBF112B33581D00147E80 /* AssetStorage.h */,
944F2F6F2B323F1900856E53 /* LocalAssetRepository.cpp */,
944F2F6E2B323E2100856E53 /* LocalAssetRepository.h */,
948CBF132B335A1400147E80 /* BaseAssetStorage.cpp */,
948CBF122B3359D700147E80 /* BaseAssetStorage.h */,
);
path = assets;
sourceTree = "<group>";
};
E5890B1B29894DB3007A875D = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1044,6 +1083,7 @@
children = (
E5890C7929895118007A875D /* Avara.cpp */,
E2B62D7D2997052B00600401 /* tests.cpp */,
9465BFCF2B30C2130050681C /* assets */,
E5890C6E29895118007A875D /* audio */,
E5890C9729895118007A875D /* base */,
E5890C5F29895118007A875D /* bsp */,
Expand Down Expand Up @@ -1337,6 +1377,8 @@
E5890C7729895118007A875D /* CSoundMixer.cpp */,
E5890C7229895118007A875D /* CSoundMixer.h */,
E5890C7429895118007A875D /* DopplerPlug.cpp */,
94924EAE2B3A894900197378 /* OggFile.cpp */,
94924EAD2B3A893900197378 /* OggFile.h */,
E5890C7629895118007A875D /* SoundSystemDefines.h */,
);
path = audio;
Expand Down Expand Up @@ -2002,6 +2044,7 @@
E517F057299713DB0036B206 /* CSoundMixer.cpp in Sources */,
E517F058299713DB0036B206 /* DopplerPlug.cpp in Sources */,
E517F059299713DB0036B206 /* CBaseObject.cpp in Sources */,
948CBF152B335A1400147E80 /* BaseAssetStorage.cpp in Sources */,
E517F05A299713DB0036B206 /* CDirectObject.cpp in Sources */,
E517F05B299713DB0036B206 /* CTagBase.cpp in Sources */,
E517F05C299713DB0036B206 /* CBSPPart.cpp in Sources */,
Expand Down Expand Up @@ -2069,6 +2112,7 @@
E517F09A299713DB0036B206 /* CSolidActor.cpp in Sources */,
E517F09B299713DB0036B206 /* CSoundActor.cpp in Sources */,
E517F09C299713DB0036B206 /* CSphereActor.cpp in Sources */,
94924EB02B3A894900197378 /* OggFile.cpp in Sources */,
E517F09D299713DB0036B206 /* CSwitchActor.cpp in Sources */,
E517F09E299713DB0036B206 /* CTeleporter.cpp in Sources */,
E517F09F299713DB0036B206 /* CTextActor.cpp in Sources */,
Expand All @@ -2078,10 +2122,13 @@
E517F0A3299713DB0036B206 /* CWallActor.cpp in Sources */,
E517F0A4299713DB0036B206 /* CWallDoor.cpp in Sources */,
E517F0A5299713DB0036B206 /* CWallSolid.cpp in Sources */,
9465BFD82B30EF680050681C /* PackageManifest.cpp in Sources */,
E517F0A6299713DB0036B206 /* CWeapon.cpp in Sources */,
E517F0A7299713DB0036B206 /* CWorldShader.cpp in Sources */,
E517F0A8299713DB0036B206 /* CYonBox.cpp in Sources */,
944F2F712B323F1900856E53 /* LocalAssetRepository.cpp in Sources */,
E517F0A9299713DB0036B206 /* CYonSphere.cpp in Sources */,
9465BFD32B30C2A00050681C /* AssetManager.cpp in Sources */,
E517F0AA299713DB0036B206 /* CZombieActor.cpp in Sources */,
E517F0AB299713DB0036B206 /* LinkLoose.cpp in Sources */,
E517F0AC299713DB0036B206 /* CApplication.cpp in Sources */,
Expand Down Expand Up @@ -2163,6 +2210,7 @@
E5890CF129895118007A875D /* CSliverPart.cpp in Sources */,
E5890CD329895118007A875D /* CUfo.cpp in Sources */,
E5890D0A29895118007A875D /* ColorManager.cpp in Sources */,
948CBF142B335A1400147E80 /* BaseAssetStorage.cpp in Sources */,
E5890CDD29895118007A875D /* CLogicAnd.cpp in Sources */,
E5890CFC29895118007A875D /* CScaledBSP.cpp in Sources */,
E5890CD429895118007A875D /* CSmart.cpp in Sources */,
Expand Down Expand Up @@ -2230,6 +2278,7 @@
E5890EF929895124007A875D /* nanogui_resources.cpp in Sources */,
E5890CBD29895118007A875D /* CScout.cpp in Sources */,
E5890CA429895118007A875D /* AvaraTCP.cpp in Sources */,
94924EAF2B3A894900197378 /* OggFile.cpp in Sources */,
E5890EFB29895124007A875D /* darwin.mm in Sources */,
E5890CBC29895118007A875D /* CAbstractMissile.cpp in Sources */,
E5890CD229895118007A875D /* CBall.cpp in Sources */,
Expand All @@ -2239,10 +2288,13 @@
E5890CC029895118007A875D /* CGoal.cpp in Sources */,
E5890CA929895118007A875D /* CHuffProcessor.cpp in Sources */,
E5890EF729895124007A875D /* popup.cpp in Sources */,
9465BFD72B30EF680050681C /* PackageManifest.cpp in Sources */,
E5890CBA29895118007A875D /* CWeapon.cpp in Sources */,
E247DE242A0EB51B001CA630 /* PlayerRatingsSimpleElo.cpp in Sources */,
E5890CE429895118007A875D /* CAreaActor.cpp in Sources */,
944F2F702B323F1900856E53 /* LocalAssetRepository.cpp in Sources */,
E5890D0929895118007A875D /* CNetworkWindow.cpp in Sources */,
9465BFD22B30C2A00050681C /* AssetManager.cpp in Sources */,
E5890EFA29895124007A875D /* glcanvas.cpp in Sources */,
E5890CB029895118007A875D /* RamFiles.cpp in Sources */,
E5890CD929895118007A875D /* CRandomIncarnator.cpp in Sources */,
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTORS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ The following people have contributed to this port:
* Jonathan Voss <@jonathan-voss> - sound system port, tests, fps improvements
* grimm <@shrizza> - user interface, levels
* Andy Halstead <@assertivist> - graphics and geometry fixes, level set format
* Ryan Herriman <@rherriman> - numerous levels, level set format, color handling, colorblind mode, custom hull colors, Aftershock support, networking fixes
* Ryan Herriman <@rherriman> - numerous levels, level set format, color handling, colorblind mode, custom hull colors, Aftershock support, networking fixes, asset management
* Rob Marlin <@ScarletSwordfish> - level sets, icon, designs, playtesting
* Ryan Sommers <@ryansommers> - playtesting, QA
* Eric Blenkush <@blenkush> - user interface, spectator mode, scoreboard, bug fixes
* Tom Anderson <@tra> - critical networking fixes and updates
* Tom Anderson <@tra> - critical networking fixes and updates, fps improvements
* Jack Carlson <@JackCarlson> - user interface, bug fixes, playtesting
* Ben Darling <@Ymihere03> - user interface, bug fixes, playtesting
38 changes: 7 additions & 31 deletions levels/avaraline-quirks-mode/set.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"Message": "The unwanted stepchild of all Baghdad clones."
},
{
"Alf": "banzai.alf",
"Alf": "banzai-4mkf.alf",
"Name": "Banzai [4MKF]",
"Message": "Take a leap of faith. Four minute killfest version."
},
Expand Down Expand Up @@ -128,66 +128,42 @@
"Loop Start": 0,
"Loop End": 0,
"Loop Count": 0,
"Data offset": 24,
"Base Rate": 1.0092774853131914,
"Sound": 0,
"Ogg": "3000.ogg",
"Wav": "3000.wav"
"Base Rate": 1.0092774853131914
},
"3001": {
"Version": 2,
"Loop Start": 0,
"Loop End": 0,
"Loop Count": 0,
"Data offset": 24,
"Base Rate": 1.0092774853131914,
"Sound": 0,
"Ogg": "3001.ogg",
"Wav": "3001.wav"
"Base Rate": 1.0092774853131914
},
"3002": {
"Version": 2,
"Loop Start": 0,
"Loop End": 0,
"Loop Count": 0,
"Data offset": 24,
"Base Rate": 1.0092774853131914,
"Sound": 0,
"Ogg": "3002.ogg",
"Wav": "3002.wav"
"Base Rate": 1.0092774853131914
},
"3003": {
"Version": 2,
"Loop Start": 0,
"Loop End": 0,
"Loop Count": 0,
"Data offset": 24,
"Base Rate": 1.0092774853131914,
"Sound": 0,
"Ogg": "3003.ogg",
"Wav": "3003.wav"
"Base Rate": 1.0092774853131914
},
"3004": {
"Version": 2,
"Loop Start": 0,
"Loop End": 0,
"Loop Count": 0,
"Data offset": 24,
"Base Rate": 1.0092774853131914,
"Sound": 0,
"Ogg": "3004.ogg",
"Wav": "3004.wav"
"Base Rate": 1.0092774853131914
},
"3005": {
"Version": 2,
"Loop Start": 0,
"Loop End": 0,
"Loop Count": 0,
"Data offset": 24,
"Base Rate": 1.0092774853131914,
"Sound": 0,
"Ogg": "3005.ogg",
"Wav": "3005.wav"
"Base Rate": 1.0092774853131914
}
},
"HULL": {
Expand Down
Loading

0 comments on commit 06c2346

Please sign in to comment.