Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ... in this world | Howaner | 2014-10-30 | 1 | -1/+1 |
| | |||||
* | Added a MaxViewDistance option. | Howaner | 2014-10-30 | 1 | -0/+10 |
| | |||||
* | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-23 | 1 | -183/+187 |
|\ | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h | ||||
| * | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 1 | -185/+189 |
| | | |||||
* | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 1 | -143/+139 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Merged branch 'master' of git://github.com/sriehl/MCServer | Mattes D | 2014-10-21 | 1 | -144/+140 |
| |\ | |||||
| | * | convert old style casts to fix warnings | Steven Riehl | 2014-10-12 | 1 | -144/+140 |
| | | | |||||
* | | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 1 | -12/+13 |
|\| | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | Functions in cPluginManager get references instead of pointers. | Mattes D | 2014-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed style. | Mattes D | 2014-10-13 | 1 | -1/+2 |
| | | | |||||
| * | | Aligned simulators | worktycho | 2014-10-12 | 1 | -5/+5 |
| | | | |||||
| * | | Moved a few objects to unique_ptr | tycho | 2014-10-10 | 1 | -9/+9 |
| |/ | |||||
* / | Stream 4 chunks per tick. Added priority. | Howaner | 2014-10-06 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'master' into Fixes | Howaner | 2014-09-26 | 1 | -5/+6 |
|\ | |||||
| * | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -27/+34 |
| |\ | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| * \ | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| * | | | Added first test to show the object can be created | Tycho | 2014-09-17 | 1 | -2/+2 |
| | | | | |||||
| * | | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the server | Tycho | 2014-09-11 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | THis wil hopefully allow for unit testing | ||||
* | | | | Fixed players custom name in 1.8 | Howaner | 2014-09-26 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-19 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | Update World.h | nesco | 2014-09-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Preparing 1.8 update | nesco | 2014-09-16 | 1 | -0/+3 |
| | |/ | |/| | | | | Added Spectator gamemode | ||||
* | | | Exported player list states to extra functions. | Howaner | 2014-09-18 | 1 | -27/+31 |
| | | | |||||
* | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-13 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h | ||||
| * | | Spawn exp if you break a mob spawner. | Howaner | 2014-09-12 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-12 | 1 | -3/+3 |
|\| | |||||
| * | TimeOfDay does not need to be an Int64 | Tycho | 2014-09-08 | 1 | -3/+3 |
| | | |||||
* | | 1.8: Added ParticleEffect packet. | Howaner | 2014-09-11 | 1 | -1/+1 |
| | | |||||
* | | Added the player list to the 1.8 protocol. | Howaner | 2014-09-09 | 1 | -1/+1 |
|/ | |||||
* | Rewritten chunk status to specify whether the chunk is in queue. | Mattes D | 2014-09-05 | 1 | -7/+7 |
| | | | | This fixes #1370. | ||||
* | Merge remote-tracking branch 'origin/master' into EntitiesInBox | madmaxoft | 2014-09-04 | 1 | -4/+4 |
|\ | |||||
| * | fix chunk regenerating | LO1ZB | 2014-08-29 | 1 | -1/+1 |
| | | |||||
| * | remove y-coord from chunks | LO1ZB | 2014-08-28 | 1 | -3/+3 |
| | | |||||
* | | Added cWorld::ForEachEntityInBox() | madmaxoft | 2014-09-03 | 1 | -0/+5 |
|/ | |||||
* | CheckBasicStyle checks the src folder as well. | madmaxoft | 2014-08-14 | 1 | -1/+1 |
| | |||||
* | Renamed functions. | Howaner | 2014-08-10 | 1 | -4/+4 |
| | |||||
* | Renamed m_DoDaylightCycle to m_CycleDaylight. | Howaner | 2014-08-08 | 1 | -4/+4 |
| | |||||
* | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. | Howaner | 2014-08-07 | 1 | -1/+13 |
| | | | I need this for a GameRule plugin. | ||||
* | Exported the beacon. | Howaner | 2014-07-30 | 1 | -0/+5 |
| | |||||
* | Merged branch 'howaner/Options'. | madmaxoft | 2014-07-30 | 1 | -0/+7 |
|\ | |||||
| * | Add "Broadcasting" settings to world.ini | Howaner | 2014-07-27 | 1 | -1/+7 |
| | | |||||
* | | Slight cleanup after portals | Tiger Wang | 2014-07-29 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 1 | -25/+25 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 1 | -6/+6 |
| | | |||||
| * | Added a queue for setting chunk data. | madmaxoft | 2014-07-24 | 1 | -18/+18 |
| | | | | | | | | Fixes #1196. | ||||
| * | Export BroadcastEntityAnimation with ToLua | archshift | 2014-07-22 | 1 | -1/+1 |
| | | | | | | Fixes #752 | ||||
* | | Speed improvements, crash fixes, & self-suggestions | Tiger Wang | 2014-07-22 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -5/+5 |
|\| | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 1 | -4/+4 |
| | | |||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 1 | -1/+1 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-07-21 | 1 | -0/+7 |
| | | |||||
* | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files | ||||
* | | Fix failed merge and other issues | Tiger Wang | 2014-07-18 | 1 | -12/+0 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -29/+25 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | | | | | | | | | 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. | ||||
| * | Fixed spaces around single-line comments. | madmaxoft | 2014-07-17 | 1 | -4/+4 |
| | | | | | | | | There should be at least two spaces in front and one space after //-style comments. | ||||
| * | Fixed basic whitespace problems. | madmaxoft | 2014-07-17 | 1 | -7/+7 |
| | | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines. | ||||
| * | Made CreateProjectile a pointer | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | |||||
| * | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #1154 from mc-server/trappedchests | Tiger Wang | 2014-07-13 | 1 | -13/+2 |
| |\ | | | | | | | Implemented trapped chests & others | ||||
| | * | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 1 | -13/+2 |
| | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes | ||||
| * | | Implemented support for forced chunk ticking. | madmaxoft | 2014-07-10 | 1 | -0/+7 |
| | | | | | | | | | | | | Fixes #1160. | ||||
| * | | Fixed arrow collection animation | Tiger Wang | 2014-07-09 | 1 | -1/+0 |
| |/ | | | | | | | * Fixed piston extension non-solidness | ||||
| * | Redstone simulator is alerted to lever unpowering | Tiger Wang | 2014-07-02 | 1 | -1/+1 |
| | | | | | | | | | | * Fixed the "fix" that broke the fix for #535, thereby fixing said issue * Fixed #535 | ||||
| * | Added generic entity-collecting. | Mattes D | 2014-06-27 | 1 | -0/+1 |
| | | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098. | ||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -1/+2 |
|\| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | Nullify deleted pointers. | archshift | 2014-06-19 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'master' into GlobalFixes | Howaner | 2014-06-17 | 1 | -8/+73 |
| |\ | |||||
| * | | Add DoWithBlockEntityAt() to WorldInterface.h | Howaner | 2014-06-17 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed invalid iterators | Tiger Wang | 2014-06-21 | 1 | -3/+0 |
| | | | |||||
* | | | Cauldrons check the heightmap | Tiger Wang | 2014-06-14 | 1 | -3/+3 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-14 | 1 | -6/+32 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: src/World.h | ||||
| * | | Removed an unused fwd declaration. | madmaxoft | 2014-06-13 | 1 | -1/+0 |
| | | | |||||
| * | | Fixed constness | worktycho | 2014-06-11 | 1 | -5/+5 |
| | | | |||||
| * | | Compile fix | Tiger Wang | 2014-06-11 | 1 | -1/+1 |
| | | | |||||
| * | | Reduced code duplication | Tiger Wang | 2014-06-11 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | call @maxmaxoft! calling... call connected (0:20) call ended | ||||
| * | | IsWeatherSunnyAt does something useful :D | Tiger Wang | 2014-06-11 | 1 | -9/+5 |
| | | | |||||
| * | | SMICOLOSL | Alexander Harkness | 2014-06-11 | 1 | -4/+4 |
| | | | | | | | | | Meant to be semicolons up there. | ||||
| * | | Updated unnecessary function :/ | Tiger Wang | 2014-06-11 | 1 | -1/+5 |
| | | | |||||
| * | | Add DoxyComments to he weather things. | Alexander Harkness | 2014-06-11 | 1 | -7/+24 |
| | | | | | | | | | Also changed the function names. | ||||
| * | | Add new IsWeatherWet hook for cauldrons. | Alexander Harkness | 2014-06-11 | 1 | -1/+12 |
| | | | | | | | | | @madmaxoft can you comment? | ||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -3/+27 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp | ||||
| * | | Fixed deadlock when moving players to other worlds. | Mattes D | 2014-06-08 | 1 | -2/+19 |
| | | | | | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | | Added queue for adding entities to cWorld. | Mattes D | 2014-06-08 | 1 | -1/+8 |
| | | | | | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed. | ||||
* | | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 1 | -2/+11 |
| | | | |||||
* | | | Suggestions | Tiger Wang | 2014-06-05 | 1 | -1/+3 |
| | | | |||||
* | | | Configurable portals | Tiger Wang | 2014-06-04 | 1 | -0/+24 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 1 | -1/+15 |
|\| | | |||||
| * | | Changed block send queue to use vectors | Tiger Wang | 2014-05-29 | 1 | -4/+2 |
| | | | | | | | | | | | | As suggested by @worktycho. | ||||
| * | | Hopefully fixed piston duplication issues | Tiger Wang | 2014-05-25 | 1 | -1/+17 |
| |/ | | | | | | | | | * Fixes #879 * Fixes #714 | ||||
* / | Cauldrons fill | Tiger Wang | 2014-05-29 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'master' into fixes | Tiger Wang | 2014-05-06 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: src/Vector3.h | ||||
| * | Redstone simulator now directly accesses cChunk | Tiger Wang | 2014-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes | ||||
* | | Merge branch 'master' into fixes. | madmaxoft | 2014-05-02 | 1 | -1/+4 |
|\| | |||||
| * | Moved the weather picker out of TickWeather(), squashing a warning and improving readability. | archshift | 2014-04-26 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' into fixes | Tiger Wang | 2014-04-24 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 1 | -1/+1 |
| | | |||||
* | | Small changes | Tiger Wang | 2014-04-23 | 1 | -1/+3 |
|/ | |||||
* | Merge branch 'master' into override | Tycho | 2014-04-05 | 1 | -13/+13 |
|\ | | | | | | | | | Conflicts: lib/tolua++/CMakeLists.txt | ||||
| * | Fixed a few clang warnings. | madmaxoft | 2014-03-30 | 1 | -3/+3 |
| | | |||||
| * | Minor fixes | andrew | 2014-03-25 | 1 | -10/+10 |
| | | |||||
| * | Wither invulnerability | andrew | 2014-03-24 | 1 | -1/+1 |
| | | |||||
* | | Added override specifier to functions declared in cWorld | Tycho | 2014-03-22 | 1 | -8/+8 |
|/ | |||||
* | ENUMified shrapnel level | Tiger Wang | 2014-03-20 | 1 | -6/+4 |
| | |||||
* | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-18 | 1 | -39/+39 |
|\ | | | | | | | | | Conflicts: src/ChunkMap.cpp | ||||
| * | Added override specifier where appropriate in cWorld. | madmaxoft | 2014-03-16 | 1 | -37/+38 |
| | | |||||
| * | Merge pull request #782 from mc-server/beds | Mattes D | 2014-03-16 | 1 | -4/+4 |
| |\ | | | | | | | Beds now work properly, fixes #707 | ||||
| | * | Beds now work properly fixes #707 | Tiger Wang | 2014-03-09 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp | ||||
| * | | Unified Vector classes | andrew | 2014-03-11 | 1 | -2/+1 |
| | | | |||||
* | | | Added levels of shrapnel | Tiger Wang | 2014-03-18 | 1 | -4/+8 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into awesometnt | Tiger Wang | 2014-03-10 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | Merge pull request #768 from Howaner/BlockEntitys | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Add TNT load/save | ||||
| | * | | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-08 | 1 | -1/+1 |
| | |\| | |||||
| | * | | Change TNT Fuse to ticks | Howaner | 2014-03-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -5/+20 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | | Implemented ballistic missiles (fireworks) | Tiger Wang | 2014-02-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | + Added fireworks | ||||
* | | | | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-10 | 1 | -5/+20 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #763 from Howaner/BlockEntitys | Mattes D | 2014-03-07 | 1 | -4/+9 |
| |\ \ \ | | | |/ | | |/| | Add Flower Pots | ||||
| | * | | Add Lua Bindings for FlowerPotEntity.h and add documentation. | Howaner | 2014-03-07 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add Flower Pots | Howaner | 2014-03-07 | 1 | -2/+7 |
| | | | | |||||
| * | | | Add SendBlockTo to cWorldInterface | Howaner | 2014-03-05 | 1 | -1/+1 |
| |/ / | |||||
| * | | Fixed previous weather changes. | madmaxoft | 2014-03-03 | 1 | -1/+2 |
| | | | | | | | | | | | | cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather. | ||||
| * | | Add cancelling to WeatherChanging event. | Howaner | 2014-03-02 | 1 | -0/+3 |
| | | | |||||
| * | | More documentation (thanks to madmaxoft) and use GetBlockTypeMeta | Howaner | 2014-03-02 | 1 | -2/+2 |
| | | | |||||
| * | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | Howaner | 2014-03-02 | 1 | -0/+6 |
| |/ | |||||
* / | Shrapnel now configurable | Tiger Wang | 2014-03-10 | 1 | -0/+6 |
|/ | |||||
* | Maps: Improvements | andrew | 2014-02-23 | 1 | -3/+6 |
| | |||||
* | Thread safe cMap manager | andrew | 2014-02-20 | 1 | -2/+3 |
| | |||||
* | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -32/+56 |
|\ | |||||
| * | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 1 | -0/+5 |
| |\ | | | | | | | Add Skulls/Heads to MCServer | ||||
| | * | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 1 | -4/+4 |
| | | | |||||
| | * | Add Heads completely | Howaner | 2014-02-18 | 1 | -0/+5 |
| | | | |||||
| * | | The cuboid for cWorld::SetAreaBiome() doesn't need sorting. | madmaxoft | 2014-02-18 | 1 | -1/+2 |
| | | | |||||
| * | | Added cWorld:SetAreaBiome() API function. | madmaxoft | 2014-02-18 | 1 | -1/+19 |
| | | | | | | | | | | | | Fixes #675. | ||||
| * | | Added a bit more documentation to cForEachChunkProvider. | madmaxoft | 2014-02-18 | 1 | -4/+7 |
| |/ | |||||
| * | Removed the unnecessary LoopPlayersAndBroadcastChat() functions. | madmaxoft | 2014-02-15 | 1 | -9/+7 |
| | | |||||
| * | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -1/+3 |
| | | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678. | ||||
| * | Merge pull request #677 from mc-server/BroadcastParticleEffect | Alexander Harkness | 2014-02-15 | 1 | -1/+1 |
| |\ | | | | | | | Broadcast particle effect | ||||
| | * | Exported cWorld::BroadcastParticleEffect. | STRWarrior | 2014-02-15 | 1 | -1/+1 |
| | | | |||||
| * | | Merged branch 'narroo/master'. | madmaxoft | 2014-02-13 | 1 | -1/+14 |
| |\ \ | | |/ | |/| | | | | This merges pull request #661. | ||||
| | * | Fixed formatting. Moved UnloadUnusedChunks from public to private. | narroo | 2014-02-11 | 1 | -4/+3 |
| | | | |||||
| | * | Fixed formatting of previous commit. | narroo | 2014-02-11 | 1 | -2/+2 |
| | | | |||||
| | * | Fixed bug #385. UnloadUnusedChunks now has the same interface as | narroo | 2014-02-11 | 1 | -1/+15 |
| | | | | | | | | | | | | | | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking. | ||||
* | | | Send map when selected | andrew | 2014-02-14 | 1 | -0/+6 |
| | | | |||||
* | | | IDCount Serialization | andrew | 2014-02-13 | 1 | -0/+11 |
|/ / | |||||
* | | More gcc warnings fixed. | madmaxoft | 2014-02-11 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into ChunkStay | madmaxoft | 2014-02-09 | 1 | -3/+20 |
|\| | |||||
| * | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -0/+3 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| * \ | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 1 | -10/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API. | ||||
| * | | | Added more chat functions | Tiger Wang | 2014-02-06 | 1 | -1/+11 |
| | | | | |||||
* | | | | Initial ChunkStay code. | madmaxoft | 2014-02-08 | 1 | -3/+0 |
| |_|/ |/| | | |||||
* | | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later). | STRWarrior | 2014-02-07 | 1 | -4/+4 |
| | | | |||||
* | | | Implemented an easy way of adding new redstone simulators. | STRWarrior | 2014-02-07 | 1 | -3/+6 |
| |/ |/| | | | | | Also added a "noop" redstone simulator that does the same as the fluid version. | ||||
* | | Merge pull request #635 from tonibm19/master | Mattes D | 2014-02-04 | 1 | -1/+1 |
|\ \ | | | | | | | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API | ||||
| * | | Not exporting FindClosestPlayer | tonibm19 | 2014-02-03 | 1 | -1/+1 |
| | | | |||||
| * | | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API | tonibm19 | 2014-02-03 | 1 | -1/+1 |
| |/ | |||||
* / | Increased Type safety of Biomes | Tycho | 2014-02-03 | 1 | -1/+1 |
|/ | | | | | 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 | ||||
* | Changed pointers to references | Tycho | 2014-02-01 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-01 | 1 | -0/+3 |
|\ | | | | | | | | | Conflicts: src/World.h | ||||
| * | The world can now be configured wether farmers should be able to harvest crops. | STRWarrior | 2014-01-27 | 1 | -0/+3 |
| | | |||||
* | | Changed signitures of Several BLockHandler Methods | Tycho | 2014-02-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check | ||||
* | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-01-26 | 1 | -1/+11 |
|\| | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| * | Merge pull request #575 from worktycho/GeneratingBenchmark | Mattes D | 2014-01-25 | 1 | -3/+4 |
| |\ | | | | | | | More Interfaces to decouple Generator from the rest of the code | ||||
| * | | Mob bugfixes | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | Command block fixes 2 | andrew | 2014-01-23 | 1 | -0/+9 |
| | | | |||||
* | | | Refactored cBlockHandler::OnUse and dependents | Tycho | 2014-01-26 | 1 | -28/+28 |
| | | | |||||
* | | | First attempt at Implementing Interfaces | Tycho | 2014-01-25 | 1 | -4/+5 |
| |/ |/| | |||||
* | | Merge branch 'master' into GeneratingBenchmark | Tycho | 2014-01-22 | 1 | -3/+12 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 1 | -130/+146 |
| |\ | |||||
| * | | Scoreboard protocol support | andrew | 2014-01-21 | 1 | -1/+4 |
| | | | |||||
| * | | Basic scoreboard implementation | andrew | 2014-01-19 | 1 | -0/+6 |
| | | | |||||
* | | | Actually implemented interfaces | Tycho | 2014-01-20 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'ForEachChunkProvider' into GeneratingBenchmark | Tycho | 2014-01-20 | 1 | -6/+6 |
|\ \ \ | |_|/ |/| | | | | | | | | Conflicts: src/World.h | ||||
| * | | Seperated BlockArea From World | Tycho | 2014-01-20 | 1 | -3/+3 |
| | | | | | | | | | | | | 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 | ||||
* | | | Changed the cWorld::ScheduleTask() signature. | madmaxoft | 2014-01-19 | 1 | -130/+146 |
| |/ |/| | | | | | 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. | ||||
* | | Command blocks: Execute() | andrew | 2014-01-18 | 1 | -1/+1 |
| | | |||||
* | | Basic command block implementation | andrew | 2014-01-18 | 1 | -6/+10 |
|/ | |||||
* | Added user setting compression factor | Tycho | 2014-01-17 | 1 | -0/+2 |
| | |||||
* | Merge pull request #534 from mc-server/SpawnMinecart | Mattes D | 2014-01-17 | 1 | -0/+3 |
|\ | | | | | Added cWorld::SpawnMinecart. | ||||
| * | Renamed cEmptyMinecart to cRideableMinecart | STRWarrior | 2014-01-12 | 1 | -1/+1 |
| | | |||||
| * | EmptyMinecarts should be able to get a block inside of them. | STRWarrior | 2014-01-12 | 1 | -1/+1 |
| | | |||||
| * | Added cWorld::SpawnMinecart. | STRWarrior | 2014-01-12 | 1 | -0/+3 |
| | | |||||
* | | added cWorld::ScheduleTask Function | Tycho | 2014-01-14 | 1 | -0/+24 |
|/ | | | | | ScheduleTask schedules a SceduledTask object to be run x ticks in the future. In is exported to lua, fixes #150 | ||||
* | Decoupled cChunkGenerator from cWorld and cRoot. | madmaxoft | 2014-01-10 | 1 | -0/+24 |
| | | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS. | ||||
* | Exported cWorld::BroadcastBlockAction(). | madmaxoft | 2014-01-06 | 1 | -1/+1 |
| | | | | As requested in #508; no guarantees about it. | ||||
* | fixed warnings in World.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+1 |
| | |||||
* | Replaced esCreeper with esMonster. | madmaxoft | 2013-12-23 | 1 | -1/+1 |
| | | | | Any monster will be able to explode, and also this fixes #425. | ||||
* | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 1 | -0/+1 |
| | |||||
* | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | |||||
* | Removed some old cRedstone remnants | Tiger Wang | 2013-12-16 | 1 | -5/+0 |
| | |||||
* | This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions. | STRWarrior | 2013-12-15 | 1 | -0/+2 |
| | |||||
* | Implemented note block playing and fixed wire | Tiger Wang | 2013-12-14 | 1 | -0/+5 |
| | | | | Game of Thrones music in Minecraft, here I come! | ||||
* | Redstone data is now loaded on chunk load | Tiger Wang | 2013-12-13 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 1 | -0/+3 |
|\ | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Added a SpawnFallingBlock function so plugins can make other blocks fall. | STRWarrior | 2013-12-07 | 1 | -0/+3 |
| | | |||||
* | | Renamed animation function | Tiger Wang | 2013-12-07 | 1 | -1/+1 |
| | | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | | Fixed duplication glitch with QueueSetBlock | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
|/ | | | | | | | 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. | ||||
* | Lava can spawn fire. | madmaxoft | 2013-12-04 | 1 | -0/+3 |
| | | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65. | ||||
* | Added the real tick duration to the OnWorldTick hook. | madmaxoft | 2013-11-30 | 1 | -1/+1 |
| | |||||
* | Merged master into redstonefixes | Tiger Wang | 2013-11-27 | 1 | -1/+5 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -0/+3 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -2/+8 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+744 |