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
|
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
|
b55d2d4a65
|
added minetestmapper in utils/
|
2011-06-25 17:46:08 +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
|
47e4eda4bb
|
Reorganizing stuff (import from temporary git repo)
|
2011-06-25 04:23:21 +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
|
bf947833e9
|
uh oh, forgot to add treeprop.png to the repo
|
2011-06-19 12:37:00 +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
|
3c532fff15
|
lol, i have apparently used python too much...
|
2011-06-18 21:37:08 +03:00 |
|
Perttu Ahola
|
90dba34d80
|
added a small php example
|
2011-06-18 21:36:31 +03:00 |
|
Perttu Ahola
|
0d949c68d8
|
Added endianess to procotol.txt
|
2011-06-18 20:27:17 +03:00 |
|
Perttu Ahola
|
50ef74da1e
|
Fixed typo in protocol.txt
|
2011-06-18 20:21:25 +03:00 |
|
Perttu Ahola
|
cde8c70f8c
|
updated protocol.txt
|
2011-06-18 20:18:13 +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
|
13f469073e
|
Added tag 0.2.20110618_0_dev for changeset dd08a9b5cb84
|
2011-06-18 15:32:35 +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 |
|
Perttu Ahola
|
e7580d2804
|
added in-game key shortcuts for toggling free_move and fast_move (default K and J)
|
2011-06-17 23:55:21 +03:00 |
|
Perttu Ahola
|
6b1f059ccd
|
modified iron amount a bit
|
2011-06-17 23:43:28 +03:00 |
|
Perttu Ahola
|
6378a71ea5
|
Updated comments
|
2011-06-17 23:28:25 +03:00 |
|
Perttu Ahola
|
682c9d8e7d
|
Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and content_mapblock.{h,cpp}
|
2011-06-17 23:20:31 +03:00 |
|
Perttu Ahola
|
df5affe836
|
removed licensecomment.txt
|
2011-06-17 22:58:38 +03:00 |
|
Perttu Ahola
|
dc5319b6c9
|
Moved some mapnode content stuff from mapnode.{h,cpp} and digging property stuff from material.cpp to content_mapnode.{h,cpp}
|
2011-06-17 22:20:15 +03:00 |
|
Perttu Ahola
|
d6b54514bf
|
hopefully fixed old furnaces taking ridiculous amounts of cpu and halting the server
|
2011-06-16 19:43:28 +03:00 |
|
Perttu Ahola
|
1d372b9273
|
Probably fixed the single-MapBlock generator using 1 block lower water height than it should
|
2011-06-16 18:51:23 +03:00 |
|
Nils Dagsson Moskopp
|
158b054e72
|
+ rail block bounding box
|
2011-06-08 05:27:55 +02:00 |
|
Perttu Ahola
|
72e742c24e
|
Added an experimental "far view" thing. Doesn't work exactly like it should and not suitable for real use yet, and might never be.
|
2011-06-07 22:08:16 +03:00 |
|
Nils Dagsson Moskopp
|
1f4bdeab85
|
* README updated
|
2011-06-07 19:41:03 +02:00 |
|
Nils Dagsson Moskopp
|
3be6891938
|
+ rail
|
2011-06-07 19:24:30 +02:00 |
|
Perttu Ahola
|
fdee31abf1
|
...and the map part of that
|
2011-06-05 21:07:54 +03:00 |
|