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

290 Commits

Author SHA1 Message Date
proller
82aeac3959 Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	src/mapblock_mesh.cpp
	src/nodedef.cpp
	src/nodedef.h
 2014-10-21 00:15:57 +04:00
proller
ced787ef84 Merge remote-tracking branch 'minetest/master' 
Conflicts:
	src/client.cpp
	src/nodedef.cpp
 2014-10-19 21:45:10 +04:00
sfan5
b11e1db809 Update the cURL the buildbot uses to 7.38.0 2014-10-19 16:09:36 +02:00
proller
1dad366da9 Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	src/client.cpp
	util/master/list.js
 2014-10-02 21:18:28 +04:00
proller
0523361d0c Merge remote-tracking branch 'minetest/master' 2014-10-01 15:18:11 +04:00
Diego Martínez
47abe25fe7 updatepo.sh: Find all files 2014-09-30 13:25:26 -04:00
proller
def58867e8 Update masterserver 2014-09-25 18:29:08 +04:00
proller
fcff10fe6f Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	src/CMakeLists.txt
 2014-07-30 15:57:10 +04:00
proller
bf6b890cb7 Merge remote-tracking branch 'minetest/master' 
Conflicts:
	CMakeLists.txt
	README.txt
	src/CMakeLists.txt
	src/tile.cpp
 2014-07-30 15:54:03 +04:00
sfan5
17345404ba Add ZLIBWAPI_DLL and LEVELDB_DLL CMake options Remove legacy MINGWM10_DLL CMake option Update 32-bit buildbot (OpenAL updated, zlib updated) Change build directory for buildbots to '_build' to prevent removal of Android build files Use -win64 suffix for 64-bit Windows builds Fixes #1476 2014-07-29 20:03:18 +02:00
proller
95605eb27f Moving masterserver to http://servers.freeminer.org/ 2014-07-03 16:20:36 +04:00
ShadowNinja
567dea29ee Move master server to seperate repository 2014-06-30 17:27:24 -04:00
proller
b8d95b2d5e Merge remote-tracking branch 'upstream/master' into next 
Conflicts:
	src/game.cpp
	src/guiFormSpecMenu.cpp
	src/guiFormSpecMenu.h
	src/main.cpp
	src/server.cpp
	src/util/string.cpp
	src/util/string.h
 2014-06-30 23:07:01 +04:00
proller
48cb5eb028 Merge remote-tracking branch 'minetest/master' 
Conflicts:
	README.txt
	src/CMakeLists.txt
 2014-06-30 22:20:01 +04:00
proller
65436ad81a Merge commit 'ff36071' 
Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
	src/environment.cpp
	src/game.cpp
	src/guiFormSpecMenu.cpp
	src/player.cpp
	src/profiler.h
	src/server.cpp
	src/util/string.h
 2014-06-30 21:42:30 +04:00
proller
1c01ed5f13 Masterserver: Fix compiling servers.jst 2014-06-30 20:47:50 +04:00
proller
897c218b96 Masterserver: Fix undefined players 2014-06-28 22:10:55 +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
62b735f923 Merge commit 'ce9f1e1' into merge3 2014-06-22 16:29:16 +04:00
sfan5
ce9f1e1d3c Update buildbot scripts and add 64-bit buildbot 2014-06-18 16:40:24 +02:00
proller
2ae025ff41 masterserver: disable ping check 2014-05-21 03:17:13 +04:00
proller
bd34b7dfff Merge remote-tracking branch 'minetest/master' 
Conflicts:
	src/server.cpp
 2014-02-28 11:11:36 +04:00
proller
d4be81155e Fix null string escape 2014-02-24 20:41:04 +04:00
proller
c71642d756 reverse patch 2014-01-21 17:45:53 +04:00
proller
3cd48fd139 better mandelbulber 2014-01-21 17:32:04 +04:00
proller
c62bab010f Send long announce as POST, show OS in useragent 
Add lag reporting to masterserver (average dtime)
StyledWriter  -> FastWriter in masterserver announce
 2014-01-07 02:50:45 +04:00
proller
e21543e4d3 Merge remote-tracking branch 'proller/post' 2014-01-06 23:55:31 +04:00
proller
ecde738909 Add lag reporting to masterserver (average dtime) 2014-01-06 23:51:04 +04:00
proller
b580ea1576 External mandelbulber 2013-12-29 04:43:33 +04:00
proller
25df028668 mingw move to build 2013-12-04 16:47:48 +04:00
proller
1309e52198 Rename names -> can_see_far_names in announce 2013-12-03 20:14:06 +04:00
proller
6cbd1b8bf7 Remove link to #, add unlimited_player_transfer_distance to announce 2013-12-03 19:48:43 +04:00
proller
6f44492238 Masterserver uptime fix 2013-11-05 21:18:37 +04:00
Ilya Zhuravlev
7be18657b1 Fix masterserver README.md 2013-11-04 21:54:25 +04:00
proller
cf0786dc9d Masterserver fixes 2013-11-04 13:02:42 +04:00
proller
4a8a50a2a2 Masterserver show privs and js autoload 2013-11-04 04:56:39 +04:00
ShadowNinja
0fd29b7e09 Add a "More..." link when the serverlist is filtered 2013-11-03 18:21:53 -05:00
ShadowNinja
4c2687775f Only show servers with at least master.min_clients clients 2013-11-03 18:02:07 -05:00
ShadowNinja
50ea8601d5 Use a doT.js template for the serverlist 2013-11-03 17:47:16 -05:00
proller
382357d61c Masterserver totals fix 2013-10-18 23:57:22 +04:00
proller
a924409bd1 Masterserver update 2013-10-18 01:32:49 +04:00
sapier
09a50d0458 Add translation for main menu 
Add engine.gettext() and remove gettext() calls in guiFormspecMenu.cpp
 2013-08-17 16:01:43 +02:00
Sfan5
8b9bf47166 Fix stored XSS vulnerability in the serverlist 2013-08-07 09:24:32 +02:00
proller
2336d21efd Master server script improvement 2013-08-05 01:50:34 +04:00
proller
0b0919e81c Masterserver bugfix 2013-08-04 23:46:03 +04:00
proller
5e433fa913 More info in serverlist 2013-08-03 03:02:59 +04:00
proller
a70993d6d2 Masterserver mods fix 2013-07-13 04:11:26 +04:00
proller
0a2de78da4 Better masterserver html 2013-07-13 01:41:49 +04:00
proller
ac7a44792c Masterserver mods announse, ipv6, better curl errors 2013-07-13 00:19:05 +04:00
RealBadAngel
3f6f327cb9 Add texture bumpmapping feature. 2013-07-04 02:36:32 +02:00