Oblomov/minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
minetest/src
History
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
..
jthread
Temporary commit; lots of test code and stuff
2011-02-21 00:45:14 +02:00
sqlite
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
activeobject.h
Some work-in-progress in hp and mobs and a frightening amount of random fixes.
2011-04-21 19:35:17 +03:00
auth.cpp
auth stuff is now saved only when modified
2011-05-31 00:23:39 +03:00
auth.h
auth stuff is now saved only when modified
2011-05-31 00:23:39 +03:00
base64.cpp
Fixed the password crash on Windows
2011-06-02 00:01:11 +03:00
base64.h
Passwords - password entry at main menu, stored and checked by server
2011-05-20 20:28:03 +01:00
client.cpp
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
2011-06-26 12:24:32 +02:00
client.h
farmesh is now usable.
2011-06-18 12:42:17 +03:00
clientobject.cpp
All textures are are now searched first from the directory specified by the texture_path setting.
2011-05-21 11:07:03 +03:00
clientobject.h
Some work-in-progress in hp and mobs and a frightening amount of random fixes.
2011-04-21 19:35:17 +03:00
clientserver.h
player passwords and privileges in world/auth.txt
2011-05-29 21:11:16 +03:00
clouds.cpp
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
clouds.h
random comment updates
2011-04-30 02:12:32 +03:00
cmake_config.h.in
cleaning notes and stuff
2011-04-06 11:34:41 +03:00
CMakeLists.txt
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
2011-06-26 12:24:32 +02:00
collision.cpp
Some work-in-progress in hp and mobs and a frightening amount of random fixes.
2011-04-21 19:35:17 +03:00
collision.h
Some work-in-progress in hp and mobs and a frightening amount of random fixes.
2011-04-21 19:35:17 +03:00
common_irrlicht.h
random comment updates
2011-04-30 02:12:32 +03:00
config.h
made old build system to work too. the cmake one doesn't make working binaries for some computers.
2011-01-18 15:05:29 +02:00
connection.cpp
Cleaned networking code a bit (had this one on the to-do list for like 4 months already)
2011-05-21 12:25:08 +03:00
connection.h
Cleaned networking code a bit (had this one on the to-do list for like 4 months already)
2011-05-21 12:25:08 +03:00
constants.h
small comment update
2011-05-18 21:59:31 +03:00
content_craft.cpp
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
2011-06-26 12:24:32 +02:00
content_craft.h
Created and moved stuff to content_nodemeta.{h,cpp}
2011-06-18 00:46:50 +03:00
content_inventory.cpp
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
2011-06-26 12:24:32 +02:00
content_inventory.h
separated inventory-related game content to content_inventory.{h,cpp}
2011-06-18 02:30:33 +03:00
content_mapblock.cpp
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
2011-06-26 12:24:32 +02:00
content_mapblock.h
Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and content_mapblock.{h,cpp}
2011-06-17 23:20:31 +03:00
content_mapnode.cpp
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
2011-06-26 12:24:32 +02:00
content_mapnode.h
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
2011-06-26 12:24:32 +02:00
content_nodemeta.cpp
fixed wrong furnace menu layout
2011-06-18 08:50:05 +03:00
content_nodemeta.h
moved inventory menu definition of chest and furnace to content_nodemeta.{h,cpp}
2011-06-18 02:00:01 +03:00
debug.cpp
fixed warnings reported by cppcheck
2011-04-11 11:36:13 +03:00
debug.h
Get rid of all the string format warnings caused by the DSTACK macro
2011-05-16 21:47:50 +01:00
defaultsettings.cpp
mapgen stuff
2011-06-25 16:32:09 +03:00
environment.cpp
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
2011-06-26 12:24:32 +02:00
environment.h
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
exceptions.h
framework for modifying textures
2010-12-20 22:03:49 +02:00
farmesh.cpp
moved map generator to separate source files
2011-06-25 18:12:41 +03:00
farmesh.h
farmesh render range is now dynamic
2011-06-18 13:43:49 +03:00
filesys.cpp
New map directory structure that avoids map size being limited by filesystem
2011-05-18 16:48:27 +01:00
filesys.h
New map directory structure that avoids map size being limited by filesystem
2011-05-18 16:48:27 +01:00
game.cpp
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
2011-06-26 12:24:32 +02:00
game.h
Passwords - password entry at main menu, stored and checked by server
2011-05-20 20:28:03 +01:00
gettime.h
organizing stuff.
2010-12-21 18:08:24 +02:00
guiInventoryMenu.cpp
moved inventory menu definition of chest and furnace to content_nodemeta.{h,cpp}
2011-06-18 02:00:01 +03:00
guiInventoryMenu.h
moved inventory menu definition of chest and furnace to content_nodemeta.{h,cpp}
2011-06-18 02:00:01 +03:00
guiMainMenu.cpp
added new submenu for key assignment
2011-06-01 19:44:07 +02:00
guiMainMenu.h
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
2011-06-26 12:24:32 +02:00
guiMessageMenu.cpp
bug-fixin'
2011-02-08 01:12:55 +02:00
guiMessageMenu.h
added new submenu for key assignment
2011-06-01 19:44:07 +02:00
guiPasswordChange.cpp
Updated licenses of CiaranG's contributions to be in line with the new contribution policy and added a TODO note to server.cpp
2011-05-31 11:59:51 +03:00
guiPasswordChange.h
Updated licenses of CiaranG's contributions to be in line with the new contribution policy and added a TODO note to server.cpp
2011-05-31 11:59:51 +03:00
guiPauseMenu.cpp
Added the ability to change your password (via pause menu)
2011-05-22 21:09:12 +01:00
guiPauseMenu.h
Added the ability to change your password (via pause menu)
2011-05-22 21:09:12 +01:00
guiTextInputMenu.cpp
bug-fixin'
2011-02-08 01:12:55 +02:00
guiTextInputMenu.h
OMG! Main Menu!
2011-01-23 17:29:15 +02:00
inventory.cpp
fixed a segfault in case of wrong input from network on the server (reported by spongie)
2011-06-19 19:40:41 +03:00
inventory.h
Removed IrrlichtWrapper
2011-04-22 09:54:05 +03:00
keycode.cpp
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
2011-06-26 12:24:32 +02:00
keycode.h
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
2011-06-26 12:24:32 +02:00
light.cpp
tested out and commented out some new stuff for the terrain generator, to be used in the future.
2011-04-26 15:38:42 +03:00
light.h
all kinds of tweaking and fixing
2011-02-04 01:22:07 +02:00
main.cpp
added correct data to new images, added comments in main.cpp
2011-06-25 04:41:38 +03:00
main.h
Reduced the CPU usage of the sent block selector algorithm
2011-05-31 00:15:43 +03:00
map.cpp
moved mapgen stuff around abit
2011-06-25 18:35:32 +03:00
map.h
moved mapgen stuff around abit
2011-06-25 18:35:32 +03:00
mapblock_mesh.cpp
mapgen stuff
2011-06-25 16:32:09 +03:00
mapblock_mesh.h
Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and content_mapblock.{h,cpp}
2011-06-17 23:20:31 +03:00
mapblock_nodemod.h
forgot to add mapblock_nodemod.h
2011-06-18 02:01:51 +03:00
mapblock.cpp
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
mapblock.h
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
mapblockobject.cpp
All textures are are now searched first from the directory specified by the texture_path setting.
2011-05-21 11:07:03 +03:00
mapblockobject.h
All textures are are now searched first from the directory specified by the texture_path setting.
2011-05-21 11:07:03 +03:00
mapchunk.h
Optimized map saving and sending (server-side)
2011-04-26 00:23:38 +03:00
mapgen.cpp
moved mapgen stuff around abit
2011-06-25 18:35:32 +03:00
mapgen.h
moved mapgen stuff around abit
2011-06-25 18:35:32 +03:00
mapnode.cpp
Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and content_mapblock.{h,cpp}
2011-06-17 23:20:31 +03:00
mapnode.h
Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and content_mapblock.{h,cpp}
2011-06-17 23:20:31 +03:00
mapsector.cpp
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
mapsector.h
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
materials.cpp
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
materials.h
Updated comments
2011-06-17 23:28:25 +03:00
mineral.cpp
All textures are are now searched first from the directory specified by the texture_path setting.
2011-05-21 11:07:03 +03:00
mineral.h
All textures are are now searched first from the directory specified by the texture_path setting.
2011-05-21 11:07:03 +03:00
modalMenu.h
changed node metadata format to better accomodate future needs and problems
2011-04-05 00:24:47 +03:00
nodemetadata.cpp
Created and moved stuff to content_nodemeta.{h,cpp}
2011-06-18 00:46:50 +03:00
nodemetadata.h
moved inventory menu definition of chest and furnace to content_nodemeta.{h,cpp}
2011-06-18 02:00:01 +03:00
noise.cpp
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
noise.h
mapgen stuff
2011-06-25 16:32:09 +03:00
player.cpp
hopefully fixed the privilege problems
2011-05-29 22:34:04 +03:00
player.h
hopefully fixed the privilege problems
2011-05-29 22:34:04 +03:00
porting.cpp
moved the mac include in porting.cpp out of namespace
2011-06-20 07:56:45 +03:00
porting.h
Ctrl+C handling on POSIX, some commands for server and other tweaking
2011-02-15 16:11:24 +02:00
profiler.h
Reduced the CPU usage of the sent block selector algorithm
2011-05-31 00:15:43 +03:00
serialization.cpp
Messed around with genmap.py. Now supports format version 17.
2011-06-05 00:10:06 +03:00
serialization.h
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
server.cpp
moved map generator to separate source files
2011-06-25 18:12:41 +03:00
server.h
moved map generator to separate source files
2011-06-25 18:12:41 +03:00
servercommand.cpp
Updated licenses of CiaranG's contributions to be in line with the new contribution policy and added a TODO note to server.cpp
2011-05-31 11:59:51 +03:00
servercommand.h
Updated licenses of CiaranG's contributions to be in line with the new contribution policy and added a TODO note to server.cpp
2011-05-31 11:59:51 +03:00
servermain.cpp
fixed servermain.cpp lacking filesys.h
2011-06-22 14:21:55 +03:00
serverobject.cpp
Preliminary "active block" stuff + set up test code to grow grass.
2011-05-22 17:00:09 +03:00
serverobject.h
Preliminary "active block" stuff + set up test code to grow grass.
2011-05-22 17:00:09 +03:00
sha1.cpp
Passwords - a few corrections to the previous commit
2011-05-20 21:37:13 +01:00
sha1.h
Passwords - a few corrections to the previous commit
2011-05-20 21:37:13 +01:00
socket.cpp
fixed warnings reported by cppcheck
2011-04-11 11:36:13 +03:00
socket.h
some fixes to make compiling on some bsd easier
2011-02-11 22:34:34 +02:00
staticobject.h
added missing file
2011-04-10 20:49:15 +03:00
strfnd.h
crafting system!
2010-12-22 16:30:23 +02:00
test.cpp
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
test.h
license stuff
2010-11-29 20:13:04 +02:00
threads.h
added some missing files
2010-12-20 22:23:24 +02:00
tile.cpp
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
tile.h
All textures are are now searched first from the directory specified by the texture_path setting.
2011-05-21 11:07:03 +03:00
utility.cpp
Fixed the password crash on Windows
2011-06-02 00:01:11 +03:00
utility.h
mapgen stuff
2011-06-25 16:32:09 +03:00
voxel.cpp
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
voxel.h
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