modifying resource manager
reattempting push to server
fixed loading lists
fixed loading lists, still works
Merge branch 'mat'
Mergine loading list work and physics work from mat and jamie
Merge branch 'master' of https://github.com/matblair/SWEN30006
Working towards universal loading structure, been playing around with things, all stable now
Working towards universal loading structure, been playing around with things, completed resource manager, just need to get level loading working
Fixing what should be a merge with jamie and my own files
merge is complete, verified
Finished level loader, about to attempt implementation, merging with master for backup
Merged with lates from mat, updating
removing garbage git files
All working and loading from levelloader. At the moment there's no splace screens but i'll work on that tomorrow, it's also not loading the level from xml, i'm not sure why, it wasn't picking up on image types and the xml loader simply didn't think there was anything it needed to load, the underlying code for the add functions is fine because loadTestLevel just calls those with predefined values so i'll look into it tomorrow
merged with latest resource loader work