Mattes D
709015369d
Merge pull request #940 from Howaner/GlobalFixes
...
Add entity invulnerable
2014-04-28 20:58:15 +02:00
Howaner
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
Mattes D
c063051645
Merge pull request #954 from mc-server/projectiles-split
...
Totally refactored ProjectileEntity.h, splitting up into several files.
2014-04-28 12:32:02 +02:00
archshift
9b0cb3fd97
Fixed projectile source filenames, indentations
2014-04-27 17:05:18 -07:00
Mattes D
a0f6149d05
Merge pull request #948 from jfhumann/staticFixes
...
Fixes motivated by Coverity #1
2014-04-27 17:00:37 +02:00
Tycho
57b8ee9163
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.cpp
src/Chunk.h
2014-04-27 06:35:27 -07:00
archshift
cb93a57963
Moved cGhastFireballEntity out of ProjectileEntity.h
2014-04-26 17:41:07 -07:00
archshift
de7eaa5735
Moved cFireChargeEntity out of ProjectileEntity.h
2014-04-26 17:35:31 -07:00
archshift
08b77f4880
Moved cThrownSnowballEntity out of ProjectileEntity.h
2014-04-26 17:24:44 -07:00
archshift
bc5c28a0be
Moved cThrownEnderPearl out of ProjectileEntity.h
2014-04-26 17:08:39 -07:00
archshift
de23a115a5
Moved cThrownEggEntity out of ProjectileEntity.h
2014-04-26 17:02:47 -07:00
archshift
477b3e7861
Moved cArrowEntity out of ProjectileEntity.h
2014-04-26 16:45:39 -07:00
Tycho
e40f9d6e5b
Implemented Chunk Sparsing with segments
2014-04-26 10:50:23 -07:00
archshift
aef2c8ec62
Further refactored, Reverted Minecart change
...
Other small changes.
2014-04-26 09:25:30 -07:00
Howaner
d50f8f6f11
Changed the old invulnerable methods from the wither to the new.
2014-04-26 17:47:25 +02:00
Howaner
49f6819829
Fixes
2014-04-26 16:44:15 +02:00
archshift
b2f40a7a11
Removed unused assignments.
2014-04-25 18:18:46 -07:00
jfhumann
c8d5fcfffa
Fix for minor resource leak (CID 43616)
2014-04-26 00:43:01 +02:00
archshift
d64e46186f
Merge remote-tracking branch 'upstream/master'
2014-04-25 10:50:10 -07:00
archshift
e47dab84f3
Cmake generated projects for IDEs include headers in project files.
2014-04-25 09:56:15 -07:00
archshift
62e5234535
Small changes; warning fixing.
2014-04-24 20:25:03 -07:00
archshift
8fc45c5730
Fixed class capitalization for the cave spider.
2014-04-24 12:18:17 -07:00
archshift
06819595b0
Fixed references to renamed files.
2014-04-23 15:25:10 -07:00
jfhumann
67344a3782
Merge remote-tracking branch 'origin/master' into fixes
...
Conflicts:
src/Authenticator.cpp
src/ClientHandle.cpp
src/Entities/Minecart.cpp
src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +02:00
jfhumann
013da806ec
Did some static analysis, fixed some bugs and optimized a lot of code
2014-04-18 21:09:44 +02:00
Tiger Wang
82b3d543e7
Rewrote redstone powering to use power levels
2014-04-15 13:15:56 +01:00
Tycho
10e72a122c
Removed check for enqueuing a chunk that is already enqueued to be loaded
...
This remaval is safe as cWorldStorage checks for duplicate chunks when dequeuing
and removes an expensive iteration whilst holding the queue lock
2014-04-08 08:43:28 -07:00
madmaxoft
396abb5db6
Fixed silly Clang's warnings in FastNBT.
2014-04-04 10:19:21 +02:00
Tycho
b449ad8613
Merge branch 'MacFixes'
...
Conflicts:
src/DeadlockDetect.cpp
src/World.cpp
2014-04-02 06:54:57 -07:00
madmaxoft
bcd7f9669b
Added schematic string serializer self-test.
2014-04-02 11:56:27 +02:00
madmaxoft
87e0bd54b4
BlockArea: Switched internal coords to Vector3i.
2014-03-25 21:59:41 +01:00
Mattes D
cac5149974
Merge pull request #833 from mc-server/EnderCrystal
...
Ender crystals
2014-03-25 21:02:23 +01:00
andrew
2e28c09770
Ender crystals
2014-03-25 20:59:33 +02:00
Samuel Barney
71e9133e49
Added one more missing newline.
2014-03-25 10:34:31 -06:00
andrew
6b77dc74ad
Wither invulnerability
2014-03-24 12:29:19 +02:00
madmaxoft
9447cd20f3
Fixed a crash in firework rockets.
...
Fixes #816 .
2014-03-17 22:12:02 +01:00
Mattes D
dc77cbfdc4
Merge pull request #809 from Howaner/BlockEntitys
...
More entity saving.
2014-03-16 21:43:33 +01:00
Howaner
b9fce71bf6
Add new leaves to all classes.
2014-03-16 21:38:57 +01:00
Howaner
4e0edc9fa7
Add anvil direction.
2014-03-16 17:42:23 +01:00
Howaner
d6edd5f24e
Remove old debug messages.
2014-03-15 11:53:55 +01:00
Howaner
8316ae330e
Merge branch 'master' into BlockEntitys
2014-03-15 02:46:18 +01:00
Howaner
7ac7304c91
Add item frame saving.
2014-03-15 02:45:25 +01:00
Howaner
cf13739288
Add health and age load to pickup's.
2014-03-15 00:43:38 +01:00
Howaner
28898f710b
Add ExpOrb saving.
2014-03-15 00:32:49 +01:00
Tycho
862e219443
Added additional macros to support the MSVC size_t format and changed all formats to use the macros
2014-03-12 10:34:50 -07:00
Tycho
d904e89712
Merge branch 'Werror' into warnings
...
Conflicts:
src/Globals.h
2014-03-12 10:12:13 -07:00
Tycho
3caa4a38b9
Merge branch 'master' into Werror
...
Conflicts:
src/Generating/PieceGenerator.cpp
2014-03-12 09:59:10 -07:00
madmaxoft
f2df33f746
Merge remote-tracking branch 'xdot/master'
2014-03-12 14:42:04 +01:00
Tycho
16b27c4b7a
Fixed a load of format string errors
2014-03-11 14:16:08 -07:00
andrew
b4bf13aa4f
Unified Vector classes
2014-03-11 16:02:25 +02:00
madmaxoft
950614da7e
Renamed cBlockArea Offset to WEOffset.
...
Even in getters / setters.
2014-03-12 07:46:14 +01:00
madmaxoft
3e9f265a36
Merge branch 'master' into cBlockArea_Offset
2014-03-12 07:39:39 +01:00
STRWarrior
e213e5f9fc
Renamed m_Offset to m_WEOffset
2014-03-11 18:23:21 +01:00
Tycho
98e15a34a4
Fixed xofts issues
2014-03-10 13:18:53 -07:00
Tycho
2eca30aebc
Removed Some unnessicary macros
2014-03-10 11:34:20 -07:00
Tycho
8947f80294
Use string.reserve to avoid the need to do inplace byteswap
2014-03-10 11:24:12 -07:00
Tycho
cff6631513
Removed unused macro from WSSCompact
2014-03-10 11:14:34 -07:00
Tycho
8864e7d8ca
Fixed alignment issues in Fireworks Serializer
2014-03-10 11:13:07 -07:00
Tycho
0a509ab85e
Merge branch 'master' into Werror
2014-03-10 10:17:28 -07:00
STRWarrior
0cce0478d8
This allows a blockarea to have an Offset.
2014-03-10 17:07:46 +01:00
madmaxoft
0b9763fc5a
Fixed MSVC2008 compilation.
2014-03-10 07:55:47 +01:00
Tiger Wang
09c5542123
Merge pull request #768 from Howaner/BlockEntitys
...
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tycho
430aba9f1d
Its a const not a macro
2014-03-09 10:10:36 -07:00
Tycho
02afa78b68
Take 5
2014-03-09 10:04:07 -07:00
Tycho
167ef3b7a1
Take 4
2014-03-09 09:52:49 -07:00
Tycho
ebf163b77a
Unsigned types take 3
2014-03-09 09:45:59 -07:00
Tycho
e73caf30f0
Fix gcc error attempt 2
2014-03-09 09:33:40 -07:00
Tycho
f4201e0b82
Fixed gcc error
2014-03-09 09:25:16 -07:00
Tiger Wang
c2978a3457
Merge branch 'master' into ballisticmissiles
...
Conflicts:
src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
Tiger Wang
76bf7ad813
Hexified colours
2014-03-09 12:49:00 +00:00
Tiger Wang
a2fb28dd08
Fixed data length issues
2014-03-09 12:48:59 +00:00
Tiger Wang
124fc8bc66
Demonstrated issues with GetDataLength()
2014-03-09 12:48:58 +00:00
Howaner
527f358510
Merge branch 'master' into BlockEntitys
2014-03-08 12:29:45 +01:00
Howaner
b37966fd21
Change TNT Fuse to ticks
2014-03-08 12:24:33 +01:00
Howaner
f5e374be41
Add TNT Save/Load and add Netbeans projects to .gitignore
2014-03-08 10:25:46 +01:00
madmaxoft
ffdf5f2022
Fixed cBlockArea schematic string saving signature.
2014-03-07 21:28:52 +01:00
Mattes D
f72c747b50
Merge pull request #763 from Howaner/BlockEntitys
...
Add Flower Pots
2014-03-07 17:54:10 +01:00
madmaxoft
97d803e34f
Added cBlockArea serialization to string.
...
Fixes #665 .
2014-03-07 09:17:13 +01:00
Howaner
787a71929c
Add Flower Pots
2014-03-07 01:30:34 +01:00
madmaxoft
2998228e85
Added more documentation for FastNBT parser.
2014-03-02 08:22:27 +01:00
andrew
692a84af31
Shortened enums
2014-03-01 14:20:29 +02:00
madmaxoft
3991c04d47
Improved comments in float size check.
2014-03-01 02:43:35 +01:00
madmaxoft
0aac17874c
Better fix for the 32-bit float reading.
2014-02-28 08:31:35 +01:00
Tiger Wang
528467bc5c
Fixed compile
2014-02-27 21:48:49 +00:00
Tiger Wang
baf2d88921
Implemented ballistic missiles (fireworks)
...
+ Added fireworks
2014-02-26 23:33:52 +00:00
madmaxoft
cb40d114ab
Fixed a gcc warning in FastNBT.h.
2014-02-26 22:17:28 +01:00
Mattes D
23093fd4d1
Merge pull request #710 from TheJumper/master
...
Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops
2014-02-24 18:30:44 +01:00
STRWarrior
9440b61c8c
Fixed MCServer not compiling with C++03 compilers
2014-02-24 14:43:46 +01:00
TheJumper
2cc597372a
Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters
2014-02-23 19:50:51 +01:00
Howaner
1f726b7d9d
Rename SkullEntity to MobHeadEntity
2014-02-23 19:50:50 +01:00
Howaner
7bc5946883
Add Heads completely
2014-02-23 19:50:50 +01:00
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
