Commit: 41dd0daca4f5556447b31e547ef52ad0b99a8f87 - HotshotOnline (hg)

Commit MetaInfo

• Revision: 41dd0daca4f5556447b31e547ef52ad0b99a8f87 (tree)
• Time: 2020-01-07 02:59:49
• Author: sebastian_bugiu <sebastian.bugiu@head...>
• Commiter: sebastian_bugiu

Log Message

Backported from iOS to add new ships and textures for android. Also moved the loading of essential and normal resources from iOS so we only load the loading screen first and show it before loading all the resources.

Change Summary

• modified: .hgignore
• modified: android/assets/hotshot_gamedata/ship_alien0.mesh
• modified: android/assets/hotshot_gamedata/ship_alien4.mesh
• modified: android/assets/hotshot_gamedata/ship_alien_big0.mesh
• modified: android/assets/hotshot_gamedata/ship_alien_big1.mesh
• modified: android/assets/hotshot_gamedata/ship_human0.mesh
• modified: android/assets/hotshot_gamedata/ship_human_big0.mesh
• modified: android/assets/resources2.cfg
• modified: android/src/main/jni/blackholedarksunmain.cpp
• modified: core/src/headwayEnt/HotshotEngine/GUI/SimpleView/ENG_TableView.java
• modified: core/src/headwayEnt/blackholedarksun/APP_Game.java
• modified: core/src/headwayEnt/blackholedarksun/APP_MultiPlayerGame.java
• modified: core/src/headwayEnt/blackholedarksun/APP_SinglePlayerGame.java
• add: android/assets/badlogic.jpg
• add: android/assets/hotshot_gamedata/ship_alien0_BaseColor.png
• add: android/assets/hotshot_gamedata/ship_alien0_Emissive.png
• add: android/assets/hotshot_gamedata/ship_alien0_Height.png
• add: android/assets/hotshot_gamedata/ship_alien0_Metallic.png
• add: android/assets/hotshot_gamedata/ship_alien0_Normal.png
• add: android/assets/hotshot_gamedata/ship_alien0_Roughness.png
• add: android/assets/hotshot_gamedata/ship_alien4_BaseColor.png
• add: android/assets/hotshot_gamedata/ship_alien4_Emissive.png
• add: android/assets/hotshot_gamedata/ship_alien4_Height.png
• add: android/assets/hotshot_gamedata/ship_alien4_Metallic.png
• add: android/assets/hotshot_gamedata/ship_alien4_Normal.png
• add: android/assets/hotshot_gamedata/ship_alien4_Roughness.png
• add: android/assets/hotshot_gamedata/ship_alien_big0_BaseColor.png
• add: android/assets/hotshot_gamedata/ship_alien_big0_Emissive.png
• add: android/assets/hotshot_gamedata/ship_alien_big0_Height.png
• add: android/assets/hotshot_gamedata/ship_alien_big0_Metallic.png
• add: android/assets/hotshot_gamedata/ship_alien_big0_Normal.png
• add: android/assets/hotshot_gamedata/ship_alien_big0_Roughness.png
• add: android/assets/hotshot_gamedata/ship_alien_big1_BaseColor.png
• add: android/assets/hotshot_gamedata/ship_alien_big1_Emissive.png
• add: android/assets/hotshot_gamedata/ship_alien_big1_Height.png
• add: android/assets/hotshot_gamedata/ship_alien_big1_Metallic.png
• add: android/assets/hotshot_gamedata/ship_alien_big1_Normal.png
• add: android/assets/hotshot_gamedata/ship_alien_big1_Roughness.png
• add: android/assets/hotshot_gamedata/ship_human0_BaseColor.png
• add: android/assets/hotshot_gamedata/ship_human0_Emissive.png
• add: android/assets/hotshot_gamedata/ship_human0_Height.png
• add: android/assets/hotshot_gamedata/ship_human0_Metallic.png
• add: android/assets/hotshot_gamedata/ship_human0_Normal.png
• add: android/assets/hotshot_gamedata/ship_human0_Roughness.png
• add: android/assets/hotshot_gamedata/ship_human_big0_BaseColor.png
• add: android/assets/hotshot_gamedata/ship_human_big0_Emissive.png
• add: android/assets/hotshot_gamedata/ship_human_big0_Height.png
• add: android/assets/hotshot_gamedata/ship_human_big0_Metallic.png
• add: android/assets/hotshot_gamedata/ship_human_big0_Normal.png
• add: android/assets/hotshot_gamedata/ship_human_big0_Roughness.png
• add: android/assets/hotshot_gamedata/skybox_postprocess.compositor
• add: android/assets/hotshot_gamedata/sl_cut_scripting_language.hsl
• add: android/assets/hotshot_gamedata/sl_level_patrol_begin.hsl
• add: android/assets/plugins_d.cfg
• add: desktop/raw/hotshot_gamedata/skybox_postprocess.compositor
• delete: android/assets/default.compositor.orig
• delete: android/assets/hotshot_gamedata/cleaned.rar
• delete: android/assets/hotshot_gamedata/explosion0_.png
• delete: android/assets/hotshot_gamedata/robovm.ini
• delete: android/assets/hotshot_gamedata/shaders.air
• delete: desktop/raw/default.compositor.orig
• delete: desktop/raw/skybox_postprocess.compositor
• delete: desktop/raw/skybox_postprocess.compositor.orig