Giuseppe Bilotta [Thu, 21 Jul 2011 12:46:14 +0000 (14:46 +0200)]
Only install locale files if using gettext
Giuseppe Bilotta [Thu, 21 Jul 2011 11:59:50 +0000 (13:59 +0200)]
Uppercase DEFINED or cmake 2.8.4 complains
Constantin Wenger [Thu, 21 Jul 2011 11:24:37 +0000 (13:24 +0200)]
updated some path because the dlls are mostly under bin not lib
added explanation why libintl must not belinked under some oses
Giuseppe Bilotta [Thu, 21 Jul 2011 10:33:29 +0000 (12:33 +0200)]
Refactor and clean up gettext management
Giuseppe Bilotta [Thu, 21 Jul 2011 05:53:13 +0000 (07:53 +0200)]
Make gettext optional
Weedy [Thu, 21 Jul 2011 06:36:30 +0000 (02:36 -0400)]
Tweak makefiles to add -delta suffix.
Weedy [Thu, 21 Jul 2011 06:30:21 +0000 (02:30 -0400)]
Fix win32 MSVC compile. (screw gettext)
Nils Dagsson Moskopp [Wed, 20 Jul 2011 21:29:01 +0000 (14:29 -0700)]
Merge pull request #27 from Oblomov/master
* regression fix for windows build.
Giuseppe Bilotta [Wed, 20 Jul 2011 20:49:48 +0000 (22:49 +0200)]
Move package search out of conditional
This unbreaks the Windows build which would otherwise have problems at
the jthread level.
Nils Dagsson Moskopp [Wed, 20 Jul 2011 20:04:24 +0000 (22:04 +0200)]
+ fireflies
Nils Dagsson Moskopp [Wed, 20 Jul 2011 17:14:40 +0000 (19:14 +0200)]
* README updated
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:56:32 +0000 (18:56 +0200)]
Merge branch 'master' of github.com:erlehmann/minetest-delta
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:56:23 +0000 (09:56 -0700)]
Merge pull request #24 from SpeedProg/master
gettext paths problem
Constantin Wenger [Wed, 20 Jul 2011 16:49:18 +0000 (18:49 +0200)]
fixed problem with wront paths in gettext
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:29:48 +0000 (18:29 +0200)]
Merge branch 'master' of github.com:erlehmann/minetest-delta
Nils Dagsson Moskopp [Wed, 20 Jul 2011 16:29:07 +0000 (09:29 -0700)]
Merge pull request #23 from Oblomov/master
Some misc usability patches
Giuseppe Bilotta [Thu, 9 Jun 2011 20:31:40 +0000 (22:31 +0200)]
Set the window caption for the initial window too
Giuseppe Bilotta [Wed, 8 Jun 2011 15:27:30 +0000 (17:27 +0200)]
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.
Giuseppe Bilotta [Tue, 19 Jul 2011 18:02:31 +0000 (20:02 +0200)]
Use system sqlite3/jthread libs if available
Nils Dagsson Moskopp [Wed, 20 Jul 2011 15:56:49 +0000 (17:56 +0200)]
Merge branch 'master' of github.com:erlehmann/minetest-delta
Nils Dagsson Moskopp [Wed, 20 Jul 2011 15:56:35 +0000 (08:56 -0700)]
Merge pull request #22 from SpeedProg/master
added gettext support
Constantin Wenger [Wed, 20 Jul 2011 15:00:54 +0000 (17:00 +0200)]
updated german po file for minetest-delta (prior it was for minetest)
set +x on bashscript
Constantin Wenger [Wed, 20 Jul 2011 14:51:19 +0000 (16:51 +0200)]
added gettext support
german translation file
and bashscript to update translations
Nils Dagsson Moskopp [Wed, 20 Jul 2011 12:20:07 +0000 (14:20 +0200)]
Merge branch 'upstream/master'
Nils Dagsson Moskopp [Wed, 20 Jul 2011 00:45:15 +0000 (02:45 +0200)]
* README updated (graphics licensing)
Nils Dagsson Moskopp [Wed, 20 Jul 2011 00:44:51 +0000 (02:44 +0200)]
* by popular request, fewer clouds
Nils Dagsson Moskopp [Tue, 19 Jul 2011 21:35:12 +0000 (23:35 +0200)]
* README updated
Nils Dagsson Moskopp [Tue, 19 Jul 2011 21:32:01 +0000 (23:32 +0200)]
+ minetest application icon
Nils Dagsson Moskopp [Tue, 19 Jul 2011 00:02:50 +0000 (02:02 +0200)]
* initialize liquid_kind properly so compiler does not bitch about it
Nils Dagsson Moskopp [Mon, 18 Jul 2011 23:43:30 +0000 (01:43 +0200)]
+ fake shading for the volumetric clouds
Nils Dagsson Moskopp [Mon, 18 Jul 2011 20:50:14 +0000 (22:50 +0200)]
+ volumetric clouds (thanks teddydestodes)
Felix Krause [Sun, 17 Jul 2011 11:55:59 +0000 (13:55 +0200)]
final fixes to liquid flow, works now as intended
Felix Krause [Sun, 17 Jul 2011 11:15:33 +0000 (13:15 +0200)]
fixes to liquid transformation
Felix Krause [Sun, 17 Jul 2011 02:01:31 +0000 (04:01 +0200)]
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
Felix Krause [Sat, 16 Jul 2011 14:01:37 +0000 (16:01 +0200)]
* 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.
Nils Dagsson Moskopp [Mon, 18 Jul 2011 00:09:55 +0000 (02:09 +0200)]
* Омская птица
Nils Dagsson Moskopp [Sun, 17 Jul 2011 20:33:18 +0000 (22:33 +0200)]
* changed GUI to indicate Minetest Δ
Perttu Ahola [Sun, 17 Jul 2011 16:32:06 +0000 (19:32 +0300)]
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.
Perttu Ahola [Sun, 17 Jul 2011 10:40:47 +0000 (13:40 +0300)]
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.
Nils Dagsson Moskopp [Sat, 16 Jul 2011 15:14:58 +0000 (17:14 +0200)]
* README updated
Nils Dagsson Moskopp [Sat, 16 Jul 2011 14:52:45 +0000 (16:52 +0200)]
Merge remote-tracking branch 'origin/upstream'
Perttu Ahola [Sat, 16 Jul 2011 14:39:03 +0000 (17:39 +0300)]
Attempt to fix a problem with the factory mappings of objects residing in different source files than the prototype objects that fill them in
Nils Dagsson Moskopp [Fri, 15 Jul 2011 18:16:02 +0000 (20:16 +0200)]
* fix automerge regression
Nils Dagsson Moskopp [Fri, 15 Jul 2011 04:37:47 +0000 (06:37 +0200)]
* regression fix, clay occurs again now
Nils Dagsson Moskopp [Fri, 15 Jul 2011 00:23:41 +0000 (02:23 +0200)]
* possibly nicer trees
Nils Dagsson Moskopp [Thu, 14 Jul 2011 20:43:22 +0000 (22:43 +0200)]
Merge branch 'upstream/master'
Conflicts:
data/oerkki1.png
src/client.cpp
Nils Dagsson Moskopp [Thu, 14 Jul 2011 14:17:50 +0000 (16:17 +0200)]
* 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.
Nils Dagsson Moskopp [Wed, 13 Jul 2011 21:12:18 +0000 (23:12 +0200)]
* possible fix for large cubic holes in map
Nils Dagsson Moskopp [Wed, 13 Jul 2011 21:10:41 +0000 (23:10 +0200)]
* slightly different values for 3d perlin noise
Nils Dagsson Moskopp [Wed, 13 Jul 2011 14:21:20 +0000 (16:21 +0200)]
* regression fix, papyrus should appear again now
Nils Dagsson Moskopp [Mon, 11 Jul 2011 14:22:14 +0000 (16:22 +0200)]
* README updated
Jiří Procházka [Mon, 11 Jul 2011 12:29:59 +0000 (14:29 +0200)]
+ farmesh config options
Nils Dagsson Moskopp [Sat, 9 Jul 2011 16:22:39 +0000 (18:22 +0200)]
* amended upstream branch notes
Nils Dagsson Moskopp [Sat, 9 Jul 2011 16:14:05 +0000 (18:14 +0200)]
+ notes regarding upstream conversion from mercurial using hg-fast-export
Perttu Ahola [Mon, 4 Jul 2011 19:15:22 +0000 (22:15 +0300)]
Added tag 0.2.20110704_0 for changeset
65263ec55caf
Perttu Ahola [Mon, 4 Jul 2011 19:15:15 +0000 (22:15 +0300)]
Updated version and changelog
Perttu Ahola [Mon, 4 Jul 2011 19:12:58 +0000 (22:12 +0300)]
Removed tag 0.2.20110704_0
Perttu Ahola [Mon, 4 Jul 2011 19:12:38 +0000 (22:12 +0300)]
Added tag 0.2.20110704_0 for changeset
25aa2021937f
Perttu Ahola [Fri, 1 Jul 2011 22:07:54 +0000 (01:07 +0300)]
initial steps in doing content type extension
Perttu Ahola [Fri, 1 Jul 2011 18:25:31 +0000 (21:25 +0300)]
made screen go slightly blue when underwater
Perttu Ahola [Fri, 1 Jul 2011 18:04:40 +0000 (21:04 +0300)]
Fixed objects being sometimes not able to be stored statically in a block when block has been unloaded
Nils Dagsson Moskopp [Mon, 27 Jun 2011 13:56:26 +0000 (06:56 -0700)]
Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Perttu Ahola [Mon, 27 Jun 2011 06:50:34 +0000 (09:50 +0300)]
tried to fix block selection in map rendering a bit
Perttu Ahola [Mon, 27 Jun 2011 05:46:54 +0000 (08:46 +0300)]
fixed bug in inventory textures caused from better handling of unknown blocks
Perttu Ahola [Mon, 27 Jun 2011 05:36:37 +0000 (08:36 +0300)]
updated minetest.conf.example and changed client_unload_unused_data_timeout default to 600
Perttu Ahola [Mon, 27 Jun 2011 04:30:02 +0000 (07:30 +0300)]
better handling of unknown blocks on client
Perttu Ahola [Mon, 27 Jun 2011 03:52:20 +0000 (06:52 +0300)]
updated to-do list
Perttu Ahola [Sun, 26 Jun 2011 21:29:17 +0000 (00:29 +0300)]
made dtime jitter compare value and fps calculation a bit faster changing
Perttu Ahola [Sun, 26 Jun 2011 21:27:17 +0000 (00:27 +0300)]
map unloading is now a whole lot better
Perttu Ahola [Sun, 26 Jun 2011 18:53:11 +0000 (21:53 +0300)]
fixed block unloading from memory (a better fix coming next)
Perttu Ahola [Sun, 26 Jun 2011 17:00:04 +0000 (20:00 +0300)]
Made the initial loading screen slightly more alive
Perttu Ahola [Sun, 26 Jun 2011 16:33:40 +0000 (19:33 +0300)]
added screenshot key F12 (from spongie)
Perttu Ahola [Sun, 26 Jun 2011 16:23:44 +0000 (19:23 +0300)]
Added CPT_FACEDIR_SIMPLE calculation, finally, as figured out by spongie
Perttu Ahola [Sun, 26 Jun 2011 16:23:05 +0000 (19:23 +0300)]
changed one "if" to "else if" in content_mapblock.cpp
Perttu Ahola [Sun, 26 Jun 2011 15:51:57 +0000 (18:51 +0300)]
reorganized stuff
Perttu Ahola [Sun, 26 Jun 2011 15:51:35 +0000 (18:51 +0300)]
tuned mapgen
Perttu Ahola [Sun, 26 Jun 2011 15:50:43 +0000 (18:50 +0300)]
changed water color in farmesh
Perttu Ahola [Sun, 26 Jun 2011 15:50:13 +0000 (18:50 +0300)]
updated noise stuff
Perttu Ahola [Sun, 26 Jun 2011 12:48:56 +0000 (15:48 +0300)]
reorganized a lot of stuff and modified mapgen and objects slightly while doing it
Perttu Ahola [Sun, 26 Jun 2011 12:45:13 +0000 (15:45 +0300)]
improved player fall damage detection
Sebastian Rühl [Sun, 26 Jun 2011 11:47:21 +0000 (13:47 +0200)]
backported cactus, papyrus and clay
Sebastian Rühl [Sun, 26 Jun 2011 10:52:03 +0000 (12:52 +0200)]
small fix
Sebastian Rühl [Sun, 26 Jun 2011 10:24:32 +0000 (12:24 +0200)]
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
Conflicts:
.gitignore
CMakeLists.txt
data/heart.png
src/CMakeLists.txt
src/game.cpp
src/guiMainMenu.cpp
src/inventory.cpp
src/map.cpp
src/mapblock.cpp
src/mapnode.cpp
src/mapnode.h
src/materials.cpp
src/server.cpp
Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
Perttu Ahola [Sun, 26 Jun 2011 00:14:52 +0000 (03:14 +0300)]
added and commented out some debug output
Perttu Ahola [Sat, 25 Jun 2011 23:34:36 +0000 (02:34 +0300)]
even more code refactoring
Perttu Ahola [Sat, 25 Jun 2011 22:31:43 +0000 (01:31 +0300)]
more reorganizing of map code
Perttu Ahola [Sat, 25 Jun 2011 21:03:58 +0000 (00:03 +0300)]
cleaned map stuff
Perttu Ahola [Sat, 25 Jun 2011 15:35:32 +0000 (18:35 +0300)]
moved mapgen stuff around abit
Perttu Ahola [Sat, 25 Jun 2011 15:12:41 +0000 (18:12 +0300)]
moved map generator to separate source files
Perttu Ahola [Sat, 25 Jun 2011 14:46:08 +0000 (17:46 +0300)]
added minetestmapper in utils/
Perttu Ahola [Sat, 25 Jun 2011 13:32:09 +0000 (16:32 +0300)]
mapgen stuff
Perttu Ahola [Sat, 25 Jun 2011 01:41:38 +0000 (04:41 +0300)]
added correct data to new images, added comments in main.cpp
Perttu Ahola [Sat, 25 Jun 2011 01:25:14 +0000 (04:25 +0300)]
New map generator added (and SQLite, messed up the commits at that time...) (import from temporary git repo)
Perttu Ahola [Sat, 25 Jun 2011 01:23:21 +0000 (04:23 +0300)]
Reorganizing stuff (import from temporary git repo)
Perttu Ahola [Thu, 23 Jun 2011 11:10:46 +0000 (14:10 +0300)]
disabled farmesh in default settings
Perttu Ahola [Wed, 22 Jun 2011 11:21:55 +0000 (14:21 +0300)]
fixed servermain.cpp lacking filesys.h
Perttu Ahola [Mon, 20 Jun 2011 15:04:49 +0000 (18:04 +0300)]
path_userdata is now created before potentially creating debug.txt in there
Perttu Ahola [Mon, 20 Jun 2011 04:56:45 +0000 (07:56 +0300)]
moved the mac include in porting.cpp out of namespace
Perttu Ahola [Sun, 19 Jun 2011 16:40:41 +0000 (19:40 +0300)]
fixed a segfault in case of wrong input from network on the server (reported by spongie)
Perttu Ahola [Sun, 19 Jun 2011 09:37:00 +0000 (12:37 +0300)]
uh oh, forgot to add treeprop.png to the repo