1
0
Fork 0
Commit Graph

480 Commits

Author SHA1 Message Date
Howaner ab2eba17ec Add Skulls/Heads 2014-02-23 19:50:50 +01:00
andrew f471873945 Maps: Improvements 2014-02-23 15:05:03 +02:00
andrew 83d3a2eedf Manual merge (Fixed conflicts) 2014-02-20 15:37:15 +02:00
Mattes D 87db4b6a90 Merge pull request #697 from Howaner/Skull
Add Skulls/Heads to MCServer
2014-02-19 22:12:38 +01:00
Howaner d63ce62f3b Rename SkullEntity to MobHeadEntity 2014-02-19 14:45:09 +01:00
andrew 4a1ac57408 Documented cMap 2014-02-19 15:28:48 +02:00
Tiger Wang a686656253 Merge branch 'master' into itemframes
Conflicts:
	src/Entities/Entity.h
	src/WorldStorage/NBTChunkSerializer.cpp
2014-02-18 22:13:44 +00:00
Howaner 52c41f8869 Add Heads completely 2014-02-18 21:40:02 +01:00
Tiger Wang 320cc74f0a Implemented paintings, fixes #689
+ Implemented paintings
2014-02-18 00:16:03 +00:00
Tiger Wang 464ec47eb7 Implemented item frames, a part of #689
+ Implemented Item Frames
* Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
2014-02-17 23:00:03 +00:00
Howaner 777041806f Add Skulls/Heads 2014-02-17 20:14:08 +01:00
andrew 3b24bc870b Map item handler; Fixed several bugs 2014-02-17 16:27:12 +02:00
andrew 5b92b877bc Send map when selected 2014-02-14 16:21:16 +02:00
andrew 32b465b8e1 IDCount Serialization 2014-02-13 21:36:24 +02:00
andrew 92e85cc960 Implementation of in-game maps 2014-02-13 17:13:09 +02:00
STRWarrior 8470841f84 Fixed #573 2014-02-12 19:07:17 +01:00
Tiger Wang c68bdaf34b Fixed compile and some warnings in MSVS 2014-02-09 00:57:22 +00:00
Tiger Wang d82f3102e5 Partial fix for #130 2014-02-03 22:26:16 +00:00
Kirill Kirilenko a134fd45cf Added saving of angry flag. 2014-02-02 14:28:42 +04:00
Kirill Kirilenko a1c36c18e0 Fixed sitting tag. 2014-02-02 13:56:55 +04:00
Kirill Kirilenko 0259aed8be Added saving of collar's color. 2014-02-01 20:16:42 +04:00
Kirill Kirilenko 8180b643ff Added reading saved state of the wolf (sitting or standing). 2014-01-31 21:34:00 +04:00
STRWarrior 19e5122b77 Inversed condition. 2014-01-31 16:31:55 +01:00
STRWarrior c7e4ade7c3 Wolf: If Owner tag is missing a normal ownerless wolf will spawn. 2014-01-31 16:27:21 +01:00
STRWarrior 550a09020d Fixed bad variable. 2014-01-30 21:49:39 +01:00
STRWarrior 1a361be44f Check if the tag is found. 2014-01-30 21:46:45 +01:00
STRWarrior 419778a306 Fixes #606 2014-01-30 21:39:31 +01:00
madmaxoft 61848ff5a0 Item-loading now checks for weird bytes. 2014-01-26 17:56:11 +01:00
Mattes D f78a62a5e3 Merge pull request #575 from worktycho/GeneratingBenchmark
More Interfaces to decouple Generator from the rest of the code
2014-01-25 13:55:33 -08:00
Tycho 2806b48afa Fixed exports 2014-01-25 06:06:30 -08:00
madmaxoft 0369c585fb Fixed a few compile-time and runtime warnings in ScoreboardSerializer. 2014-01-24 09:58:40 +01:00
madmaxoft b02940209d Fixed crash with failed entity-loading.
This should fix issues reported in:
http://forum.mc-server.org/showthread.php?tid=1328
http://forum.mc-server.org/showthread.php?tid=1308
2014-01-24 09:57:12 +01:00
andrew 5c04e216eb Fixed scoreboard.dat structure 2014-01-23 16:42:01 +02:00
andrew bafa0347a3 Fixed scoreboard serialization 2014-01-23 16:27:23 +02:00
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
andrew 4ef61d8bf6 Command block fixes 2 2014-01-23 14:57:04 +02: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
andrew dd04f5a73c cWorld now saves/loads the scoreboard 2014-01-22 15:49:21 +02:00
andrew 9bd8f74b59 Merge branch 'master' of https://github.com/mc-server/MCServer 2014-01-21 20:40:41 +02:00
andrew aa61f55b74 Scoreboard protocol support 2014-01-21 15:58:17 +02: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
andrew ff2302ebd5 Scoreboard serialization 2014-01-20 16:45:40 +02:00
andrew 7728f4bcbe Scoreboard deserialization 2014-01-20 16:10:39 +02:00
Mattes D 865016abe2 Merge pull request #569 from worktycho/EnchantmentsFix
Enchantments fix
2014-01-19 13:50:50 -08:00
Tycho f13a14d2cf Switched EnchantmentSerilizer to namespace 2014-01-19 08:52:45 -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
andrew 02c9aa2b1e Parse the MC|AdvCdm plugin message 2014-01-18 19:58:46 +02:00
andrew 1ad6469a18 Command blocks: Execute() 2014-01-18 16:59:33 +02:00
andrew be5299350a Command block (de)serialization 2014-01-18 15:40:47 +02:00
Tycho a54cbba0fd Added user setting compression factor 2014-01-17 11:01:14 -08:00
Mattes D 79c1f6f438 Merge pull request #534 from mc-server/SpawnMinecart
Added cWorld::SpawnMinecart.
2014-01-17 02:27:56 -08:00
madmaxoft aec5200893 Removed internal cEntity::GetRot() usage. 2014-01-17 11:11:17 +01:00
Tiger Wang 74645fdfaa Removed obsoleted functions 2014-01-16 19:00:49 +00:00
STRWarrior f11427e8cd Renamed cEmptyMinecart to cRideableMinecart 2014-01-12 18:04:41 +01:00
STRWarrior c5603ce064 EmptyMinecarts should be able to get a block inside of them. 2014-01-12 15:27:50 +01:00
madmaxoft 934b90c121 Fixed a few MSVC warnings. 2014-01-07 14:24:25 +01:00
madmaxoft c9c71fe5a7 Fixed wrong enqueueing.
Fixes #505.
2014-01-06 10:09:00 +01:00
Tycho Bickerstaff ea6f94f6cb Merge branch 'master' into threadsafequeue 2014-01-02 17:49:55 +00:00
Tycho Bickerstaff bbdb34252e fixed a few remaining issues with worldstorage 2014-01-02 17:37:34 +00:00
madmaxoft 15dddc7701 More memory alignment fixes.
Ref.: #420.
2014-01-02 18:08:38 +01:00
madmaxoft c510683d2a Fixed unaligned memory access in FastNBT.
This should fix #420.
2014-01-02 17:33:18 +01:00
Tycho Bickerstaff 042b72bc17 rewrote queue not to use promises for waits 2014-01-02 12:32:55 +00:00
Tycho Bickerstaff f3736b1eb7 refactored chunk Queue to seperate class 2013-12-31 15:48:57 +00:00
Tycho Bickerstaff d0cd9a2b36 added link dependency between WorldStorage and OSSupport 2013-12-22 22:52:21 +00:00
Tiger Wang 548273c8f7 Preliminary mobile entity saving
* Fixes #252
* Alleviates #380
+ Adds mob saving
* Fixed some debug !ASSERTs
2013-12-25 16:07:52 +00:00
Tycho Bickerstaff 32e6be002d Merge branch 'master' into cmake 2013-12-20 15:33:04 +00:00
madmaxoft 812375fab1 Attempt at fixing cChunkDef::Height signedness. 2013-12-20 16:15:39 +01:00
madmaxoft 8610d45ef1 Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
Tycho Bickerstaff d5866a0978 moved Worldstorage to globs 2013-12-10 23:18:26 +00:00
Tycho Bickerstaff 6cdc990884 more cmake 2013-12-10 21:39:20 +00:00
madmaxoft 012840360e Moved json includes to where they are really needed. 2013-11-28 20:14:34 +01:00
madmaxoft 2113ca3844 Fixed VC2008 compilation, normalized include paths. 2013-11-27 09:17:25 +01:00
Alexander Harkness d925cf4def Fixed the remaining derps 2013-11-27 07:40:59 +00:00
Tiger Wang 32449f1fca Further attempts to fix compile 2013-11-25 18:29:36 +00:00
Tiger Wang e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Alexander Harkness 675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00