4f5d73b770
Slight cleanup after portals
2014-07-29 20:50:30 +01:00
3385ed56b8
Merge remote-tracking branch 'origin/master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Player.cpp
src/Root.cpp
src/World.cpp
2014-07-22 10:24:28 +01:00
e8262373e1
NBTChunkSerializer.cpp: Added break after serializing the splash potion
2014-07-20 03:19:46 -07:00
f5bcfdc58c
Splash potions: Renamed PotionParticleType to PotionColor for clarity
2014-07-19 02:51:39 -07:00
37140ae578
Merge branch 'master' into portals
...
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
src/ClientHandle.h
src/Entities/Player.cpp
src/Entities/Player.h
src/Generating/FinishGen.cpp
src/Protocol/Protocol.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol125.h
src/Protocol/Protocol16x.cpp
src/Protocol/Protocol16x.h
src/Protocol/Protocol17x.cpp
src/Protocol/Protocol17x.h
src/Protocol/ProtocolRecognizer.cpp
src/Protocol/ProtocolRecognizer.h
src/Root.h
src/World.cpp
2014-07-18 20:10:51 +01:00
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +02:00
2423fbf2ef
Normalized comments.
...
This was mostly done automatically and then visually inspected for obvious errors.
All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
2014-07-17 22:15:34 +02:00
cc452f51c8
Restructured cSplashPotionEntity code.
...
The callback doesn't need declaration in the header.
Renamed PotionName to PotionParticleType.
2014-07-15 22:41:42 +02:00
8e946da8ac
Merge branch 'master' into potions
2014-07-15 09:01:32 +02:00
5f72cdac38
Merge pull request #1154 from mc-server/trappedchests
...
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
e2e0f52ecb
cNBTChunkSerializer: Fixed alignment.
2014-07-12 23:48:39 +02:00
e71e432633
Suggestions and bug fix
...
* Fixed hoppers pushing/pulling to/from (trapped)chests that do not form
a double-chest with the chest type directly connected to said hopper;
thank you, @madmaxoft
2014-07-12 22:06:25 +01:00
8cbd43e043
Added splash potions to NBT serialization and retrieval
2014-07-11 18:58:11 -07:00
6a33fa84ae
Suggestions
2014-07-11 12:43:24 +01:00
372dbbb994
Merge pull request #1135 from mc-server/fixes
...
Fixes to projectiles and the undead
2014-07-09 09:50:38 +01:00
164ffe50ad
Made things consistent
2014-07-08 12:34:39 +01:00
9e44b0aae1
Implemented trapped chests & others
...
+ Added trapped chests
* Fixed a bunch of bugs in the redstone simulator concerning wires and
repeaters
* Other potential bugfixes
2014-07-06 23:50:22 +01:00
f4e3c01a71
Various fixed
...
* Fixed potential invalid pointer dereferencing, fixes #1117
* Fixed ender pearls not being loaded properly
2014-07-04 16:49:24 +01:00
89a26cc786
Suggestions
2014-07-02 21:07:34 +01:00
b94fef3089
Removed unneeded code
2014-06-30 19:15:10 +01:00
dde641ce83
Properly implemented enderchests
2014-06-29 11:36:38 +01:00
bd5df3d3b9
Merge branch 'master' of https://github.com/mc-server/MCServer into portals
2014-06-24 21:15:48 +01:00
d4e1277724
Add entity health saving.
2014-06-24 16:06:26 +02:00
7615ed90c0
Merge branch 'master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Entity.h
src/Entities/Player.h
2014-06-21 22:14:23 +01:00
c60ba8a52d
Merge branch 'master' into GlobalFixes
2014-06-17 19:03:56 +02:00
46b84aa8b6
The motion is already set in AddBasicEntity()
2014-06-17 01:17:35 +02:00
9c7a6bc443
Health of monsters is now saved
2014-06-04 20:09:02 +01:00
142fa83124
Code improvements
2014-05-28 19:32:20 +02:00
e7a7c45c36
Add throw sound and fix arrow server crash.
2014-05-28 16:39:59 +02:00
4ab8288116
Merge branch 'master' into chunksparsing/structs
2014-05-24 12:44:49 +01:00
3a5e04d118
More switch warnings.
2014-05-11 16:54:42 -07:00
3f9e00a3f3
Fixed a few more switch warnings.
2014-05-11 16:28:48 -07:00
d478e3cfb1
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.h
2014-05-10 05:05:44 -07:00
d1b719885d
Merge pull request #989 from Howaner/Anvil
...
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
2014-05-07 22:18:53 +02:00
fbb6404cc8
Change m_RepairCost to int.
2014-05-07 20:43:37 +02:00
80bcc43c7b
Fix MagmaCube save.
2014-05-07 12:43:21 +02:00
d6cb6e0423
Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.
2014-05-07 12:30:30 +02:00
8780b324ff
Merge branch 'master' into chunksparsing/structs
2014-05-01 11:50:40 -07:00
709015369d
Merge pull request #940 from Howaner/GlobalFixes
...
Add entity invulnerable
2014-04-28 20:58:15 +02:00
26e935cb20
Revert "Changed the old invulnerable methods from the wither to the new."
...
This reverts commit d50f8f6f11
2014-04-28 13:51:22 +02:00
9b0cb3fd97
Fixed projectile source filenames, indentations
2014-04-27 17:05:18 -07:00
57b8ee9163
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.cpp
src/Chunk.h
2014-04-27 06:35:27 -07:00
477b3e7861
Moved cArrowEntity out of ProjectileEntity.h
2014-04-26 16:45:39 -07:00
e40f9d6e5b
Implemented Chunk Sparsing with segments
2014-04-26 10:50:23 -07:00
aef2c8ec62
Further refactored, Reverted Minecart change
...
Other small changes.
2014-04-26 09:25:30 -07:00
d50f8f6f11
Changed the old invulnerable methods from the wither to the new.
2014-04-26 17:47:25 +02:00
49f6819829
Fixes
2014-04-26 16:44:15 +02:00
62e5234535
Small changes; warning fixing.
2014-04-24 20:25:03 -07:00
06819595b0
Fixed references to renamed files.
2014-04-23 15:25:10 -07:00
cac5149974
Merge pull request #833 from mc-server/EnderCrystal
...
Ender crystals
2014-03-25 21:02:23 +01:00
2e28c09770
Ender crystals
2014-03-25 20:59:33 +02:00
6b77dc74ad
Wither invulnerability
2014-03-24 12:29:19 +02:00
8316ae330e
Merge branch 'master' into BlockEntitys
2014-03-15 02:46:18 +01:00
7ac7304c91
Add item frame saving.
2014-03-15 02:45:25 +01:00
cf13739288
Add health and age load to pickup's.
2014-03-15 00:43:38 +01:00
28898f710b
Add ExpOrb saving.
2014-03-15 00:32:49 +01:00
09c5542123
Merge pull request #768 from Howaner/BlockEntitys
...
Add TNT load/save
2014-03-09 21:44:32 +00:00
c2978a3457
Merge branch 'master' into ballisticmissiles
...
Conflicts:
src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
b37966fd21
Change TNT Fuse to ticks
2014-03-08 12:24:33 +01:00
f5e374be41
Add TNT Save/Load and add Netbeans projects to .gitignore
2014-03-08 10:25:46 +01:00
787a71929c
Add Flower Pots
2014-03-07 01:30:34 +01:00
baf2d88921
Implemented ballistic missiles (fireworks)
...
+ Added fireworks
2014-02-26 23:33:52 +00:00
2cc597372a
Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters
2014-02-23 19:50:51 +01:00
1f726b7d9d
Rename SkullEntity to MobHeadEntity
2014-02-23 19:50:50 +01:00
ab2eba17ec
Add Skulls/Heads
2014-02-23 19:50:50 +01:00
a686656253
Merge branch 'master' into itemframes
...
Conflicts:
src/Entities/Entity.h
src/WorldStorage/NBTChunkSerializer.cpp
2014-02-18 22:13:44 +00:00
320cc74f0a
Implemented paintings, fixes #689
...
+ Implemented paintings
2014-02-18 00:16:03 +00:00
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
d82f3102e5
Partial fix for #130
2014-02-03 22:26:16 +00:00
a134fd45cf
Added saving of angry flag.
2014-02-02 14:28:42 +04:00
a1c36c18e0
Fixed sitting tag.
2014-02-02 13:56:55 +04:00
0259aed8be
Added saving of collar's color.
2014-02-01 20:16:42 +04:00
419778a306
Fixes #606
2014-01-30 21:39:31 +01:00
4ef61d8bf6
Command block fixes 2
2014-01-23 14:57:04 +02:00
865016abe2
Merge pull request #569 from worktycho/EnchantmentsFix
...
Enchantments fix
2014-01-19 13:50:50 -08:00
f13a14d2cf
Switched EnchantmentSerilizer to namespace
2014-01-19 08:52:45 -08:00
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
02c9aa2b1e
Parse the MC|AdvCdm plugin message
2014-01-18 19:58:46 +02:00
be5299350a
Command block (de)serialization
2014-01-18 15:40:47 +02:00
aec5200893
Removed internal cEntity::GetRot() usage.
2014-01-17 11:11:17 +01:00
74645fdfaa
Removed obsoleted functions
2014-01-16 19:00:49 +00:00
548273c8f7
Preliminary mobile entity saving
...
* Fixes #252
* Alleviates #380
+ Adds mob saving
* Fixed some debug !ASSERTs
2013-12-25 16:07:52 +00:00
8610d45ef1
Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).
2013-12-20 16:01:34 +01:00
675b4aa878
Moved source to src
2013-11-24 14:19:41 +00:00
Tiger Wang
archshift
madmaxoft
Howaner
Tycho
archshift
andrew
TheJumper
Kirill Kirilenko
STRWarrior
Alexander Harkness