Tycho
23395a5ce1
Merge branch 'master' into override
...
Conflicts:
lib/tolua++/CMakeLists.txt
2014-04-05 14:12:17 -07:00
madmaxoft
a5c0600e6c
Fixed a few clang warnings.
2014-03-30 20:02:30 +02:00
andrew
4f3377bbbf
Minor fixes
2014-03-25 09:10:55 +02:00
andrew
6b77dc74ad
Wither invulnerability
2014-03-24 12:29:19 +02:00
Tycho
5653997bcc
Added override specifier to functions declared in cWorld
2014-03-22 08:43:54 -07: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
260d13c7a4
Added override specifier where appropriate in cWorld.
2014-03-16 21:56:27 +01:00
Mattes D
4ec402e6f9
Merge pull request #782 from mc-server/beds
...
Beds now work properly, fixes #707
2014-03-16 21:47:34 +01:00
andrew
b4bf13aa4f
Unified Vector classes
2014-03-11 16:02:25 +02:00
Tiger Wang
e672988577
Merge remote-tracking branch 'origin/master' into awesometnt
...
Conflicts:
src/Items/ItemLighter.h
src/Simulator/IncrementalRedstoneSimulator.cpp
2014-03-10 18:59:11 +00: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
Tiger Wang
09c5542123
Merge pull request #768 from Howaner/BlockEntitys
...
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tiger Wang
b64e9fb7f5
Beds now work properly fixes #707
...
Also fixes FS392
Conflicts:
src/Blocks/WorldInterface.h
src/ClientHandle.cpp
2014-03-09 15:32:34 +00:00
Tiger Wang
c2978a3457
Merge branch 'master' into ballisticmissiles
...
Conflicts:
src/ClientHandle.cpp
2014-03-09 12:53:50 +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
Mattes D
f72c747b50
Merge pull request #763 from Howaner/BlockEntitys
...
Add Flower Pots
2014-03-07 17:54:10 +01: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
Howaner
594ddd86a0
Add SendBlockTo to cWorldInterface
2014-03-05 19:33:43 +01:00
madmaxoft
442c1d96fc
Fixed previous weather changes.
...
cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather.
2014-03-03 20:55:04 +01:00
Howaner
1d67345989
Add cancelling to WeatherChanging event.
2014-03-02 21:04:01 +01:00
Howaner
5e427ee825
More documentation (thanks to madmaxoft) and use GetBlockTypeMeta
2014-03-02 16:16:22 +01:00
Howaner
e4b2502896
Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
2014-03-02 16:01:37 +01:00
Tiger Wang
baf2d88921
Implemented ballistic missiles (fireworks)
...
+ Added fireworks
2014-02-26 23:33:52 +00:00
andrew
f471873945
Maps: Improvements
2014-02-23 15:05:03 +02:00
andrew
f201f4f176
Thread safe cMap manager
2014-02-20 16:38:37 +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
Howaner
52c41f8869
Add Heads completely
2014-02-18 21:40:02 +01:00
madmaxoft
b1c6b4f584
The cuboid for cWorld::SetAreaBiome() doesn't need sorting.
2014-02-18 13:49:24 +01:00
madmaxoft
803ea41236
Added cWorld:SetAreaBiome() API function.
...
Fixes #675 .
2014-02-18 13:49:23 +01:00
madmaxoft
fc8743df96
Added a bit more documentation to cForEachChunkProvider.
2014-02-18 13:49:23 +01:00
madmaxoft
52cd9dfe9f
Removed the unnecessary LoopPlayersAndBroadcastChat() functions.
2014-02-15 23:26:19 +01:00
madmaxoft
0f1f7583ae
Implemented cCompositeChat.
...
This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions.
Fixes #678 .
2014-02-15 23:17:49 +01:00
Alexander Harkness
a57c8bd7da
Merge pull request #677 from mc-server/BroadcastParticleEffect
...
Broadcast particle effect
2014-02-15 10:52:31 +00:00
STRWarrior
ceb16ea2f7
Exported cWorld::BroadcastParticleEffect.
2014-02-15 11:38:20 +01: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
madmaxoft
9bb48a8fa4
Merged branch 'narroo/master'.
...
This merges pull request #661 .
2014-02-13 17:04:25 +01:00
narroo
e53b331b4a
Fixed formatting. Moved UnloadUnusedChunks from public to private.
2014-02-11 14:38:28 -05:00
narroo
d7f32ed682
Fixed formatting of previous commit.
2014-02-11 08:01:25 -05:00
madmaxoft
892c7eb57f
More gcc warnings fixed.
2014-02-11 11:56:29 +01:00
narroo
e8e76a6058
Fixed bug #385 . UnloadUnusedChunks now has the same interface as
...
SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting
cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from
now on to prevent deadlocking.
2014-02-10 20:00:07 -05:00
madmaxoft
a184d59209
Merge remote-tracking branch 'origin/master' into ChunkStay
2014-02-09 09:36:42 +01:00
Tiger Wang
9d1c9097e3
Merge remote-tracking branch 'origin/master' into playerimprovements
...
Conflicts:
src/Root.cpp
src/Root.h
src/World.cpp
2014-02-09 00:14:42 +00: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
STRWarrior
3a897844a0
Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later).
2014-02-07 22:59:08 +01:00
STRWarrior
176664810b
Implemented an easy way of adding new redstone simulators.
...
Also added a "noop" redstone simulator that does the same as the fluid version.
2014-02-07 22:13:55 +01:00
Tiger Wang
88a64ec40d
Improved chat messaging functions
...
* Moved string manipulation into cClientHandle and therefore...
+ Added configuration option for prefixes.
* Cleaned up code.
* Updated documentation for API.
2014-02-07 18:58:52 +00:00
Tiger Wang
3450f0ca42
Added more chat functions
2014-02-05 23:24:02 +00:00
Mattes D
0ceb0ef607
Merge pull request #635 from tonibm19/master
...
Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
2014-02-04 09:23:03 -08:00
Tycho
80807eec2c
Increased Type safety of Biomes
...
Changed a number of funcictions from using integers to store biomes to using EMCSBiome
Note that switching from an int to an Enum is a non-breaking chang to the lua bindings
2014-02-03 12:26:17 -08:00
tonibm19
df8b589b31
Not exporting FindClosestPlayer
2014-02-03 21:06:43 +01:00
tonibm19
c2e7dd34d9
Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API
2014-02-03 20:52:11 +01:00
Tycho
c6304b2b4f
Changed pointers to references
2014-02-01 05:06:32 -08:00
Tycho
fec17409d2
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/World.h
2014-01-31 15:31:05 -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
STRWarrior
babc80ed77
The world can now be configured wether farmers should be able to harvest crops.
2014-01-27 22:02:19 +01:00
Tycho
bed2ee22e8
Merge branch 'master' into GeneratingBenchmark2
...
Conflicts:
src/Blocks/BlockRail.h
src/World.h
2014-01-26 06:28:51 -08:00
Tycho
14e48ccb4b
Refactored cBlockHandler::OnUse and dependents
2014-01-26 06:20:39 -08: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
15b92af166
First attempt at Implementing Interfaces
2014-01-25 11:14:14 -08:00
Tiger Wang
314fc3cdac
Mob bugfixes
...
* Mobs no longer require constant line-of-sight to a player to remain
aggravated
* Fixed an ASSERT
* Fixed mobs jumping
* Fixed Idle state not properly using AI
+ Added FILE_IO_PREFIX to favicon loading
+ Implemented #563
2014-01-25 14:42:26 +00:00
andrew
4ef61d8bf6
Command block fixes 2
2014-01-23 14:57:04 +02:00
Tycho
c832fbeb8e
Merge branch 'master' into GeneratingBenchmark
...
Conflicts:
src/World.h
2014-01-22 09:13:12 -08: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
613f238ab6
Merge branch 'ForEachChunkProvider' into GeneratingBenchmark
...
Conflicts:
src/World.h
2014-01-20 09:37:31 -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
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
andrew
2b94361059
Basic scoreboard implementation
2014-01-19 14:20:57 +02:00
andrew
1ad6469a18
Command blocks: Execute()
2014-01-18 16:59:33 +02:00
andrew
9a9b51a513
Basic command block implementation
2014-01-18 15:16: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
Tycho
292ccdc09e
added cWorld::ScheduleTask Function
...
ScheduleTask schedules a SceduledTask object to be run x ticks in the future.
In is exported to lua, fixes #150
2014-01-14 12:17:03 -08: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
STRWarrior
6ff375273b
Added cWorld::SpawnMinecart.
2014-01-12 14:33:32 +01:00
madmaxoft
cea997426b
Decoupled cChunkGenerator from cWorld and cRoot.
...
Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
2014-01-10 22:22:54 +01:00
madmaxoft
0d5a5cc990
Exported cWorld::BroadcastBlockAction().
...
As requested in #508 ; no guarantees about it.
2014-01-06 16:01:20 +01:00
Tycho Bickerstaff
2e1588820d
fixed warnings in World.cpp
2013-12-31 09:16:42 +01:00
madmaxoft
5bbe72bc90
Replaced esCreeper with esMonster.
...
Any monster will be able to explode, and also this fixes #425 .
2013-12-23 22:36:22 +01:00
STRWarrior
e9d1352f6e
Implented BroadcastParticleEffect
2013-12-22 14:45:25 +01:00
madmaxoft
f5e6124ee0
Fixed the rest of constructor reorders.
2013-12-20 19:10:15 +01:00
Tiger Wang
3e6fd5c6e5
Removed some old cRedstone remnants
2013-12-16 17:35:20 +00: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
6b6905fe1c
Redstone data is now loaded on chunk load
2013-12-12 23:49:10 +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
STRWarrior
c0f091b1a3
Added a SpawnFallingBlock function so plugins can make other blocks fall.
2013-12-07 14:26:52 +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
e48168aa13
Lava can spawn fire.
...
Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65 .
2013-12-04 19:48:42 +01:00
madmaxoft
2383016b1d
Added the real tick duration to the OnWorldTick hook.
2013-11-30 14:22:26 +01:00
Tiger Wang
a6630d3239
Merged master into redstonefixes
2013-11-27 21:35:13 +00:00
Alexander Harkness
0de95a215f
Merge remote-tracking branch 'origin/master' into foldermove2
...
Conflicts:
VC2008/MCServer.vcproj
2013-11-26 17:21:06 +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
