Commit Graph

545 Commits

Author SHA1 Message Date
Perttu Ahola
58f612eca1 Changing key settings now doesn't require a game restart 2011-07-22 22:35:20 +03:00
Constantin Wenger
2abe6ed75c Merge remote-tracking branch 'upstream/master' 2011-07-22 20:53:29 +02:00
Constantin Wenger
a12229f271 fixed some problems with filenames of the translations 2011-07-22 20:40:47 +02:00
Nils Dagsson Moskopp
805ccd449f Merge branch 'upstream/master' 2011-07-22 20:16:58 +02:00
Perttu Ahola
f706644a50 Fixed the problem of <=r548 clients fucking up maps on >=r549 servers. Also, already fucked up maps are now loaded correctly. 2011-07-22 18:51:49 +03:00
Giuseppe Bilotta
9653522873 Declare USE_GETTEXT option 2011-07-22 14:42:04 +02:00
Constantin Wenger
bf3dfec7d6 fixed problem with displaying special chars 2011-07-22 13:27:30 +02:00
Giuseppe Bilotta
aaa165f985 updatepo cmake rule
Get rid of the system-specific updatelocales.sh and introduce an
updatepo cmake rule. po files are also updated before creating the mo
files, and we now keep the .pot file (in the po/en directory). To
stabilize the po file creation, file contents are sorted by source
filename.

Update po files in the process.
2011-07-22 12:40:29 +02:00
Perttu Ahola
2b39be44e4 added an unit test for the Settings thingy (the python ConfigParser -like thing) 2011-07-22 13:10:58 +03:00
Giuseppe Bilotta
8f2409a1b4 Static naming of po file
The po file should not be named c55 if we're in ∆. But since it is not
exposed at installation time, we don't actually need its name to be
based on the project name at all, so just call it minetest.po
2011-07-22 09:58:02 +02:00
Giuseppe Bilotta
0ec749317c Refactor mo creation/installation 2011-07-22 09:36:17 +02:00
Giuseppe Bilotta
bc05bd8b59 Use project name for mo files 2011-07-22 08:33:08 +02:00
Giuseppe Bilotta
7c1ea34baf Merge remote-tracking branch 'erlehmann/master'
Conflicts (from the introduction of fr translations):
	src/CMakeLists.txt
2011-07-22 07:48:22 +02:00
Constantin Wenger
3d53cc2c11 changed some lines to fit the 80chars limit 2011-07-22 07:25:40 +02:00
Perttu Ahola
329158f7d1 Fixed small error in mapnode.cpp (didn't cause any harm though) 2011-07-22 01:37:21 +03:00
Perttu Ahola
fe855e004f Fixed new map generator causing a crash when generating at map limit 2011-07-22 01:37:05 +03:00
Cyriaque Skrapits
8048961cc5 Added french translation. 2011-07-21 16:09:57 +02:00
Nils Dagsson Moskopp
cbf2ac5e8f * different collision box for fireflies so they now hover above the ground 2011-07-21 15:40:00 +02:00
Giuseppe Bilotta
767280577b Reorganize cmake gettext message output to ease debugging 2011-07-21 15:16:59 +02:00
Giuseppe Bilotta
aa6506ce96 Restore "Leave address blank" position 2011-07-21 15:12:58 +02:00
Giuseppe Bilotta
02695bebc6 Find correct library for MSVC vs MingW in Winows 2011-07-21 14:50:15 +02:00
Giuseppe Bilotta
7b93fb59cf Only install locale files if using gettext 2011-07-21 14:46:23 +02:00
Giuseppe Bilotta
adb7181969 Uppercase DEFINED or cmake 2.8.4 complains 2011-07-21 13:59:50 +02:00
Giuseppe Bilotta
b99174cb0c Refactor and clean up gettext management 2011-07-21 12:33:29 +02:00
Giuseppe Bilotta
fd70bbd367 Make gettext optional 2011-07-21 09:03:41 +02:00
Weedy
36d8f91f1a Tweak makefiles to add -delta suffix. 2011-07-21 09:03:20 +02:00
Weedy
9cb5f70be5 Fix win32 MSVC compile. (screw gettext) 2011-07-21 09:03:17 +02:00
Nils Dagsson Moskopp
bca3de3d08 Merge pull request #27 from Oblomov/master
* regression fix for windows build.
2011-07-20 14:29:01 -07:00
Giuseppe Bilotta
29aae3dcb5 Move package search out of conditional
This unbreaks the Windows build which would otherwise have problems at
the jthread level.
2011-07-20 23:09:28 +02:00
Nils Dagsson Moskopp
8129d16dd3 + fireflies 2011-07-20 22:05:57 +02:00
Nils Dagsson Moskopp
2732dac337 Merge branch 'master' of github.com:erlehmann/minetest-delta 2011-07-20 18:56:32 +02:00
Nils Dagsson Moskopp
0f10fc0cd9 Merge pull request #24 from SpeedProg/master
gettext paths problem
2011-07-20 09:56:23 -07:00
Constantin Wenger
c6d99fbe0c fixed problem with wront paths in gettext 2011-07-20 18:49:18 +02:00
Nils Dagsson Moskopp
84b85964fa Merge branch 'master' of github.com:erlehmann/minetest-delta 2011-07-20 18:29:48 +02:00
Giuseppe Bilotta
52df1b598c Set the window caption for the initial window too 2011-07-20 17:59:48 +02:00
Giuseppe Bilotta
8fa94c3547 Check the data path before usage
When not running in place, check if the assumed data path in
../share/APPNAME exists. If it doesn't exist, fall back to ../data
instead. This allows the program to run successfully from the checkout
directory even without the run-in-place flag active.
2011-07-20 17:59:48 +02:00
Giuseppe Bilotta
3321edae77 Use system sqlite3/jthread libs if available 2011-07-20 17:59:48 +02:00
Nils Dagsson Moskopp
69937c342c Merge branch 'master' of github.com:erlehmann/minetest-delta 2011-07-20 17:56:49 +02:00
Constantin Wenger
6a8328de79 added gettext support
german translation file
and bashscript to update translations
2011-07-20 16:51:19 +02:00
Nils Dagsson Moskopp
9bc701d194 Merge branch 'upstream/master' 2011-07-20 14:20:07 +02:00
Nils Dagsson Moskopp
6791c856b2 * by popular request, fewer clouds 2011-07-20 02:44:51 +02:00
Nils Dagsson Moskopp
57fcfb2b0d * initialize liquid_kind properly so compiler does not bitch about it 2011-07-19 02:02:50 +02:00
Nils Dagsson Moskopp
a99b7e6e05 + fake shading for the volumetric clouds 2011-07-19 01:43:30 +02:00
Nils Dagsson Moskopp
890d3468e7 + volumetric clouds (thanks teddydestodes) 2011-07-18 22:50:14 +02:00
Felix Krause
466f9d87b6 final fixes to liquid flow, works now as intended 2011-07-18 02:38:57 +02:00
Felix Krause
b7862805c8 fixes to liquid transformation 2011-07-18 02:38:48 +02:00
Felix Krause
c4b86adee8 fixed refactoring issues // slowed down water flow a bit
* liquid flow no longer does random things when transformed
* if a flowi
ng liquid node doesn't have a solid block as neighbor, its spread distan
ce is shortened by 1
2011-07-18 02:38:32 +02:00
Felix Krause
f1e8ff2245 * refactored liquid transformation code (has some flaws)
Completely rewrote the liquid transformation. The algorithm now exclusively modifies the current node in one iteration. Another change is that MapNode.param2 now stores a bit that tells other nodes if a flowing liquid node flows downwards. This is accomplished by two masks on param2 for the "flow down" bit and the "liquid level" bits.

This will be the base of future improvements to the liquid flow. However, in the current state flowing liquid does not always disappear when cut off its source. Be aware that this branch is work in progress.
2011-07-18 02:37:19 +02:00
Nils Dagsson Moskopp
13b2bad54b * changed GUI to indicate Minetest Δ 2011-07-17 22:33:51 +02:00
Perttu Ahola
74ef5b8a42 Hopefully fixed u64 to be the actual 64-bit type on 64-bit architectures. This should fix the compiler error caused by irrlicht on 64-bit fedora defining u64 to be different. 2011-07-17 19:32:06 +03:00