From 5388e8b1243183cbf1806a657d580621e6b9b7c8 Mon Sep 17 00:00:00 2001
From: Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net>
Date: Thu, 21 Jul 2011 15:40:00 +0200
Subject: * different collision box for fireflies so they now hover above the
 ground

---
 src/content_sao.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index aeeafc2f8..0b81855c1 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -809,7 +809,7 @@ void FireflySAO::step(float dtime, bool send_recommended)
 		Move it, with collision detection
 	*/
 
-	core::aabbox3d<f32> box(-BS/3.,0.0,-BS/3., BS/3.,BS*2./3.,BS/3.);
+	core::aabbox3d<f32> box(-BS/3.,-BS*2/3.0,-BS/3., BS/3.,BS*4./3.,BS/3.);
 	collisionMoveResult moveresult;
 	// Maximum movement without glitches
 	f32 pos_max_d = BS*0.25;
-- 
cgit v1.2.3


From 6875ead7cf6d2d0a72bca3d3fa4e675b7c4c0ad9 Mon Sep 17 00:00:00 2001
From: Cyriaque Skrapits <cyriaque@Ferm.(none)>
Date: Thu, 21 Jul 2011 16:09:57 +0200
Subject: Added french translation.

---
 src/CMakeLists.txt | 16 +++++++++++++++-
 updatelocales.sh   |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 72f79976c..532ac9fee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -257,7 +257,8 @@ if(BUILD_CLIENT)
 	install(FILES ${images} DESTINATION ${DATADIR})
 
 	install(FILES ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-c55.mo DESTINATION locale/de/LC_MESSAGES)
- 
+ 	install(FILES ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES/minetest-c55.mo DESTINATION locale/fr/LC_MESSAGES)
+ 	
 	if(WIN32)
 		if(DEFINED IRRLICHT_DLL)
 			install(FILES ${IRRLICHT_DLL} DESTINATION ${BINDIR})
@@ -285,6 +286,7 @@ else()
 endif()
 
 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES COMMENT "mo-update [de]: Creating locale directory.")
+add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES COMMENT "mo-update [fr]: Creating locale directory.")
 
 add_custom_command(
 		OUTPUT ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-c55.mo
@@ -295,7 +297,19 @@ add_custom_command(
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/po/de
 		COMMENT "mo-update [de]: Creating mo file."
 		)
+add_custom_command(
+		OUTPUT ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES/minetest-c55.mo
+		COMMAND ${GETTEXT_MSGFMT} -o ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES/minetest-c55.mo ${CMAKE_SOURCE_DIR}/po/fr/minetest-c55.po 
+		DEPENDS 
+			${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES
+			${CMAKE_SOURCE_DIR}/po/fr/minetest-c55.po
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/po/fr
+		COMMENT "mo-update [fr]: Creating mo file."
+		)
+		
 add_custom_target(translation_de ALL COMMENT "mo update [de]" DEPENDS ${CMAKE_BINARY_DIR}/locale/de/LC_MESSAGES/minetest-c55.mo)
+add_custom_target(translation_fr ALL COMMENT "mo update [fr]" DEPENDS ${CMAKE_BINARY_DIR}/locale/fr/LC_MESSAGES/minetest-c55.mo)
+
 
 # Subdirectories
 
diff --git a/updatelocales.sh b/updatelocales.sh
index 1ac42342d..e84145107 100755
--- a/updatelocales.sh
+++ b/updatelocales.sh
@@ -1,4 +1,5 @@
 #! /bin/bash
 xgettext -n -o minetest-c55.pot ./src/*.cpp ./src/*.h
 msgmerge -U ./po/de/minetest-c55.po minetest-c55.pot
+msgmerge -U ./po/fr/minetest-c55.po minetest-c55.pot
 rm minetest-c55.pot
-- 
cgit v1.2.3