Merge branch 'master' of https://github.com/Revolutionary-Games/Thrive

yowshi · Aug 16, 2016 · 52805f1 · 52805f1
2 parents f1c3831 + 448284e
commit 52805f1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/SetupThrive.sh b/SetupThrive.sh
@@ -186,7 +186,9 @@ function prepare_CEGUI() {
 		cd cegui
 	fi
 
-	hg update default
+    # Let's use this commit for now
+    hg update 869014de5669
+	#hg update default
 
 	mkdir build
 	cd build

diff --git a/contrib/luabind b/contrib/luabind
diff --git a/src/gui/CEGUIWindow.cpp b/src/gui/CEGUIWindow.cpp
@@ -482,7 +482,7 @@ CEGUIWindow::registerKeyEventHandler(
         {
             luabind::call_function<void>(callback, CEGUIWindow(static_cast<
                     const CEGUI::WindowEventArgs&>(args).window, false),
-                static_cast<int>(static_cast<const CEGUI::TextEventArgs&>(args).character));
+                static_cast<int>(static_cast<const CEGUI::TextEventArgs&>(args).d_character));
             return 0;
         };
+1 −1		.gitmodules
+6 −0		CMakeLists.txt
+52 −2		luabind/class.hpp
+4 −0		luabind/detail/object.hpp
+2 −0		luabind/detail/object_rep.hpp
+1 −0		luabind/handle.hpp
+51 −0		luabind/std_shared_ptr_converter.hpp
+6 −0		src/class_info.cpp
+1 −8		src/class_rep.cpp
+58 −0		src/object_rep.cpp
+1 −1		src/open.cpp
+32 −3		src/weak_ref.cpp
+1 −0		src/wrapper_base.cpp
+4 −0		test/CMakeLists.txt
+79 −0		test/test_index_operator.cpp