Merge from upstream. psp
authorachurch
Sat, 23 Apr 2011 02:00:40 +0900
branchpsp
changeset 675 6e476e399b55
parent 672 76fbef23a74d (current diff)
parent 674 813441490f18 (diff)
child 676 f0a7b3d09d06
Merge from upstream.
Aquaria/AquariaMenuItem.cpp
Aquaria/AquariaSaveSlot.cpp
Aquaria/Avatar.cpp
Aquaria/Continuity.cpp
Aquaria/CurrentRender.cpp
Aquaria/DSQ.cpp
Aquaria/DSQ.h
Aquaria/Element.cpp
Aquaria/Entity.cpp
Aquaria/Entity.h
Aquaria/Game.cpp
Aquaria/Game.h
Aquaria/GridRender.cpp
Aquaria/GridRender.h
Aquaria/Main.cpp
Aquaria/MiniMapRender.cpp
Aquaria/ModSelector.cpp
Aquaria/Path.cpp
Aquaria/Path.h
Aquaria/PathFinding.cpp
Aquaria/SceneEditor.cpp
Aquaria/SchoolFish.cpp
Aquaria/SchoolFish.h
Aquaria/ScriptInterface.cpp
Aquaria/ScriptedEntity.cpp
Aquaria/Shot.cpp
Aquaria/StatsAndAchievements.cpp
Aquaria/UserSettings.cpp
Aquaria/UserSettings.h
Aquaria/WorldMapRender.cpp
BBGE/ActionMapper.cpp
BBGE/AfterEffect.cpp
BBGE/Base.cpp
BBGE/Base.h
BBGE/Core.cpp
BBGE/Core.h
BBGE/Emitter.cpp
BBGE/MathFunctions.h
BBGE/ParticleEffect.cpp
BBGE/ParticleManager.cpp
BBGE/Precacher.cpp
BBGE/Quad.cpp
BBGE/Quad.h
BBGE/RenderObject.cpp
BBGE/RenderObject.h
BBGE/RenderObjectLayer.cpp
BBGE/ScreenTransition.cpp
BBGE/SkeletalSprite.cpp
BBGE/Slider.cpp
BBGE/SoundManager.cpp
BBGE/StateManager.h
BBGE/TTFFont.cpp
BBGE/Texture.cpp
BBGE/Texture.h
BBGE/Vector.cpp
BBGE/Vector.h
CMakeLists.txt
game_scripts/scripts/entities/_unused/entityinclude.lua
game_scripts/scripts/maps/map_naijacave.lua
game_scripts/scripts/maps/node_hint_beastform1.lua
game_scripts/scripts/maps/node_hint_beastform2.lua
game_scripts/scripts/maps/node_hint_dualformchange.lua
game_scripts/scripts/maps/node_hint_dualformcharge.lua
game_scripts/scripts/maps/node_hint_energytarget.lua
game_scripts/scripts/maps/node_hint_healthupgrade.lua
game_scripts/scripts/maps/node_hint_natureformability.lua
game_scripts/scripts/maps/node_hint_rollgear.lua
game_scripts/scripts/maps/node_hint_rollgearagain.lua
game_scripts/scripts/maps/node_hint_singbulb.lua
game_scripts/scripts/maps/node_naija_energyformcharge.lua
game_scripts/scripts/maps/node_naija_energyformshot.lua
game_scripts/scripts/maps/node_naija_look.lua
game_scripts/scripts/maps/node_naija_returntonormalform.lua
game_scripts/scripts/maps/node_naija_speedboost.lua
game_scripts/scripts/maps/node_npchint.lua
game_scripts/scripts/maps/node_singinghint.lua
--- a/Aquaria/ScriptInterface.cpp	Sun Apr 17 21:35:39 2011 +0900
+++ b/Aquaria/ScriptInterface.cpp	Sat Apr 23 02:00:40 2011 +0900
@@ -8721,7 +8721,7 @@
 
 void ScriptInterface::init()
 {
-    baseState = createLuaVM();
+	baseState = createLuaVM();
 }
 
 lua_State *ScriptInterface::createLuaVM()