Pantyhose-X/freeminer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,896 Commits 1 Branch 0 Tags
Commit Graph

210 Commits

Author SHA1 Message Date
proller
fabf169fef rename mg_heat -> mgv7_np_heat 2014-08-22 02:50:15 +04:00
proller
a3c814de43 Merge remote-tracking branch 'upstream/master' into next 2014-08-21 20:03:35 +04:00
proller
f2354622d0 Merge remote-tracking branch 'minetest/master' 
Conflicts:
	doc/lua_api.txt
 2014-08-20 18:44:33 +04:00
proller
d6535ebcf2 Revert "Increase curl_timeout to 59s" 
This reverts commit 6547998af87dc4998bb0f08af1042d0117b80a6c.
 2014-08-15 17:50:41 +04:00
proller
6547998af8 Increase curl_timeout to 59s 2014-08-15 17:34:23 +04:00
proller
97aae759be Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	build/windows/build.py
	src/CMakeLists.txt
	src/client.cpp
 2014-08-04 14:56:39 +04:00
Nathan Moore
73e99a0718 Optionally display console on Windows (via config option) (fixes #54) 
Conflicts:

	src/defaultsettings.cpp
	src/main.cpp
 2014-07-31 22:41:25 +04:00
proller
6fd181f721 Merge remote-tracking branch 'upstream/master' into next 2014-07-27 21:39:35 +04:00
proller
4a116d801f more_threads=1 on windows 2014-07-27 21:38:20 +04:00
proller
dff67e09d4 Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	src/defaultsettings.cpp
 2014-07-21 23:32:46 +04:00
proller
b47077dfca more_threads option 2014-07-21 20:10:09 +04:00
proller
7af2f42f90 Merge remote-tracking branch 'upstream/master' into next 2014-07-15 22:07:48 +04:00
proller
33bd18444f save_generated_block option, disable for big servers 2014-07-15 22:06:27 +04:00
proller
c71082cdf8 Merge remote-tracking branch 'upstream/master' into next 2014-07-11 20:37:44 +04:00
proller
b55d3b587f Adjustable weather 2014-07-11 19:59:54 +04:00
proller
b553a29b47 Merge remote-tracking branch 'upstream/master' into next 2014-06-27 22:24:41 +04:00
proller
83fe97aeb6 Merge remote-tracking branch 'minetest/master' 2014-06-27 22:24:03 +04:00
proller
78db96ed37 Merge remote-tracking branch 'upstream/master' into next 2014-06-25 23:51:45 +04:00
proller
8b4d17db9d Merge remote-tracking branch 'minetest/master' 2014-06-25 23:50:22 +04:00
proller
82e765bf65 Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	src/content_cao.cpp
	src/defaultsettings.cpp
	src/game.cpp
	src/guiFormSpecMenu.cpp
	src/main.cpp
	src/nodedef.h
 2014-06-22 19:27:29 +04:00
proller
6d3a12a116 Merge commit '9675d9e' into merge3 2014-06-22 04:58:54 +04:00
proller
acdd924690 Merge commit 'c1e297a' into merge3 
Conflicts:
	src/CMakeLists.txt
 2014-06-22 04:27:03 +04:00
proller
135d23e065 Merge commit '18fe277' into merge3 
Conflicts:
	builtin/game/item_entity.lua
 2014-06-22 04:22:49 +04:00
proller
ec477cf1ef Merge commit '09970b7' into merge3 
Conflicts:
	src/CMakeLists.txt
	src/clientmap.h
	src/content_cao.cpp
	src/defaultsettings.cpp
	src/game.cpp
	src/localplayer.h
 2014-06-22 04:18:32 +04:00
proller
3fda362e53 Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	build/windows/README.md
	build/windows/build.py
	src/defaultsettings.cpp
	src/guiFormSpecMenu.cpp
	src/main.cpp
	src/server.cpp
 2014-05-08 00:23:18 +04:00
proller
acdd492d8a Merge remote-tracking branch 'minetest/master' 
Conflicts:
	builtin/falling.lua
	freeminer.conf.example
	src/defaultsettings.cpp
	src/guiFormSpecMenu.cpp
 2014-05-01 02:05:55 +04:00
proller
072b757575 Merge remote-tracking branch 'minetest/master' 
Conflicts:
	src/defaultsettings.cpp
	src/script/cpp_api/s_entity.cpp
	src/script/lua_api/l_async_events.cpp
	src/script/lua_api/l_async_events.h
 2014-04-28 01:17:52 +04:00
proller
6ab7fd85e3 rename liquid_finite to liquid_real 2014-04-19 03:11:29 +04:00
proller
67bab7c3c2 Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	src/client.cpp
	src/config.h
	src/game.cpp
	src/server.cpp
	src/server.h
 2014-04-12 04:47:09 +04:00
proller
4852f87d50 Merge branch 'master' into next 
Conflicts:
	src/defaultsettings.cpp
 2014-04-11 21:39:38 +04:00
proller
92c5c18bc3 Merge remote-tracking branch 'minetest/master' 
Conflicts:
	src/config.h
 2014-04-11 21:26:35 +04:00
proller
0665462824 Save user/pass for every server 2014-04-06 02:01:10 +04:00
proller
18f4e55edf Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	src/client.cpp
	src/client.h
	src/cmake_config.h.in
	src/content_sao.cpp
	src/content_sao.h
	src/guiFormSpecMenu.cpp
	src/guiFormSpecMenu.h
	src/server.cpp
	src/server.h
 2014-04-04 19:43:59 +04:00
proller
851dba67d3 conf var enable_any_name 2014-04-01 19:48:11 +04:00
proller
651e76dadb Merge remote-tracking branch 'minetest/master' 
Conflicts:
	builtin/mainmenu.lua
	client/shaders/alpha_shader/opengl_fragment.glsl
	client/shaders/leaves_shader/opengl_fragment.glsl
	client/shaders/liquids_shader/opengl_fragment.glsl
	client/shaders/liquids_shader/opengl_vertex.glsl
	client/shaders/plants_shader/opengl_fragment.glsl
	client/shaders/solids_shader/opengl_fragment.glsl
 2014-03-22 16:54:41 +04:00
Ilya Zhuravlev
e77da72bb4 Merge remote-tracking branch 'origin/master' into next 
Conflicts:
	games/default
	src/client.cpp
	src/clientserver.h
	src/connection.cpp
	src/connection.h
	src/defaultsettings.cpp
	src/game.cpp
	src/script/lua_api/l_server.cpp
	src/server.cpp
	src/server.h
	src/test.cpp
	src/util/serialize.h
 2014-03-07 00:09:02 +04:00
proller
48f0cea724 farmesh alpha version (buggy) 2014-03-01 02:33:50 +04:00
proller
af8ea9d70a Merge commit '5771052' into merge2 
Conflicts:
	freeminer.conf.example
	src/defaultsettings.cpp
 2014-02-12 22:44:40 +04:00
proller
d2e24bde98 Merge commit '83bafbe' into merge2 
Conflicts:
	src/mapgen_math.cpp
	src/util/string.cpp
 2014-02-12 22:36:13 +04:00
proller
3ac3e88310 Merge commit '3670f5a' into merge2 
Conflicts:
	builtin/mainmenu.lua
	src/defaultsettings.cpp
	src/emerge.cpp
	src/server.cpp
	src/test.cpp
 2014-02-12 21:44:55 +04:00
Ilya Zhuravlev
9c8f28ae32 Merge branch 'master' into next 
Conflicts:
	src/clientserver.h
 2014-01-22 15:15:10 +04:00
BlockMen
ecdeac3def Clean up, add documentation 2014-01-21 19:07:15 +04:00
proller
0c810d5264 Merge remote-tracking branch 'upstream/master' into enet_msgpack 2014-01-19 17:42:46 +04:00
proller
9239279663 in config renames 2014-01-18 15:15:28 +04:00
proller
44b8df656c Announce to servers.freeminer.org 2014-01-18 15:07:18 +04:00
proller
d70d033da7 Merge remote-tracking branch 'minetest/master' 
Conflicts:
	builtin/builtin.lua
	src/environment.h
	src/script/lua_api/l_env.cpp
	src/script/lua_api/l_env.h
 2014-01-12 03:54:00 +04:00
proller
e80810d81d Merge remote-tracking branch 'minetest/master' 
Conflicts:
	src/client.cpp
	src/connection.cpp
	src/connection.h
	src/server.cpp
	src/server.h
 2014-01-10 20:28:45 +04:00
proller
da6850f38f Disableable timetaker 2014-01-07 20:37:16 +04:00
proller
72c6c4ac2c Revert "Revert "Improve (re)spawn, add cache_block_before_spawn and max_spawn_height settings"" 
This reverts commit 0fd5c61c00819ae3eaf298739e8cf879e2d43820.
 2014-01-07 15:42:57 +04:00
proller
9722354953 Merge remote-tracking branch 'minetest/master' 2014-01-07 15:21:06 +04:00