1
0
Commit Graph

4208 Commits

Author SHA1 Message Date
Mattes D
9ae31d913c Improved code safety for the Compact world storage.
That was a huge chunk of smelly code.
2014-01-23 14:21:56 +01:00
Mattes D
97ee3340e3 Minor style improvements for the merged PR. 2014-01-23 14:14:33 +01:00
Mattes D
0526ed327c Merge remote-tracking branch 'xdot/master'
* xdot/master:
  Command block fixes 2
2014-01-23 14:06:05 +01:00
andrew
4ef61d8bf6 Command block fixes 2 2014-01-23 14:57:04 +02:00
Mike Hunsinger
00d7317746 Removed extra line 2014-01-23 00:53:00 -07:00
Mike Hunsinger
41b05416c7 Split TossItem into three Toss functions (Held, Equipped and Pickup) 2014-01-23 00:27:39 -07:00
madmaxoft
34f13d589a Removed CryptoPP files. 2014-01-22 22:26:40 +01:00
madmaxoft
eb9bebf755 Replacing CryptoPP with PolarSSL.
This is only the CMake modification to build with PolarSSL, the actual MCS code doesn't compile at all yet.
2014-01-22 22:19:33 +01:00
madmaxoft
37e820d16e Added PolarSSL as a submodule. 2014-01-22 22:17:20 +01:00
madmaxoft
3b96fc1e54 Authenticator: Reduced logging levels. 2014-01-22 22:06:48 +01:00
Tycho
5ef0a00a6c Fixed spelling error 2014-01-22 10:39:09 -08:00
Tycho
571200019d Added manual bindings for moved functions 2014-01-22 10:35:36 -08:00
Tycho
1c320fa18c formatting changes 2014-01-22 10:13:41 -08:00
Tycho
c832fbeb8e Merge branch 'master' into GeneratingBenchmark
Conflicts:
	src/World.h
2014-01-22 09:13:12 -08:00
STRWarrior
bcda30526d Merge pull request #574 from tonibm19/patch-1
Fixed compilation on VC2008
2014-01-22 08:07:26 -08:00
tonibm19
d59a0156ce Fixed compilation on VC2008 2014-01-22 16:58:25 +01:00
Mattes D
26586fdb92 Merge pull request #566 from xdot/master
Scoreboard
2014-01-22 06:05:17 -08:00
andrew
dd04f5a73c cWorld now saves/loads the scoreboard 2014-01-22 15:49:21 +02:00
madmaxoft
a6661e899a InfoDump: Can dump a single plugin without LFS. 2014-01-22 12:41:19 +01:00
madmaxoft
f58d11fc1a InfoDump: Dump all referenced permissions. 2014-01-22 10:18:58 +01:00
madmaxoft
2a018cfa49 Implemented cPluginManager:CallPlugin() API.
This function supersedes cPlugin:Call(), is safer to use in regards to multithreading and once again removes the need for the cPlugin class being exported at all.
2014-01-21 23:00:35 +01:00
andrew
9bd8f74b59 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-01-21 20:40:41 +02:00
andrew
fa4750f015 Scoreboard SendTo() 2014-01-21 19:43:13 +02:00
andrew
aa61f55b74 Scoreboard protocol support 2014-01-21 15:58:17 +02:00
Alexander Harkness
9c93ab15ab Fix a crash but somewhere... 2014-01-20 19:02:37 +00:00
Tycho
ca3389231e Actually implemented interfaces 2014-01-20 10:15:19 -08:00
Tycho
4f09e8df6e Moved Schematic file methods to seperate class 2014-01-20 09:59:12 -08:00
Tycho
613f238ab6 Merge branch 'ForEachChunkProvider' into GeneratingBenchmark
Conflicts:
	src/World.h
2014-01-20 09:37:31 -08:00
Tycho
16375f6aad Merge branch 'master' into GeneratingBenchmark
this merge is necessary,
2014-01-20 09:21:47 -08:00
Tycho
9bb61e6e2e Seperated BlockArea From World
If anyone can come up with a better name for the interface I'll change it, It contians to methods which do compleatly unrelated things
2014-01-20 09:17:24 -08:00
andrew
ff2302ebd5 Scoreboard serialization 2014-01-20 16:45:40 +02:00
andrew
7728f4bcbe Scoreboard deserialization 2014-01-20 16:10:39 +02:00
madmaxoft
2407a67906 APIDump: Added notes about objects across cWorld's task execution. 2014-01-19 23:56:49 +01:00
madmaxoft
e9e9593e6d APIDump: Updated cWorld:ScheduleTask()'s description. 2014-01-19 23:50:49 +01:00
madmaxoft
41618bf242 Changed the cWorld::ScheduleTask() signature.
Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly.
2014-01-19 23:49:19 +01:00
madmaxoft
4a01879911 cLuaState can now check function params. 2014-01-19 23:45:26 +01:00
Mattes D
865016abe2 Merge pull request #569 from worktycho/EnchantmentsFix
Enchantments fix
2014-01-19 13:50:50 -08:00
Mattes D
fde8b0be60 Merge pull request #565 from mc-server/commandblockfixes
Command block fixes
2014-01-19 13:47:52 -08:00
Tycho
bd4278aca1 Added Inifile and OSSupport Linking 2014-01-19 12:51:23 -08:00
Tycho
2aa28ad6f4 First attempt at Compiling Generator seperatly 2014-01-19 12:50:07 -08:00
Tiger Wang
e4c3d799ff Removed unneeded paramters 2014-01-19 19:42:25 +00:00
Tiger Wang
83cbe8c139 Begin implementing ascending rails 2014-01-19 19:31:17 +00:00
Tiger Wang
3700ad8546 Added one more direction into collision checks
* Added direction XM_XP
* Improved performance, thanks STR and xoft
2014-01-19 18:42:05 +00:00
madmaxoft
3c0e8c8da0 Rewritten SocketThreads for proper shutdown scenario.
This fixes #560 and #390.
2014-01-19 19:31:43 +01:00
Tiger Wang
9a580146e4 Minecart improvements and fixes
* Fixed curved rails
* Fixed detector rails in certain situations
* Fixed powered rails and others passing bad meta to SnapToRail()
2014-01-19 18:27:06 +00:00
Tiger Wang
fc622ce194 Fixed weird meta with curved rails 2014-01-19 18:24:56 +00:00
madmaxoft
cce063b0cd Added graph of SocketThreads state transitions.
This graph has been used for #560.
2014-01-19 18:37:37 +01:00
Tycho
f13a14d2cf Switched EnchantmentSerilizer to namespace 2014-01-19 08:52:45 -08:00
Mattes D
6976735a53 Merge pull request #551 from worktycho/schedular
Implemented xoft's suggestion for a saturating counter in the scheduler
2014-01-19 07:46:34 -08:00
Tycho
e14ddff1c0 Spilt Writing of Enchantments to seperate class
Created a new class cEnchantmentSerializer to serilize Enchantments to NBT.
This breaks a dependecy chain between cChunkGenerator and cWorld.
cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments
so having it seperate reduces the spread of the frein modifier
2014-01-19 07:38:59 -08:00