1
0
Commit Graph

1940 Commits

Author SHA1 Message Date
Tiger Wang
4face38fdc Merge pull request #101 from tigerw/master
Fixes and features
2013-08-16 12:19:46 -07:00
Tiger Wang
a4d927c9e1 Another compile fix 2013-08-16 13:20:33 +01:00
Tiger Wang
6981e55b6c Possible entity ID fix? 2013-08-16 13:12:44 +01:00
Tiger Wang
e64c40115e Compilation and Minecart fixes 2013-08-16 13:04:06 +01:00
Alexander Harkness
7e9957919e Removed an old cloneplugins file. 2013-08-16 12:44:38 +01:00
Alexander Harkness
c3c3068fab Changed README so it knows about submodules 2013-08-16 12:43:56 +01:00
Alexander Harkness
1af758569d Added transapi as a submodule - so it more accurately reflects the source origin. 2013-08-16 12:17:31 +01:00
Alexander Harkness
024fe5e6c5 Added the removed plugins as submodules. 2013-08-16 12:14:05 +01:00
Tiger Wang
cbde4f546a Merge remote-tracking branch 'upstream/master' 2013-08-16 11:25:53 +01:00
Tiger Wang
7f87d6c3d6 Feature and bugfixes [SEE DESC]
Added TNT and Hopper minecarts
Fixed piston code failing without an extension set
Repeaters are now broken
Fixed not being able to place a minecart on an activator rail
Added much needed comments on piston code
Fixed minor formatting issue
2013-08-16 11:23:24 +01:00
madmaxoft
0cb00996de Replaced E_ENTITY_TYPE_XXX with cMonster::mtXXX.
Also slightly improved the spawning algorithm.
2013-08-16 10:48:30 +02:00
madmaxoft
78b329a9b5 Removed squirrel plugin remnants 2013-08-16 10:48:29 +02:00
madmaxoft
26b56689a6 Updated the nightbuild script for moved plugins 2013-08-16 10:17:37 +02:00
madmaxoft
0074432ccd Moved ProtectionAreas into a separate repository 2013-08-16 09:38:57 +02:00
madmaxoft
8326aff5b4 Added the ClonePlugins script.
This will clone the base plugins into their respective folders.
2013-08-16 09:30:27 +02:00
madmaxoft
98d574f05e No more Core in the MCServer repo 2013-08-16 09:20:34 +02:00
Tiger Wang
2630aa8078 Merge pull request #96 from mc-server/buildsystest
Changed a line, new PR system test.
2013-08-15 15:40:39 -07:00
madmaxoft
7acb665f25 Exported cWorld:DoExplosionAt() to Lua API. 2013-08-15 22:12:57 +02:00
Alexander Harkness
69fcf3188a Changed a line, new PR system test. 2013-08-15 18:11:35 +01:00
Alexander Harkness
54c8bf2e97 Merge pull request #95 from mc-server/CryptoUpdate
CryptoPP update
2013-08-15 09:53:45 -07:00
madmaxoft
1c2140dd4d Fixed the Reload and Save-all console commands.
They were broken by the PerWorldThreads update removing cServer:BroadcastMessage() and cServer:SendMessage()
2013-08-15 17:18:27 +02:00
STRWarrior
18fcab06ce Added Luksor to contributors list. 2013-08-15 13:50:49 +02:00
madmaxoft
28de751f2c Attempting to fix CentOS / gcc 4.4.7 compilation problem.
Reported by ThijsD in the forum http://forum.mc-server.org/showthread.php?tid=1220
2013-08-15 13:05:24 +02:00
Mattes D
1a52e89177 Merge pull request #93 from mc-server/PerWorldThreads
Per world threads
2013-08-15 01:56:52 -07:00
madmaxoft
0aace84516 Updated the makefile to disable assembly for clang.
You need to set a flag manually, "disableasm=1" on the commandline.
2013-08-15 09:20:50 +02:00
madmaxoft
0297cf5485 Updated CryptoPP to 5.6.2 2013-08-15 09:03:58 +02:00
Mattes D
b092c2770c Merge pull request #91 from tigerw/master
Fixed piston being able to push water
Fixed ice creating a non-source block (still doesn't update though)
2013-08-14 22:52:24 -07:00
Tiger Wang
d4f8a057dd Generation and simulation defaults
...are no longer set, instead, the server operator is told to set them.
2013-08-14 22:26:15 +01:00
madmaxoft
50205bc4df Added simple deadlock detection code.
This will assert and then deliberately crash the server once a deadlock is detected. For detection, only the world tick threads are considered, cWorld's m_WorldAge is checked periodically and if it doesn't increment for several seconds, a deadlock is reported.
2013-08-14 22:39:12 +02:00
madmaxoft
f93d13c419 Fixed world's a_Dt parameter getting time values in wrong units. 2013-08-14 22:36:34 +02:00
madmaxoft
259cf9f027 cEvent can now wait for the event with a specified timeout. 2013-08-14 22:27:49 +02:00
madmaxoft
0af2a0b08c ClientHandle no longer queues chat messages.
It is no longer needed to queue chat messages, because the protocol is parsed within the Tick thread itself, without holding any SocketThread CS.
2013-08-14 20:08:05 +02:00
madmaxoft
e2ff4a2e5c Clients are deleted when the world is stopped.
This fixes #92.
2013-08-14 19:56:29 +02:00
madmaxoft
cce9642c7b Fixed wrong names for some metas.
They were E_BLOCK_ instead of E_META_.
2013-08-14 19:49:53 +02:00
Mattes D
a1ec14f7f8 Updated CONTRIBUTING.md with basic recommendations 2013-08-14 19:42:18 +02:00
madmaxoft
17b2353d71 Server counts the players correctly.
Was missing the PlayerDestroying() call, so players weren't removed from the playercount.
2013-08-14 19:11:54 +02:00
madmaxoft
f8757d3606 Fixed crashes in world's clientlist manipulators 2013-08-14 13:43:55 +02:00
STRWarrior
1b097d2cb4 Added mtilden to contributors list. 2013-08-14 13:09:13 +02:00
Tiger Wang
ad57f1966c Okay, changed to xoft's partial fix 2013-08-14 12:08:36 +01:00
Tiger Wang
77468f87b7 Merge remote-tracking branch 'upstream/master'
Conflicts:
	source/Piston.cpp

Merge conflict?
2013-08-14 12:03:13 +01:00
Tiger Wang
4ae1750da2 Alpha sorted PistonBreakable list 2013-08-14 11:50:21 +01:00
madmaxoft
b1a892bd9a Partially fixed tonibm19's mess. 2013-08-14 12:45:39 +02:00
Tiger Wang
303b1a9c45 Buncha bugfixes [SEE DESC]
Fixed generation values not being written
Fixed piston being able to push water
Fixed ice creating a non-source block (still doesn't update though)
Removed problematic piston code
2013-08-14 11:44:02 +01:00
Tiger Wang
7803bde6b6 Merge pull request #85 from tigerw/master
Fixed #57
2013-08-14 03:36:16 -07:00
STRWarrior
64345fe288 Added some old contributors. 2013-08-14 12:16:05 +02:00
Alexander Harkness
d211cc91c4 Removed 's' at the end of CONTRIBUTING.md 2013-08-14 10:30:54 +01:00
Alexander Harkness
959f875bba Moved the file as it was markdown. 2013-08-14 10:29:43 +01:00
Alexander Harkness
a25fe9d3b2 Merge pull request #90 from mc-server/contributing
Added basic contributing file, fixes #86.
2013-08-14 02:27:00 -07:00
Alexander Harkness
ade261255c Added tabs/spaces stuff. 2013-08-14 10:26:30 +01:00
Alexander Harkness
386d8190e9 Added basic contributing file, fixes #86. 2013-08-14 09:54:32 +01:00