mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2025-07-03 06:24:32 +00:00
Merge branch 'experimental' into controllerfixup
# Conflicts: # Aquaria/Avatar.cpp # Aquaria/Continuity.cpp # Aquaria/DSQ.cpp # Aquaria/DSQ.h # Aquaria/Game.cpp # Aquaria/Game.h # Aquaria/Main.cpp # Aquaria/UserSettings.cpp # BBGE/Base.cpp # BBGE/Base.h # BBGE/Core.cpp # BBGE/Core.h # BBGE/DebugFont.cpp # BBGE/Shader.cpp # BBGE/SoundManager.h
This commit is contained in:
commit
0dc30e668d
67 changed files with 788 additions and 511 deletions
|
@ -142,7 +142,7 @@ void Precacher::precacheList(const std::string &list, void progressCallback())
|
|||
t = t.substr(0,t.size()-1);
|
||||
debugLog("precache["+t+"]");
|
||||
#endif
|
||||
stringToLower(t);
|
||||
stringToLower(t);
|
||||
precacheTex(t);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue