minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity
660 Commits 6 Branches 63 Tags 358 MiB
Commit Graph

534 Commits

Author SHA1 Message Date
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
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
Perttu Ahola 496e783988 A small fix to an unlikely situation where the map generator requires a block that hasn't been loaded from disk. Now it is actually loaded from disk in that case. 2011-07-17 13:40:47 +03:00
Nils Dagsson Moskopp 014a3aea32 Merge remote-tracking branch 'origin/upstream' 2011-07-16 16:52:45 +02:00
Perttu Ahola afa2b8714f Attempt to fix a problem with the factory mappings of objects residing in different source files than the prototype objects that fill them in 2011-07-16 17:39:03 +03:00
Nils Dagsson Moskopp 5086bd5664 * fix automerge regression 2011-07-15 20:16:02 +02:00
Nils Dagsson Moskopp 2c5617709d * regression fix, clay occurs again now 2011-07-15 06:37:47 +02:00
Nils Dagsson Moskopp 287b735224 * possibly nicer trees 2011-07-15 02:23:41 +02:00
Nils Dagsson Moskopp 3560f0de08 Merge branch 'upstream/master' 
Conflicts:
	data/oerkki1.png
	src/client.cpp
 2011-07-14 22:43:28 +02:00
Nils Dagsson Moskopp 5146c826be * possibly improved water flow, by flyx86 
- When flowing liquid starts to flow down, it stops contributing to its neighboring nodes' liquid level (possibly transforming it back to air)
- Flowing liquid turns into a source if there are at least 2 adjacent liquid source nodes
- If a new liquid flow reaches existing flowing liquid, the existing liquid is now updated properly.
 2011-07-14 16:17:53 +02:00
Nils Dagsson Moskopp 5383aa847f * possible fix for large cubic holes in map 2011-07-13 23:12:18 +02:00
Nils Dagsson Moskopp b96450b586 * slightly different values for 3d perlin noise 2011-07-13 23:10:41 +02:00
Nils Dagsson Moskopp a676493f46 * regression fix, papyrus should appear again now 2011-07-13 16:21:20 +02:00