Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-30 19:43:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
714 Commits 5 Branches 67 Tags 273 MiB
d62ae0e18b
Commit Graph

578 Commits

Author SHA1 Message Date
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
Jiří Procházka
692bd66011 + farmesh config options 2011-07-11 15:01:43 +02:00
Perttu Ahola
8f742855a1 initial steps in doing content type extension 2011-07-02 01:07:54 +03:00
Perttu Ahola
7b290660ea made screen go slightly blue when underwater 2011-07-01 21:25:31 +03:00
Perttu Ahola
71f5d4b344 Fixed objects being sometimes not able to be stored statically in a block when block has been unloaded 2011-07-01 21:04:40 +03:00
Perttu Ahola
282912caa0 tried to fix block selection in map rendering a bit 2011-06-27 09:50:34 +03:00
Perttu Ahola
ccf5eae751 fixed bug in inventory textures caused from better handling of unknown blocks 2011-06-27 08:46:54 +03:00
Perttu Ahola
3e40235ce2 updated minetest.conf.example and changed client_unload_unused_data_timeout default to 600 2011-06-27 08:36:37 +03:00
Perttu Ahola
ab0cc1bb47 better handling of unknown blocks on client 2011-06-27 07:30:02 +03:00
Perttu Ahola
cf9a1f0109 updated to-do list 2011-06-27 06:52:20 +03:00
Perttu Ahola
d09f9c0d1d made dtime jitter compare value and fps calculation a bit faster changing 2011-06-27 00:29:17 +03:00
Perttu Ahola
dd22ea051a map unloading is now a whole lot better 2011-06-27 00:27:17 +03:00
Perttu Ahola
3fccc67eb7 fixed block unloading from memory (a better fix coming next) 2011-06-26 21:53:11 +03:00
Perttu Ahola
d702a2c33b Made the initial loading screen slightly more alive 2011-06-26 20:00:04 +03:00
Perttu Ahola
7e59938c54 added screenshot key F12 (from spongie) 2011-06-26 19:33:40 +03:00
Perttu Ahola
5e3deed672 Added CPT_FACEDIR_SIMPLE calculation, finally, as figured out by spongie 2011-06-26 19:23:44 +03:00
Perttu Ahola
97840e93b5 changed one "if" to "else if" in content_mapblock.cpp 2011-06-26 19:23:05 +03:00
Perttu Ahola
d3d369a63b reorganized stuff 2011-06-26 18:51:57 +03:00
Perttu Ahola
af6860f6f4 tuned mapgen 2011-06-26 18:51:35 +03:00
Perttu Ahola
d3a5eac22c changed water color in farmesh 2011-06-26 18:50:43 +03:00
Perttu Ahola
2bd2bdff08 updated noise stuff 2011-06-26 18:50:13 +03:00
Perttu Ahola
91cfbe2891 reorganized a lot of stuff and modified mapgen and objects slightly while doing it 2011-06-26 15:48:56 +03:00
Perttu Ahola
3b098fd5dc improved player fall damage detection 2011-06-26 15:45:13 +03:00
Sebastian Rühl
7efe89ff58 backported cactus, papyrus and clay 2011-06-26 13:47:21 +02:00
Sebastian Rühl
4f44cabe1c small fix 2011-06-26 12:52:03 +02:00
Sebastian Rühl
9d09103e48 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>
 2011-06-26 12:24:32 +02:00
Perttu Ahola
c1ceabef71 added and commented out some debug output 2011-06-26 03:14:52 +03:00
Perttu Ahola
bb940a946d even more code refactoring 2011-06-26 02:34:36 +03:00
Perttu Ahola
2915bd5518 more reorganizing of map code 2011-06-26 01:31:43 +03:00
Perttu Ahola
cb130d9158 cleaned map stuff 2011-06-26 00:03:58 +03:00
Perttu Ahola
a80025c352 moved mapgen stuff around abit 2011-06-25 18:35:32 +03:00
Perttu Ahola
f2c26e2014 moved map generator to separate source files 2011-06-25 18:12:41 +03:00
Perttu Ahola
aed9e809a1 mapgen stuff 2011-06-25 16:32:09 +03:00
Perttu Ahola
e8a731adc5 added correct data to new images, added comments in main.cpp 2011-06-25 04:41:38 +03:00
Perttu Ahola
7538b4c620 New map generator added (and SQLite, messed up the commits at that time...) (import from temporary git repo) 2011-06-25 04:25:14 +03:00
Perttu Ahola
30c34cc23e disabled farmesh in default settings 2011-06-23 14:10:46 +03:00
Perttu Ahola
c1844a921d fixed servermain.cpp lacking filesys.h 2011-06-22 14:21:55 +03:00
Perttu Ahola
051c0048d8 path_userdata is now created before potentially creating debug.txt in there 2011-06-20 18:04:49 +03:00
Perttu Ahola
bdd1375011 moved the mac include in porting.cpp out of namespace 2011-06-20 07:56:45 +03:00
Perttu Ahola
748340fad5 fixed a segfault in case of wrong input from network on the server (reported by spongie) 2011-06-19 19:40:41 +03:00
Perttu Ahola
02006a9540 Modified the mesh update thread's sleep time to speed it up (it was way too high) 2011-06-18 22:31:24 +03:00
Perttu Ahola
28a8218adf Documentation update 2011-06-18 20:16:11 +03:00
Perttu Ahola
5d1ae85ab9 Hand-picked Mac OSX cursor and bundle path fixes from https://bitbucket.org/toabi/minetest-mac 2011-06-18 18:44:01 +03:00
Perttu Ahola
5ac900ddd9 Changed MapBlockObjects to be never written anymore. Incremented version number. 2011-06-18 15:16:35 +03:00
Perttu Ahola
c7ab4f15a5 comment update 2011-06-18 13:52:49 +03:00
Perttu Ahola
c78d610618 farmesh render range is now dynamic 2011-06-18 13:43:49 +03:00
Perttu Ahola
7d0395ba36 fixed tree placement in farmesh 2011-06-18 13:11:11 +03:00
Perttu Ahola
7773e68c2a farmesh is now usable. 2011-06-18 12:42:17 +03:00
Perttu Ahola
0bd1b782d0 modified health bar a bit 2011-06-18 09:04:31 +03:00
Perttu Ahola
4a6e6cee20 enabled word wrap in chat 2011-06-18 08:50:14 +03:00
Perttu Ahola
a4cceb93ec fixed wrong furnace menu layout 2011-06-18 08:50:05 +03:00
Perttu Ahola
534287892d merged Mac OSX build fix from minetest-delta 2011-06-18 03:14:13 +03:00
Perttu Ahola
c391bcee16 removed furnace menu because it is not needed anymore 2011-06-18 02:32:34 +03:00
Perttu Ahola
cced6aaf8d separated inventory-related game content to content_inventory.{h,cpp} 2011-06-18 02:30:33 +03:00
Perttu Ahola
a23f6a1548 forgot to add mapblock_nodemod.h 2011-06-18 02:01:51 +03:00
Perttu Ahola
931474658d moved inventory menu definition of chest and furnace to content_nodemeta.{h,cpp} 2011-06-18 02:00:01 +03:00
Perttu Ahola
da692355e8 Created and moved stuff to content_nodemeta.{h,cpp} 2011-06-18 00:46:50 +03:00