summaryrefslogtreecommitdiffstats
path: root/src/Entities (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Implemented Chest MinecartsTiger Wang2014-09-132-18/+63
|
* Fixed friction being applied whilst airborneTiger Wang2014-09-121-11/+13
| | | | Reported by tonibm9 in #1300.
* Fixed player spawning in unknown world.Mattes D2014-09-061-0/+4
| | | | This may happen if the admin removes a world.
* 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
| | | | | | This reverts commit 472efa8174626a00ffdf5b39e1a44ac419cd3698. Apparently we don't support some of these features quite yet (darn you C++98!)
* Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etcarchshift2014-09-041-3/+3
| | | | Snow Golems must also be above 64Y to spawn snow (as of 1.8).
* Fixed style and alpha-sorting.madmaxoft2014-09-032-4/+4
|
* EntityEffect.cpp: Enable 1.8's leaping potionarchshift2014-09-031-1/+1
|
* Pickups combine only within one chunk.madmaxoft2014-09-011-2/+6
| | | | This greatly improves performance of the tick thread.
* Fixed previous commit's wrong assumptions.madmaxoft2014-09-011-10/+10
| | | | The equipment-getting functions return a copy already, so we can't take a pointer, really.
* Fixed MSVC compilation, improved performance.madmaxoft2014-09-011-30/+59
| | | | We're not creating copies of the equipped items anymore, rather, we're using pointers to them. Also pow() is needlessly slow for a simple second power, and MSVC2008 was confused about the pow() overloads.
* 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
| | | | | | | | - Added Thorns and Respiration enchantments
| * Protection Enchantments, some fixesJaume Aloy2014-08-213-8/+114
| | | | | | | | | | | | | | | | - Protection echantments (fire, blast, feather falling, protection and projectile). It isn't finished, add secondary effects and optimize the code. - Removed some brackets. - Silk touch fixed.
| * Changed if in BlockHandlerJaume Aloy2014-08-191-1/+0
| |
| * FixesJaume Aloy2014-08-194-14/+15
| | | | | | | | | | | | | | | | - Changed m_TicksLeftBurning > 0 for IsOnFire() - Tried to do the changes in BlockHandler.cpp - Removed m_Creator in ArrowEntity - Added m_Enchantments in ProjectileEntity CreatorData - Added blank lines between functions
| * Changed if for switchJaume Aloy2014-08-191-3/+2
| |
| * Added more enchantments and some fixesJaume Aloy2014-08-194-7/+61
| | | | | | | | | | | | | | - Removed Debug messages - Added Punch enchantment effect - Added Silk Touch enchantment - Added Unbreaking enchantment effect
| * Added some EnchantmentsJaume Aloy2014-08-193-6/+89
| | | | | | | | | | | | - Bow enchantments: Infinity, Flame and Power - Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite, Sharpness
* | Merge branch 'master' into fixesmadmaxoft2014-08-301-18/+18
|\ \
| * | Fixed MSVC2008 compilation.madmaxoft2014-08-301-18/+18
| | | | | | | | | | | | It was getting confused about which sqrt() overload to call.
* | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-294-247/+220
|\| | | | | | | | | | | | | | Conflicts: src/Server.cpp
| * | Fixed a typo.Mattes D2014-08-281-1/+1
| | |
| * | Merge pull request #1324 from ChriPiv/masterMattes D2014-08-281-2/+92
| |\ \ | | | | | | | | Implement ability to push minecarts on curved rails
| | * | 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
| | | |/ | | |/| | | | | | | | | Fixes #1268.
| | * | 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
| | | | | | | | | | Fixes CID 71780 If ShouldBroadcastDeathMessages is false the pointer would fall through to a check agaist it being a player
| * 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
| | | | If current dimension corresponds with the portal (nether portal in the nether) send to the overworld, else send to the portal dimension. No need to switch on the dimension and exclude potential others.
* Merge pull request #1255 from mc-server/NameToUUIDMattes D2014-08-012-6/+9
|\ | | | | Name to UUID
| * Merged branch 'master' into NameToUUID.madmaxoft2014-07-314-81/+328
| |\
| * | Fixed UUIDs handling in cPlayer.madmaxoft2014-07-312-6/+9
| | | | | | | | | | | | The loading expected dashed UUIDs, MCS uses short UUIDs throughout.
* | | 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
|\ \ | | | | | | | | | | | | Conflicts: src/World.h
| * \ Merge pull request #1236 from Howaner/Inventory2Mattes D2014-07-273-8/+11
| |\ \ | | |/ | |/| Fix item durability.
| | * Merge branch 'master' into Inventory2Howaner2014-07-2626-33/+33
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/BlockInfo.cpp
| | * | Fix item durability.Howaner2014-07-233-8/+11
| | | | | | | | | | | | Fixes #1181
| * | | 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
|\| | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * 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
| |\ | | | | | | Refactored cChatColor
| | * Removed references to deprecated cChatColor::Colorarchshift2014-07-191-1/+1
| | |
| * | Line tracer invalid chunk fixTiger Wang2014-07-201-6/+7
| | | | | | | | | | | | | | | * Fixes #1230 * Additionally improved speed in some scenarios
| * | 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
| |\ | | | | | | CMake - Explicitly lists all source files
| | * 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
| |\ \ | | | | | | | | Fixed small issues throughout the codebase
| | * | 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
| | | | | | | | | | | | | | | | | | | | | - Fixed slime hurt/death sound - Added slime spawning on death. - Fixed the max health. - Fixed the attack damage. - Little slimes should not attack players.
* | | SuggestionsTiger Wang2014-07-214-65/+70
| | |
* | | Bug and crash fixesTiger Wang2014-07-204-48/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files
* | | Fix failed merge and other issuesTiger Wang2014-07-183-45/+12
| | |
* | | Merge branch 'master' into portalsTiger Wang2014-07-1843-506/+1917
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp
| * | 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
| | | | | | | | | | | | * Fixes #901
| * | Normalized comments.madmaxoft2014-07-1729-141/+141
| |/ | | | | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
| * Fixed 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
| | |\ | | | | | | | | Death messages
| | | * 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
| | |\ \ | | | | | | | | | | Skins
| | | * | Player properties are now retrievedTiger Wang2014-07-141-2/+2
| | | | |
| * | | | Restructured cSplashPotionEntity code.madmaxoft2014-07-153-70/+102
| | | | | | | | | | | | | | | | | | | | | | | | | The callback doesn't need declaration in the header. Renamed PotionName to PotionParticleType.
| * | | | Only the cEntityEffect::effXXX constants are Lua-exported.madmaxoft2014-07-152-72/+102
| | | | | | | | | | | | | | | | | | | | The rest of the classes don't need exporting, there's no interface using them anyway.
| * | | | 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 & others
| | | * | Implemented trapped chests & othersTiger Wang2014-07-071-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
| * | | 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
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp
| | * | Fixed arrow collection animationTiger Wang2014-07-092-22/+4
| | | | | | | | | | | | | | | | * Fixed piston extension non-solidness
| | * | Merge pull request #1135 from mc-server/fixesTiger Wang2014-07-0912-83/+205
| | |\ \ | | | |/ | | |/| Fixes to projectiles and the undead
| | | * 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
| | | | | | | | | | | | | | | | | | | | * Fixed potential invalid pointer dereferencing, fixes #1117 * Fixed ender pearls not being loaded properly
| | | * Eps comparisonTiger Wang2014-07-042-2/+2
| | | |
| | | * SuggestionsTiger Wang2014-07-022-8/+14
| | | |
| | | * Vector clamping fixesTiger Wang2014-07-011-4/+8
| | | | | | | | | | | | | | | | Thank you, @madmaxoft.
| | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed arrows not being collectable/not truly hitting a block/not lodging into blocks/not going in far enough * Fixed projectiles not playing their block hit animation owning to being destroyed too quickly
| | * | Merge pull request #1138 from mc-server/enderchestMattes D2014-07-022-15/+29
| | |\ \ | | | | | | | | | | Properly implemented enderchests
| | | * | 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
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp
| | | * | | 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
| | |/ / | | | | | | | | | | | | * Fixes #1103
| | * | Likely fixed too quick food depletionTiger Wang2014-06-281-1/+1
| | | | | | | | | | | | | | | | * Fixes FS427 properly, hopefully
| | * | Fixed server forcing players afloatTiger Wang2014-06-281-1/+4
| | | | | | | | | | | | | | | | * Fixes #1131
| | * | Merged branch 'howaner/Bow'.Mattes D2014-06-263-13/+46
| | |\ \ | | | | | | | | | | | | | | | Removed the pickup collection broadcast due to bad code.
| | | * | 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
| | | | | | | | | | | | | | | | Changed effect map to take a pointer of the effect as a result.
| * | | 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
| | | | | | | | | | | | | | | | Added second AddEntityEffect with a pass-by-value of the class.
| * | | 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
| | | | | | | | | | | | | | | | Changed HandleEntityEffect to use cEntityEffect's ticks instead of a static counter
| * | | Fixed MSVC compilation.madmaxoft2014-06-171-4/+7
| | | |
| * | | Pawn: renamed HandleEntityEffects to HandleEntityEffectarchshift2014-06-174-6/+8
| | | | | | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua
| * | | 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
| | | | | | | | | | | | | | | | Clears entity effects on death
| * | | Implemented milk, added documentation to Pawn.harchshift2014-06-173-1/+36
| | | |
| * | | Pawn.cpp: fixed effect iterator BAD_ACCESSarchshift2014-06-172-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | Erasure was occurring before the iterator increased, causing a bad access. Solved by storing map pairs in variables and manually updating iterator before erasure. Fixed mix-up in function arguments on food poisoning
| * | | Pawn: Enabled entity effect broadcast, added typedefarchshift2014-06-172-4/+6
| | | | | | | | | | | | | | | | Typedef'd std::map<cEntityEffect::eType, cEntityEffect> to tEffectMap
| * | | EntityEffect: read-only getters, added user and distance modifier fieldsarchshift2014-06-173-11/+35
| | | | | | | | | | | | | | | | | | | | User: the pawn that uses or produces the entity effect (drinks/throws a potion) Distance modifier: the potency modifier from splash potion effectivity radius
| * | | Player: Removed food-poisoning-specific code, set duration to 30 secondsarchshift2014-06-172-26/+2
| | | | | | | | | | | | | | | | http://minecraft.gamepedia.com/Hunger#Behavior
| * | | Entity effects: Added handlers for entity effectsarchshift2014-06-174-13/+138
| | | | | | | | | | | | | | | | | | | | | | | | Implemented hunger, instant health, damage, poison, regen Added "template" entity effect implementations
| * | | 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
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * | 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
| | | | | | | | | | | | | | | | | | | | | Furnace.txt: newline BlockID: removed extraneous dimension mapping cEntity: fixed typo cPlayer: WorldPtr typedef
* | | Reverted portal creation codeTiger Wang2014-06-142-103/+0
| | | | | | | | | | | | It wasn't really working and needs more development
* | | 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
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * | Fixed deadlock when moving players to other worlds.Mattes D2014-06-083-15/+18
| | | | | | | | | | | | Fixes #1039, fixes #851
| * | Added queue for adding entities to cWorld.Mattes D2014-06-083-4/+5
| | | | | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed.
| * | 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
| | | | | | | | | | | | This was only logspam on most servers and there are alternative ways to list players' permissions.
| * | Merge pull request #844 from mc-server/ProjectileHitBlockMattes D2014-06-011-2/+2
| |\ \ | | | | | | | | OnProjectileHitBlock tweak.
| | * | 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
| |\ \ \ | | |_|/ | |/| | Chunksparsing with segments
| | * | Merge branch 'master' into chunksparsing/structsTycho2014-05-246-16/+300
| | |\ \
| | * \ \ Merge branch 'master' into chunksparsing/structsTycho2014-05-108-136/+125
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.h
| | * \ \ \ Merge branch 'master' into chunksparsing/structsTycho2014-05-0127-890/+1015
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into chunksparsing/structsTycho2014-04-2710-184/+328
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h
| | * | | | | | Implemented Chunk Sparsing with segmentsTycho2014-04-261-3/+2
| | | | | | | |
* | | | | | | | Implemented bed homesTiger Wang2014-06-013-16/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented bed home positions * Fixed some inventory and health server/client mismatches after world change
* | | | | | | | Implemented end and nether portalsTiger Wang2014-05-314-11/+150
|/ / / / / / /
* | | | | | | Merge branch 'master' into achievementtranslateTiger Wang2014-05-253-16/+62
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp
| * | | | | | Fixed datatype conversion warning.Mattes D2014-05-231-2/+2
| | | | | | |
| * | | | | | Merge pull request #1015 from mc-server/Statsxdot2014-05-212-14/+60
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Statistics
| | * | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Implemented cacti damage
| * | | | | | DerpAlexander Harkness2014-05-191-1/+1
| | | | | | |
| * | | | | | Should have fixed assumptions about entity width.Alexander Harkness2014-05-191-4/+5
| | | | | | | | | | | | | | | | | | | | | @madmaxoft can you comment?
| * | | | | | Fixed clanging errors.Alexander Harkness2014-05-191-5/+5
| | | | | | | | | | | | | | | | | | | | | Please @tigerw make sure this is correct.
| * | | | | | Implemented cacti damageTiger Wang2014-05-182-0/+26
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | + Implemented cacti damage * Fixed pickup tossing (PR #994 bug)
* | | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Vector3.h
| * \ \ \ \ Merge branch 'master' into redstoneimprovementsTiger Wang2014-05-0427-885/+983
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp
| * | | | | Redstone simulator now directly accesses cChunkTiger Wang2014-04-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes
* | | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | Add entity invulnerable
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files.
| | * | | | | | 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Fixed lots of warnings, and other small changes.
| | * | | | More small fixes.archshift2014-04-261-1/+1
| | | | | |
| | * | | | Further refactored, Reverted Minecart changearchshift2014-04-264-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | Other small changes.
| | * | | | 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Mobs shouldn't burn when it's Raining
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Mob Knockback is far too much #776
| | * | | | | 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
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | Chicken eggs and ender pearls can hit entities.
| | * | | | | 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
| | | |/ / / | | |/| | | | | | | | | | | | | | | Fixed warning by adding dedicated m_HasTeleported for fired arrows.
| * / | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | * Also fixed a potential issue with position sending - if someone moved slowly enough, their position would never be updated.
* | | | | Implemented suggestionsTiger Wang2014-04-241-7/+6
| | | | |
* | | | | Merge branch 'master' into fixesTiger Wang2014-04-245-10/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h
| * | | | Merge pull request #925 from archshift/masterMattes D2014-04-232-0/+16
| |\ \ \ \ | | | | | | | | | | | | Added monsters.ini rule for fireproof mobs.
| | * | | | 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
| |\| | | | | | | | | | | | | | | | Added flag for fireproof entities.
| | * | | | Fixed indentation and changed m_Fireproof to m_IsFireproof.archshift2014-04-222-14/+14
| | | | | |
| | * | | | Lay foundation for fireproof entities.archshift2014-04-222-3/+15
| | |/ / / | | | | | | | | | | | | | | | Prevent any entities with the m_Fireproof flag from taking fire or lava damage.
| * | | | Merge pull request #909 from jfhumann/fixesMattes D2014-04-223-7/+8
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Bug fixes and optimizations. We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
| | * | | 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
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp
| | * | | | 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
|/ / / / / | | | | | | | | | | | | | | | * Added comments to BroadcastMovementUpdate() and the collision tracer
* | / / / Fixed #906Tiger Wang2014-04-181-0/+10
| |/ / / |/| | |
* | | | Merge pull request #891 from mc-server/fixesMattes D2014-04-176-118/+118
|\ \ \ \ | | | | | | | | | | Fixes to redstone & general
| * | | | Entities handle chunks properly againTiger Wang2014-04-126-118/+118
| |/ / / | | | | | | | | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty
* / / / Added new AI rulesTiger Wang2014-04-174-39/+36
|/ / / | | | | | | | | | | | | | | | | | | + Added new AI rules handling cacti and large heights * Fixed cIniFile not recognising comments in cIniFile::ReadFile() * Fixed users.ini not being properly generated * Changed all instances of (int)floor(GetPosXXX()) to POSXXX_TOINT
* | | Fixed Endiannes conversion routines for floats and doubles.madmaxoft2014-04-051-1/+1
| | | | | | | | | | | | | | | This bug has been introduced in 8825d30aabbee8cb2e452dc5a17deb6f9b6892a7. This change fixes #854.
* | | 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
|\ \ | | | | | | | | | | | | | | | Conflicts: src/DeadlockDetect.cpp src/World.cpp
| * | 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
| | | | | | | | | | | | Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
| * | 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
|\ \ \ | | |/ | |/| Projectile hooks
| * | 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
| | | | Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
* Minor Entity.cpp cleanupTiger Wang2014-03-201-12/+9
|
* Merge branch 'master' into awesometntTiger Wang2014-03-1814-75/+213
|\ | | | | | | | | Conflicts: src/ChunkMap.cpp
| * Merge pull request #782 from mc-server/bedsMattes D2014-03-161-3/+14
| |\ | | | | | | Beds now work properly, fixes #707
| | * Beds now work properly fixes #707Tiger Wang2014-03-091-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp
| * | 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
| | | | | | | | | | | | | | | | | | | | 3 damage for blazes and 1 for the ender dragon. Otherwise 0
| * | | | 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
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp
| * | | | Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-092-20/+36
| |\| | | | | | | | | | | | | Add TNT load/save
| | * | | 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
| |\ \ \ | | | | | | | | | | Ballistic firework missiles
| | * | | Merge branch 'master' into ballisticmissilesTiger Wang2014-03-096-43/+42
| | |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| | * | | 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
| | | | | | | | | | | | | | | | | | | | + Added fireworks
* | | | | 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
|/ / | | | | | | | | | | | | + TNT now has a chance of flinging FallingBlock entities around * Improved TNT damage * Improved TNT spawning visuals * Possible fix for 'SetSwimState failure' messages in debug
* | 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
| | | | | | | | This fixes my concerns in PR #709.
* | Merge pull request #709 from Howaner/GlobalFixesMattes D2014-02-281-7/+6
|\ \ | |/ |/| Add 'Group not found', when the Server load the users.ini and add auto g...
| * 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
| |\ | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp
| | * Properly exported and documented paintingsTiger Wang2014-02-181-2/+2
| | |
| | * Implemented paintings, fixes #689Tiger Wang2014-02-183-0/+87
| | | | | | | | | | | | + Implemented paintings
| * | Changed BlockFace type to eBlockFaceTiger Wang2014-02-182-13/+26
| | |
| * | Added a braceTiger Wang2014-02-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ==== { } { __ } { | | } ==== REMOVE ALL THE BRACES!!
| * | Implemented item frames, a part of #689Tiger Wang2014-02-183-0/+153
| |/ | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
| * Links sent via chat messages are clickable.madmaxoft2014-02-161-1/+2
| | | | | | | | Fixes #658.
| * Fixed minor formatting issues from #682Tiger Wang2014-02-163-16/+3
| | | | | | | | | | - Removed unused PlaySoundEffect * Simplified and parenthesised code
| * 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
| | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
| * Merge pull request #679 from mc-server/NotchDeathAlexander Harkness2014-02-151-0/+6
| |\ | | | | | | NotchApple
| | * 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
| |/ | | | | | | | | | | | | - Attack() is now called from cAggressive instead of cMonster * Monsters can no longer attack through walls * Should fix last remnants of player damage after teleporting (that both STR and bearbin contributed fixes to :P)
* / Map item handler; Fixed several bugsandrew2014-02-171-0/+3
|/
* Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-096-25/+11
|\ | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| * Merge pull request #649 from mc-server/GroupsPermissionsMattes D2014-02-052-14/+0
| |\ | | | | | | Removed deprecated HasCommand function
| | * 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
|\| | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * | Improved Type safety of eBlockFaceTycho2014-02-043-22/+22
| |/ | | | | | | May Fix #640
* | Fixed a boat ASSERTTiger Wang2014-02-091-2/+8
| |
* | Improved chat messaging functionsTiger Wang2014-02-072-17/+8
| | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API.
* | 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
| | | | | | | | | | It didn't do anything without Initialize() exported, anyway, pickups are spawned with cWorld.
* | Added SendMessageXXX() to cPlayerTiger Wang2014-02-031-0/+3
| | | | | | | | | | | | As requested by @bearbin, one no longer needs to download a file that links to Core. The server does it! Hopefully this encourages standards compliance.
* | 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
| |\ | | | | | | Redstone crash fix and current console line replace function
| | * Creative players take Plugin damageTiger Wang2014-02-022-3/+4
| | |
* | | Server now handles join messages alsoTiger Wang2014-02-031-1/+7
|/ / | | | | | | * Revised as well hook documentation
* | Merge pull request #585 from daniel0916/hooksMattes D2014-02-011-0/+2
|\ \ | |/ |/| Added "player destroying" and "player destroyed" hooks
| * Removed "player destroying" hookdaniel09162014-02-011-3/+1
| |
| * Added "player destroying" and "player destroyed" hooksdaniel09162014-01-251-0/+4
| | | | | | | | | | | | | | | | Hooks: HOOK_PLAYER_DESTROYING HOOK_PLAYER_DESTROYED Idea from: https://github.com/mc-server/MCServer/issues/473
* | 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
|\ \ | | | | | | Minecart improvements
| * | 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
| | | | | | | | | | | | | | | * Added direction XM_XP * Improved performance, thanks STR and xoft
| * | Minecart improvements and fixesTiger Wang2014-01-191-33/+43
| | | | | | | | | | | | | | | | | | * Fixed curved rails * Fixed detector rails in certain situations * Fixed powered rails and others passing bad meta to SnapToRail()
| * | 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
| | | | | | | | | | | | | | | | | | + Implemented collision on one type of rail * Improved curved rails somewhat * Fixed a crash bug
* | | Two minor changesTiger Wang2014-01-251-5/+3
| | |
* | | Implemented fall damage for mobsTiger Wang2014-01-253-5/+8
| | | | | | | | | | | | | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros
* | | Implemented pickup combiningTiger Wang2014-01-251-0/+55
| | | | | | | | | | | | | | | * Fixes FS393 * Part of #131
* | | All mobs now drown (fixes #54)Tiger Wang2014-01-254-127/+130
| | | | | | | | | | | | | | | * Implemented mob drowning * Iron Golems and squids are excluded
* | | 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
| | | | | | | | | | | | | | | | | | This should fix issues reported in: http://forum.mc-server.org/showthread.php?tid=1328 http://forum.mc-server.org/showthread.php?tid=1308
* | | 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
|\ \ | | | | | | Added cWorld::SpawnMinecart.
| * | 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
| | | | | | | | | | | | Also fixed an issue with TossItems not respecting count.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed curved rails being a little broken + Implemented detector rails + Implemented block collisions on rails * Fixed snapping to rail - Removed minecart physics conditions in Entity.cpp as minecarts use their own simulator when on rails Fixes #148 and #217; partially implemented #215. This is Cave Johnson, and we're done here.
* | Detaching improvementsTiger Wang2014-01-134-4/+34
| | | | | | | | | | * Players now search for an area around themselves to teleport to when detaching from something
* | Multiple enhancements and fixes to minecartsTiger Wang2014-01-123-132/+190
|/ | | | | | + They are destroyed instantly by creative mode * Physics is much improved + Basic implementation of powered rails
* 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
| | | | Also removed an unused inline header file (yuck).
* 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
| |\ | | | | | | Repeaters, pressure plates, and others
| | * 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
| | | | | | | | | | | | | | | | | | | | | * Critical hits now actually increase damage * Looking down at an entity and hitting them still produces upwards motion (as per Vanilla experience) * Reduced force to be more realistic
| | * 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
| |\ | | | | | | Multiple fixes
| | * 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
| | | | | | | | | | When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread. Final fix for #187.
| * 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
| |\ | | | | | | Shoot to function
| | * 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
| |\ | | | | | | Redstone and configuration improvements
| | * Improved player permissions loggingTiger Wang2013-12-141-1/+1
| | |
| | * Fixes to redstone wire and torchesTiger Wang2013-12-141-1/+1
| | | | | | | | | | | | | | | | | | + Wires now power blocks around the block beneath * Torches no longer power off if it is on a linked powered block * Enhanced code, split functions, etc.
| | * 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
|\ | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Fixed normalizing large angles.madmaxoft2013-12-081-6/+3
| |
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-083-3/+3
| | | | | | | | Ref.: #407
* | Renamed animation functionTiger Wang2013-12-071-3/+3
| | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* | 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
| | | | | Conflicts: VC2008/MCServer.vcproj
* Attempt to fix compilationTiger Wang2013-11-241-2/+2
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-244-70/+298
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-2418-0/+6466
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 08:36:44 +0100