Merge branch 'development' into loadoutScreen
Moved the global ResourceManager to MasterController.
Fixed NPE.
Merge branch 'cleanup' into loadoutScreen
Started work on more menu.
Added wake lock permision to android manifest
Added a loading screen for loading textures in the background.
- Made the loading screen be the one to start.
- Moved the resourceManager.startLoad to the loading screen.
- Made GameController override resume and handle reloading of textures when app is resumed from pause (this only really applies to android).
- Added a blocking parameter to ResourceManager.load and renamed the method to startLoad.
- Added a loadAsync method to ResourceManager that forwards calls to the internal asset manager's update.
- Made ResourceManager re-create the static AssetManager every time it is constructed, as the AssetManager is disposed when app is destroyed.
Added back start button.
Fixed fps-dropping bug where a list was being allocated 1200 times/sec.
Buttons can now be clicked on menu.
Other buttons are now unselected when one is selected.
You can now click the selected-box to unselect it.
Error message is now shown if no weapon was selected.
Made the AssetManager held by the ResourceManagerImpl not static.
- The getTexture method of the TextureType enum is now private and requires an AssetManager, as the AssetManager is no longer static.
Changed usages of TextureType.getTexture to instead query the resource manager for a handled texture.
Added some stuff.
Changed to using an interface event listener for handling when loading finishes.
Merge branch 'loadoutScreen' of https://github.com/Jokab/Bullet-Inferno into loadoutScreen
Merged with development.
Fixed special ability enum.