summaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* IDCount Serializationandrew2014-02-137-3/+191
* Implementation of in-game mapsandrew2014-02-1313-0/+596
* Fixed #573STRWarrior2014-02-121-4/+4
* cWorld:ChunkStay() accepts nils as callbacks.madmaxoft2014-02-111-5/+3
* Added cLuaState::CheckParamFunctionOrNil().madmaxoft2014-02-112-2/+37
* More gcc warnings fixed.madmaxoft2014-02-112-4/+5
* Made cChunkStay's destructor virtual.madmaxoft2014-02-111-1/+1
* Fixed gcc warnings in Item.h.madmaxoft2014-02-111-21/+21
* Fixed nested plugin function calls.madmaxoft2014-02-111-6/+9
* Merge branch 'master' into ChunkStaymadmaxoft2014-02-111-2/+1
|\
| * Added additional parenthasiesworktycho2014-02-101-2/+1
| * Merge branch 'master' into boatsFixTycho2014-02-101-0/+1
| |\
| | * Maybe fixed boat placingtonibm192014-02-101-1/+1
| * | Fixed stupid mistax in conditionalworktycho2014-02-101-2/+1
| |/
* | Added LuaChunkStay to Bindings sources.madmaxoft2014-02-101-36/+47
* | Rewritten Lua ChunkStay API into a single function, cWorld:ChunkStay().madmaxoft2014-02-109-87/+213
* | cLuaState: Stack traces don't include ghost 0-th element.madmaxoft2014-02-101-1/+1
* | Added cPluginLua::cOperation.madmaxoft2014-02-101-1/+27
* | First working version of cLuaChunkStay.madmaxoft2014-02-094-17/+92
* | Initial Lua cChunkStay export.madmaxoft2014-02-094-1/+123
* | cLuaState::cRef can be unbound and re-bound.madmaxoft2014-02-092-9/+60
* | Added AllToLua.pkg to MSVC project files.madmaxoft2014-02-091-0/+2
* | Merge remote-tracking branch 'origin/master' into ChunkStaymadmaxoft2014-02-0930-127/+328
|\|
| * Fixed compile and some warnings in MSVSTiger Wang2014-02-097-17/+6
| * Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-0933-1897/+2087
| |\
| | * Merge pull request #656 from mc-server/ReloadGroupsMattes D2014-02-091-0/+11
| | |\
| | | * "reload" is back.STRWarrior2014-02-091-0/+7
| | | * Split "reload" in "reloadplugins" and "reloadgroups".STRWarrior2014-02-091-2/+5
| | | * The console reload command also reloads the groups.STRWarrior2014-02-091-0/+1
| * | | Merge branch 'master' into playerimprovementsTiger Wang2014-02-0992-214/+347
| |\ \ \
| * | | | Fixed a boat ASSERTTiger Wang2014-02-091-2/+8
| * | | | Moved Gamemode setting into General root tagTiger Wang2014-02-071-1/+1
| * | | | Added sender name to PM if prefixes disabledTiger Wang2014-02-072-2/+2
| * | | | Improved chat messaging functionsTiger Wang2014-02-079-111/+155
| * | | | Server internally uses new functionsTiger Wang2014-02-064-17/+13
| * | | | Added more chat functionsTiger Wang2014-02-064-27/+46
| * | | | Reduced max explosions per tickTiger Wang2014-02-051-1/+1
| * | | | Fixed explosions bugTiger Wang2014-02-053-32/+13
| * | | | Fixed annoying creative on fire bugTiger Wang2014-02-052-0/+20
| * | | | Fixed a bunch of MSVS warningsTiger Wang2014-02-056-7/+8
| * | | | Added more SendMessageXXX() functionsTiger Wang2014-02-043-47/+62
| * | | | Pickup constructor no longer exportedTiger Wang2014-02-033-4/+8
| * | | | Added SendMessageXXX() to cPlayerTiger Wang2014-02-032-1/+72
| * | | | Partial fix for #130Tiger Wang2014-02-031-0/+1
| * | | | Fixed #491Tiger Wang2014-02-031-2/+14
| * | | | Fixed a crash bugTiger Wang2014-02-032-11/+5
| * | | | Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-0311-80/+219
| |\ \ \ \
| * | | | | Fixed #626Tiger Wang2014-02-033-13/+38
| * | | | | Fixed issues with farmlandTiger Wang2014-02-032-1/+3
| * | | | | Server now handles join messages alsoTiger Wang2014-02-032-10/+18
* | | | | | Moved a forgotten comment back to its place.madmaxoft2014-02-081-2/+2
* | | | | | Fixed lighting thread queueing.madmaxoft2014-02-081-2/+4
* | | | | | Fixed ChunkStay initialization.madmaxoft2014-02-081-1/+1
* | | | | | Fixed gcc compilation.madmaxoft2014-02-081-1/+1
* | | | | | Initial ChunkStay code.madmaxoft2014-02-0811-406/+560
| |_|_|/ / |/| | | |
* | | | | Merge pull request #653 from mc-server/RedstoneSimulatorMattes D2014-02-088-1772/+1881
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fixed comment.STRWarrior2014-02-081-1/+1
| * | | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later).STRWarrior2014-02-0710-1826/+1822
| * | | | Fixed some end of linesSTRWarrior2014-02-072-2/+2
| * | | | Implemented an easy way of adding new redstone simulators.STRWarrior2014-02-076-9/+122
* | | | | Fixed cWorld:TryGetHeight() API.madmaxoft2014-02-081-1/+5
|/ / / /
* | | | WebAdmin is stopped properly on server shutdown / restart.madmaxoft2014-02-073-36/+55
* | | | Fixed wiki link in auto-generated settings.ini.madmaxoft2014-02-071-1/+2
* | | | Merge pull request #648 from worktycho/runMCServerMattes D2014-02-051-9/+27
|\ \ \ \
| * | | | Change Output to stderrworktycho2014-02-051-4/+3
| * | | | Merge branch 'master' into runMCServerTycho2014-02-0516-45/+96
| |\ \ \ \
| * | | | | Modified automatic test for boundingBoxTycho2014-02-051-7/+26
| * | | | | Simplified shutdownTycho2014-02-051-4/+0
| * | | | | Added support to start up MCServer and then immediatly sut it down in travisTycho2014-02-051-0/+4
* | | | | | Merge pull request #649 from mc-server/GroupsPermissionsMattes D2014-02-054-36/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Removed deprecated HasCommand functionSTRWarrior2014-02-054-36/+1
* | | | | | Merge pull request #645 from mc-server/GroupsPermissionsMattes D2014-02-056-18/+69
|\| | | | |
| * | | | | Forgot extra lines.STRWarrior2014-02-051-0/+4
| * | | | | Improvements:STRWarrior2014-02-056-22/+69
* | | | | | Merge pull request #646 from worktycho/warningfixesAlexander Harkness2014-02-0510-27/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixed most of the reordering warningsTycho2014-02-0512-33/+33
* | | | | | Improved the signedness conversion.madmaxoft2014-02-051-2/+2
* | | | | | Added cPluginManager:LogStackTrace() to the Lua API.madmaxoft2014-02-051-0/+11
* | | | | | Crypto: Removed unused member, fixed gcc warning.madmaxoft2014-02-042-6/+4
* | | | | | Added dtExplosion to damage<->string functions.madmaxoft2014-02-041-1/+2
* | | | | | Protocol 1.7: Fixed a signed / unsigned comparison warning.madmaxoft2014-02-041-2/+2
| |_|_|_|/ |/| | | |
* | | | | Fixed a gcc warning in ManualBindings.madmaxoft2014-02-041-2/+2
* | | | | Removed a useless check in cLuaState.madmaxoft2014-02-041-3/+1
* | | | | Fixed a warning in cItem in gcc.madmaxoft2014-02-041-1/+1
* | | | | Protocol 1.7 uses char for blockface.madmaxoft2014-02-041-2/+2
* | | | | Merge pull request #644 from worktycho/warningfixesMattes D2014-02-0476-178/+199
|\| | | |
| * | | | Fix gcc not having operator ++ on enumsTycho2014-02-041-6/+7
| * | | | Improved Type safety of eBlockFaceTycho2014-02-0476-174/+194
* | | | | Fixed chest placement.madmaxoft2014-02-041-2/+4
* | | | | Merge pull request #635 from tonibm19/masterMattes D2014-02-045-3/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Blank lines and indentation.tonibm192014-02-041-0/+4
| * | | | Not exporting FindClosestPlayertonibm192014-02-031-1/+1
| * | | | Fixed compilationtonibm192014-02-031-1/+0
| * | | | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua APItonibm192014-02-036-3/+13
| | |_|/ | |/| |
* | | | Fixed calling plugins with userdata params.madmaxoft2014-02-041-0/+1
* | | | Removed a leftover debug message.madmaxoft2014-02-041-1/+0
* | | | Fixed error handling in cPluginManager:CallPlugin() API.madmaxoft2014-02-041-2/+5
* | | | Improved error resistance in cPluginManager:CallPlugin().madmaxoft2014-02-041-0/+8
* | | | Greatly improved TNT propulsion chancesTiger Wang2014-02-031-1/+1
* | | | Merge pull request #636 from worktycho/warningfixesMattes D2014-02-039-18/+31
|\ \ \ \
| * | | | Fogot to save BiogenTycho2014-02-031-4/+4
| * | | | Fixed Compile errorsTycho2014-02-033-6/+6
| * | | | Removed unused lookupsTycho2014-02-031-2/+0
| * | | | Increased Type safety of BiomesTycho2014-02-038-16/+31
| |/ / /
* | | | Merge pull request #633 from mc-server/More_Sideways_BlocksMattes D2014-02-034-5/+80
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Named the different quartz block.STRWarrior2014-02-032-1/+6
| * | Fixed some issues.STRWarrior2014-02-031-1/+2
| * | Renamed cBlockQuartsHandler to cBlockQuartzHandler. Fixed not being able to place normal quartz blocks.STRWarrior2014-02-032-4/+4
| * | This renames the cBlockWoodHandler to cBlockSidewaysHandler, and implements a new cBlockQuartzHandler to handle the quartz pillars.STRWarrior2014-02-033-5/+74
* | | Merge pull request #623 from mc-server/tntMattes D2014-02-032-36/+122
|\ \ \ | |/ / |/| |
| * | Inversed conditionTiger Wang2014-02-031-25/+28
| * | Uncommented pickup spawner codeTiger Wang2014-02-021-3/+7
| * | TNT improvementsTiger Wang2014-02-022-37/+116
* | | Fixed socket leaking.madmaxoft2014-02-031-0/+5
* | | SocketThreads: Fixed sending to closed socket.madmaxoft2014-02-031-1/+6
* | | Groups.ini can contain spaces around commas in values.madmaxoft2014-02-031-21/+25
* | | Merge pull request #602 from mc-server/improvementsandfixesMattes D2014-02-037-22/+61
|\ \ \ | |_|/ |/| |
| * | Added IsBlockWaterOrIce()Tiger Wang2014-02-022-10/+12
| * | Revert "Added LOGREPLACELINE for line replacement"Tiger Wang2014-02-025-94/+16
| * | Revert "Improved code"Tiger Wang2014-02-024-19/+13
| * | Revert "Added a comment"Tiger Wang2014-02-021-1/+1
| * | Revert "Properly initialised variables"Tiger Wang2014-02-024-13/+10
| * | Revert "Fixed issues with insufficient console space"Tiger Wang2014-02-023-114/+29
| * | Revert "A newline issue is resolved"Tiger Wang2014-02-022-1/+3
| * | Revert "Fixed Linux compile"Tiger Wang2014-02-021-2/+1
| * | Revert "Another Linux fix"Tiger Wang2014-02-021-6/+0
| * | Revert "Again improved LogReplaceLine"Tiger Wang2014-02-022-80/+77
| * | Possibly fixed #618Tiger Wang2014-02-021-2/+2
| * | Creative players take Plugin damageTiger Wang2014-02-022-3/+4
| * | Again improved LogReplaceLineTiger Wang2014-02-012-77/+80
| * | Added checks for ice into IsBlockWater()Tiger Wang2014-02-012-3/+10
| * | Split cCoord template into one and two data typesTiger Wang2014-02-012-12/+34
| * | Another Linux fixTiger Wang2014-02-011-0/+6
| * | Fixed Linux compileTiger Wang2014-02-011-1/+2
| * | A newline issue is resolvedTiger Wang2014-02-012-3/+1
| * | Fixed issues with insufficient console spaceTiger Wang2014-02-013-29/+114
| * | Properly initialised variablesTiger Wang2014-01-314-10/+13
| * | Added a commentTiger Wang2014-01-311-1/+1
| * | Improved codeTiger Wang2014-01-314-13/+19
| * | Added LOGREPLACELINE for line replacementTiger Wang2014-01-295-16/+94
| * | Fixed redstone simulator crash found in #570Tiger Wang2014-01-293-18/+25
* | | Fixed multiple invalid permission nodesTiger Wang2014-02-021-2/+2
* | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-02-0278-550/+730
|\ \ \
| * \ \ Merge branch 'master' into registerfixTycho2014-02-0244-63/+211
| |\ \ \
| | * | | Fixed dark oak and acacia placement.madmaxoft2014-02-021-0/+1
| | * | | Added missing filesTycho2014-02-023-0/+39
| | * | | Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-0211-3/+72
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Changed Signiture of OnUpdateTycho2014-02-0220-37/+65
| | * | | Changed Signiture of OnDiggingTycho2014-02-014-7/+7
| | * | | Changed Signiture of OnDestroyedByPlayerTycho2014-02-0112-16/+27
| * | | | Removed register keyword from Messinne TwisterTycho2014-02-011-26/+26
| |/ / /
| * | | Changed pointers to referencesTycho2014-02-0160-249/+247
| * | | Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-0141-184/+863
| |\ \ \
| * | | | Changed signitures of Several BLockHandler MethodsTycho2014-02-0155-196/+209
| * | | | Removed cWorld IncludeTycho2014-01-263-3/+0
| * | | | Refactored GetPlacementBlockTypeMetaTycho2014-01-267-11/+12
| * | | | Merge branch 'master' into GeneratingBenchmark2Tycho2014-01-2670-1195/+2527
| |\ \ \ \
| * | | | | Refactored cBlockHandler::OnUse and dependentsTycho2014-01-2621-263/+310
| * | | | | Added support for overide in c++11 supporting varients of gcc/clangTycho2014-01-261-2/+4
| * | | | | First attempt at Implementing InterfacesTycho2014-01-2519-38/+80
| * | | | | dded dependecy on Blocks to GeneratorTycho2014-01-251-1/+1
* | | | | | Fixed #624Tiger Wang2014-02-022-0/+7
| |_|_|/ / |/| | | |
* | | | | Fixed #620Tiger Wang2014-02-021-1/+2
* | | | | Added saving of angry flag.Kirill Kirilenko2014-02-022-0/+7
* | | | | Fixed sitting tag.Kirill Kirilenko2014-02-022-5/+5
* | | | | Monster's nominal speed was increased.Kirill Kirilenko2014-02-011-1/+1
* | | | | Fixed teleport to air, if owner is flying.Kirill Kirilenko2014-02-011-0/+1
* | | | | Added saving of collar's color.Kirill Kirilenko2014-02-012-4/+11
* | | | | Merge pull request #585 from daniel0916/hooksMattes D2014-02-016-0/+47
|\ \ \ \ \
| * | | | | Removed "player destroying" hookdaniel09162014-02-016-48/+1
| * | | | | Added "player destroying" and "player destroyed" hooksdaniel09162014-01-256-0/+94
* | | | | | Added reading saved state of the wolf (sitting or standing).Kirill Kirilenko2014-01-311-0/+6
| |_|_|/ / |/| | | |
* | | | | Merge pull request #607 from mc-server/Wolf_Owner_SavingMattes D2014-01-312-3/+12
|\ \ \ \ \
| * | | | | Inversed condition.STRWarrior2014-01-311-1/+1
| * | | | | Wolf: If Owner tag is missing a normal ownerless wolf will spawn.STRWarrior2014-01-311-9/+6
| * | | | | Fixed bad variable.STRWarrior2014-01-301-1/+1
| * | | | | Check if the tag is found.STRWarrior2014-01-301-0/+5
| * | | | | Fixes #606STRWarrior2014-01-302-2/+9
* | | | | | Fixed cLineBlockTracer:Trace() signature.madmaxoft2014-01-311-13/+27
* | | | | | Added cPluginManager:BindCommand() form to the API.madmaxoft2014-01-311-1/+4
* | | | | | Added cChunkDest::UpdateHeightmap()madmaxoft2014-01-312-17/+48
* | | | | | Attempt at implementing #563tonibm192014-01-301-2/+1
* | | | | | Lua: Fixed an error in table-functions callbacks.madmaxoft2014-01-291-1/+5
| |_|_|_|/ |/| | | |
* | | | | Did what xoft saidtonibm192014-01-294-5/+3
* | | | | Rewritten code.tonibm192014-01-2912-152/+25
* | | | | Fixed sheeptonibm192014-01-291-18/+17
* | | | | Fixed a copypasta error...tonibm192014-01-294-1/+5
* | | | | Now mobs follow you when holding their breed itemtonibm192014-01-2910-5/+153
* | | | | Limited sign lines to 15 chars.madmaxoft2014-01-291-4/+5
* | | | | Plugin files are loaded in alphabetical order.madmaxoft2014-01-291-17/+35
|/ / / /
* | | | Removed debug message when a firework entity hit a solid block.STRWarrior2014-01-291-2/+0
* | | | Bottle o' Enchanting spawns an experience orb.STRWarrior2014-01-291-1/+2
* | | | Added 1.7.4 to the list of supported protocols.madmaxoft2014-01-291-1/+1
* | | | Protocol 1.7: Encryption is enabled only with auth.madmaxoft2014-01-291-1/+1
* | | | Protocol 1.7: Forced encryption on all connections.madmaxoft2014-01-284-15/+120
* | | | Crypto: Added public key encryption / decryption.madmaxoft2014-01-282-0/+106
* | | | Fixed an error in Crypto.madmaxoft2014-01-281-2/+2
* | | | Merge pull request #594 from mc-server/Villager_UpdateMattes D2014-01-285-2/+185
|\ \ \ \
| * | | | Renamed Farmer functions and added doxycommentsSTRWarrior2014-01-282-17/+20
| * | | | Villager: NoCountDown and Action function don't check VillagersShouldHarvestCrops anymore because it shoudn't even be activated anywhere.STRWarrior2014-01-281-10/+0
| * | | | Villager doesn't check the environment for crops if it doesn't need to.STRWarrior2014-01-271-0/+5
| * | | | The world can now be configured wether farmers should be able to harvest crops.STRWarrior2014-01-273-0/+14
| * | | | Villager: Few more comments.STRWarrior2014-01-272-4/+9
| * | | | CleanupSTRWarrior2014-01-272-31/+65
| * | | | Villagers: Harvesting is more rare.STRWarrior2014-01-271-1/+1
| * | | | Villager: Farmers can't place crops on blocks other then farmland.STRWarrior2014-01-271-1/+7
| * | | | Fixed compiler error.STRWarrior2014-01-271-1/+1
| * | | | Villager: Farmer: Crops finding is more random.STRWarrior2014-01-271-18/+19
| * | | | Added GetCropsPos and DidFindCrops functions.STRWarrior2014-01-271-0/+6
| * | | | Villagers: Farmers now replant the crops.STRWarrior2014-01-272-1/+17
| * | | | Villagers: Fixed only gettings the crops block when farming.STRWarrior2014-01-271-2/+2
| * | | | Villagers don't look for new crops when they already found one.STRWarrior2014-01-271-11/+9
| * | | | E_BLOCK_POTATOES isn't an solid block. Villagers were floating above them.STRWarrior2014-01-271-0/+1
| * | | | Villagers: Farmers can also harvest carrots and potatoes.STRWarrior2014-01-272-9/+38
| * | | | Makes farmers farm crops.STRWarrior2014-01-272-1/+76
| | |_|/ | |/| |
* | | | Fixed timing on *nix.madmaxoft2014-01-282-2/+2
* | | | Fixed a slight bug in RSA encryption code.madmaxoft2014-01-281-2/+1
* | | | Merge pull request #595 from mc-server/NonBlockingSocketsMattes D2014-01-284-63/+171
|\ \ \ \
| * | | | Squashed common code.madmaxoft2014-01-271-14/+7
| * | | | Fixed Linux compilation.madmaxoft2014-01-271-1/+2
| * | | | Rewritten networking to use non-blocking sockets.madmaxoft2014-01-274-62/+176
* | | | | SIGABRT exits with failure.Tiger Wang2014-01-271-0/+1
|/ / / /
* | | | Fixed client packet parsing.madmaxoft2014-01-262-15/+56
* | | | cByteBuffer has more self-tests.madmaxoft2014-01-261-6/+29
* | | | Item-loading now checks for weird bytes.madmaxoft2014-01-261-3/+9
* | | | Fixed Byte-order reading.madmaxoft2014-01-261-2/+4
* | | | Added SIGABRT to catchers listTiger Wang2014-01-261-1/+6
|/ / /
* | | Merge pull request #589 from mc-server/minecartimprovementsMattes D2014-01-265-110/+438
|\ \ \
| * | | Reduced unnecessary echoes (thanks xoft)Tiger Wang2014-01-261-5/+3
| * | | Rail speed tweakTiger Wang2014-01-251-2/+2
| * | | Improved AllToLua UI experienceTiger Wang2014-01-251-2/+8
| * | | Added more minecart powered rail directionsTiger Wang2014-01-243-80/+63
| * | | Begin implementing ascending railsTiger Wang2014-01-192-2/+45
| * | | Added one more direction into collision checksTiger Wang2014-01-191-26/+51
| * | | Minecart improvements and fixesTiger Wang2014-01-191-33/+43
| * | | Fixed weird meta with curved railsTiger Wang2014-01-191-5/+15
| * | | Added more rail functionalityTiger Wang2014-01-193-18/+22
| * | | Merge remote-tracking branch 'origin/master' into minecartimprovementsTiger Wang2014-01-1972-276/+1139
| |\ \ \
| * | | | Minecart collision and general improvementsTiger Wang2014-01-182-70/+242
* | | | | Merge pull request #590 from mc-server/Wolf_FixMattes D2014-01-261-7/+31
|\ \ \ \ \
| * | | | | Fixed bug where wolfs would teleport while they were sitting.STRWarrior2014-01-261-1/+4
| * | | | | Small fix since the new AI and a new small feature.STRWarrior2014-01-261-6/+27
* | | | | | Fixed segmentation fault on villager damageTiger Wang2014-01-261-1/+1
* | | | | | Merge pull request #575 from worktycho/GeneratingBenchmarkMattes D2014-01-258-189/+294
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Stupid Mistake fixedTycho2014-01-251-2/+2
| * | | | Fixed exportsTycho2014-01-253-7/+1
| * | | | Fixed spelling errorTycho2014-01-224-3/+3
| * | | | Added manual bindings for moved functionsTycho2014-01-223-2/+71
| * | | | formatting changesTycho2014-01-222-6/+26
| * | | | Merge branch 'master' into GeneratingBenchmarkTycho2014-01-2227-228/+2047
| |\ \ \ \
| * | | | | Actually implemented interfacesTycho2014-01-204-21/+33
| * | | | | Moved Schematic file methods to seperate classTycho2014-01-204-175/+177
| * | | | | Merge branch 'ForEachChunkProvider' into GeneratingBenchmarkTycho2014-01-204-17/+23
| |\ \ \ \ \
| | * | | | | Seperated BlockArea From WorldTycho2014-01-204-14/+20
| * | | | | | Merge branch 'master' into GeneratingBenchmarkTycho2014-01-2043-490/+1360
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| * | | | | Added Inifile and OSSupport LinkingTycho2014-01-191-0/+2
* | | | | | Merge pull request #588 from mc-server/Sheep_EatingMattes D2014-01-252-1/+41
|\ \ \ \ \ \
| * | | | | | Implemented sheeps eating grass.STRWarrior2014-01-252-1/+41
* | | | | | | Merge pull request #587 from mc-server/mobimprovementsMattes D2014-01-2528-563/+716
|\ \ \ \ \ \ \
| * | | | | | | Did what xoft recommendedTiger Wang2014-01-252-2/+6
| * | | | | | | Two minor changesTiger Wang2014-01-252-6/+4
| * | | | | | | Implemented fall damage for mobsTiger Wang2014-01-255-11/+41
| * | | | | | | Attack() is no longer always calledTiger Wang2014-01-251-1/+1
| * | | | | | | Implemented pickup combiningTiger Wang2014-01-251-0/+55
| * | | | | | | Mob bugfixesTiger Wang2014-01-256-26/+54
| * | | | | | | All mobs now drown (fixes #54)Tiger Wang2014-01-256-127/+137
| * | | | | | | Fixed a generator bugTiger Wang2014-01-252-1/+9
| * | | | | | | Zombies and skeletons use AITiger Wang2014-01-252-9/+15
| * | | | | | | Miscellaneous improvementsTiger Wang2014-01-243-28/+17
| * | | | | | | Changed a condition to IsGameModeTiger Wang2014-01-241-2/+1
| * | | | | | | Made wolves compatible with new AI codeTiger Wang2014-01-242-11/+26
| * | | | | | | Monsters no longer check for direct line of sightTiger Wang2014-01-241-10/+2
| * | | | | | | Large reworking of mob code [SEE DESC]Tiger Wang2014-01-247-242/+334
| * | | | | | | Fixed mobs too close to player not tickingTiger Wang2014-01-241-2/+2
| * | | | | | | Implemented creeper abilitiesTiger Wang2014-01-242-2/+50
| * | | | | | | Removed unused ReferenceManagerTiger Wang2014-01-244-122/+1
* | | | | | | | Merge pull request #583 from mc-server/ChangeToPolarSSLMattes D2014-01-2514-161/+679
|\ \ \ \ \ \ \ \
| * | | | | | | | Added RSA encryption to crypto wrappers.madmaxoft2014-01-252-0/+39
| * | | | | | | | Merged branch 'master' into ChangeToPolarSSL.madmaxoft2014-01-2515-117/+319
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into ChangeToPolarSSL.madmaxoft2014-01-2311-198/+254
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed a warning in ScoreboardSerializer.madmaxoft2014-01-231-2/+2
| * | | | | | | | | | PolarSSL is fully used for 1.3.2 protocol encryption.madmaxoft2014-01-2313-157/+630
| * | | | | | | | | | Fixed a bug in LeakFinder.madmaxoft2014-01-231-3/+8
| * | | | | | | | | | Replacing CryptoPP with PolarSSL.madmaxoft2014-01-221-1/+1
* | | | | | | | | | | Merge pull request #581 from worktycho/strerrorMattes D2014-01-257-65/+76
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Switched cEvent to GetOSErrorStringTycho2014-01-253-18/+14
| * | | | | | | | | | Extracted cSocket::GetErrorString into GetOSErrorStringTycho2014-01-256-59/+62
| * | | | | | | | | | Switched cEvent to use strerror_r for error messagesTycho2014-01-231-6/+18
* | | | | | | | | | | Comm logging is available in both Debug and Release modes.madmaxoft2014-01-253-16/+16
* | | | | | | | | | | Added cFile::Flush().madmaxoft2014-01-252-20/+34
* | | | | | | | | | | Protocol17: Comm logging shows the data left over from previous parse.madmaxoft2014-01-251-2/+15
* | | | | | | | | | | Merge pull request #586 from worktycho/BindingsMoveAlexander Harkness2014-01-251-28/+65
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Added dependecy output to Bindings/BindingsDependencies.txtTycho2014-01-251-0/+7
| * | | | | | | | | | Reformatted Bindings DependeciesTycho2014-01-251-28/+58
* | | | | | | | | | | Fixed *nix compilation for previous commit.madmaxoft2014-01-241-2/+2
* | | | | | | | | | | Added per-connection comm logging in debug mode.madmaxoft2014-01-243-1/+93
* | | | | | | | | | | Fixed a possible deadlock on client disconnect.madmaxoft2014-01-241-9/+0
* | | | | | | | | | | Fixed a failure in cSquid.madmaxoft2014-01-241-1/+2
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Fixed Win nightbuilds not producing PDBs.madmaxoft2014-01-241-0/+7
* | | | | | | | | | Fixed a few compile-time and runtime warnings in ScoreboardSerializer.madmaxoft2014-01-241-8/+4
* | | | | | | | | | Fixed crash with failed entity-loading.madmaxoft2014-01-242-3/+9
* | | | | | | | | | Merge remote-tracking branch 'MikeHunsinger/master'madmaxoft2014-01-244-49/+89
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed indentation once and for all.Mike Hunsinger2014-01-242-46/+46
| * | | | | | | | | | Fixed indentation and doxygen comments... For real this time.Mike Hunsinger2014-01-242-15/+15
| * | | | | | | | | | Fixed spacing and doxycomments.Mike Hunsinger2014-01-243-18/+16
| * | | | | | | | | | Removed extra lineMike Hunsinger2014-01-231-2/+0
| * | | | | | | | | | Split TossItem into three Toss functions (Held, Equipped and Pickup)Mike Hunsinger2014-01-234-57/+101
* | | | | | | | | | | Fixed flint&steel failure on the Y world edges.madmaxoft2014-01-241-0/+4
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #580 from xdot/masterMattes D2014-01-232-41/+33
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixed 1.5.x scoreboard packet IDsandrew2014-01-231-3/+3
| * | | | | | | | | Fixed scoreboard.dat structureandrew2014-01-231-5/+6
| * | | | | | | | | Fixed scoreboard serializationandrew2014-01-231-35/+26
* | | | | | | | | | Make clean now effects BindingsTycho2014-01-231-0/+2
* | | | | | | | | | Removed Bindings folder subcmake on *nixTycho2014-01-231-1/+2
* | | | | | | | | | BugfixesTycho2014-01-232-12/+9
* | | | | | | | | | added dependecies for bindings regenTycho2014-01-232-14/+46
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Fixed crash while calling disabled plugins.madmaxoft2014-01-231-1/+1
|/ / / / / / / /
* | | | | | | | Improved code safety for the Compact world storage.Mattes D2014-01-231-104/+72
* | | | | | | | Minor style improvements for the merged PR.Mattes D2014-01-231-4/+4
* | | | | | | | Merge remote-tracking branch 'xdot/master'Mattes D2014-01-236-40/+104
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Command block fixes 2andrew2014-01-236-40/+104
* | | | | | | | Authenticator: Reduced logging levels.madmaxoft2014-01-221-4/+4
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Fixed compilation on VC2008tonibm192014-01-221-0/+1
|/ / / / / /
* | | | | | Merge pull request #566 from xdot/masterMattes D2014-01-2220-9/+1571
|\ \ \ \ \ \
| * | | | | | cWorld now saves/loads the scoreboardandrew2014-01-224-15/+44
| * | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-2130-478/+679
| |\| | | | |
| * | | | | | Scoreboard SendTo()andrew2014-01-214-6/+74
| * | | | | | Scoreboard protocol supportandrew2014-01-2117-23/+321
| * | | | | | Scoreboard serializationandrew2014-01-203-14/+92
| * | | | | | Scoreboard deserializationandrew2014-01-207-48/+599
| * | | | | | Scoreboard improvementsandrew2014-01-193-116/+79
| * | | | | | Basic scoreboard implementationandrew2014-01-195-1/+576
| | |_|_|_|/ | |/| | | |
* | | | | | Implemented cPluginManager:CallPlugin() API.madmaxoft2014-01-217-214/+471
| |/ / / / |/| | | |
* | | | | Fix a crash but somewhere...Alexander Harkness2014-01-201-2/+1
| |_|/ / |/| | |
* | | | Changed the cWorld::ScheduleTask() signature.madmaxoft2014-01-193-151/+181
* | | | cLuaState can now check function params.madmaxoft2014-01-192-0/+37
* | | | Merge pull request #569 from worktycho/EnchantmentsFixMattes D2014-01-198-88/+120
|\ \ \ \ | | |/ / | |/| |
| * | | Switched EnchantmentSerilizer to namespaceTycho2014-01-197-17/+23
| * | | Spilt Writing of Enchantments to seperate classTycho2014-01-198-90/+116
* | | | Merge pull request #565 from mc-server/commandblockfixesMattes D2014-01-1911-5/+151
|\ \ \ \
| * | | | Removed unneeded paramtersTiger Wang2014-01-199-15/+23
| * | | | Changed SendBlockEntity format slightlyTiger Wang2014-01-199-42/+55
| * | | | Implemented MC|Brand responseTiger Wang2014-01-191-3/+9
| * | | | Improved command blocksTiger Wang2014-01-1911-5/+124
* | | | | Rewritten SocketThreads for proper shutdown scenario.madmaxoft2014-01-198-178/+189
* | | | | Merge pull request #551 from worktycho/schedularMattes D2014-01-191-6/+2
|\ \ \ \ \
| * | | | | Fixed iterators bugTycho2014-01-181-2/+1
| * | | | | switched to using m_WorldAge rather than m_TickIDTycho2014-01-182-9/+3
| * | | | | Increased tick count to longTycho2014-01-172-3/+3
| * | | | | Implemented xsofts suggestion for a saturating counter in the schedulerTycho2014-01-172-5/+8
* | | | | | SocketThreads: Removed unused code.madmaxoft2014-01-192-53/+3
| |_|_|/ / |/| | | |
* | | | | Merge pull request #559 from mc-server/SpawnMobParticlesMattes D2014-01-191-3/+0
|\ \ \ \ \
| * | | | | Removed the particles when a mob spawns.STRWarrior2014-01-181-3/+0
* | | | | | Exported cFloater to the Lua API.STRWarrior2014-01-192-3/+8
* | | | | | Fixed compiler error.STRWarrior2014-01-181-3/+3
| |_|/ / / |/| | | |
* | | | | Merge pull request #557 from xdot/masterMattes D2014-01-1819-62/+592
|\ \ \ \ \
| * | | | | Command block fixesandrew2014-01-183-43/+17
| * | | | | Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-183-3/+150
| |\| | | |
| * | | | | Parse the MC|AdvCdm plugin messageandrew2014-01-184-1/+70
| * | | | | Command blocks: Execute()andrew2014-01-185-18/+42
| * | | | | Command block (de)serializationandrew2014-01-186-21/+122
| * | | | | Basic command block implementationandrew2014-01-1811-33/+395
| | |_|/ / | |/| | |
* | | | | HTTP connections aren't kept alive unless explicitly enabled.madmaxoft2014-01-184-37/+58
| |/ / / |/| | |
* | | | Alpha-sorted the finishers.madmaxoft2014-01-181-4/+4
* | | | Merged branch 'NetherFinish'.madmaxoft2014-01-183-3/+150
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed errors.STRWarrior2014-01-182-2/+2
| * | | Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo'sSTRWarrior2014-01-183-10/+10
| * | | Some tweaks.STRWarrior2014-01-181-5/+18
| * | | Fixed bug where only brown mushrooms would spawn.STRWarrior2014-01-181-3/+3
| * | | It now actualy works.STRWarrior2014-01-181-20/+42
| * | | First attempt at creating a clumb version NetherFinisher.STRWarrior2014-01-172-22/+63
| * | | Added cFinishGenNetherSprinkleFoliage.STRWarrior2014-01-103-2/+73
* | | | Merge pull request #552 from worktycho/c++11Mattes D2014-01-171-4/+0
|\ \ \ \
| * | | | Changed std to c++11 in clang to fix va_copy issuesTycho2014-01-171-4/+0
| | |/ / | |/| |
* / | | Added user setting compression factorTycho2014-01-1710-22/+33
|/ / /
* | | Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-177-11/+62
|\ \ \
| * | | Changed GetContent function.STRWarrior2014-01-161-1/+1
| * | | Fixed server crash.STRWarrior2014-01-121-1/+1
| * | | Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-127-17/+18
| * | | EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-127-10/+33
| * | | Added cWorld::SpawnMinecart.STRWarrior2014-01-122-0/+27
* | | | Fixed SIGABRT_COMPAT on other architectures.madmaxoft2014-01-171-0/+2
* | | | Removed internal cEntity::GetRot() usage.madmaxoft2014-01-1723-43/+43
* | | | Merge remote-tracking branch 'origin/customnames'madmaxoft2014-01-1738-115/+201
|\ \ \ \
| * | | | Changed newline character because of issuesTiger Wang2014-01-162-4/+13
| * | | | Removed CustomCopy()Tiger Wang2014-01-162-24/+1
| * | | | Really did what xoft wantedTiger Wang2014-01-161-5/+8
| * | | | Fixed #535Tiger Wang2014-01-161-1/+1
| * | | | Removed obsoleted functionsTiger Wang2014-01-1634-74/+67
| * | | | Possibly did what xoft wantedTiger Wang2014-01-163-10/+25
| * | | | Merge remote-tracking branch 'origin/master' into customnamesTiger Wang2014-01-169-75/+90
| |\ \ \ \
| * | | | | OBSOLETE'd obsolete functionsTiger Wang2014-01-151-2/+2
| * | | | | Implemented custom names and loreTiger Wang2014-01-154-35/+107
| * | | | | Implemented Ctrl-Q drop stackTiger Wang2014-01-153-3/+20
* | | | | | Protocol 1.7: More output on unknown packets / protocol states.madmaxoft2014-01-171-4/+21
| |_|_|_|/ |/| | | |
* | | | | Fixed block break packet numberTiger Wang2014-01-161-1/+1
* | | | | Fixed #535Tiger Wang2014-01-161-1/+1
* | | | | Fixed SIGPIPE on cSocket::Send().madmaxoft2014-01-163-12/+13
* | | | | Protocol 1.7: Unknown packets are dumped to log in Debug mode.madmaxoft2014-01-161-1/+14
* | | | | Disabled excessive entity-related logging in Debug mode.madmaxoft2014-01-162-3/+26
* | | | | Fixed whitespace in previous commit.madmaxoft2014-01-161-1/+1
* | | | | Finished exporting cWorld:ScheduleTask() to Lua API.madmaxoft2014-01-161-1/+15
| |/ / / |/| | |
* | | | CMake: Fixed output paths for all MSVC versions.madmaxoft2014-01-161-7/+9
* | | | Added packet diagnostics to 1.7 protocol.madmaxoft2014-01-162-30/+40
* | | | Yet another attempt at VarArgs.madmaxoft2014-01-161-10/+15
* | | | Another VarArgs fix.madmaxoft2014-01-166-39/+37
|/ / /
* | | Using a 2nd argument instead of va_copy().madmaxoft2014-01-156-30/+42
* | | Fixed varargs modification.madmaxoft2014-01-151-1/+5
* | | Furnace minecarts now stop being active after a while.STRWarrior2014-01-152-2/+19
* | | First implementation for furnace minecarts.STRWarrior2014-01-152-1/+23
* | | Merge pull request #542 from worktycho/schedularMattes D2014-01-153-4/+121
|\ \ \
| * | | added cWorld::ScheduleTask FunctionTycho2014-01-143-4/+121
* | | | Merge pull request #538 from mc-server/minecartsMattes D2014-01-159-176/+469
|\ \ \ \ | |/ / / |/| | |
| * | | Yes newline at end of file :DTiger Wang2014-01-141-1/+5
| * | | Final improvements to MinecartsTiger Wang2014-01-133-93/+292
| * | | Detaching improvementsTiger Wang2014-01-134-4/+34
| * | | Fixed wire, rail, and pressure plate unpoweringTiger Wang2014-01-131-3/+4
| * | | Fixed settings plugin generation after IniFileTiger Wang2014-01-121-3/+3
| * | | Multiple enhancements and fixes to minecartsTiger Wang2014-01-124-132/+191
* | | | CMake: Added postfix for profiled exemadmaxoft2014-01-141-0/+4
* | | | Removed shutdown() from socket closing.madmaxoft2014-01-131-4/+0
* | | | Added handshake processing to protocol 1.7.madmaxoft2014-01-132-2/+29
* | | | Generating the bindings outputs a message at the end.madmaxoft2014-01-131-0/+8
* | | | cCreeper is no longer available in API.madmaxoft2014-01-133-14/+1
* | | | CMake: Removed leftover debugging output.madmaxoft2014-01-131-1/+0
* | | | CMake: Added resources to windows projects.madmaxoft2014-01-131-1/+14
* | | | Added a generic .user file for MSVC.madmaxoft2014-01-131-0/+167
* | | | Moved the win resources into a separate subfolder.madmaxoft2014-01-125-0/+22
* | | | CMake generates Bindings when not existant (win)madmaxoft2014-01-121-0/+10
|/ / /
* | | Merge pull request #529 from mc-server/derpstonerefactorAlexander Harkness2014-01-1210-331/+265
|\ \ \ | |/ / |/| |
| * | Fixed rails poweringTiger Wang2014-01-111-0/+2
| * | Did some stuff with the vectorsTiger Wang2014-01-111-32/+17
| * | Fixed a door bug and reduced codeTiger Wang2014-01-111-19/+1
| * | Renamed g_TorchPlaceable...Tiger Wang2014-01-116-71/+71
| * | Fixed doors, fixes #453Tiger Wang2014-01-101-38/+8
| * | Major refactoring of redstoneTiger Wang2014-01-104-186/+181
* | | Disabled a useless MSVC warning in Bindings.cpp.madmaxoft2014-01-121-0/+6
* | | Merge pull request #532 from mc-server/LuaStateErrorHandlerMattes D2014-01-125-252/+130
|\ \ \
| * | | Lua errors display stack trace.madmaxoft2014-01-112-3/+27
| * | | Removed internal methods from public cLuaState interface.madmaxoft2014-01-113-119/+103
| * | | Removed an unused file.madmaxoft2014-01-112-130/+0
* | | | Merge pull request #527 from derouinw/biomessplitMattes D2014-01-118-222/+241
|\ \ \ \ | |/ / / |/| | |
| * | | Globals.h needs to be first includeBill Derouin2014-01-101-1/+1
| * | | Include Biome enum in ChunkDefBill Derouin2014-01-101-2/+1
| * | | Added newlines at ends of filesBill Derouin2014-01-102-2/+2
| * | | Fixed missing externalsBill Derouin2014-01-101-1/+2
| * | | Move biome definition to separate filesBill Derouin2014-01-098-222/+241
* | | | Removed unused variables.madmaxoft2014-01-111-2/+0
* | | | Merge pull request #530 from mc-server/GeneratorDecoupleMattes D2014-01-1110-50/+188
|\ \ \ \
| * | | | Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-1010-50/+188
* | | | | Fixed glowstone drop countandrew2014-01-111-2/+2
|/ / / /
* | | | Fixed generator adding values to ini file.madmaxoft2014-01-102-1/+3
* | | | Merge pull request #520 from mc-server/SoulSandMattes D2014-01-102-1/+17
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fixed recurring pattern.STRWarrior2014-01-101-1/+1
| * | Fixed chunk borders.STRWarrior2014-01-091-3/+3
| * | Speed-up. I got about 40 extra ch/sSTRWarrior2014-01-081-9/+14
| * | WormNestCaves now remove soul sand.STRWarrior2014-01-081-0/+1
| * | NetherGen: Now generates SoulSand.STRWarrior2014-01-081-1/+11
| |/
* | Exported cClientHandle::SendPluginMessage() to Lua.madmaxoft2014-01-091-0/+30
* | Fixed wrong packet number for PluginMessage packet.madmaxoft2014-01-091-1/+1
* | Added cClientHandle::SendPluginMessage().madmaxoft2014-01-099-0/+50
* | Composition generator creating moved to a separate function.madmaxoft2014-01-092-61/+83
* | Height generator creating moved info HeiGen.cpp.madmaxoft2014-01-093-54/+82
* | Merge pull request #517 from derouinw/masterMattes D2014-01-091-0/+13
|\ \ | |/ |/|
| * A couple touchupsBill Derouin2014-01-081-2/+3
| * Add missing plugin errorBill Derouin2014-01-071-0/+12
* | Fixed AppendVPrintf() handling for large strings.madmaxoft2014-01-081-6/+4
* | Graceful shutdown on SIGTERMTiger Wang2014-01-071-0/+5
|/
* Merge pull request #516 from mc-server/faviconAlexander Harkness2014-01-074-18/+8
|\
| * Fixed faviconsTiger Wang2014-01-074-18/+8
* | Plugin messages are received and handed to plugins.madmaxoft2014-01-078-2/+68
|/
* Merge pull request #514 from derouinw/masterMattes D2014-01-073-0/+20
|\
| * Avoid making copies of favicon stringBill Derouin2014-01-072-2/+2
| * A few more touch upsBill Derouin2014-01-072-12/+2
| * A few touch upsBill Derouin2014-01-072-2/+5
| * Removed unused lineBill Derouin2014-01-071-1/+0
| * Implement favicon for 1.7.2Bill Derouin2014-01-074-0/+28
* | Disabled an unneeded MSVC warning.madmaxoft2014-01-071-4/+7
* | Removed a debugging log output in cPluginManager:AddHook().madmaxoft2014-01-071-1/+0
* | More MSVC warning fixes.madmaxoft2014-01-079-11/+11
* | LuaState can push strings with embedded NULs.madmaxoft2014-01-071-1/+1
* | Fixed a few MSVC warnings.madmaxoft2014-01-078-18/+21
* | Added Base64Encode().madmaxoft2014-01-072-0/+51
* | Disabled the type conversion MSVC warning.madmaxoft2014-01-061-1/+3
* | Fixed a few MSVC warnings.madmaxoft2014-01-0611-16/+12
|/
* Merge pull request #511 from mc-server/CmakeOutputMattes D2014-01-061-1/+1
|\
| * Output dir set to $/MCServer.madmaxoft2014-01-061-1/+1
* | Merge pull request #509 from Diusrex/masterMattes D2014-01-067-5/+87
|\ \
| * | Added fake functions into cCriticalSection because of the change to ASSERTDiusrex2014-01-051-0/+5
| * | Changed the release version of ASSERT.Diusrex2014-01-051-1/+1
| * | Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.hDiusrex2014-01-055-3/+68
| * | Making all of the useful level 4 warnings be active.Diusrex2014-01-051-1/+13
* | | Exported cWorld::BroadcastBlockAction().madmaxoft2014-01-061-1/+1
| |/ |/|
* | Fixed wrong enqueueing.madmaxoft2014-01-061-2/+9
|/
* Fixed cPluginManager:AddHook() binding.madmaxoft2014-01-051-6/+13
* Fixed a race condition in the cQueue class.madmaxoft2014-01-051-59/+86
* Fixed DocumentationTycho2014-01-031-4/+2
* derpTycho2014-01-031-1/+1
* actual fixTycho2014-01-031-2/+9
* fixed failure to return a value from RemoveTycho2014-01-031-1/+1
* implement xsofts recommendationsTycho Bickerstaff2014-01-031-9/+15
* Merge branch 'master' into threadsafequeueTycho Bickerstaff2014-01-027-29/+80
|\
| * Merge pull request #479 from mc-server/cmake-winMattes D2014-01-022-18/+30
| |\
| | * Added support for out-of-source builds.madmaxoft2013-12-282-18/+30
| * | More memory alignment fixes.madmaxoft2014-01-022-6/+6
| * | Fixed unaligned memory access in FastNBT.madmaxoft2014-01-023-5/+44
* | | added documentationTycho Bickerstaff2014-01-021-7/+45
* | | fixed a few remaining issues with worldstorageTycho Bickerstaff2014-01-022-24/+6
* | | rewrote queue not to use promises for waitsTycho Bickerstaff2014-01-026-121/+24
* | | Merge branch 'master' into threadsafequeueTycho Bickerstaff2013-12-3110-3/+117
|\| |
| * | merged changes from upstreamTycho Bickerstaff2013-12-319-3/+112
| |\ \
| | * \ Merge branch 'FishingHook'madmaxoft2014-01-018-1/+110
| | |\ \
| | | * | OnPlayerFishing doesn't have a const cItems anymoreSTRWarrior2014-01-015-5/+5
| | | * | implemented the recommendations Xoft gave.STRWarrior2013-12-317-12/+25
| | | * | Implented OnPlayerFishing and OnPlayerFished.STRWarrior2013-12-306-1/+97
| | * | | Fixed GetPhysicalRAMUsage on Linuxandrew2014-01-011-2/+2
| * | | | Merge branch 'master' into cmake-fixesTycho Bickerstaff2013-12-3114-16/+56
| |\| | |
| * | | | fixed bad mergeTycho Bickerstaff2013-12-221-4/+0
| * | | | merged in more warning fixesTycho Bickerstaff2013-12-222-3/+2
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | merged in changesTycho Bickerstaff2013-12-223-2/+12
| |\ \ \ \
| * | | | | merged in warnings changesTycho Bickerstaff2013-12-2226-93/+94
| * | | | | fixed accedental commitTycho Bickerstaff2013-12-221-2/+1
| * | | | | fixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker notTycho Bickerstaff2013-12-222-1/+33
* | | | | | fogot to add promise classesTycho Bickerstaff2013-12-312-0/+92
* | | | | | clean up code for patchingTycho Bickerstaff2013-12-313-3/+5
* | | | | | Merge branch 'master' into threadsafequeueTycho Bickerstaff2013-12-3120-91/+69
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | removed unneccisary castTycho Bickerstaff2013-12-311-1/+2
| * | | | | fixed warnings in LineBlockTracer.cppTycho Bickerstaff2013-12-311-1/+0
| * | | | | fixed warnings in LightingThread.cppTycho Bickerstaff2013-12-311-0/+1
| * | | | | take Z axis into account when calculating neighboors in LightingThread::ChunkReadyTycho Bickerstaff2013-12-311-1/+1
| * | | | | fixed warnings in World.cppTycho Bickerstaff2013-12-314-6/+34
| * | | | | fixxed warnings in Server.cppTycho Bickerstaff2013-12-311-0/+5
| * | | | | fixed warnings in Inventory.cppTycho Bickerstaff2013-12-311-2/+2
| * | | | | fixed warnings in bytebuffer.cppTycho Bickerstaff2013-12-312-4/+4
| * | | | | fixed ClientHandle warningsTycho Bickerstaff2013-12-311-0/+1
| * | | | | fixed warnings in webadmin.cppTycho Bickerstaff2013-12-311-0/+3
| * | | | | fixed warnings in BlockArea.cppTycho Bickerstaff2013-12-311-0/+2
| * | | | | Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure.Morgan Redshaw2013-12-311-2/+2
| | |_|/ / | |/| | |
| * | | | Fixed compilation in VC2008.madmaxoft2013-12-306-75/+13
| | |/ / | |/| |
* | | | refactored chunk Queue to seperate classTycho Bickerstaff2013-12-317-124/+162
* | | | added link dependency between WorldStorage and OSSupportTycho Bickerstaff2013-12-221-0/+2
* | | | Merge branch 'master' into threadsafequeueTycho Bickerstaff2013-12-2224-29/+92
|\| | |
| * | | converted commneted paramater names to the unused macroTycho Bickerstaff2013-12-2216-39/+100
| * | | Merge branch 'master' of github.com:mc-server/MCServerTycho Bickerstaff2013-12-2260-233/+1990
| |\| |
| * | | Chunk is now warnings cleanTycho Bickerstaff2013-12-214-6/+5
| * | | fixed hidden bug with furnaces ignoring time burntTycho Bickerstaff2013-12-211-1/+1
| * | | Root is now warnings cleanTycho Bickerstaff2013-12-218-30/+32
| * | | Piston is now warnings cleanTycho Bickerstaff2013-12-215-6/+6
| * | | ChunkSender is now warnings cleanTycho Bickerstaff2013-12-216-9/+10
* | | | Merge remote-tracking branch 'upstream/master' into threadsafequeueTycho Bickerstaff2013-12-2260-233/+1990
|\ \ \ \ | | |/ / | |/| |
| * | | Added HOOK_PLUGINS_LOADED.madmaxoft2013-12-296-3/+64
| * | | Merge pull request #481 from MikeHunsinger/masterMattes D2013-12-292-3/+49
| |\ \ \
| | * | | Added function to create Tall Birch tree in BirchTreeForest biomesMike Hunsinger2013-12-292-3/+49
| | | |/ | | |/|
| * / | Fixed a (valid) warning in RCONServer.madmaxoft2013-12-281-0/+3
| |/ /
| * | Merge branch 'master' into cmake-winmadmaxoft2013-12-272-4/+56
| |\ \
| | * | Server now handles death messagesTiger Wang2013-12-261-0/+16
| | * | Merge pull request #472 from mc-server/Extreme_Hills_MMattes D2013-12-261-4/+40
| | |\ \
| | | * | Simplefied Extreme Hills M pattern select.STRWarrior2013-12-261-11/+3
| | | * | Extreme Hills M biomes now generate gravel, stone and grass patterns.STRWarrior2013-12-251-2/+10
| | | * | Changed tbGravel. Vanilla has 3 layers of gravel and then stone.STRWarrior2013-12-251-3/+3
| | | * | Normal extreme hills (plus) now generate a stone/grass pattern.STRWarrior2013-12-251-2/+20
| | | * | Re-added empty line.STRWarrior2013-12-251-0/+1
| | | * | This generates gravel in Extreme Hills M biomes.STRWarrior2013-12-252-3/+20
| * | | | Made cmake compilation possible on Windows.madmaxoft2013-12-274-21/+27
| * | | | Added proper precompiled headers for MSVC.madmaxoft2013-12-261-48/+47
| |/ / /
| * | | cBlockArea: Fixed writing full-height areas.madmaxoft2013-12-261-2/+2
| * | | Merge pull request #461 from mc-server/repeatersMattes D2013-12-267-47/+314
| |\ \ \ | | |/ / | |/| |
| | * | Moved increment operator to back of variablesTiger Wang2013-12-261-9/+9
| | * | Fixed rails not updating with diagonalsTiger Wang2013-12-251-0/+34
| | * | Braced up some codeTiger Wang2013-12-251-0/+2
| | * | Used IsGamemodeCreative() functionTiger Wang2013-12-251-1/+1
| | * | Fixed comments in main.cpp and Player.cppTiger Wang2013-12-242-2/+2
| | * | Implemented stone and wooden pressure platesTiger Wang2013-12-242-3/+105
| | * | Improved knockback animationTiger Wang2013-12-241-3/+3
| | * | Improved player fall particle positionsTiger Wang2013-12-231-5/+2
| | * | Provides an enhancement to daylight sensorsTiger Wang2013-12-231-2/+27
| | * | Clarified some code in Player.cppTiger Wang2013-12-231-2/+5
| | * | Fixed a comment in Entity.cppTiger Wang2013-12-231-1/+1
| | * | Added some comments in main.cppTiger Wang2013-12-231-1/+1
| | * | Daylight sensor sensing enhancementTiger Wang2013-12-231-9/+11
| | * | A fix for daylight sensorsTiger Wang2013-12-221-2/+3
| | * | Implemented knockback and critical hitTiger Wang2013-12-221-4/+21
| | * | Added many event catchersTiger Wang2013-12-222-20/+78
| | * | Implemented fall particlesTiger Wang2013-12-221-3/+18
| | * | Daylight sensorsTiger Wang2013-12-221-2/+1
| | * | Fixed them again, confound itTiger Wang2013-12-221-9/+21
| * | | Merge pull request #471 from mc-server/Fishing_CatapultMattes D2013-12-253-38/+206
| |\ \ \
| | * | | Fixed Parentheses.STRWarrior2013-12-251-2/+2
| | * | | You are now able to sweep mobs to your position using fishing rods.STRWarrior2013-12-253-38/+206
| * | | | Merge branch 'fixes&features' of git://github.com/tonibm19/MCServermadmaxoft2013-12-252-9/+64
| |\ \ \ \
| | * | | | (Hopefully) fixed if conditionstonibm192013-12-251-4/+1
| | * | | | Implemented xoft suggestion (partly)tonibm192013-12-251-25/+29
| | * | | | BLOCKTYPE...tonibm192013-12-241-2/+2
| | * | | | Fixed compilationtonibm192013-12-241-29/+9
| | * | | | Implemented xoft suggestiontonibm192013-12-241-7/+11
| | * | | | Using BLOCKTYPE instead of inttonibm192013-12-241-2/+2
| | * | | | Fixed commentstonibm192013-12-241-8/+8
| | * | | | Changed a little how detection works and added comments.tonibm192013-12-241-28/+31
| | * | | | Storing Y -1 and -2 blocks in a variabletonibm192013-12-241-5/+7
| | * | | | Using parenthesistonibm192013-12-241-8/+8
| | * | | | Fixed a possible crashtonibm192013-12-241-39/+42
| | * | | | Improved iron golem detection algorithmtonibm192013-12-231-3/+16
| | * | | | Some fixes (SEE DESC)tonibm192013-12-231-0/+6
| | * | | | You can now spawn iron golems.tonibm192013-12-231-3/+20
| * | | | | Fixed block area height check.madmaxoft2013-12-251-2/+2
| * | | | | Preliminary mobile entity savingTiger Wang2013-12-254-13/+790
| | |/ / / | |/| | |
| * | | | Merge pull request #469 from mc-server/Android_UpdateTiger Wang2013-12-242-3/+9
| |\ \ \ \
| | * | | | Fixed getting configure button going to port 0.STRWarrior2013-12-242-3/+9
| | |/ / /
| * | | | removed the function def alsoAlexander Harkness2013-12-241-1/+0
| * | | | Finally removed the function.Alexander Harkness2013-12-241-6/+0
| * | | | fixed compile?Alexander Harkness2013-12-241-1/+1
| * | | | finally removed them all?Alexander Harkness2013-12-241-1/+1
| * | | | updated another file...Alexander Harkness2013-12-241-4/+4
| * | | | Updated MakeColour's defenition in the header.Alexander Harkness2013-12-241-9/+9
| * | | | Update as per xoft's instructions.Alexander Harkness2013-12-241-1/+1
| * | | | Update chat coloursAlexander Harkness2013-12-241-3/+2
| * | | | Replaced esCreeper with esMonster.madmaxoft2013-12-233-4/+7
| |/ / /
| * | | Fixed bug where snowgolems could replace non-solid blocks to snow blocks.STRWarrior2013-12-221-1/+3
| * | | Snow golems die in hot biomes and leave a snow trail.STRWarrior2013-12-222-0/+18
| * | | You can spawn snow golems with snow blocks and pumpkins.STRWarrior2013-12-221-0/+15
| * | | EnderDragons and SnowGolems are able to spawn.STRWarrior2013-12-221-0/+2
| * | | Fixed cacus breaking when next to any non-air block.STRWarrior2013-12-221-1/+1
| * | | Made the lure enchantment work.STRWarrior2013-12-221-1/+1
| * | | Fixed signedness warning in cItemGrid.madmaxoft2013-12-222-4/+4
| * | | Fixed compiler warning.STRWarrior2013-12-221-1/+1
| * | | Fishing underground is slower and fishing while raining is faster.STRWarrior2013-12-221-0/+15
| * | | Fixed compiler warnings.STRWarrior2013-12-221-2/+2
| * | | Countdown time is between 100 and 900 ticks.STRWarrior2013-12-221-1/+1
| * | | Fishing now uses a countdown instead of a random number each tick.STRWarrior2013-12-222-12/+29
| * | | Implented BroadcastParticleEffectSTRWarrior2013-12-2217-2/+122
| * | | Using regular assignments.STRWarrior2013-12-211-6/+6
| * | | Once again better Y direction for the items given when fishing.STRWarrior2013-12-211-2/+2
| * | | You are now able to get different items from fishing.STRWarrior2013-12-211-2/+108
| * | | Bindings regen script updated.madmaxoft2013-12-211-11/+6
| * | | Floater now dissapears when the player doesn't have an fishing rod equipped.STRWarrior2013-12-212-0/+32
| | |/ | |/|
* / | basic threadsafe queue interfaceTycho Bickerstaff2013-12-212-0/+34
|/ /
* | Merge branch 'cmake' of github.com:worktycho/MCServer into cmakeTycho Bickerstaff2013-12-212-5/+25
|\ \
| * | added precompiled headerstycho2013-12-201-13/+24
| * | fixed include of math on windowstycho2013-12-202-1/+10
* | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-2126-174/+221
|\ \ \ | |/ / |/| |
| * | You could now only get fish from non-source blocks. Fixed it.STRWarrior2013-12-211-1/+1
| * | Fixed bug where you could pickup the floater only to get one spawned instantly or the other way around.STRWarrior2013-12-211-0/+5
| * | Fixed bug where you could get fish from non-source blocks.STRWarrior2013-12-211-1/+1
| |/
| * Fixed repeaters delay, maybeTiger Wang2013-12-203-12/+41
| * Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2013-12-209-97/+92
| |\
| | * Fixed the rest of constructor reorders.madmaxoft2013-12-209-97/+92
| * | Increased the range an Floater can shoot to.STRWarrior2013-12-201-1/+1
| |/
| * Fish now actualy jumps to the player instead of a few block bellow them.STRWarrior2013-12-201-1/+1
| * Fixed bug where the floater could pop in the water while you could already get a fish.STRWarrior2013-12-201-2/+2
| * More reordering fixes.madmaxoft2013-12-203-7/+16
| * Fixed a typo in cBlockArea merging code.madmaxoft2013-12-201-2/+1
| * Sorted a few constructors to remove warnings.madmaxoft2013-12-2010-49/+57
| * Fixed minor warnings.madmaxoft2013-12-202-5/+7
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-2039-97/+114
|\|
| * Fixed warnings in HTTP parser.madmaxoft2013-12-204-5/+15
| * Attempt at fixing cChunkDef::Height signedness.madmaxoft2013-12-204-21/+24
| * Properly fixed warnings in cFastRandom.madmaxoft2013-12-201-4/+4
| * Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-2028-62/+66
| * Fixed melon and pumpkin growing.madmaxoft2013-12-201-1/+1
| * Fixed missing parenthesis.madmaxoft2013-12-201-4/+4
* | Merge branch 'cmake' of github.com:worktycho/MCServer into cmakeTycho Bickerstaff2013-12-191-6/+16
|\ \
| * | fixed include paths on windows and added build dir to gitignoretycho2013-12-201-0/+2
| * | fixed compile errors with headers and math librarytycho2013-12-201-6/+15
| * | Merge branch 'master' into cmaketycho2013-12-2012-26/+276
| |\ \
| * | | fixed multiprocessing on windows and removed redundend compile of headerstycho2013-12-201-1/+0
* | | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-192-21/+21
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed clang warnings in Noise.cpp.madmaxoft2013-12-201-20/+20
| * | | Fixed assertion during dirt block OnUpdate()Tiger Wang2013-12-201-1/+1
| | |/ | |/|
* | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-1912-26/+276
|\| | | |/ |/|
| * Merge pull request #450 from mc-server/redstonefixesMattes D2013-12-196-26/+94
| |\
| | * Fixed PlayerAbilities and creativeTiger Wang2013-12-193-13/+24
| | * Fixed 1.7 arm swing animationTiger Wang2013-12-191-1/+23
| | * Fixed dust from being placed on nonsolidsTiger Wang2013-12-192-1/+6
| | * Fixed repeaters not updating powerTiger Wang2013-12-191-11/+41
| * | Fixed #include in Floater.cpp.STRWarrior2013-12-191-1/+1
| * | The floater now actualy dives under water.STRWarrior2013-12-191-1/+1
| * | You can get fish from fishing :D. Only one type of fish though.STRWarrior2013-12-191-12/+27
| * | Implented cItemFishingRodHandler.STRWarrior2013-12-192-0/+65
| * | Implented IsFishing, SetIsFishing and GetFloaterID().STRWarrior2013-12-192-0/+12
| * | Added cFloater class.STRWarrior2013-12-193-0/+90
* | | fixed a number of windows issuestycho2013-12-191-13/+28
* | | added md5 as a dependency for bindingsTycho Bickerstaff2013-12-191-1/+2
* | | added expat as lua bindings dependincyTycho Bickerstaff2013-12-192-2/+2
* | | added all cpp files to bindingsTycho Bickerstaff2013-12-191-1/+4
* | | moved HTTPServer to globsTycho Bickerstaff2013-12-191-1/+5
* | | added pthread linking code to OSSupportTycho Bickerstaff2013-12-191-0/+4
* | | moved protocol to globTycho Bickerstaff2013-12-191-1/+5
* | | added blocks and blockentitiesTycho Bickerstaff2013-12-193-2/+18
* | | linked in luaTycho Bickerstaff2013-12-191-1/+1
* | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-193-14/+41
|\| |
| * | Disconnection message no longer shown if pingTiger Wang2013-12-181-5/+8
| * | Prettified command error messagesTiger Wang2013-12-182-9/+23
| * | The "<>" of a player name is now colouredTiger Wang2013-12-181-1/+1
| * | Fixed 1.7 player disconnection not calling hookTiger Wang2013-12-181-4/+14
| |/
* | fixed bindings generationTycho Bickerstaff2013-12-191-8/+2
* | bindings regenration logicTycho Bickerstaff2013-12-193-32240/+8
* | added zlib and UITycho Bickerstaff2013-12-181-0/+11
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-1850-306/+1327
|\|
| * Merge pull request #440 from mc-server/repeaterfixesMattes D2013-12-182-84/+77
| |\
| | * Fixed wire powering blocks beneathTiger Wang2013-12-181-1/+1
| | * Fixed bad repeater power queuing in corner caseTiger Wang2013-12-182-83/+76
| * | Merge pull request #442 from mc-server/Nether_WartMattes D2013-12-184-0/+110
| |\ \
| | * | Implented Nether Wart.STRWarrior2013-12-184-0/+110
| * | | Renamed back EntityAnimation to PlayerAnimationTiger Wang2013-12-188-15/+51
| |/ /
| * / Removed offending tr1/memory header inclusion.madmaxoft2013-12-181-3/+0
| |/
| * Fixed player falling through the floor on spawn.madmaxoft2013-12-171-1/+5
| * cBlockArea: origin is initialized in the constructor and the loader.madmaxoft2013-12-171-0/+6
| * Fixed naming and initialization.madmaxoft2013-12-171-4/+12
| * Forgot to change one Vector3d to Vector3i.STRWarrior2013-12-171-1/+1
| * Renamed Pos to m_Pos.STRWarrior2013-12-171-3/+3
| * Using Recommendations.STRWarrior2013-12-171-10/+23
| * Made buckets work when the player does not 'look' at a block. This fixes #265STRWarrior2013-12-171-32/+53
| * Merge pull request #438 from mc-server/BoatsTiger Wang2013-12-165-14/+80
| |\
| | * Boats spawn on top of a block. not between 4 blocks.STRWarrior2013-12-161-1/+1
| | * Using suggestions for Boat placing.STRWarrior2013-12-161-1/+1
| | * Boats drop a boat pickup when destroyed by hand. You can now actualy use boats.STRWarrior2013-12-162-3/+33
| | * Added HandleSpeedFromAttachee so an entity can override the function.STRWarrior2013-12-162-4/+15
| | * You can spawn boats on water.STRWarrior2013-12-161-7/+32
| * | Fixed multiple inheritance in ToLua++.madmaxoft2013-12-168-36/+127
| * | Removed some old cRedstone remnantsTiger Wang2013-12-163-30/+0
| |/
| * Fixed cClientHandle::Tick() being called from two threads.madmaxoft2013-12-165-31/+48
| * Fixed multiple player spawn broadcasts.madmaxoft2013-12-161-3/+0
| * Server saves if a player is flying.STRWarrior2013-12-151-1/+3
| * Merge pull request #437 from mc-server/ShootTo_functionSTRWarrior2013-12-155-4/+49
| |\
| | * Exported to LuaSTRWarrior2013-12-152-10/+10
| | * Renamed ShootTo function to ForceSetSpeed.STRWarrior2013-12-152-3/+3
| | * This adds a function that allows you to 'shoot' a player towards a direction.STRWarrior2013-12-155-4/+49
| * | Fixed player spawning packet.madmaxoft2013-12-151-1/+1
| * | Fixed calling OnPlayerJoined() in the wrong place.madmaxoft2013-12-151-6/+1
| * | Merge pull request #433 from mc-server/redstoneimprovementsMattes D2013-12-151-1/+33
| |\ \
| | * | Implemented xoft's suggestionsTiger Wang2013-12-151-3/+16
| | * | Fixed wire repeater checkingTiger Wang2013-12-151-1/+1
| | * | Wires now power repeaters properlyTiger Wang2013-12-151-0/+7
| | * | Fixed the hopefully final wire self-powering bugTiger Wang2013-12-151-1/+13
| * | | Fixed indentation.madmaxoft2013-12-151-1/+1
| | |/ | |/|
| * | Moved reading flags to the protocol.STRWarrior2013-12-153-19/+23
| * | Exported Set and Get functions to Lua.STRWarrior2013-12-152-2/+136
| * | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() functionSTRWarrior2013-12-155-3/+90
| * | Merge pull request #432 from mc-server/Broadcast_EffectsMattes D2013-12-157-3/+92
| |\ \
| | * | cPlayer is using the broadcast functions.STRWarrior2013-12-151-3/+3
| | * | This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions.STRWarrior2013-12-156-0/+89
| * | | Fixed pre 1.7 clients crashing.STRWarrior2013-12-151-2/+2
| |/ /
| * | Merge pull request #431 from mc-server/Entity_EffectsMattes D2013-12-1415-4/+170
| |\ \
| | * | Exported E_EFFECTS_<Effect> to lua. Forgot to commit Globals.h.STRWarrior2013-12-145-4/+31
| | * | Added E_EFFECT_<Effect>STRWarrior2013-12-142-3/+32
| | * | Forgot to commit the ClientHandle.STRWarrior2013-12-142-0/+20
| | * | Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison.STRWarrior2013-12-148-1/+91
| * | | Added tolua++ redirection include.madmaxoft2013-12-141-0/+13
| * | | Removed leftover debugging messages from cProtocol172.madmaxoft2013-12-141-4/+0
| * | | Merge pull request #430 from mc-server/redstoneimprovementsMattes D2013-12-149-33/+162
| |\ \ \ | | |/ / | |/| / | | |/
| | * Potentially fixed debug assertsTiger Wang2013-12-141-5/+5
| | * Wires no longer power if a block cuts them offTiger Wang2013-12-141-23/+32
| | * Implemented note block playing and fixed wireTiger Wang2013-12-149-5/+125
* | | added zlibTycho Bickerstaff2013-12-111-1/+1
* | | moved generating to globsTycho Bickerstaff2013-12-111-1/+5
* | | added UI folderTycho Bickerstaff2013-12-111-1/+3
* | | moved Worldstorage to globsTycho Bickerstaff2013-12-111-1/+5
* | | Merge branch 'master' of github.com:mc-server/MCServer into cmakeTycho Bickerstaff2013-12-112-8/+7
|\| |
| * | Merge branch 'master' into quickfixsTycho Bickerstaff2013-12-1127-514/+603
| |\ \
| * | | fixed unused expression warnings in blockFireTycho Bickerstaff2013-12-101-7/+6
| * | | fixed comparison of thread handle to Null point rather than null handleTycho Bickerstaff2013-12-101-1/+1
* | | | moved entities to globsTycho Bickerstaff2013-12-111-1/+5
* | | | moved mobs to globsTycho Bickerstaff2013-12-111-1/+5
* | | | moved simulor to globsTycho Bickerstaff2013-12-111-1/+5
* | | | removed leakfinder form buildTycho Bickerstaff2013-12-111-1/+1
* | | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-1127-514/+603
|\ \ \ \ | | |/ / | |/| |
| * | | Exported the cTNTEntitySTRWarrior2013-12-144-9/+85
| * | | Merge pull request #423 from mc-server/redstoneimprovementsMattes D2013-12-144-290/+158
| |\ \ \ | | | |/ | | |/|
| | * | Fixed compilating!Tiger Wang2013-12-141-5/+5
| | * | Improved player permissions loggingTiger Wang2013-12-141-1/+1
| | * | Fixes to redstone wire and torchesTiger Wang2013-12-143-21/+37
| | * | Groups.ini and Users.ini are now generatedTiger Wang2013-12-142-3/+25
| | * | Removed loads of unneeded code againTiger Wang2013-12-141-86/+60
| | * | Reduced loads of unneeded codeTiger Wang2013-12-141-188/+44
| * | | Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2013-12-146-194/+236
| |\| |
| | * | Merge pull request #419 from mc-server/redstoneloadingMattes D2013-12-132-3/+17
| | |\ \
| | | * | Improved redstone loading performanceTiger Wang2013-12-131-2/+10
| | | * | Fixed QueueSetBlock not sending to client changesTiger Wang2013-12-131-2/+1
| | | * | Redstone data is now loaded on chunk loadTiger Wang2013-12-132-0/+7
| | * | | Fixed threading issues affecting cProtocol172.madmaxoft2013-12-134-191/+219
| * | | | Fixed not getting XP from mobs.STRWarrior2013-12-142-1/+7
| |/ / /
| * / / Using "a_ClosestPlayer != NULL" in cExpOrb.STRWarrior2013-12-131-1/+1
| |/ /
| * | Unknown packet type extended to 32 bits.madmaxoft2013-12-122-4/+4
| * | Fixed protocol 1.7 recovery after unknown packet.madmaxoft2013-12-121-4/+0
| * | Fixed pistons being viable middle blockTiger Wang2013-12-111-0/+3
| * | Merge pull request #417 from mc-server/WorldUpdateMattes D2013-12-119-2/+99
| |\ \
| | * | HOOK_WORLD_STARTED now gets called when the CreateAndInitializeWorld function is used.STRWarrior2013-12-111-0/+1
| | * | Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins.STRWarrior2013-12-119-2/+98
| * | | ExpOrbs now move.STRWarrior2013-12-111-4/+8
| * | | Provides a possible fix for repeater timingsTiger Wang2013-12-102-2/+2
| * | | added abort to DeadlockDetector to generate core dumps on failureTycho Bickerstaff2013-12-101-5/+2
| | |/ | |/|
* | | added tolua++ command and removed stackwalker from buildTycho Bickerstaff2013-12-103-6/+8
* | | more cmake changesTycho Bickerstaff2013-12-103-6/+15
* | | removed more accedentailly commited object filesTycho Bickerstaff2013-12-109-3985/+0
* | | removed accedentailly commited object filesTycho Bickerstaff2013-12-1027-0/+0
* | | more cmakeTycho Bickerstaff2013-12-1046-6/+4051
* | | more cmake stuffTycho Bickerstaff2013-12-103-2/+18
* | | started work on cmakeTycho Bickerstaff2013-12-104-0/+36
|/ /
* | Merge remote-tracking branch 'upstream/master'Tycho Bickerstaff2013-12-105-13/+96
|\|
| * Merge pull request #412 from mc-server/fixesMattes D2013-12-105-13/+96
| |\
| | * Readded initial lineTiger Wang2013-12-101-0/+1
| | * Fixed compile (alas, no more goto)Tiger Wang2013-12-101-11/+14
| | * Fixed Floody lava to stone fizzleTiger Wang2013-12-101-2/+16
| | * Added repeater delaysTiger Wang2013-12-102-1/+62
| | * Slight redstone wire performance improvementTiger Wang2013-12-101-1/+6
| | * Changed more FastSetBlocks to SetBlocksTiger Wang2013-12-101-3/+3
| | * Improved pickups spawning speed againTiger Wang2013-12-102-7/+6
* | | moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741Tycho Bickerstaff2013-12-081-2/+4
* | | reordered initalisation order at src/Generating/Cave.h line 73Tycho Bickerstaff2013-12-081-2/+2
|/ /
* | fixed warnings in src/Generating/BioGen.cppTycho Bickerstaff2013-12-081-1/+1
* | added default fallthrough clause to switch at line 178 of src/UI/Window.cppTycho Bickerstaff2013-12-081-0/+4
* | Reordered Listed Initalisation order in src/UI/Window.cppTycho Bickerstaff2013-12-081-2/+2
* | Removed unused variable ResultSlotTycho Bickerstaff2013-12-081-1/+0
* | Fix Undefined behavior at Bindings/LuaWindow line 32worktycho2013-12-091-1/+4
* | Fix Unused Variable Warning at FluidSimulator.cpp line 169 and 176worktycho2013-12-091-4/+3
* | Fixed warning unchecked enum value at Chunk.cpp line 841worktycho2013-12-091-2/+4
* | Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54worktycho2013-12-091-1/+4
|/
* Fixed angle normalization typo.madmaxoft2013-12-081-1/+1
* Fixed tolua++ compilation.madmaxoft2013-12-087-192/+5
* Fixed VS2008 compilation after those huge changes.madmaxoft2013-12-082-5/+7
* Merge pull request #408 from mc-server/SpawnPoint_FixMattes D2013-12-081-1/+1
|\
| * Now spawn points will not be in deep oceans or rivers etc.STRWarrior2013-12-081-1/+1
* | Readded redstone lamp handlerTiger Wang2013-12-081-0/+2
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-0843-1251/+1348
|\|
| * Fixed normalizing large angles.madmaxoft2013-12-084-8/+51
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-0841-1238/+1237
| * Fixed stationary water starting fires and flowing lava not.madmaxoft2013-12-081-2/+2
| * Added a SpawnFallingBlock function so plugins can make other blocks fall.STRWarrior2013-12-074-2/+93
* | Fixed tabcompletion packet, fixes #356Tiger Wang2013-12-081-8/+4
* | Fixed falling block metas, fixes #406Tiger Wang2013-12-081-1/+1
* | Bonemeal has particles, fixes #393Tiger Wang2013-12-082-3/+8
* | Console trims its commands before executing 'emTiger Wang2013-12-071-3/+3
* | Fixed water starting firesTiger Wang2013-12-071-1/+0
* | Improved piston animationsTiger Wang2013-12-071-4/+4
* | Fixed some new 1.7 client crash bugsTiger Wang2013-12-074-1/+37
* | Changed some FastSetBlocks to SetBlockTiger Wang2013-12-071-3/+3
* | Fixed trapdoors not togglingTiger Wang2013-12-073-17/+103
* | Added basic ender chestsTiger Wang2013-12-0710-14/+355
* | Renamed animation functionTiger Wang2013-12-0723-47/+82
* | Fixed bed leave animationTiger Wang2013-12-061-1/+1
* | Fixed duplication glitch with QueueSetBlockTiger Wang2013-12-067-16/+38
* | Added trapdoor cursor Y detectionTiger Wang2013-12-061-2/+0
* | Puking now uses GetEyeHeight()Tiger Wang2013-12-061-1/+1
* | Added pickup invalid item checkTiger Wang2013-12-061-0/+11
* | Re-implemented redstone duplicate checkingTiger Wang2013-12-061-0/+29
* | Fixed eating using wrong animationTiger Wang2013-12-061-1/+1
* | Fixed trapdoors not overriding OnUseTiger Wang2013-12-061-1/+1
* | Spawn eggs use IsGameMode()Tiger Wang2013-12-061-2/+2
* | Tools make a sound when breaking, fixes #266Tiger Wang2013-12-062-2/+5
* | Cleaned up torch code and added commentsTiger Wang2013-12-061-31/+7
* | Removed another export and inline'd stuffTiger Wang2013-12-061-5/+5
* | Removed exporting of a torch functionTiger Wang2013-12-061-3/+3
* | Updated comments for slabsTiger Wang2013-12-061-5/+6
* | Fixed pickups spawning for BlockEntitiesTiger Wang2013-12-061-1/+1
|/
* Merge pull request #394 from SamJBarney/masterMattes D2013-12-062-4/+8
|\
| * Merged if statements.Samuel Barney2013-12-051-7/+1
| * Finished MergeSamuel Barney2013-12-051-2/+2
| * Merge branch 'master' of https://github.com/mc-server/MCServerSamuel Barney2013-12-057-10/+97
| |\
| * | Made suggested changesSamuel Barney2013-12-042-6/+11
| * | Fire no longer goes out when on top of nether rackSamuel Barney2013-12-021-1/+6
* | | Added cPluginManager:GetCurrentPlugin() to Lua API.madmaxoft2013-12-051-7/+22
| |/ |/|
* | ByteBuffer: Fixed optimization failures with threading checks.madmaxoft2013-12-051-1/+1
* | Hopefully fixed the sparc not being detectedAlexander Harkness2013-12-041-1/+3
* | Lava can spawn fire.madmaxoft2013-12-045-8/+93
* | Fixed an error in cChunk's block ticking.madmaxoft2013-12-041-2/+2
|/
* Removed stray printf, again.Samuel Barney2013-12-021-1/+0
* Switched to using provided ReadItem function.Samuel Barney2013-12-022-17/+12
* Removed stray printf.Samuel Barney2013-12-021-1/+0
* Fixed 1.7 slab and stair placement.Samuel Barney2013-12-021-0/+19
* Fixed compiler warnings in LightingThread.cpp.madmaxoft2013-12-011-2/+2
* Fixed linux compile errors and formatting in RedstoneSimulator.cppmadmaxoft2013-12-011-14/+26
* DeadlockDetect is configurable now.madmaxoft2013-11-303-7/+15
* Fixed compiler warnings in IsBiomeNoDownfall().madmaxoft2013-11-301-1/+4
* Merge pull request #387 from mc-server/trapdoorsMattes D2013-11-3020-330/+431
|\
| * Fixed pistons extendingTiger Wang2013-11-301-0/+10
| * Removed redstone duplicate power checkingTiger Wang2013-11-301-2/+0
| * Improved piston direction checkingTiger Wang2013-11-301-62/+8
| * Pistons no longer accept power through front faceTiger Wang2013-11-302-3/+96
| * Fixed thin snow CanBeAt checkingTiger Wang2013-11-301-1/+13
| * Properly fixed snow height, fixes #98 and #264Tiger Wang2013-11-303-25/+53
| * Improved redstone speed and fixed a wire bugTiger Wang2013-11-301-73/+83
| * Stairs reset meta when dropped, fixes #269Tiger Wang2013-11-291-2/+22
| * Implemented trapdoors, fixes #43 and #105Tiger Wang2013-11-295-3/+131
| * Removed unneeded CPP filesTiger Wang2013-11-2911-221/+77
* | Changed cBlockHandler->OnUpdate() to use cChunk directly.madmaxoft2013-11-3015-63/+117
* | Added IsBiomeNoDownfall() function.madmaxoft2013-11-303-103/+164
* | Explicitly set spawnpoint fixes.madmaxoft2013-11-301-20/+11
* | Added the real tick duration to the OnWorldTick hook.madmaxoft2013-11-308-17/+34
* | Grass doesn't spread to podzol or grassless dirt blocks.madmaxoft2013-11-301-2/+3
* | Added floor pattern for MegaTaiga biomes.madmaxoft2013-11-301-1/+10
* | Implemented mesa biomes in DistortedHeightmap CompoGen.madmaxoft2013-11-293-21/+106
* | Fixed CheckerboardBiomeGen in negative coords.madmaxoft2013-11-291-2/+3
* | DistortedHeightmap: Improved speed, prepared for mesa biomes.madmaxoft2013-11-292-157/+424
* | Fixed an off-by-one error in cByteBuffer.madmaxoft2013-11-291-1/+1
* | Alpha-sorted BlockMetas, added red sand.madmaxoft2013-11-291-125/+128
* | Trees will generate in the new biomes.madmaxoft2013-11-282-14/+101
* | Added new biomes to old composition generator.madmaxoft2013-11-284-0/+145
* | Added new biomes to old height generators.madmaxoft2013-11-284-39/+179
* | Moved BiomeGen creation from INI file data to BioGen.cpp.madmaxoft2013-11-283-48/+74
* | Moved json includes to where they are really needed.madmaxoft2013-11-283-1/+2
* | BiomeVisualiser: Added the TwoLevel biome generator.madmaxoft2013-11-282-0/+229
|/
* Fixed a bug with TNT waking simulatorsTiger Wang2013-11-281-2/+2
* Improved TNT pickup randomisationTiger Wang2013-11-281-1/+1
* Made TNT pickups spawning chance 25%Tiger Wang2013-11-272-3/+3
* Merged master into redstonefixesTiger Wang2013-11-27465-0/+138834
|\
| * Voronoi-related biomegens use the new cVoronoiMap class.madmaxoft2013-11-273-54/+29
| * Fixed a load of issues, clang autodetection works now.Alexander Harkness2013-11-271-1/+0
| * Added missing files for Voronoi map generation.madmaxoft2013-11-272-0/+140
| * Fixed VC2008 compilation, normalized include paths.madmaxoft2013-11-2712-12/+12
| * Fixed the remaining derpsAlexander Harkness2013-11-2726-30/+30
| * Fixed some of tiger's derpyness.Alexander Harkness2013-11-279-11/+11
| * ANOTHER compile fixTiger Wang2013-11-261-1/+1
| * Hopefully fixed last of the Linux compile errorsTiger Wang2013-11-265-5/+5
| * Compile fix againTiger Wang2013-11-261-1/+1
| * Fixed Linux compile againTiger Wang2013-11-261-1/+1
| * Fixed tolua++ filesTiger Wang2013-11-263-4/+4
| * Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-2618-6/+268
| |\ | |/ |/|
| * Merge branch 'master' into foldermove2Alexander Harkness2013-11-261-3/+0
| |\ | |/ |/|
| * Fixed loads more of them.Alexander Harkness2013-11-2611-13/+13
| * AnotherAlexander Harkness2013-11-261-1/+1
| * And another.Alexander Harkness2013-11-261-1/+1
| * Fixed another.Alexander Harkness2013-11-261-1/+1
| * Fixed another one.Alexander Harkness2013-11-261-1/+1
| * Fixed a mis-includeAlexander Harkness2013-11-261-1/+1
| * Further attempts to fix compileTiger Wang2013-11-2524-27/+27
| * Attempt to fix compilationTiger Wang2013-11-2448-59/+58
| * Moved SQLite, LuaExpat, and MD5 to /libTiger Wang2013-11-248-148557/+0
| * Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-2466-1497/+2365
| |\ | |/ |/|
| * Moved source to srcAlexander Harkness2013-11-24469-0/+285880
|/
* Android: Moved Android stuff to the ~/trunk/Android/ folder!faketruth2012-08-191-267/+0
* Android: Finally a log! :Dfaketruth2012-08-191-32/+44
* Android: Showing last MCServer related logcat messagefaketruth2012-08-191-13/+63
* Android: I'm probably using a lot of bad practices, but the app looks somewhat better now and polls the server statusfaketruth2012-08-181-9/+146
* Android: Pressing back button sends stop command to serverfaketruth2012-08-181-9/+30
* MCServer should run just fine on Android now :Dfaketruth2012-08-161-3/+13
* Compiles on Android! Added Eclipse project, import it into your workspace and it should be runnable on Android!faketruth2012-08-151-0/+37
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 01:07:48 +0100