summaryrefslogtreecommitdiffstats
path: root/src/Entities (follow)
Commit message (Expand)AuthorAgeFilesLines
* Improved player freeze codeLogicParrot2016-04-052-54/+62
* Players never fall through unloaded chunks or end up inside solids on teleportLogicParrot2016-03-312-27/+82
* Player death crashfixLogicParrot2016-03-311-2/+4
* MoveToWorld defaults to spawnpointLogicParrot2016-03-302-3/+21
* Bed's world is now savedLogicParrot2016-03-292-4/+47
* Revert "Lua callback"Mattes D2016-03-211-3/+3
* Fixed leaping potion not giving jump boostBlitz Rakete2016-03-181-0/+1
* Changed cLuaWindow callbacks to use cLuaState::cCallback.Mattes D2016-03-171-3/+3
* Proper entity destruction in non-ticking chunksLogicParrot2016-02-197-87/+177
* Fix minecart entity collisionMarvin Kopf2016-02-162-27/+11
* remove cWorld::createAndInitializeWorldLogicParrot2016-02-082-5/+11
* Bulk clearing of whitespaceLogicParrot2016-02-0531-242/+242
* cMonster::m_Target safety across worldsLogicParrot2016-02-034-18/+120
* Merge pull request #2941 from LogicParrot/chunkBug2LogicParrot2016-02-032-6/+25
|\
| * Fixed cChunk::m_Entities corruption upon world travelLogicParrot2016-02-022-6/+25
* | Fix cPawn pushingMarvin Kopf2016-02-023-0/+22
|/
* Updated old forum linksMathias2016-01-311-1/+1
* Improved tamed wolf pack cooperation and projectile reactionsLogicParrot2016-01-227-21/+68
* Spiders now friendly at daylight, new cChunk functionsLogicParrot2016-01-211-1/+0
* Fixed wrong knockback direction after explosion damageLogicParrot2016-01-161-0/+4
* Fix crash when tamed wolf is hit by arrowsLogicParrot2016-01-164-58/+69
* Merge pull request #2875 from LogicParrot/fallDamageLogicParrot2016-01-161-1/+5
|\
| * Fix fall damage crash when tamed wolves neabryLogicParrot2016-01-161-1/+5
* | Limited the username length to 16 characters.bibo382016-01-131-0/+2
|/
* Tamed wolf assists owner (attack / defence)LogicParrot2016-01-127-50/+123
* Fixed Clang warnings.Mattes D2016-01-062-5/+10
* Renamed leftover strings to Cuberite / Server, as needed.Mattes D2016-01-011-1/+1
* Freeze player until chunk is loadedSafwat Halaby2015-12-252-1/+112
* Moved variables into scope, removed unused variables and fixed variablesLukas Pioch2015-12-171-1/+1
* blockheight mechanismGargaj2015-12-135-109/+193
* Test for correct coordinates when fishingGargaj2015-12-101-1/+1
* Small spelling issues fixedJulian Laubstein2015-12-081-3/+3
* Spawn chickens from eggs as babiesGargaj2015-12-051-5/+5
* implement breedingGargaj2015-11-291-0/+2
* Add enum for Sound and Particle EffectsDave Tucker2015-11-242-2/+4
* Improved spawn location calculations.samoatesgames2015-11-131-2/+2
* Avoid reading out of boundsGargaj2015-11-101-4/+14
* Avoid division by zeroGargaj2015-11-101-1/+1
* fix shallow water + add future code for liquid fall dampeningGargaj2015-11-101-3/+11
* code styleGargaj2015-11-071-3/+3
* implement pushing/shoving based on @NiLSPACE's suggestionGargaj2015-11-071-0/+36
* Merge pull request #2593 from cuberite/endereggJulian Laubstein2015-11-052-92/+103
|\
| * Destroy an ender crystal, damage a dragon when hit by an egg.Alexander Harkness2015-11-052-92/+103
* | Fix being set on fire while directly being under lavaGargaj2015-11-041-1/+1
|/
* Implemented the Water Breathing Potion functionality.bibo382015-11-012-0/+16
* Implemented the FireResistence potion effects.bibo382015-10-315-6/+34
* Debug mode: Fixed assertion, if player below y < 0Lukas Pioch2015-10-311-3/+3
* Spectator Mode doesn't fly[FIX]OdnetninI2015-10-051-0/+1
* Maked it compileable for clang-3.7Lukas Pioch2015-09-251-2/+2
* Namespace qualify std::abs, use explicit castMatti Hänninen2015-08-211-1/+1
* Fixed food drain bugsTiger Wang2015-08-204-287/+138
* Unified the doxy-comment format.Mattes D2015-07-316-80/+77
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-299-121/+120
* Spawn baby mobshallucino2015-07-161-5/+5
* Merge pull request #2349 from cuberite/mapsTiger Wang2015-07-151-0/+5
|\
| * Improved mapsTiger Wang2015-07-141-0/+5
* | Fix food drain on movement.LO1ZB2015-07-141-11/+10
|/
* Merge pull request #2241 from lkolbly/masterworktycho2015-06-262-16/+26
|\
| * Work on NetherPortalScanner. Setup portal scanner to reset PortalCooldown. Changed where player is spawned. Added a_InitSpawn flag to CreateAndInitializeWorld.Lane Kolbly2015-06-132-16/+26
* | Added a forgotten break in cHangingEntity constructor.Mattes D2015-06-241-0/+1
|/
* Added HOOK_KILLEDNounours Heureux2015-06-132-6/+26
* Implemented nether portal scanning code.Lane Kolbly2015-06-104-19/+63
* Added system and above action bar chat messagesjan642015-06-021-8/+13
* Fixed warnings in MSVC.Mattes D2015-06-021-3/+12
* Merge branch 'master' into PreventNewWarningstycho2015-05-291-4/+5
|\
| * AI - Sane SkeletonSafwatHalaby2015-05-281-10/+11
* | Fix commentstycho2015-05-281-5/+6
* | Merge branch 'master' into PreventNewWarningstycho2015-05-281-0/+1
|\|
| * Merge pull request #2061 from mc-server/fixesAlexander Harkness2015-05-271-0/+1
| |\
| | * Fixes #2052Tiger Wang2015-05-181-0/+1
* | | Merge branch 'master' into PreventNewWarningstycho2015-05-242-148/+154
|\| |
| * | Fix gamemode not changing properly.Alexander Harkness2015-05-232-148/+154
* | | Made -Weverything an error.tycho2015-05-2417-42/+48
* | | Merge branch 'master' into PreventNewWarningstycho2015-05-232-6/+6
|\| |
| * | Merge pull request #2117 from Seadragon91/clang_errorsworktycho2015-05-232-6/+6
| |\ \
| | * | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.Lukas Pioch2015-05-232-6/+6
* | | | Merge branch 'master' into PreventNewWarningstycho2015-05-231-0/+9
|\| | |
| * | | Merge pull request #2103 from beeduck/Issue1980Alexander Harkness2015-05-231-0/+9
| |\ \ \ | | |/ / | |/| |
| | * | Fixed players head visible when in spectator modeb33duck2015-05-221-0/+9
| | |/
* | | Merge branch 'master' into PreventNewWarningstycho2015-05-232-5/+13
|\| |
| * | Merge pull request #2104 from beeduck/Issue2053Alexander Harkness2015-05-231-0/+7
| |\ \
| | * | Added a fix for players falling through the world when connecting in spectator modeb33duck2015-05-231-0/+7
| | |/
| * | Renamed hook HOOK_ENTITY_CHANGE_WORLDLukas Pioch2015-05-212-5/+6
* | | Make -Werror disabling file onlytycho2015-05-198-12/+17
|/ /
* / Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLDLukas Pioch2015-05-182-0/+21
|/
* More style checking.Mattes D2015-05-098-20/+20
* Added support for additional data in the ParticleEffect Packettycho2015-05-071-3/+3
* Entity improvementsTiger Wang2015-05-042-2/+1
* cPlayer now checks restrictions.Mattes D2015-04-252-7/+36
* HangingEntity: Fixed a needless clang warning.Mattes D2015-04-191-2/+5
* Merge pull request #1844 from DevToaster/masterMattes D2015-04-1414-16/+57
|\
| * Changed air drag for pickupsDevToaster2015-03-311-1/+1
| * Changed air drag units to 'interpolated ticks' per secondDevToaster2015-03-319-13/+15
| * Adjusted projectile physicsDevToaster2015-03-311-4/+6
| * Modified physics for more vanilla-like behaviorDevToaster2015-03-3114-12/+49
* | Fixed players not appearing/disappearing when traveling to a new world.STRWarrior2015-04-031-0/+6
|/
* Merge pull request #1826 from mc-server/UnifyPacketizerMattes D2015-03-246-53/+62
|\
| * Unified cPacketizer across all protocols.Mattes D2015-03-221-1/+1
| * Changed cEntity::m_UniqueID to UInt32.Mattes D2015-03-215-52/+61
* | Merge pull request #1775 from tommysanterre/terrainheightfixMattes D2015-03-232-2/+5
|\ \
| * | Correct world height validations.Tommy Santerre2015-03-202-2/+5
| |/
* | Changed linked world name variables and setters / getters.Mattes D2015-03-211-5/+5
* | Fixed trailing whitespace.Mattes D2015-03-211-1/+1
* | Improved arrow in-flight and block-hit appearanceTiger Wang2015-03-202-19/+3
|/
* Merge pull request #1810 from mc-server/paintingsMattes D2015-03-156-95/+94
|\
| * Fixed style violationsTiger Wang2015-03-141-2/+2
| * cPainting saving implementedTiger Wang2015-03-146-32/+31
| * Fixed confusion over Item Frame directionsTiger Wang2015-03-132-65/+65
* | Merge pull request #1734 from mc-server/pistonsMattes D2015-03-141-2/+12
|\ \ | |/ |/|
| * Handle client 'leave bed' requestTiger Wang2015-02-081-2/+12
* | Merge branch 'master' into InventoryHowaner2015-03-094-72/+78
|\ \
| * | Added OnTeleportEntity hook for plugins.joshi072015-03-052-12/+21
| * | Changed C-styled casts to static_cast and removed unneeded castsDevToaster2015-02-281-34/+34
| * | Replaced short int with int for Player experienceDevToaster2015-02-281-1/+1
| * | modified: src/Entities/Player.cppDevToaster2015-02-282-27/+27
| * | use DoSetSpeed in AddSpeed* in Entity.cppRaekye2015-02-261-10/+4
| |/
| * SpacingHowaner2015-02-071-1/+1
| * cPlayer should override IsOnGround()Howaner2015-02-072-3/+3
| * Added IsOnGround() to cEntityHowaner2015-02-071-0/+3
* | Merge branch 'master' into InventoryHowaner2015-02-062-10/+32
|\|
| * Converted cServer to use the cNetwork API.Mattes D2015-01-272-10/+32
* | Merge branch 'master' into InventoryHowaner2015-01-2538-91/+206
|\|
| * Fixed type-conversion warnings.Mattes D2015-01-183-7/+7
| * Converted cPickupEntity to std::chronoTycho2015-01-162-12/+12
| * Converted MinecartEntity to std::chronoTycho2015-01-162-8/+8
| * Converted cExpOrbEntity to std::chronoTycho2015-01-162-7/+7
| * Converted ArrowEntityTiers to std::chronoTycho2015-01-162-7/+7
| * Initial convertion of a_Dt to std::chronoTycho2015-01-1138-69/+69
| * APIDump: Updated the player block placement documentation.Mattes D2014-12-241-1/+2
| * Replaced a std::hash specialization with explicit type.Mattes D2014-12-241-1/+1
| * Refactored all player block placing to go through hooks.Mattes D2014-12-242-0/+114
* | Merge branch 'master' into InventoryHowaner2014-12-171-0/+6
|\|
| * Added braces to 'if' according to the code guidelinesgushromp2014-12-151-0/+2
| * Updated cPlayer::DoMoveToWorld to send target world's weather info to Playerblashyrk2014-12-151-0/+4
* | Own classes for all windows.Howaner2014-12-132-1/+2
|/
* Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-12-062-11/+40
|\
| * BasicStyle: Added missing braces to control statements.Mattes D2014-12-052-10/+39
| * Fixed reported parentheses around comparisons.Mattes D2014-12-051-1/+1
* | Merged branch 'origin/master' into c++11.Mattes D2014-12-042-7/+12
|\|
| * Updated whitespace in comment, changed conditional to logical equivalent due to popular demandJonathan Fabian2014-12-041-2/+2
| * Fix Spaces to TabsJonathan Fabian2014-12-031-5/+5
| * Add missing IsSpectatorMode() checks in Player.cpp, make sure that player is flying when spawned otherwise it will fall through the world.Jonathan Fabian2014-12-031-6/+11
| * Minecart.h: Fixed integral conversion warning.Mattes D2014-11-271-1/+1
* | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-231-0/+3
|\|
| * Renamed GetSettedViewDistance() to GetRequestedViewDistance()Howaner2014-11-151-1/+1
| * Use m_UsedViewDistance and m_SetViewDistance.Howaner2014-11-141-0/+3
* | Compilation fixesTiger Wang2014-11-231-7/+5
* | Merged branch 'master' into c++11.Mattes D2014-10-241-2/+1
|\|
| * Merge pull request #1565 from mc-server/MergedIniFileMattes D2014-10-241-1/+1
| |\
| | * Merged IniFile into main MCS sources.Mattes D2014-10-231-1/+1
| * | Merge branch 'master' into ChunkLoaderHowaner2014-10-2333-342/+500
| |\|
| * | Merge branch 'master' into ChunkLoaderHowaner2014-10-212-100/+92
| |\ \
| * \ \ Merge branch 'master' into ChunkLoaderHowaner2014-10-219-34/+40
| |\ \ \
| * | | | Optimized chunk loaderHowaner2014-10-021-1/+0
* | | | | Merged branch 'master' into c++11.Mattes D2014-10-2321-161/+311
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | En masse NULL -> nullptr replaceTiger Wang2014-10-2315-188/+192
| * | | | cItemFrame: Fixed a forgotten rename.Mattes D2014-10-211-1/+1
| * | | | Properly exported cItemFrame and cHangingEntity to Lua.Mattes D2014-10-214-37/+55
| * | | | Exported individual projectile classes to Lua API.Mattes D2014-10-2116-117/+253
| | |_|/ | |/| |
| * | | Merged branch 'master' of git://github.com/sriehl/MCServerMattes D2014-10-212-100/+92
| |\ \ \ | | |_|/ | |/| |
| | * | convert old style casts to fix warningsSteven Riehl2014-10-122-101/+93
* | | | En masse NULL -> nullptr replaceTiger Wang2014-10-2015-99/+99
* | | | Migrated cSleep and cTimer to std::chronoTiger Wang2014-10-202-9/+5
|/ / /
* | | LuaState: Pushing a cEntity pushes the correct class name.Mattes D2014-10-191-5/+5
* | | Merge pull request #1502 from mc-server/furnacesTiger Wang2014-10-181-6/+6
|\ \ \
| * | | Fixed failure for cRankManager to restartTiger Wang2014-10-181-6/+6
| | |/ | |/|
* | | Functions in cPluginManager get references instead of pointers.Mattes D2014-10-157-19/+25
* | | Fixed style.Mattes D2014-10-131-1/+1
| |/ |/|
* | Float/Ciel: If it's going to use C++11, it might as well take advantage of itarchshift2014-10-091-3/+3
* | Use static casts instead of C casts, add floor-cast functionsarchshift2014-10-091-3/+3
|/
* cPlayer: Removed useless functions from the Lua API.madmaxoft2014-10-011-2/+6
* Merge pull request #1427 from mc-server/chestcartsMattes D2014-09-302-18/+65
|\
| * Compilation fixTiger Wang2014-09-281-2/+2
| * SuggestionsTiger Wang2014-09-272-3/+4
| * Merge remote-tracking branch 'origin/master' into chestcartsTiger Wang2014-09-2718-112/+350
| |\
| * | Implemented Chest MinecartsTiger Wang2014-09-132-18/+63
* | | cRankManager: Added GetAllPlayers() and GetPlayerName()Howaner2014-09-281-0/+5
| |/ |/|
* | Merge branch 'master' into FixesHowaner2014-09-267-24/+22
|\ \
| * | Removed more unessicary includesTycho2014-09-263-3/+1
| * | Merge pull request #1419 from mc-server/redstoneTestsworktycho2014-09-265-21/+21
| |\ \
| | * \ Merge branch 'master' into redstoneTestsTycho2014-09-251-2/+8
| | |\ \
| | * \ \ Merge branch 'master' into redstoneTestsTycho2014-09-2511-62/+179
| | |\ \ \
| | * \ \ \ Merge branch 'master' into redstoneTestsTycho2014-09-175-24/+126
| | |\ \ \ \
| | * | | | | Added first test to show the object can be createdTycho2014-09-175-21/+21
* | | | | | | Fixed players custom name in 1.8Howaner2014-09-261-3/+4
|/ / / / / /
* | | | | | Comment styleHowaner2014-09-251-1/+1
* | | | | | Merge branch 'master' into FixesHowaner2014-09-251-2/+8
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | HangingEntity: Silenced a crash.madmaxoft2014-09-251-2/+8
| | |_|/ / | |/| | |
* / | | | Fixed hanging direction bugs.Howaner2014-09-252-1/+16
|/ / / /
* | | | Merge branch 'master' into EntityCustomNameHowaner2014-09-2310-89/+244
|\ \ \ \
| * | | | Made ExpBottleEntity break on entities.archshift2014-09-232-1/+23
| * | | | A few compiler warning fixesChris Darnell2014-09-233-42/+45
| * | | | Merge pull request #1398 from mc-server/1.8-ProtocolAlexander Harkness2014-09-223-3/+5
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into 1.8-ProtocolHowaner2014-09-192-5/+27
| | |\ \ \ \
| | * | | | | DerpHowaner2014-09-181-1/+1
| | * | | | | Exported player list states to extra functions.Howaner2014-09-181-2/+2
| | * | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-145-25/+125
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-131-11/+13
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | 1.8: Fixed hangings.Howaner2014-09-111-1/+1
| | * | | | | Added the player list to the 1.8 protocol.Howaner2014-09-092-2/+4
| | | |_|_|/ | | |/| | |
| * | | | | Made it compile with clangChris Darnell2014-09-222-4/+4
| | |_|_|/ | |/| | |
| * | | | Fixed minor style issues.madmaxoft2014-09-171-2/+2
| * | | | Implementing Spectator Modenesco2014-09-171-1/+1
| * | | | Preparing 1.8 updatenesco2014-09-171-5/+15
| * | | | Preparing 1.8 updatenesco2014-09-161-1/+2
| * | | | Pre 1.8 releasenesco2014-09-161-0/+8
| * | | | Preparing 1.8 changesnesco2014-09-161-0/+3
| | |_|/ | |/| |
| * | | Entities experience water resistanceTiger Wang2014-09-132-16/+31
| * | | Merge pull request #1353 from mc-server/EffectsMattes D2014-09-133-9/+94
| |\ \ \ | | |_|/ | |/| |
| | * | Added extra mushroom handler.Howaner2014-09-121-7/+0
| | * | Merge branch 'master' into EffectsHowaner2014-09-123-5/+9
| | |\|
| | * | Renamed SetWalkSpeed() to SetRelativeWalkSpeed()Howaner2014-09-021-4/+4
| | * | Merge branch 'master' into EffectsHowaner2014-09-029-30/+318
| | |\ \
| | * | | Fixed potion removing in creative mode.Howaner2014-08-301-4/+2
| | * | | Added slowness effect and added entity support.Howaner2014-08-302-16/+65
| | * | | Added speed entity effect.Hownaer2014-08-282-0/+45
| * | | | Fixed friction being applied whilst airborneTiger Wang2014-09-121-11/+13
| | |_|/ | |/| |
| * | | Fixed player spawning in unknown world.Mattes D2014-09-061-0/+4
| * | | Fixed security: Player cannot spawn in a disabled world.Mattes D2014-09-051-1/+1
| * | | Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc"archshift2014-09-041-3/+3
| * | | Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etcarchshift2014-09-041-3/+3
| * | | Fixed style and alpha-sorting.madmaxoft2014-09-032-4/+4
| * | | EntityEffect.cpp: Enable 1.8's leaping potionarchshift2014-09-031-1/+1
| | |/ | |/|
* | | Merge branch 'master' into EntityCustomNameHowaner2014-09-021-2/+6
|\| |
| * | Pickups combine only within one chunk.madmaxoft2014-09-011-2/+6
* | | Added the new functions to APIDump.Howaner2014-09-021-1/+1
* | | Added SetCustomName() to players.Howaner2014-09-022-1/+61
* | | Added name tagHowaner2014-09-014-3/+8
* | | Added CustomName to cMonster.Howaner2014-09-011-3/+6
|/ /
* | Fixed previous commit's wrong assumptions.madmaxoft2014-09-011-10/+10
* | Fixed MSVC compilation, improved performance.madmaxoft2014-09-011-30/+59
* | Fixed MSVC warning.madmaxoft2014-09-011-2/+2
* | Merge remote-tracking branch 'Hircine/Enchantments'madmaxoft2014-09-016-8/+264
|\ \
| * | Fixed styleJaume Aloy2014-08-313-8/+9
| * | Added a_Digger checkJaume Aloy2014-08-301-2/+2
| * | More EnchantmentsJaume Aloy2014-08-221-57/+70
| * | Protection Enchantments, some fixesJaume Aloy2014-08-213-8/+114
| * | Changed if in BlockHandlerJaume Aloy2014-08-191-1/+0
| * | FixesJaume Aloy2014-08-194-14/+15
| * | Changed if for switchJaume Aloy2014-08-191-3/+2
| * | Added more enchantments and some fixesJaume Aloy2014-08-194-7/+61
| * | Added some EnchantmentsJaume Aloy2014-08-193-6/+89
* | | Merge branch 'master' into fixesmadmaxoft2014-08-301-18/+18
|\ \ \
| * | | Fixed MSVC2008 compilation.madmaxoft2014-08-301-18/+18
| | |/ | |/|
* | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-294-247/+220
|\| |
| * | Fixed a typo.Mattes D2014-08-281-1/+1
| * | Merge pull request #1324 from ChriPiv/masterMattes D2014-08-281-2/+92
| |\ \
| | * | Change comment formattingChristophe Piveteau2014-08-241-20/+12
| | * | Adjust comment formattingChristophe Piveteau2014-08-181-20/+40
| | * | Added a lot of commentsChristophe Piveteau2014-08-151-30/+36
| | * | Clarify comment messageChristophe Piveteau2014-08-151-2/+2
| | * | End of comment moved away from new lineChristophe Piveteau2014-08-151-2/+1
| | * | Add some commentsChristophe Piveteau2014-08-151-10/+21
| | * | Further changes in coding styleChristophe Piveteau2014-08-141-38/+28
| | * | Further fixing of coding style errorsChristophe Piveteau2014-08-131-26/+22
| | * | Another intendation errorChristophe Piveteau2014-08-131-2/+2
| | * | Fixed braces and intendation errorsChristophe Piveteau2014-08-131-3/+11
| | * | Implement ability to push minecarts on curved railsChristophe Piveteau2014-08-131-2/+70
| * | | RankMgr: Default rank is applied to players without any rank.Mattes D2014-08-241-1/+5
| * | | Merge remote-tracking branch 'origin/master' into RanksMattes D2014-08-221-4/+13
| |\ \ \
| | * | | Player: Silenced a few type conversion warnings.Mattes D2014-08-181-2/+2
| | * | | Player saving creates the "players" folder, if needed.Mattes D2014-08-171-0/+1
| | | |/ | | |/|
| | * | Better OnPlayerMoving hook.Howaner2014-08-161-2/+10
| | |/
| * | Removed last remnant of cGroup.Mattes D2014-08-211-1/+0
| * | Removed cGroup and cGroupManager.Mattes D2014-08-211-2/+0
| * | cPlayer: Exported the LoadRank function to Lua API.Mattes D2014-08-201-2/+2
| * | cPlayer reads ranks from cRankManager.Mattes D2014-08-192-224/+85
| |/
| * Fixed tolua error with static initializationarchshift2014-08-112-3/+12
| * Player.cpp: change unnamed enum to constant integersarchshift2014-08-112-7/+8
| * SpacesTycho2014-08-101-1/+1
| * Fixed potential crash in Player.cppTycho2014-08-101-0/+4
| * Fixed swing arm animation when you ate.Howaner2014-08-101-4/+2
| * On destroy ender crystal, create bedrock and firearchshift2014-08-061-3/+3
* | Removed unused codeTiger Wang2014-08-291-1/+0
|/
* CheckBasicStyle: multi-level indent change.madmaxoft2014-08-041-1/+1
* Attempt to fix knockback and swimming.Howaner2014-08-041-15/+13
* Added cPlayer::GetUUID().madmaxoft2014-08-031-0/+3
* Fixed a ToLua warning - operator = not supported.madmaxoft2014-08-032-2/+2
* Entity.cpp: Air timer comment fixarchshift2014-08-031-1/+1
* Code reduction and clarity fixesarchshift2014-08-032-29/+16
* Removed unused cPlayer::FoodPoison functionarchshift2014-08-032-12/+0
* Entity.cpp: On portal check, use if-else for current dimensionarchshift2014-08-031-60/+54
* Merge pull request #1255 from mc-server/NameToUUIDMattes D2014-08-012-6/+9
|\
| * Merged branch 'master' into NameToUUID.madmaxoft2014-07-314-81/+328
| |\
| * | Fixed UUIDs handling in cPlayer.madmaxoft2014-07-312-6/+9
* | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.Howaner2014-07-313-22/+38
| |/ |/|
* | Merged branch 'howaner/Options'.madmaxoft2014-07-301-6/+8
|\ \
| * | Add "Broadcasting" settings to world.iniHowaner2014-07-271-6/+8
| |/
* | Entity.h: Moved constants out of some unnamed enumarchshift2014-07-301-14/+14
* | Slight cleanup after portalsTiger Wang2014-07-291-1/+1
* | Detrailed whitespaceTiger Wang2014-07-291-3/+3
* | Merge branch 'master' into portalsTiger Wang2014-07-2931-50/+196
|\ \
| * \ Merge pull request #1236 from Howaner/Inventory2Mattes D2014-07-273-8/+11
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into Inventory2Howaner2014-07-2626-33/+33
| | |\
| | * | Fix item durability.Howaner2014-07-233-8/+11
| * | | SplashPotionEntity: Use `const cItem &` instead of a cItemarchshift2014-07-262-2/+2
| * | | Fixed indentations, removed redundant init code in SplashPotionEntity.cpparchshift2014-07-263-6/+2
| * | | Moved potion static functions to EntityEffect to create splash potions through worldarchshift2014-07-265-9/+156
| | |/ | |/|
| * | Removed redundant semicolons and re-added warningarchshift2014-07-2426-33/+33
| |/
* | SuggestionsTiger Wang2014-07-234-16/+23
* | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-224-35/+37
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-2212-134/+212
|\|
| * Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-214-66/+66
| * Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-28/+28
| * Merge pull request #1213 from mc-server/chat-colorMattes D2014-07-201-1/+1
| |\
| | * Removed references to deprecated cChatColor::Colorarchshift2014-07-191-1/+1
| * | Line tracer invalid chunk fixTiger Wang2014-07-201-6/+7
| * | Added m_TicksAlive to entities, allows projectiles to hit their creatorsarchshift2014-07-203-3/+14
| * | Added destroy-timer system to splash potion entitiesarchshift2014-07-202-3/+24
| |/
| * Code style: Fixed braces on separate lines.madmaxoft2014-07-191-1/+2
| * Fixed style: spaces after commas.madmaxoft2014-07-191-1/+1
| * Merge pull request #1214 from mc-server/anti-globMattes D2014-07-191-6/+59
| |\
| | * Subdirs: Only add_library if not using MSVCarchshift2014-07-191-2/+4
| | * Entities/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+56
| * | Merge pull request #1223 from mc-server/fixesMattes D2014-07-195-32/+10
| |\ \
| | * | Minecart: slimmed down SpawnOn by keeping subtype in the payload enumarchshift2014-07-192-20/+7
| | * | Fixed clamping issuesarchshift2014-07-193-12/+3
| | |/
| * | Splash potions: Renamed PotionParticleType to PotionColor for clarityarchshift2014-07-192-10/+10
| * | Fixed splash potion color on tossarchshift2014-07-192-0/+16
| |/
| * Merge branch 'Entities'madmaxoft2014-07-181-4/+1
| |\
| | * Fixed many slime bugs.Howaner2014-07-171-4/+1
* | | SuggestionsTiger Wang2014-07-214-65/+70
* | | Bug and crash fixesTiger Wang2014-07-204-48/+65
* | | Fix failed merge and other issuesTiger Wang2014-07-183-45/+12
* | | Merge branch 'master' into portalsTiger Wang2014-07-1843-506/+1917
|\| |
| * | Moved ChatColor.h out of defines where it was not neededarchshift2014-07-181-0/+1
| * | Fixed NULL being passed instead of a double to AddEntityEffectarchshift2014-07-171-1/+1
| * | Fixed tabs used for alignment.madmaxoft2014-07-179-25/+25
| * | More trailing whitespace fixes.madmaxoft2014-07-174-8/+8
| * | Player.cpp: Fixed compile errorarchshift2014-07-171-1/+1
| * | Player.cpp: Added Wither death messagearchshift2014-07-171-0/+1
| * | Basic style fixes.madmaxoft2014-07-178-29/+29
| * | Merge branch 'master' of https://github.com/mc-server/MCServermadmaxoft2014-07-171-23/+8
| |\|
| | * Fixed mob knockbackTiger Wang2014-07-171-23/+8
| * | Normalized comments.madmaxoft2014-07-1729-141/+141
| |/
| * Fixed 3 MSVC warnings in SplashPotionEntity.madmaxoft2014-07-171-1/+1
| * Updated cPawn::KilledBy signature for custom death messages.madmaxoft2014-07-172-3/+3
| * Merge branch 'master' into potionsmadmaxoft2014-07-179-22/+43
| |\
| | * Merge pull request #1193 from mc-server/deathmessagesMattes D2014-07-179-22/+43
| | |\
| | | * Resolved backwards compatibility issuesTiger Wang2014-07-161-1/+1
| | | * Tailored death messagesTiger Wang2014-07-049-22/+43
| * | | Fixed formatting for cWitherSkullEntitymadmaxoft2014-07-172-3/+13
| * | | Merge remote-tracking branch 'origin/master' into potionsmadmaxoft2014-07-172-3/+12
| |\| |
| | * | Another fix for excessive food drainTiger Wang2014-07-162-1/+10
| | * | Merge pull request #1192 from mc-server/skinuuidMattes D2014-07-161-2/+2
| | |\ \
| | | * | Player properties are now retrievedTiger Wang2014-07-141-2/+2
| * | | | Restructured cSplashPotionEntity code.madmaxoft2014-07-153-70/+102
| * | | | Only the cEntityEffect::effXXX constants are Lua-exported.madmaxoft2014-07-152-72/+102
| * | | | Reformatted EntityEffect code.madmaxoft2014-07-151-25/+29
| * | | | Fixed a MSVC warning in cEntityEffect::CreateEntityEffect().madmaxoft2014-07-151-0/+1
| * | | | Merge branch 'master' into potionsmadmaxoft2014-07-158-14/+15
| |\| | |
| | * | | Maybe improved arrow sinkingTiger Wang2014-07-141-2/+2
| | * | | Made CreateProjectile a pointerworktycho2014-07-132-4/+5
| | * | | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-135-7/+7
| | |/ /
| | * | Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-1/+1
| | |\ \
| | | * | Implemented trapped chests & othersTiger Wang2014-07-071-1/+1
| | | |/
| * | | Readability and clarity changesarchshift2014-07-143-29/+23
| * | | EntityEffect: Inlined functions, added explicit copy constructor and operator.archshift2014-07-142-20/+29
| * | | Changed separating comment style from asterisks to slashes.archshift2014-07-142-93/+93
| * | | Added splash potions to NBT serialization and retrievalarchshift2014-07-122-1/+9
| * | | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-122-85/+172
| |\| |
| | * | Simplified the player data loading.madmaxoft2014-07-111-9/+8
| | * | Player data filenames are based on UUID.madmaxoft2014-07-112-67/+132
| | * | Fixed a missing return value.madmaxoft2014-07-111-0/+2
| | * | Preparation for player UUID-based storage: LoadFromFile()madmaxoft2014-07-112-21/+42
| * | | For now, removed creator member from Entity Effect for pointer safetyarchshift2014-07-125-94/+84
| * | | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-1015-151/+334
| |\| |
| | * | Fixed arrow collection animationTiger Wang2014-07-092-22/+4
| | * | Merge pull request #1135 from mc-server/fixesTiger Wang2014-07-0912-83/+205
| | |\ \ | | | |/ | | |/|
| | | * Added extra space before commentsTiger Wang2014-07-071-6/+6
| | | * Changed everything to callbacksTiger Wang2014-07-053-80/+33
| | | * Crash and compile fixTiger Wang2014-07-042-4/+9
| | | * SuggestionsTiger Wang2014-07-046-6/+15
| | | * Various fixedTiger Wang2014-07-043-10/+107
| | | * Eps comparisonTiger Wang2014-07-042-2/+2
| | | * SuggestionsTiger Wang2014-07-022-8/+14
| | | * Vector clamping fixesTiger Wang2014-07-011-4/+8
| | | * Implemented Vector3<>::Floor()Tiger Wang2014-06-301-2/+3
| | | * SuggestionsTiger Wang2014-06-292-3/+6
| | | * An unification of code styleTiger Wang2014-06-281-1/+1
| | | * Some Entity.cpp style improvementsTiger Wang2014-06-222-13/+8
| | | * Fixed multiple issues with projectilesTiger Wang2014-06-228-63/+112
| | * | Merge pull request #1138 from mc-server/enderchestMattes D2014-07-022-15/+29
| | |\ \
| | | * | SuggestionTiger Wang2014-07-021-13/+13
| | | * | Properly implemented enderchestsTiger Wang2014-06-292-2/+16
| | * | | Merge remote-tracking branch 'origin/master'Tiger Wang2014-07-021-27/+25
| | |\ \ \
| | | * | | Fixes.Howaner2014-06-301-3/+3
| | | * | | Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGEHowaner2014-06-301-26/+24
| | * | | | Fixed player teleport food drainTiger Wang2014-07-022-1/+14
| | |/ / /
| | * / / Fixed respawningTiger Wang2014-06-291-1/+1
| | |/ /
| | * | Likely fixed too quick food depletionTiger Wang2014-06-281-1/+1
| | * | Fixed server forcing players afloatTiger Wang2014-06-281-1/+4
| | * | Merged branch 'howaner/Bow'.Mattes D2014-06-263-13/+46
| | |\ \
| | | * | Add comment.Howaner2014-06-261-0/+1
| | | * | GameMode checkHowaner2014-06-261-1/+1
| | | * | Merge branch 'master' into BowHowaner2014-06-262-4/+1
| | | |\|
| | | * | derpHowaner2014-06-171-3/+3
| | | * | The same: Float, not DoubleHowaner2014-06-171-1/+1
| | | * | Float, not DoubleHowaner2014-06-171-1/+1
| | | * | Split Broadcast Sound Effect function call in multiple lines.Howaner2014-06-161-2/+16
| | | * | Fix bow sound and creative arrow pickup.Howaner2014-06-161-10/+22
| | | * | Add bow charging animationHowaner2014-06-162-2/+6
| | * | | Merged branch 'howaner/Pickups'.Mattes D2014-06-261-6/+27
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fixed a comment and changed CombineCount to short.Howaner2014-06-261-2/+2
| | | * | Optimize combining.Howaner2014-06-241-3/+3
| | | * | Better combining.Howaner2014-06-241-3/+20
| | | * | Fix pickup combining over the maximum stack size.Howaner2014-06-241-4/+8
| | |/ /
| * | | EntityEffects.x -> EntityEffect.x, Object-Oriented effectsarchshift2014-06-1910-270/+745
| * | | Entity effects: changed User to Creator, removed pawn pass-by-valuearchshift2014-06-175-35/+19
| * | | Added the OnEntityAddEffect hook.madmaxoft2014-06-172-0/+11
| * | | Entity Effects: Clarified user, added it to AddEntityEffectarchshift2014-06-175-13/+30
| * | | Changed the AddEntityEffect() params for easier calls.madmaxoft2014-06-175-47/+50
| * | | Entity Effect: Separates total duration and ticks of activityarchshift2014-06-173-22/+23
| * | | Fixed MSVC compilation.madmaxoft2014-06-171-4/+7
| * | | Pawn: renamed HandleEntityEffects to HandleEntityEffectarchshift2014-06-174-6/+8
| * | | Cave spider now poisons its victim, added IsPawn function to Entityarchshift2014-06-172-1/+2
| * | | Added wither damage type, wither entity effect.archshift2014-06-172-1/+16
| * | | Monster: added IsUndead(), undead-specific entity effectsarchshift2014-06-171-6/+0
| * | | Applies splash potion effects to mobs as well as playersarchshift2014-06-172-8/+12
| * | | Removed long function wrappingarchshift2014-06-171-2/+1
| * | | Entity effect type: use 'eff' as a prefix instead of 'ef'archshift2014-06-174-41/+41
| * | | Added splash potion functionalityarchshift2014-06-175-14/+87
| * | | Entity: only fire critical hit if damage type is physicalarchshift2014-06-171-1/+2
| * | | Player: made healing instantaneousarchshift2014-06-172-2/+2
| * | | Implemented drinkable potions, noeffect entity effect,archshift2014-06-173-0/+16
| * | | Implemented milk, added documentation to Pawn.harchshift2014-06-173-1/+36
| * | | Pawn.cpp: fixed effect iterator BAD_ACCESSarchshift2014-06-172-9/+14
| * | | Pawn: Enabled entity effect broadcast, added typedefarchshift2014-06-172-4/+6
| * | | EntityEffect: read-only getters, added user and distance modifier fieldsarchshift2014-06-173-11/+35
| * | | Player: Removed food-poisoning-specific code, set duration to 30 secondsarchshift2014-06-172-26/+2
| * | | Entity effects: Added handlers for entity effectsarchshift2014-06-174-13/+138
| * | | Added iterator on tick to manage entity effect durationarchshift2014-06-171-1/+18
| * | | cPawn: Remove unused m_bBurnablearchshift2014-06-172-2/+0
| * | | Moved Effects.h to EntityEffects.h, added initial implarchshift2014-06-176-33/+113
| * | | Added classes for splash potions and wither skullsarchshift2014-06-175-0/+149
| | |/ | |/|
* | | Conforms to standardsTiger Wang2014-06-221-1/+1
* | | Merge branch 'master' into portalsTiger Wang2014-06-215-37/+82
|\ \ \ | | |/ | |/|
| * | Nullify deleted pointers.archshift2014-06-191-0/+1
| * | Merge branch 'master' into GlobalFixesHowaner2014-06-177-65/+111
| |\|
| | * Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-164-33/+81
| * | Wrong arrow commit.Howaner2014-05-301-4/+0
| * | Add throw sound and fix arrow server crash.Howaner2014-05-282-5/+4
| * | Fix Y-Position from arrow entity.Howaner2014-05-281-0/+1
* | | Fixed invalid iteratorsTiger Wang2014-06-213-2/+12
* | | More suggestionsTiger Wang2014-06-213-4/+6
* | | Implemented PR suggestionsarchshift2014-06-163-3/+4
* | | Reverted portal creation codeTiger Wang2014-06-142-103/+0
* | | Fixed compileworktycho2014-06-121-1/+1
* | | Portals animate and delay correctlyTiger Wang2014-06-124-50/+112
* | | Merge branch 'master' into portalsTiger Wang2014-06-105-20/+26
|\ \ \ | | |/ | |/|
| * | Fixed deadlock when moving players to other worlds.Mattes D2014-06-083-15/+18
| * | Added queue for adding entities to cWorld.Mattes D2014-06-083-4/+5
| * | Fix itemframe break.Howaner2014-06-041-1/+3
* | | Portal improvements and suggestionsTiger Wang2014-06-102-41/+92
* | | Fixed compilationTiger Wang2014-06-051-1/+1
* | | SuggestionsTiger Wang2014-06-042-2/+5
* | | Configurable portalsTiger Wang2014-06-042-14/+33
* | | SuggestionsTiger Wang2014-06-042-5/+9
* | | Added checks for no downfall biomesTiger Wang2014-06-041-1/+1
* | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-043-12/+4
|\| |
| * | Player permissions aren't logged to console anymore.madmaxoft2014-06-031-7/+0
| * | Merge pull request #844 from mc-server/ProjectileHitBlockMattes D2014-06-011-2/+2
| |\ \
| | * | Used recommendationsSTRWarrior2014-05-311-2/+1
| | * | Using recommendations (I think)STRWarrior2014-03-301-1/+2
| | * | Added a BlockHitPos parameter to OnProjectileHitBlockSTRWarrior2014-03-301-2/+2
| | * | Added a blockface parameter to the OnProjectileHitBlock hook.STRWarrior2014-03-301-1/+1
| * | | Merge pull request #951 from worktycho/chunksparsing/structsMattes D2014-05-311-3/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'master' into chunksparsing/structsTycho2014-05-246-16/+300
| | |\ \
| | * \ \ Merge branch 'master' into chunksparsing/structsTycho2014-05-108-136/+125
| | |\ \ \
| | * \ \ \ Merge branch 'master' into chunksparsing/structsTycho2014-05-0127-890/+1015
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into chunksparsing/structsTycho2014-04-2710-184/+328
| | |\ \ \ \ \
| | * | | | | | Implemented Chunk Sparsing with segmentsTycho2014-04-261-3/+2
* | | | | | | | Implemented bed homesTiger Wang2014-06-013-16/+40
* | | | | | | | Implemented end and nether portalsTiger Wang2014-05-314-11/+150
|/ / / / / / /
* | | | | | | Merge branch 'master' into achievementtranslateTiger Wang2014-05-253-16/+62
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fixed datatype conversion warning.Mattes D2014-05-231-2/+2
| * | | | | | Merge pull request #1015 from mc-server/Statsxdot2014-05-212-14/+60
| |\ \ \ \ \ \
| | * | | | | | Cleaned up cPlayer::UpdateMovementStats; Wither achievementsandrew2014-05-202-14/+60
* | | | | | | | Update Player.cppAlexander Harkness2014-05-201-19/+19
* | | | | | | | Fixed a cactus Y position issueTiger Wang2014-05-191-2/+3
* | | | | | | | Simplified cacti conditionsTiger Wang2014-05-191-2/+2
* | | | | | | | Added client translation to achievementsTiger Wang2014-05-191-4/+4
|/ / / / / / /
* | | | | | | Merge pull request #1010 from mc-server/cactidamageAlexander Harkness2014-05-192-0/+27
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | DerpAlexander Harkness2014-05-191-1/+1
| * | | | | | Should have fixed assumptions about entity width.Alexander Harkness2014-05-191-4/+5
| * | | | | | Fixed clanging errors.Alexander Harkness2014-05-191-5/+5
| * | | | | | Implemented cacti damageTiger Wang2014-05-182-0/+26
| | |_|_|/ / | |/| | | |
* | | | | | There's no "round" function in MSVC2008.madmaxoft2014-05-182-4/+4
* | | | | | Fixesandrew2014-05-132-16/+14
* | | | | | Movement Statisticsandrew2014-05-123-11/+96
* | | | | | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()andrew2014-05-125-4/+95
* | | | | | Fixed compilationandrew2014-05-111-0/+2
* | | | | | Fixed stat serializationandrew2014-05-111-10/+21
* | | | | | Statistic Managerandrew2014-05-112-2/+26
|/ / / / /
* | | | | Initialise m_HasTeleported in both constructorsworktycho2014-05-091-0/+1
* | | | | Merge branch 'master' into fixesTiger Wang2014-05-061-3/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into redstoneimprovementsTiger Wang2014-05-0427-885/+983
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Redstone simulator now directly accesses cChunkTiger Wang2014-04-272-2/+2
* | | | | | Suggestions'd #2Tiger Wang2014-05-061-1/+1
* | | | | | Suggestions'dTiger Wang2014-05-062-2/+2
* | | | | | A bit of reformatting.madmaxoft2014-05-021-5/+10
* | | | | | Merge branch 'master' into fixes.madmaxoft2014-05-0228-835/+1050
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fixed a MSVC warning.madmaxoft2014-04-281-1/+1
| * | | | | Merge pull request #940 from Howaner/GlobalFixesMattes D2014-04-288-32/+70
| |\ \ \ \ \
| | * | | | | FixesHowaner2014-04-262-11/+14
| | * | | | | Change m_InvulnerableTicks description again again :DHowaner2014-04-261-1/+1
| | * | | | | Change m_InvulnerableTicks description again.Howaner2014-04-261-1/+1
| | * | | | | Change m_InvulnerableTicks descriptionHowaner2014-04-261-1/+1
| | * | | | | Merge branch 'master' into GlobalFixesHowaner2014-04-261-7/+34
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Add entity invulnerableHowaner2014-04-268-26/+61
| * | | | | | Merge pull request #954 from mc-server/projectiles-splitMattes D2014-04-2818-852/+910
| |\ \ \ \ \ \
| | * | | | | | Fixed projectile source filenames, indentationsarchshift2014-04-2817-58/+58
| | * | | | | | Fixed ToLua errors, added newlinesarchshift2014-04-2718-19/+19
| | * | | | | | Fixed ToLua issuesarchshift2014-04-278-19/+16
| | * | | | | | Moved cFireworkEntity out of ProjectileEntity.harchshift2014-04-274-115/+115
| | * | | | | | Moved cGhastFireballEntity out of ProjectileEntity.harchshift2014-04-274-74/+83
| | * | | | | | Moved cFireChargeEntity out of ProjectileEntity.harchshift2014-04-274-82/+88
| | * | | | | | Moved cThrownSnowballEntity out of ProjectileEntity.harchshift2014-04-274-74/+83
| | * | | | | | Moved cExpBottleEntity out of ProjectileEntity.harchshift2014-04-274-52/+61
| | * | | | | | Moved cThrownEnderPearl out of ProjectileEntity.harchshift2014-04-274-86/+94
| | * | | | | | Moved cThrownEggEntity out of ProjectileEntity.harchshift2014-04-274-90/+99
| | * | | | | | Moved cArrowEntity out of ProjectileEntity.harchshift2014-04-274-280/+291
| | | |_|/ / / | | |/| | | |
| * | | | | | Fixed warnings.madmaxoft2014-04-271-0/+1
| * | | | | | Added static const, initialized fields.archshift2014-04-271-0/+2
| |/ / / / /
| * | | | | Merge pull request #941 from archshift/masterMattes D2014-04-263-6/+32
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | More small fixes.archshift2014-04-261-1/+1
| | * | | | Further refactored, Reverted Minecart changearchshift2014-04-264-17/+23
| | * | | | Moved switch{} out of GetArmorCoverAgainst().archshift2014-04-262-5/+29
| | * | | | Fixed a couple more warnings.archshift2014-04-262-21/+17
| * | | | | Merge pull request #920 from axisd/masterMattes D2014-04-251-7/+34
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix formattingr.ramazanov2014-04-251-9/+15
| | * | | | Fix for clangr.ramazanov2014-04-251-5/+1
| | * | | | Mobs shouldn't burn when it's Raining & Mob Knockback is far too muchr.ramazanov2014-04-251-8/+5
| | * | | | Merge branch 'master' of https://github.com/mc-server/MCServerr.ramazanov2014-04-235-10/+39
| | |\ \ \ \
| | * | | | | Mobs shouldn't burn when it's Raining #906r.ramazanov2014-04-231-9/+30
| | * | | | | Mobs shouldn't burn when it's Raining #906r.ramazanov2014-04-211-5/+12
| * | | | | | Merge pull request #935 from archshift/projectile-fixesMattes D2014-04-252-7/+69
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Creator not user.archshift2014-04-252-5/+5
| | * | | | | Comments for TrySpawnChicken() and TeleportUser().archshift2014-04-251-0/+2
| | * | | | | Rename spawn chicken method, Initialize m_HasTeleported.archshift2014-04-252-4/+5
| | * | | | | Chicken eggs and ender pearls can hit entities.archshift2014-04-252-7/+66
| | | |/ / / | | |/| | |
| * / | | | Cmake generated projects for IDEs include headers in project files.archshift2014-04-251-0/+1
| |/ / / /
* | | | | A tiny speed improvement in ApplyFoodExhaustion()Tiger Wang2014-04-271-5/+5
* | | | | More comments!Tiger Wang2014-04-272-3/+10
* | | | | Implemented suggestionsTiger Wang2014-04-241-7/+6
* | | | | Merge branch 'master' into fixesTiger Wang2014-04-245-10/+39
|\| | | |
| * | | | Merge pull request #925 from archshift/masterMattes D2014-04-232-0/+16
| |\ \ \ \
| | * | | | Renamed getter and setter for IsFireproof.archshift2014-04-232-3/+3
| | * | | | Fireproof status getter and setter.archshift2014-04-232-0/+16
| * | | | | Merge pull request #923 from archshift/masterMattes D2014-04-222-3/+15
| |\| | | |
| | * | | | Fixed indentation and changed m_Fireproof to m_IsFireproof.archshift2014-04-222-14/+14
| | * | | | Lay foundation for fireproof entities.archshift2014-04-222-3/+15
| | |/ / /
| * | | | Merge pull request #909 from jfhumann/fixesMattes D2014-04-223-7/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | reverted the revert of the minecart collision detection fix.jfhumann2014-04-211-2/+1
| | * | | Fixed Flint and Steel, reverted Minecart change, renamed a parameter namejfhumann2014-04-193-4/+5
| | * | | Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-187-157/+154
| | |\ \ \
| | * | | | Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-183-6/+7
* | | | | | Some change to Entity.cppTiger Wang2014-04-236-122/+100
|/ / / / /
* | / / / Fixed #906Tiger Wang2014-04-181-0/+10
| |/ / / |/| | |
* | | | Merge pull request #891 from mc-server/fixesMattes D2014-04-176-118/+118
|\ \ \ \
| * | | | Entities handle chunks properly againTiger Wang2014-04-126-118/+118
| |/ / /
* / / / Added new AI rulesTiger Wang2014-04-174-39/+36
|/ / /
* | | Fixed Endiannes conversion routines for floats and doubles.madmaxoft2014-04-051-1/+1
* | | Removed debugging log from entity physics handling.madmaxoft2014-04-051-1/+2
* | | Added cPlayer:SendRotation() API function.madmaxoft2014-04-052-0/+17
* | | Documented the units and range for entity rotations.madmaxoft2014-04-031-7/+7
|/ /
* | Merge branch 'MacFixes'Tycho2014-04-024-5/+3
|\ \
| * | More fixes to get it to compile for me on Mac 10.9. Mostly just newline additions, but some of the unused variables were causing errors, so I wrapped them in #ifndef __APPLE__ calls, since I didn't know if they were going to be used in the future.Samuel Barney2014-03-252-3/+1
| * | Added newlines. Without them, the files would not compile.Samuel Barney2014-03-252-2/+2
* | | Merge pull request #842 from mc-server/ProjectileHooksMattes D2014-03-291-1/+11
|\ \ \ | | |/ | |/|
| * | Fixed the OnProjectileHitBlock hook not stopping projectiles.STRWarrior2014-03-291-1/+1
| * | Added HOOK_PROJECTILE_HIT_BLOCK.STRWarrior2014-03-291-0/+5
| * | Fixed error when the hook gets called.STRWarrior2014-03-291-1/+0
| * | Added HOOK_PROJECTILE_HIT_ENTITYSTRWarrior2014-03-291-0/+6
* | | Fixed #721 and FS439Tiger Wang2014-03-291-0/+1
|/ /
* / Ender crystalsandrew2014-03-253-11/+102
|/
* Plugins can set flying speed.madmaxoft2014-03-202-75/+118
* Rewritten player speeds to be relative unit-less.madmaxoft2014-03-202-7/+11
* Minor Entity.cpp cleanupTiger Wang2014-03-201-12/+9
* Merge branch 'master' into awesometntTiger Wang2014-03-1814-75/+213
|\
| * Merge pull request #782 from mc-server/bedsMattes D2014-03-161-3/+14
| |\
| | * Beds now work properly fixes #707Tiger Wang2014-03-091-3/+14
| * | Merge branch 'master' into BlockEntitysHowaner2014-03-159-96/+90
| |\ \
| | * \ Merge remote-tracking branch 'xdot/master'madmaxoft2014-03-123-4/+3
| | |\ \
| | | * | Unified Matrix4 codeandrew2014-03-111-1/+1
| | | * | Unified Vector classesandrew2014-03-112-3/+2
| | * | | Merge remote-tracking branch 'origin/SnowBall'madmaxoft2014-03-122-2/+25
| | |\ \ \ | | | |/ / | | |/| |
| | | * | TakeDamage now has the cThrownSnowballEntity instead of the creator's object.STRWarrior2014-03-111-1/+1
| | | * | Snowballs now actualy hurt other entities.STRWarrior2014-03-112-2/+25
| * | | | Add item frame saving.Howaner2014-03-154-44/+119
| * | | | Add health and age load to pickup's.Howaner2014-03-152-16/+22
| * | | | Add ExpOrb saving.Howaner2014-03-153-10/+34
* | | | | Merge remote-tracking branch 'origin/master' into awesometntTiger Wang2014-03-106-105/+93
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-092-20/+36
| |\| | |
| | * | | Change TNT Fuse to ticksHowaner2014-03-082-11/+11
| | * | | Add TNT Save/Load and add Netbeans projects to .gitignoreHowaner2014-03-082-17/+33
| | |/ /
| * | | Merge pull request #731 from mc-server/ballisticmissilesTiger Wang2014-03-094-85/+57
| |\ \ \
| | * | | Merge branch 'master' into ballisticmissilesTiger Wang2014-03-096-43/+42
| | |\| |
| | * | | CheckBlockInteractionsRate() fixed & enabledTiger Wang2014-03-092-35/+1
| | * | | Removed unneeded includes in Player.cppTiger Wang2014-02-271-7/+0
| | * | | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-272-43/+56
* | | | | Merge branch 'master' into awesometntTiger Wang2014-03-103-5/+5
|\| | | |
| * | | | Fixed #778 - stack overflow.comTiger Wang2014-03-091-1/+1
| | |_|/ | |/| |
| * | | Fixed issues with int vs size_t and a few other warningsTycho2014-03-082-4/+4
| | |/ | |/|
* / | Added extra awesomeness to TNTTiger Wang2014-03-053-195/+205
|/ /
* | g_BlockXXX => cBlockInfo::XXXandrew2014-03-014-14/+14
* | Shortened enumsandrew2014-03-011-2/+2
* | Exported and documented cScoreboardandrew2014-03-011-18/+3
* | Fixed multiple gcc warnings about unused params.madmaxoft2014-02-282-1/+12
* | Moved common cGroupManager code to a separate function.madmaxoft2014-02-281-7/+11
* | Merge pull request #709 from Howaner/GlobalFixesMattes D2014-02-281-7/+6
|\ \ | |/ |/|
| * Remove users.ini generation in Player.cpp and use the CheckUsers() FunctionHowaner2014-02-211-6/+1
| * Add 'Group not found', when the Server load the users.ini and add auto generate from users.iniHowaner2014-02-211-1/+5
* | Small improvements to boats.STRWarrior2014-02-241-3/+7
* | Manual merge (Fixed conflicts)andrew2014-02-209-5/+279
|\|
| * Merge branch 'master' into itemframesTiger Wang2014-02-183-0/+87
| |\
| | * Properly exported and documented paintingsTiger Wang2014-02-181-2/+2
| | * Implemented paintings, fixes #689Tiger Wang2014-02-183-0/+87
| * | Changed BlockFace type to eBlockFaceTiger Wang2014-02-182-13/+26
| * | Added a braceTiger Wang2014-02-181-0/+2
| * | Implemented item frames, a part of #689Tiger Wang2014-02-183-0/+153
| |/
| * Links sent via chat messages are clickable.madmaxoft2014-02-161-1/+2
| * Fixed minor formatting issues from #682Tiger Wang2014-02-163-16/+3
| * Replace random Float Generation and broadcast the Exp Pickup SoundHowaner2014-02-162-9/+4
| * Add Exp Bottle EffectsHowaner2014-02-164-1/+23
| * Disable Hunger DeathHowaner2014-02-161-1/+7
| * Implemented cCompositeChat.madmaxoft2014-02-151-0/+1
| * Merge pull request #679 from mc-server/NotchDeathAlexander Harkness2014-02-151-0/+6
| |\
| | * If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/NotchSTRWarrior2014-02-151-0/+6
| * | Made player jump reset less ambiguousTiger Wang2014-02-121-1/+2
| * | Fixed #627Tiger Wang2014-02-111-2/+2
| |/
* / Map item handler; Fixed several bugsandrew2014-02-171-0/+3
|/
* Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-096-25/+11
|\
| * Merge pull request #649 from mc-server/GroupsPermissionsMattes D2014-02-052-14/+0
| |\
| | * Removed deprecated HasCommand functionSTRWarrior2014-02-052-14/+0
| * | Fixed most of the reordering warningsTycho2014-02-054-11/+11
* | | Merge branch 'master' into playerimprovementsTiger Wang2014-02-093-22/+22
|\| |
| * | Improved Type safety of eBlockFaceTycho2014-02-043-22/+22
| |/
* | Fixed a boat ASSERTTiger Wang2014-02-091-2/+8
* | Improved chat messaging functionsTiger Wang2014-02-072-17/+8
* | Server internally uses new functionsTiger Wang2014-02-061-6/+4
* | Added more chat functionsTiger Wang2014-02-061-1/+0
* | Fixed annoying creative on fire bugTiger Wang2014-02-052-0/+20
* | Added more SendMessageXXX() functionsTiger Wang2014-02-041-0/+4
* | Pickup constructor no longer exportedTiger Wang2014-02-033-4/+8
* | Added SendMessageXXX() to cPlayerTiger Wang2014-02-031-0/+3
* | Fixed a crash bugTiger Wang2014-02-031-3/+3
* | Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-032-3/+4
|\|
| * Merge pull request #602 from mc-server/improvementsandfixesMattes D2014-02-032-3/+4
| |\
| | * Creative players take Plugin damageTiger Wang2014-02-022-3/+4
* | | Server now handles join messages alsoTiger Wang2014-02-031-1/+7
|/ /
* | Merge pull request #585 from daniel0916/hooksMattes D2014-02-011-0/+2
|\ \ | |/ |/|
| * Removed "player destroying" hookdaniel09162014-02-011-3/+1
| * Added "player destroying" and "player destroyed" hooksdaniel09162014-01-251-0/+4
* | 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
* | Merge pull request #589 from mc-server/minecartimprovementsMattes D2014-01-262-101/+397
|\ \
| * | Rail speed tweakTiger Wang2014-01-251-2/+2
| * | Added more minecart powered rail directionsTiger Wang2014-01-241-3/+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
| * | Added more rail functionalityTiger Wang2014-01-191-14/+0
| * | Merge remote-tracking branch 'origin/master' into minecartimprovementsTiger Wang2014-01-197-42/+58
| |\|
| * | Minecart collision and general improvementsTiger Wang2014-01-182-70/+242
* | | Two minor changesTiger Wang2014-01-251-5/+3
* | | Implemented fall damage for mobsTiger Wang2014-01-253-5/+8
* | | Implemented pickup combiningTiger Wang2014-01-251-0/+55
* | | All mobs now drown (fixes #54)Tiger Wang2014-01-254-127/+130
* | | Miscellaneous improvementsTiger Wang2014-01-241-10/+4
* | | Removed unused ReferenceManagerTiger Wang2014-01-242-45/+1
* | | Fixed crash with failed entity-loading.madmaxoft2014-01-241-1/+2
* | | Merge remote-tracking branch 'MikeHunsinger/master'madmaxoft2014-01-242-43/+59
|\ \ \
| * | | Fixed indentation once and for all.Mike Hunsinger2014-01-241-31/+31
| * | | Fixed indentation and doxygen comments... For real this time.Mike Hunsinger2014-01-241-3/+3
| * | | Fixed spacing and doxycomments.Mike Hunsinger2014-01-242-6/+6
| * | | Split TossItem into three Toss functions (Held, Equipped and Pickup)Mike Hunsinger2014-01-232-50/+66
| | |/ | |/|
* | | Fixed compilation on VC2008tonibm192014-01-221-0/+1
* | | Scoreboard protocol supportandrew2014-01-211-6/+11
* | | Scoreboard deserializationandrew2014-01-202-3/+26
* | | Scoreboard improvementsandrew2014-01-191-4/+4
* | | Basic scoreboard implementationandrew2014-01-192-1/+62
|/ /
* | Exported cFloater to the Lua API.STRWarrior2014-01-191-3/+7
* | Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-172-7/+16
|\ \
| * | Changed GetContent function.STRWarrior2014-01-161-1/+1
| * | Fixed server crash.STRWarrior2014-01-121-1/+1
| * | Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-122-6/+7
| * | EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-122-3/+11
* | | Removed internal cEntity::GetRot() usage.madmaxoft2014-01-173-7/+7
* | | Merge remote-tracking branch 'origin/customnames'madmaxoft2014-01-175-30/+33
|\ \ \ | |_|/ |/| |
| * | Removed obsoleted functionsTiger Wang2014-01-165-27/+25
| * | OBSOLETE'd obsolete functionsTiger Wang2014-01-151-2/+2
| * | Implemented Ctrl-Q drop stackTiger Wang2014-01-151-3/+8
* | | Disabled excessive entity-related logging in Debug mode.madmaxoft2014-01-161-1/+11
|/ /
* | Furnace minecarts now stop being active after a while.STRWarrior2014-01-152-2/+19
* | First implementation for furnace minecarts.STRWarrior2014-01-152-1/+23
* | 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
* | Multiple enhancements and fixes to minecartsTiger Wang2014-01-123-132/+190
|/
* 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-301-2/+4
* converted commneted paramater names to the unused macroTycho Bickerstaff2013-12-223-5/+13
* Merge branch 'master' of github.com:mc-server/MCServerTycho Bickerstaff2013-12-225-29/+273
|\
| * Server now handles death messagesTiger Wang2013-12-261-0/+16
| * Merge pull request #461 from mc-server/repeatersMattes D2013-12-262-7/+41
| |\
| | * 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-241-1/+1
| | * Improved knockback animationTiger Wang2013-12-241-3/+3
| | * Improved player fall particle positionsTiger Wang2013-12-231-5/+2
| | * Clarified some code in Player.cppTiger Wang2013-12-231-2/+5
| | * Fixed a comment in Entity.cppTiger Wang2013-12-231-1/+1
| | * Implemented knockback and critical hitTiger Wang2013-12-221-4/+21
| | * Implemented fall particlesTiger Wang2013-12-221-3/+18
| * | Fixed Parentheses.STRWarrior2013-12-251-2/+2
| * | You are now able to sweep mobs to your position using fishing rods.STRWarrior2013-12-252-12/+142
| * | finally removed them all?Alexander Harkness2013-12-241-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
| * | Fishing now uses a countdown instead of a random number each tick.STRWarrior2013-12-222-12/+29
| * | Floater now dissapears when the player doesn't have an fishing rod equipped.STRWarrior2013-12-212-0/+32
* | | Root is now warnings cleanTycho Bickerstaff2013-12-211-2/+2
* | | ChunkSender is now warnings cleanTycho Bickerstaff2013-12-212-5/+5
|/ /
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-216-41/+54
|\ \
| * | You could now only get fish from non-source blocks. Fixed it.STRWarrior2013-12-211-1/+1
| * | Fixed bug where you could get fish from non-source blocks.STRWarrior2013-12-211-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
| * Sorted a few constructors to remove warnings.madmaxoft2013-12-205-32/+36
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-201-1/+1
|\|
| * Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-201-1/+1
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-195-0/+120
|\|
| * Merge pull request #450 from mc-server/redstonefixesMattes D2013-12-191-0/+18
| |\
| | * Fixed PlayerAbilities and creativeTiger Wang2013-12-191-0/+18
| * | Fixed #include in Floater.cpp.STRWarrior2013-12-191-1/+1
| * | The floater now actualy dives under water.STRWarrior2013-12-191-1/+1
| * | Implented IsFishing, SetIsFishing and GetFloaterID().STRWarrior2013-12-192-0/+12
| * | Added cFloater class.STRWarrior2013-12-193-0/+90
| |/
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-188-35/+149
|\|
| * 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
| * Fixed cClientHandle::Tick() being called from two threads.madmaxoft2013-12-162-24/+0
| * Server saves if a player is flying.STRWarrior2013-12-151-1/+3
| * Merge pull request #437 from mc-server/ShootTo_functionSTRWarrior2013-12-152-0/+13
| |\
| | * 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-152-0/+13
| * | Fixed indentation.madmaxoft2013-12-151-1/+1
| |/
| * Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() functionSTRWarrior2013-12-152-1/+45
| * cPlayer is using the broadcast functions.STRWarrior2013-12-151-3/+3
| * Exported E_EFFECTS_<Effect> to lua. Forgot to commit Globals.h.STRWarrior2013-12-141-1/+2
| * Added E_EFFECT_<Effect>STRWarrior2013-12-142-3/+32
| * Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison.STRWarrior2013-12-141-1/+9
* | moved entities to globsTycho Bickerstaff2013-12-111-1/+5
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-113-10/+23
|\|
| * Exported the cTNTEntitySTRWarrior2013-12-141-2/+6
| * Merge pull request #423 from mc-server/redstoneimprovementsMattes D2013-12-141-2/+7
| |\
| | * Improved player permissions loggingTiger Wang2013-12-141-1/+1
| | * Fixes to redstone wire and torchesTiger Wang2013-12-141-1/+1
| | * Groups.ini and Users.ini are now generatedTiger Wang2013-12-141-1/+6
| * | Fixed not getting XP from mobs.STRWarrior2013-12-141-1/+1
| |/
| * Using "a_ClosestPlayer != NULL" in cExpOrb.STRWarrior2013-12-131-1/+1
| * ExpOrbs now move.STRWarrior2013-12-111-4/+8
* | more cmakeTycho Bickerstaff2013-12-101-0/+7
|/
* Fixed angle normalization typo.madmaxoft2013-12-081-1/+1
* Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-083-9/+6
|\
| * Fixed normalizing large angles.madmaxoft2013-12-081-6/+3
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-083-3/+3
* | Renamed animation functionTiger Wang2013-12-071-3/+3
* | Puking now uses GetEyeHeight()Tiger Wang2013-12-061-1/+1
* | Fixed eating using wrong animationTiger Wang2013-12-061-1/+1
* | Tools make a sound when breaking, fixes #266Tiger Wang2013-12-062-2/+5
|/
* Fixed VC2008 compilation, normalized include paths.madmaxoft2013-11-271-1/+1
* Fixed some of tiger's derpyness.Alexander Harkness2013-11-271-2/+2
* Hopefully fixed last of the Linux compile errorsTiger Wang2013-11-261-1/+1
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-263-0/+90
* Attempt to fix compilationTiger Wang2013-11-241-2/+2
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-244-70/+298
* Moved source to srcAlexander Harkness2013-11-2418-0/+6466
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 01:10:21 +0100