1
0
Fork 0
Commit Graph

174 Commits

Author SHA1 Message Date
worktycho 4315deb90b Added parenthasies 2014-07-13 16:07:35 +01:00
madmaxoft 31415aec63 Fixed MSVC warnings in SoundEffect functions. 2014-07-13 13:31:09 +02:00
Howaner e48d172f49 Merge branch 'master' into Sounds 2014-07-13 11:09:19 +02:00
Howaner d529971e27 Changed BroadcastSoundEffect function to take floating pos. 2014-07-13 02:08:02 +02:00
Howaner 905fed09a6 Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE) 2014-07-13 00:51:42 +02:00
Tiger Wang 5f72cdac38 Merge pull request #1154 from mc-server/trappedchests
Implemented trapped chests & others
2014-07-12 23:24:32 +01:00
madmaxoft 9e22f46b15 Implemented support for forced chunk ticking.
Fixes #1160.
2014-07-10 18:18:32 +02:00
Tiger Wang 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
Mattes D 9926abd4f5 Added generic entity-collecting.
Now any cEntity can be collected, not only cPickups.
This should help PR #1098.
2014-06-27 20:56:44 +02:00
worktycho b832a202ab Add Null check to SendBlockTo
Fixes CID 43611
2014-06-26 18:30:02 +01:00
Tycho ee50790398 Merge branch 'master' of github.com:mc-server/MCServer 2014-06-16 15:12:50 +01:00
madmaxoft 366ecf9dfd Fixed a race condition when adding a player to a world. 2014-06-10 18:25:53 +02:00
Tiger Wang 5fc7592cba Merge remote-tracking branch 'origin/pistonfixes'
Conflicts:
	src/Chunk.cpp
2014-06-02 19:49:14 +01:00
Tiger Wang ee929793f0 Hopefully fixed piston duplication issues
* Fixes #879
* Fixes #714
2014-05-25 13:46:34 +01:00
Tycho d478e3cfb1 Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.h
2014-05-10 05:05:44 -07:00
Tiger Wang 0d1804e439 Merge branch 'master' into redstoneimprovements
Conflicts:
	src/ClientHandle.cpp
	src/Entities/FallingBlock.cpp
	src/Mobs/AggressiveMonster.cpp
	src/Simulator/IncrementalRedstoneSimulator.cpp
2014-05-04 14:15:10 +01:00
Tycho 8780b324ff Merge branch 'master' into chunksparsing/structs 2014-05-01 11:50:40 -07:00
madmaxoft 4c165f8a6d Fixed player spawning #953. 2014-04-27 23:11:36 +02:00
Tiger Wang bbc5faa723 Redstone simulator now directly accesses cChunk
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
2014-04-27 17:35:41 +01:00
Tycho 57b8ee9163 Merge branch 'master' into chunksparsing/structs
Conflicts:
	src/Chunk.cpp
	src/Chunk.h
2014-04-27 06:35:27 -07:00
Tycho e40f9d6e5b Implemented Chunk Sparsing with segments 2014-04-26 10:50:23 -07:00
archshift b2f40a7a11 Removed unused assignments. 2014-04-25 18:18:46 -07:00
jfhumann 013da806ec Did some static analysis, fixed some bugs and optimized a lot of code 2014-04-18 21:09:44 +02:00
madmaxoft 75b7244f05 Fixed chunkstays not being removed on auto-delete.
Fixes #837.
2014-04-12 22:15:09 +02:00
Tiger Wang 0524d70774 ENUMified shrapnel level 2014-03-19 23:06:39 +00:00
Tiger Wang b8fe024f9d Merge branch 'master' into awesometnt
Conflicts:
	src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
Tiger Wang 23ffaa19b7 Added levels of shrapnel 2014-03-18 20:45:10 +00:00
madmaxoft 91f64da2a6 Fixed chunkmap tree block replacing. 2014-03-18 15:45:16 +01:00
madmaxoft 89027cb675 Fixed double to float conversions. 2014-03-16 22:00:28 +01:00
Howaner b9fce71bf6 Add new leaves to all classes. 2014-03-16 21:38:57 +01:00
Tiger Wang cc2d805238 Merge branch 'master' into awesometnt 2014-03-10 18:36:55 +00:00
Tiger Wang 462829e23d Shrapnel now configurable 2014-03-10 18:35:02 +00:00
Howaner c2090c0d11 Add Lua Bindings for FlowerPotEntity.h and add documentation. 2014-03-07 11:44:16 +01:00
Howaner 787a71929c Add Flower Pots 2014-03-07 01:30:34 +01:00
Tiger Wang 53231bebd6 Added extra awesomeness to TNT
+ TNT now has a chance of flinging FallingBlock entities around
* Improved TNT damage
* Improved TNT spawning visuals
* Possible fix for 'SetSwimState failure' messages in debug
2014-03-05 22:12:48 +00:00
madmaxoft 728e3c68b6 Fixed a possible crash in cWorld::WakeUpSimulatorsInArea().
The Y coords weren't checked.
2014-02-24 09:34:37 +01: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
Howaner 52c41f8869 Add Heads completely 2014-02-18 21:40:02 +01:00
madmaxoft 803ea41236 Added cWorld:SetAreaBiome() API function.
Fixes #675.
2014-02-18 13:49:23 +01:00
madmaxoft 9cebc9157c Rewritten Lua ChunkStay API into a single function, cWorld:ChunkStay().
This fixes problems with indeterminate class object lifespan (Lua-GC) and forgetting to disable it or keep it until ready.
2014-02-10 22:47:10 +01:00
madmaxoft a184d59209 Merge remote-tracking branch 'origin/master' into ChunkStay 2014-02-09 09:36:42 +01:00
Tiger Wang f86f066615 Merge branch 'master' into playerimprovements
Conflicts:
	MCServer/Plugins/APIDump/APIDesc.lua
2014-02-09 00:04:42 +00:00
madmaxoft ea71bfa9b6 Initial ChunkStay code. 2014-02-08 21:55:21 +01:00
Tiger Wang 94c343fe07 Fixed explosions bug
* Fixed bug where explosions would sometimes never be sent
2014-02-04 23:40:58 +00:00
Tiger Wang 630507fd5b Fixed a bunch of MSVS warnings
* Possibly also fixed some bugs with pathfinding and TNT, though
unlikely
2014-02-04 23:07:22 +00:00
Tiger Wang d1b5f0859a Greatly improved TNT propulsion chances 2014-02-03 22:55:15 +00:00
Mattes D 2450d0467f Merge pull request #623 from mc-server/tnt
TNT improvements
2014-02-03 10:55:23 -08:00
Tiger Wang e3b9cdebc9 Inversed condition 2014-02-03 14:01:47 +00:00
Tiger Wang ba398c06d7 Uncommented pickup spawner code 2014-02-02 21:24:06 +00:00
Tiger Wang e56d41175b TNT improvements
+ Added entity damage
+ Added entity propulsion
* Fixed #67 and fixed #230
2014-02-02 19:16:38 +00:00
Tycho c6304b2b4f Changed pointers to references 2014-02-01 05:06:32 -08:00
Tycho 25ec7750aa Changed signitures of Several BLockHandler Methods
Changed the signitures of the following to use interfaces:
GetPlacementBlockTypeMeta
OnPlaced
OnPlacedByPlayer
OnDestroyed
OnNeighbourChanged
NeighbourChanged
OnUse
CanBeAt
Check
2014-01-31 15:17:41 -08:00
Tycho 14e48ccb4b Refactored cBlockHandler::OnUse and dependents 2014-01-26 06:20:39 -08:00
andrew 9a9b51a513 Basic command block implementation 2014-01-18 15:16:47 +02:00
madmaxoft 39a1bcdea0 More MSVC warning fixes. 2014-01-07 17:07:49 +01:00
STRWarrior 5f18abaa27 Fixed compiler warning. 2013-12-22 15:30:47 +01:00
STRWarrior e9d1352f6e Implented BroadcastParticleEffect 2013-12-22 14:45:25 +01:00
madmaxoft 8610d45ef1 Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). 2013-12-20 16:01:34 +01:00
STRWarrior c56af9a214 This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions. 2013-12-15 10:51:46 +01:00
Tiger Wang 95be80cdb5 Implemented note block playing and fixed wire
Game of Thrones music in Minecraft, here I come!
2013-12-14 16:52:22 +00:00
Tiger Wang 1d554677b4 Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures
Conflicts:
	src/Bindings/Bindings.cpp
	src/Bindings/Bindings.h
	src/Blocks/BlockHandler.cpp
2013-12-08 14:02:45 +00:00
madmaxoft 044fd237b6 Moved bindings-related to a Bindings subfolder.
Ref.: #407
2013-12-08 12:17:54 +01:00
Tiger Wang 30ead79049 Renamed animation function
Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just
players can have animations, you know.
2013-12-06 23:47:07 +00:00
Tiger Wang b028731726 Fixed duplication glitch with QueueSetBlock
If a coordinate was queued, and then the block there was broken, it
would reappear: double items!

Also now just sets meta if previous and current blocktypes matched.
2013-12-06 22:29:15 +00:00
madmaxoft c70c2fa42f Changed cBlockHandler->OnUpdate() to use cChunk directly. 2013-11-30 15:58:27 +01:00
Tiger Wang 96759637e9 Fixed a bug with TNT waking simulators 2013-11-28 18:24:25 +00:00
Tiger Wang f9e1be0d57 Improved TNT pickup randomisation 2013-11-28 18:22:13 +00:00
Tiger Wang 994e1d7335 Made TNT pickups spawning chance 25% 2013-11-27 22:03:04 +00: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 e3db69c4ae Attempt to fix compilation 2013-11-24 18:44:22 +00:00
Alexander Harkness c3cd436ec3 Merge remote-tracking branch 'origin/master' into foldermove2
Conflicts:
	GNUmakefile
2013-11-24 14:37:03 +00:00
Alexander Harkness 675b4aa878 Moved source to src 2013-11-24 14:19:41 +00:00