Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Moved tall grass pickups handle. | Howaner | 2014-10-21 | 1 | -9/+0 |
| | |||||
* | Leaves are harvest-able. | Howaner | 2014-10-07 | 1 | -2/+0 |
| | |||||
* | Corrected drops from dead bush, tall grass and cobweb. | Howaner | 2014-10-07 | 2 | -11/+35 |
| | |||||
* | Fixed sorting | Masy98 | 2014-10-01 | 1 | -2/+2 |
| | |||||
* | Fixed Red Sandstone and Prismarine drops | Masy98 | 2014-10-01 | 2 | -17/+23 |
| | |||||
* | Fixed 1.8 dirt types | Howaner | 2014-09-30 | 1 | -2/+25 |
| | |||||
* | Merge pull request #1415 from Masy98/blocks | Mattes D | 2014-09-26 | 3 | -28/+72 |
|\ | | | | | Added 1.8 Blocks and Items | ||||
| * | Moved curly brace to seperate line | Masy98 | 2014-09-26 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'master' into blocks | Masy98 | 2014-09-26 | 9 | -38/+112 |
| |\ | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHandler.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | Fixed 1.8 Item stacking and block harvesting | Masy98 | 2014-09-12 | 1 | -25/+43 |
| | | | |||||
| * | | Added new doors in ItemDoor.h | Masy98 | 2014-09-11 | 1 | -1/+15 |
| | | | |||||
| * | | Fixed mutton name in Sheep.cpp | Masy98 | 2014-09-11 | 1 | -2/+10 |
| | | | |||||
| * | | Fixed mutton name in ItemHandler | Masy98 | 2014-09-11 | 1 | -1/+1 |
| | | | |||||
| * | | Added 1.8 food to the food list | Masy98 | 2014-09-11 | 1 | -1/+4 |
| | | | |||||
* | | | Removed more unessicary includes | Tycho | 2014-09-26 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -1/+0 |
|\ \ | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| * \ | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-14 | 6 | -7/+74 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-13 | 3 | -5/+8 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h | ||||
| * | | | | Fixed many right click issues. | Howaner | 2014-09-12 | 1 | -3/+7 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 8 | -8/+83 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| * | | | Improved cBlockHandler::DropBlock | Tiger Wang | 2014-09-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #1353 from mc-server/Effects | Mattes D | 2014-09-13 | 6 | -6/+73 |
| |\ \ \ | | |_|/ | |/| | | Added speed entity effect. | ||||
| | * | | Added extra mushroom handler. | Howaner | 2014-09-12 | 3 | -3/+60 |
| | | | | |||||
| | * | | Merge branch 'master' into Effects | Howaner | 2014-09-12 | 3 | -5/+9 |
| | |\| | |||||
| | * | | Merge branch 'master' into Effects | Howaner | 2014-09-02 | 2 | -2/+12 |
| | |\ \ | |||||
| | * | | | Fixed potion removing in creative mode. | Howaner | 2014-08-30 | 4 | -4/+14 |
| | | | | | |||||
| * | | | | Fixed farmland issues. | Howaner | 2014-09-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Only place farmland if no block is upper than dirt/grass. | Howaner | 2014-09-12 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | Added hoe interact sound. | Howaner | 2014-09-12 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Spawn exp if you break a mob spawner. | Howaner | 2014-09-12 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Disabled mobspawner itemdrop. | Howaner | 2014-09-12 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
* / | | | Added first test to show the object can be created | Tycho | 2014-09-17 | 1 | -28/+28 |
|/ / / | |||||
* | | | In 1.8, carrots and potatoes yield one less hunger point. | archshift | 2014-09-04 | 2 | -2/+2 |
| | | | |||||
* | | | Fixed style and alpha-sorting. | madmaxoft | 2014-09-03 | 2 | -7/+7 |
| | | | |||||
* | | | Added mutton, which sheep now drop when killed | archshift | 2014-09-03 | 2 | -0/+4 |
| |/ |/| | |||||
* | | Merge remote-tracking branch 'Hircine/Enchantments' | madmaxoft | 2014-09-01 | 1 | -1/+11 |
|\ \ | |||||
| * | | Fixes | Jaume Aloy | 2014-08-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | - 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 | ||||
| * | | Added some Enchantments | Jaume Aloy | 2014-08-19 | 1 | -1/+11 |
| | | | | | | | | | | | | | | | | | | - Bow enchantments: Infinity, Flame and Power - Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite, Sharpness | ||||
* | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-08-29 | 4 | -3/+12 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: src/Server.cpp | ||||
| * | | Code formatting fixes. | Howaner | 2014-08-19 | 2 | -2/+1 |
| |/ | |||||
| * | Fixed unsigned long comparison to size_t | archshift | 2014-08-05 | 1 | -1/+1 |
| | | |||||
| * | Changed arrow comment. | Howaner | 2014-08-04 | 1 | -1/+1 |
| | | |||||
| * | Added arrow consuming on shooting | Howaner | 2014-08-04 | 1 | -0/+10 |
| | | |||||
* | | Removed unused code | Tiger Wang | 2014-08-29 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1272 from Howaner/Food | Mattes D | 2014-08-01 | 4 | -25/+136 |
|\ | | | | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added... | ||||
| * | Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects. | Howaner | 2014-07-31 | 4 | -25/+136 |
| | | |||||
* | | Fixed water from ice and removed packed ice drop. | Howaner | 2014-07-31 | 1 | -0/+1 |
|/ | |||||
* | Hotfixed compilation problems. | madmaxoft | 2014-07-27 | 2 | -2/+2 |
| | |||||
* | Merge pull request #1236 from Howaner/Inventory2 | Mattes D | 2014-07-27 | 7 | -13/+107 |
|\ | | | | | Fix item durability. | ||||
| * | Derp. | Howaner | 2014-07-26 | 1 | -1/+1 |
| | | |||||
| * | Rename function. | Howaner | 2014-07-26 | 4 | -6/+6 |
| | | |||||
| * | Merge branch 'master' into Inventory2 | Howaner | 2014-07-26 | 5 | -13/+61 |
| |\ | | | | | | | | | | | | | Conflicts: src/BlockInfo.cpp | ||||
| * | | Fix item durability. | Howaner | 2014-07-23 | 5 | -10/+91 |
| | | | | | | | | | Fixes #1181 | ||||
* | | | Fixed indentations, removed redundant init code in SplashPotionEntity.cpp | archshift | 2014-07-26 | 1 | -3/+5 |
| | | | |||||
* | | | Moved potion static functions to EntityEffect to create splash potions through world | archshift | 2014-07-26 | 1 | -129/+7 |
| |/ |/| | |||||
* | | Fixed block drops | Tiger Wang | 2014-07-24 | 2 | -5/+43 |
| | | | | | | | | * Fixes #1242 (the issue addressed within) | ||||
* | | Merge remote-tracking branch 'origin/master' into saplingsandleaves | Tiger Wang | 2014-07-22 | 3 | -5/+5 |
|\| | | | | | | | | | Conflicts: src/Defines.h | ||||
| * | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 3 | -4/+4 |
| | | |||||
| * | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into saplingsandleaves | Tiger Wang | 2014-07-20 | 26 | -78/+136 |
|\| | | | | | | | | | | | Conflicts: src/Bindings/DeprecatedBindings.cpp src/Blocks/BlockSapling.h | ||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 2 | -2/+2 |
| | | |||||
| * | Merge pull request #1214 from mc-server/anti-glob | Mattes D | 2014-07-19 | 1 | -5/+49 |
| |\ | | | | | | | CMake - Explicitly lists all source files | ||||
| | * | Subdirs: Only add_library if not using MSVC | archshift | 2014-07-19 | 1 | -1/+3 |
| | | | |||||
| | * | Items/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+47 |
| | | | |||||
| * | | Splash potions: Renamed PotionParticleType to PotionColor for clarity | archshift | 2014-07-19 | 1 | -3/+3 |
| |/ | |||||
| * | Added a extra wall sign handler. | Howaner | 2014-07-18 | 1 | -3/+4 |
| | | | | | | Fixes #1119 | ||||
| * | Fixed tabs used for alignment. | madmaxoft | 2014-07-17 | 2 | -8/+8 |
| | | |||||
| * | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 3 | -6/+6 |
| | | |||||
| * | Basic style fixes. | madmaxoft | 2014-07-17 | 19 | -25/+25 |
| | | |||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 10 | -26/+39 |
| | | | | | | | | | | 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 issues relating to saplings and leaves | Tiger Wang | 2014-07-17 | 1 | -6/+3 |
|/ | | | | | | - Removed cBlockInfo::RequiresSpecialTool * Fixes #1195 * Fixes #1201 | ||||
* | Reformatted cItemPotionHandler. | madmaxoft | 2014-07-17 | 1 | -47/+77 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into potions | madmaxoft | 2014-07-17 | 1 | -1/+1 |
|\ | |||||
| * | Fixed a bug with buckets | Tiger Wang | 2014-07-16 | 1 | -1/+1 |
| | | | | | | | | | | * Additionally fixed cLineBlockTracer's EntryFace parameter when a block was hit on the first iteration along the projected line | ||||
* | | Merge branch 'master' into potions | madmaxoft | 2014-07-15 | 4 | -38/+58 |
|\| | |||||
| * | Fixed placing liquids over liquids | Tiger Wang | 2014-07-14 | 1 | -1/+1 |
| | | | | | | | | * Fixes #1182 | ||||
| * | Adjusted calls to CreateProjectile that passed Items | Tycho | 2014-07-13 | 1 | -2/+2 |
| | | |||||
| * | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 3 | -12/+5 |
| | | |||||
| * | Comment grammar correction | Tiger Wang | 2014-07-12 | 1 | -1/+1 |
| | | |||||
| * | Simplified buckets code slightly | Tiger Wang | 2014-07-12 | 1 | -32/+15 |
| | | |||||
| * | Merge pull request #1162 from daniel0916/Fixes | Tiger Wang | 2014-07-12 | 1 | -23/+67 |
| |\ | | | | | | | Fix for bucket placing | ||||
| | * | Changes | daniel0916 | 2014-07-12 | 1 | -5/+4 |
| | | | |||||
| | * | Changes | daniel0916 | 2014-07-11 | 1 | -24/+16 |
| | | | |||||
| | * | Changes | daniel0916 | 2014-07-10 | 1 | -20/+22 |
| | | | |||||
| | * | Maybe fixed whitespaces | daniel0916 | 2014-07-10 | 1 | -7/+7 |
| | | | |||||
| | * | Maybe fixed whitespaces | daniel0916 | 2014-07-10 | 1 | -1/+1 |
| | | | |||||
| | * | Fixed Bucket Placing | daniel0916 | 2014-07-10 | 1 | -6/+57 |
| | | | |||||
| | * | Fixed Bucket placing | daniel0916 | 2014-07-09 | 1 | -1/+1 |
| | | | |||||
* | | | ItemHandler.cpp: removed redundant food and drink checks | archshift | 2014-07-14 | 1 | -33/+0 |
| | | | |||||
* | | | Readability and clarity changes | archshift | 2014-07-14 | 1 | -30/+45 |
| | | | |||||
* | | | For now, removed creator member from Entity Effect for pointer safety | archshift | 2014-07-12 | 1 | -2/+2 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-10 | 5 | -11/+62 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
| * | | Fixed bow charge | Tiger Wang | 2014-07-09 | 1 | -11/+2 |
| |/ | |||||
| * | Only fixes the server crash. | Howaner | 2014-07-01 | 1 | -1/+1 |
| | | |||||
| * | Fix server-crash with non-existing items. | Howaner | 2014-07-01 | 1 | -1/+1 |
| | | |||||
| * | Implemented tripwire(s) (hooks) | Tiger Wang | 2014-06-28 | 2 | -0/+41 |
| | | | | | | | | * Fixes #944 | ||||
| * | Merge branch 'master' into Bow | Howaner | 2014-06-26 | 4 | -0/+14 |
| |\ | |||||
| | * | Nullify deleted pointers. | archshift | 2014-06-19 | 3 | -0/+3 |
| | | | |||||
| | * | Merge branch 'master' into GlobalFixes | Howaner | 2014-06-17 | 6 | -6/+6 |
| | |\ | |||||
| | * | | Add throw sound and fix arrow server crash. | Howaner | 2014-05-28 | 1 | -0/+11 |
| | | | | |||||
| * | | | Split Broadcast Sound Effect function call in multiple lines. | Howaner | 2014-06-16 | 1 | -1/+8 |
| | | | | |||||
| * | | | This isn't needed | Howaner | 2014-06-16 | 1 | -1/+0 |
| | | | | |||||
| * | | | Fix bow sound and creative arrow pickup. | Howaner | 2014-06-16 | 1 | -9/+8 |
| | |/ | |/| | |||||
* | | | EntityEffects.x -> EntityEffect.x, Object-Oriented effects | archshift | 2014-06-19 | 1 | -1/+1 |
| | | | | | | | | | | | | Changed effect map to take a pointer of the effect as a result. | ||||
* | | | Entity Effects: Clarified user, added it to AddEntityEffect | archshift | 2014-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | Added second AddEntityEffect with a pass-by-value of the class. | ||||
* | | | Changed the AddEntityEffect() params for easier calls. | madmaxoft | 2014-06-17 | 1 | -2/+1 |
| | | | |||||
* | | | Fixed MSVC compilation. | madmaxoft | 2014-06-17 | 1 | -7/+7 |
| | | | |||||
* | | | Pawn: renamed HandleEntityEffects to HandleEntityEffect | archshift | 2014-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua | ||||
* | | | Removed long function wrapping | archshift | 2014-06-17 | 1 | -10/+2 |
| | | | |||||
* | | | ItemHandler: changed IsDrinkable() to take a short argument | archshift | 2014-06-17 | 4 | -15/+10 |
| | | | |||||
* | | | Splash potion: Adjusted speed, fixed spawn position | archshift | 2014-06-17 | 1 | -6/+3 |
| | | | |||||
* | | | Entity effect type: use 'eff' as a prefix instead of 'ef' | archshift | 2014-06-17 | 1 | -33/+33 |
| | | | |||||
* | | | Added splash potion functionality | archshift | 2014-06-17 | 1 | -1/+35 |
| | | | |||||
* | | | Implemented drinkable potions, noeffect entity effect, | archshift | 2014-06-17 | 4 | -3/+146 |
| | | | | | | | | | | | | Clears entity effects on death | ||||
* | | | Implemented milk, added documentation to Pawn.h | archshift | 2014-06-17 | 3 | -1/+47 |
| | | | |||||
* | | | Player: Removed food-poisoning-specific code, set duration to 30 seconds | archshift | 2014-06-17 | 1 | -1/+1 |
|/ / | | | | | | | http://minecraft.gamepedia.com/Hunger#Behavior | ||||
* / | Fixed deadlock when moving players to other worlds. | Mattes D | 2014-06-08 | 6 | -6/+6 |
|/ | | | | Fixes #1039, fixes #851 | ||||
* | Cleaned up cPlayer::UpdateMovementStats; Wither achievements | andrew | 2014-05-20 | 1 | -0/+6 |
| | |||||
* | Merge pull request #989 from Howaner/Anvil | Mattes D | 2014-05-07 | 2 | -12/+0 |
|\ | | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ... | ||||
| * | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. | Howaner | 2014-05-07 | 2 | -12/+0 |
| | | |||||
* | | Merge branch 'master' into Slabs | Howaner | 2014-05-07 | 11 | -34/+282 |
|\ \ | |||||
| * | | Merge pull request #985 from Howaner/Anvil | Mattes D | 2014-05-06 | 6 | -0/+108 |
| |\| | | | | | | | Add anvil inventory. | ||||
| | * | Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count() | Howaner | 2014-05-06 | 6 | -26/+26 |
| | | | |||||
| | * | Add anvil window and slot area. | Howaner | 2014-05-05 | 6 | -0/+108 |
| | | | |||||
| * | | Suggestions'd | Tiger Wang | 2014-05-06 | 1 | -5/+9 |
| | | | |||||
| * | | Merge branch 'master' into fixes. | madmaxoft | 2014-05-02 | 6 | -18/+154 |
| |\| | |||||
| | * | Added a sanitizer for Spawn egg damage value. | madmaxoft | 2014-05-02 | 1 | -1/+39 |
| | | | | | | | | | | | | This disallows spawning unknown mobs from unknown spawn eggs. Ref.: #928. | ||||
| | * | Fixed projectile source filenames, indentations | archshift | 2014-04-28 | 1 | -1/+1 |
| | | | |||||
| | * | Moved cArrowEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 1 | -1/+1 |
| | | | |||||
| | * | Missed these CMakeLists. | archshift | 2014-04-25 | 1 | -1/+6 |
| | | | |||||
| | * | Add commit what the code is doing. | Howaner | 2014-04-25 | 1 | -0/+1 |
| | | | |||||
| | * | Add unkown armor warning and fix armor stacks. | Howaner | 2014-04-25 | 1 | -2/+14 |
| | | | |||||
| | * | Add armor to switch() in ItemHandler.cpp | Howaner | 2014-04-24 | 1 | -6/+25 |
| | | | |||||
| | * | Fix armor in survival mode. | Howaner | 2014-04-24 | 3 | -15/+76 |
| | | | |||||
| * | | Merge branch 'master' into fixes | Tiger Wang | 2014-04-24 | 2 | -3/+2 |
| |\| | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| | * | Fixed clang compilation errors. Apparently gcc and MSVC do not care about the order of initializer lists, but clang does. | jfhumann | 2014-04-18 | 1 | -1/+1 |
| | | | |||||
| | * | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 2 | -2/+1 |
| | | | |||||
| * | | Small changes | Tiger Wang | 2014-04-23 | 2 | -9/+10 |
| |/ | |||||
* | | Merge branch 'master' into Slabs | Howaner | 2014-04-06 | 5 | -18/+19 |
|\| | |||||
| * | Fixed Clang warnings in itemhandlers. | madmaxoft | 2014-04-04 | 5 | -18/+19 |
| | | |||||
* | | Add CanChangeDirtToGrass function to Block Handlers. | Howaner | 2014-04-06 | 2 | -1/+2 |
|/ | |||||
* | Fixed boat placement code. | madmaxoft | 2014-04-02 | 1 | -9/+17 |
| | |||||
* | Another curly | Tiger Wang | 2014-03-30 | 1 | -1/+2 |
| | |||||
* | Curly brackets | Tiger Wang | 2014-03-29 | 1 | -1/+4 |
| | |||||
* | Fixed infinite minecart items | Tiger Wang | 2014-03-28 | 1 | -0/+3 |
| | |||||
* | Some fixes to lilypads | Tiger Wang | 2014-03-28 | 2 | -0/+108 |
| | | | | | | | | * Fixed placement on lava * Fixed placement on side of blocks * Fixed placement through blocks + Added washing-away of pads + Added ice as a block that fully occupies its voxel | ||||
* | Implemented lilypad placement | Tiger Wang | 2014-03-23 | 1 | -4/+4 |
| | |||||
* | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-18 | 5 | -4/+75 |
|\ | | | | | | | | | Conflicts: src/ChunkMap.cpp | ||||
| * | Merge pull request #809 from Howaner/BlockEntitys | Mattes D | 2014-03-16 | 3 | -2/+27 |
| |\ | | | | | | | More entity saving. | ||||
| | * | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-15 | 3 | -14/+17 |
| | |\ | |||||
| | * | | Add fireball interact | Howaner | 2014-03-14 | 3 | -2/+27 |
| | | | | |||||
| * | | | Add new leaves to all classes. | Howaner | 2014-03-16 | 2 | -2/+4 |
| | | | | |||||
| * | | | Add cake | Howaner | 2014-03-16 | 2 | -0/+44 |
| | |/ | |/| | |||||
* | | | Merge remote-tracking branch 'origin/master' into awesometnt | Tiger Wang | 2014-03-10 | 2 | -5/+5 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | Merge pull request #768 from Howaner/BlockEntitys | Tiger Wang | 2014-03-09 | 1 | -2/+2 |
| |\| | | | | | | | Add TNT load/save | ||||
| | * | Change TNT Fuse to ticks | Howaner | 2014-03-08 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #731 from mc-server/ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -3/+3 |
| |\ \ | | | | | | | | | Ballistic firework missiles | ||||
| | * \ | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 4 | -17/+41 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| | * | | | Implemented ballistic missiles (fireworks) | Tiger Wang | 2014-02-27 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | + Added fireworks | ||||
* | | | | | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-10 | 3 | -12/+15 |
|\| | | | | |||||
| * | | | | Merge branch 'master' into warnings | Tycho | 2014-03-08 | 1 | -11/+11 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | cBlockInfo-related changes from #723 | andrew | 2014-03-08 | 1 | -11/+11 |
| | | |/ | | |/| | |||||
| * / | | Fixed warnings | Tycho | 2014-03-07 | 1 | -0/+3 |
| |/ / | |||||
| * | | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 1 | -1/+1 |
| | | | |||||
* | | | Added extra awesomeness to TNT | Tiger Wang | 2014-03-05 | 1 | -1/+1 |
|/ / | | | | | | | | | | | | | + 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::XXX | andrew | 2014-03-01 | 1 | -1/+1 |
| | | |||||
* | | Fixed multiple gcc warnings about unused params. | madmaxoft | 2014-02-28 | 1 | -1/+25 |
| | | |||||
* | | Fixed crash and some warnings in map handling. | madmaxoft | 2014-02-27 | 1 | -3/+3 |
|/ | | | | Fixes #728. | ||||
* | Fixed MCServer not compiling with C++03 compilers | STRWarrior | 2014-02-24 | 1 | -3/+3 |
| | |||||
* | Maps: Improvements | andrew | 2014-02-23 | 2 | -2/+2 |
| | |||||
* | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 5 | -3/+203 |
|\ | |||||
| * | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 2 | -0/+44 |
| |\ | | | | | | | Add Skulls/Heads to MCServer | ||||
| | * | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 2 | -6/+4 |
| | | | |||||
| | * | Add Heads completely | Howaner | 2014-02-18 | 1 | -0/+1 |
| | | | |||||
| | * | Add Skulls/Heads | Howaner | 2014-02-17 | 2 | -0/+45 |
| | | | |||||
| * | | Merge branch 'master' into itemframes | Tiger Wang | 2014-02-18 | 2 | -2/+102 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp | ||||
| | * | | Comments & new BLOCK_FACE constants | Tiger Wang | 2014-02-18 | 1 | -7/+10 |
| | | | | |||||
| | * | | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 2 | -2/+99 |
| | |/ | | | | | | | | | | + Implemented paintings | ||||
| * | | Fixed possible ASSERT failure | Tiger Wang | 2014-02-18 | 1 | -1/+1 |
| | | | |||||
| * | | Changed BlockFace type to eBlockFace | Tiger Wang | 2014-02-18 | 1 | -13/+1 |
| | | | |||||
| * | | Added an explanatory comment | Tiger Wang | 2014-02-18 | 1 | -0/+2 |
| | | | |||||
| * | | Used new BLOCK_FACE constants | Tiger Wang | 2014-02-18 | 1 | -7/+8 |
| | | | | | | | | | Also added more comments | ||||
| * | | Implemented item frames, a part of #689 | Tiger Wang | 2014-02-18 | 2 | -0/+65 |
| |/ | | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!) | ||||
| * | Fixed TNT fizzing everywhere | Tiger Wang | 2014-02-15 | 1 | -1/+1 |
| | | |||||
* | | Map decorators; Map clients | andrew | 2014-02-18 | 1 | -2/+2 |
| | | |||||
* | | Map item handler; Fixed several bugs | andrew | 2014-02-17 | 4 | -1/+68 |
| | | |||||
* | | cMap::UpdateRadius | andrew | 2014-02-15 | 1 | -2/+4 |
| | | |||||
* | | EmptyMap item handler | andrew | 2014-02-14 | 2 | -0/+48 |
|/ | |||||
* | Added additional parenthasies | worktycho | 2014-02-10 | 1 | -2/+1 |
| | |||||
* | Merge branch 'master' into boatsFix | Tycho | 2014-02-10 | 1 | -0/+1 |
|\ | | | | | | | | | Conflicts: src/Items/ItemBoat.h | ||||
| * | Maybe fixed boat placing | tonibm19 | 2014-02-10 | 1 | -1/+1 |
| | | |||||
* | | Fixed stupid mistax in conditional | worktycho | 2014-02-10 | 1 | -2/+1 |
|/ | | | boats can't be placed if the face is not block_face_none and not block_face_YM, not if it is only not one. | ||||
* | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 28 | -40/+40 |
|\ | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | Improved Type safety of eBlockFace | Tycho | 2014-02-04 | 28 | -40/+40 |
| | | | | | | | | May Fix #640 | ||||
* | | Fixed #626 | Tiger Wang | 2014-02-03 | 3 | -13/+38 |
|/ | | | | * Fixed consumption of carrots and potatoes | ||||
* | Changed Signiture of OnUpdate | Tycho | 2014-02-02 | 3 | -4/+13 |
| | |||||
* | Changed pointers to references | Tycho | 2014-02-01 | 2 | -2/+2 |
| | |||||
* | Refactored GetPlacementBlockTypeMeta | Tycho | 2014-01-26 | 2 | -3/+6 |
| | |||||
* | Fixed flint&steel failure on the Y world edges. | madmaxoft | 2014-01-24 | 1 | -0/+4 |
| | |||||
* | Merge pull request #534 from mc-server/SpawnMinecart | Mattes D | 2014-01-17 | 1 | -1/+1 |
|\ | | | | | Added cWorld::SpawnMinecart. | ||||
| * | Renamed cEmptyMinecart to cRideableMinecart | STRWarrior | 2014-01-12 | 1 | -1/+1 |
| | | |||||
| * | EmptyMinecarts should be able to get a block inside of them. | STRWarrior | 2014-01-12 | 1 | -1/+1 |
| | | |||||
* | | Removed internal cEntity::GetRot() usage. | madmaxoft | 2014-01-17 | 4 | -4/+4 |
| | | |||||
* | | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 4 | -4/+4 |
| | | |||||
* | | Renamed g_TorchPlaceable... | Tiger Wang | 2014-01-11 | 1 | -1/+1 |
|/ | | | | ...to g_FullyOccupiesVoxel, as recommended by @bearbin | ||||
* | Fixed a few MSVC warnings. | madmaxoft | 2014-01-07 | 1 | -1/+0 |
| | |||||
* | Implented OnPlayerFishing and OnPlayerFished. | STRWarrior | 2013-12-30 | 1 | -1/+7 |
| | |||||
* | converted commneted paramater names to the unused macro | Tycho Bickerstaff | 2013-12-22 | 1 | -1/+7 |
| | |||||
* | Merge branch 'master' of github.com:mc-server/MCServer | Tycho Bickerstaff | 2013-12-22 | 1 | -29/+173 |
|\ | |||||
| * | You are now able to sweep mobs to your position using fishing rods. | STRWarrior | 2013-12-25 | 1 | -26/+64 |
| | | |||||
| * | Made the lure enchantment work. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | |||||
| * | Countdown time is between 100 and 900 ticks. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | |||||
| * | Using regular assignments. | STRWarrior | 2013-12-21 | 1 | -6/+6 |
| | | |||||
| * | Once again better Y direction for the items given when fishing. | STRWarrior | 2013-12-21 | 1 | -2/+2 |
| | | |||||
| * | You are now able to get different items from fishing. | STRWarrior | 2013-12-21 | 1 | -2/+108 |
| | | |||||
* | | Root is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-21 | 1 | -2/+7 |
|\ | |||||
| * | Fixed bug where you could pickup the floater only to get one spawned instantly or the other way around. | STRWarrior | 2013-12-21 | 1 | -0/+5 |
| | | |||||
| * | Increased the range an Floater can shoot to. | STRWarrior | 2013-12-20 | 1 | -1/+1 |
| | | |||||
| * | Fish now actualy jumps to the player instead of a few block bellow them. | STRWarrior | 2013-12-20 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 3 | -0/+85 |
|\| | |||||
| * | Merge pull request #450 from mc-server/redstonefixes | Mattes D | 2013-12-19 | 1 | -0/+5 |
| |\ | | | | | | | Multiple fixes | ||||
| | * | Fixed dust from being placed on nonsolids | Tiger Wang | 2013-12-19 | 1 | -0/+5 |
| | | | |||||
| * | | You can get fish from fishing :D. Only one type of fish though. | STRWarrior | 2013-12-19 | 1 | -12/+27 |
| | | | |||||
| * | | Implented cItemFishingRodHandler. | STRWarrior | 2013-12-19 | 2 | -0/+65 |
| |/ | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-18 | 4 | -46/+169 |
|\| | |||||
| * | Implented Nether Wart. | STRWarrior | 2013-12-18 | 2 | -0/+56 |
| | | |||||
| * | Fixed naming and initialization. | madmaxoft | 2013-12-17 | 1 | -4/+12 |
| | | |||||
| * | Forgot to change one Vector3d to Vector3i. | STRWarrior | 2013-12-17 | 1 | -1/+1 |
| | | |||||
| * | Renamed Pos to m_Pos. | STRWarrior | 2013-12-17 | 1 | -3/+3 |
| | | |||||
| * | Using Recommendations. | STRWarrior | 2013-12-17 | 1 | -10/+23 |
| | | |||||
| * | Made buckets work when the player does not 'look' at a block. This fixes #265 | STRWarrior | 2013-12-17 | 1 | -32/+53 |
| | | |||||
| * | Boats spawn on top of a block. not between 4 blocks. | STRWarrior | 2013-12-16 | 1 | -1/+1 |
| | | |||||
| * | Using suggestions for Boat placing. | STRWarrior | 2013-12-16 | 1 | -1/+1 |
| | | |||||
| * | You can spawn boats on water. | STRWarrior | 2013-12-16 | 1 | -7/+32 |
| | | |||||
* | | more cmake stuff | Tycho Bickerstaff | 2013-12-10 | 1 | -0/+7 |
|/ | |||||
* | Bonemeal has particles, fixes #393 | Tiger Wang | 2013-12-08 | 1 | -3/+2 |
| | |||||
* | Spawn eggs use IsGameMode() | Tiger Wang | 2013-12-06 | 1 | -2/+2 |
| | | | | Possible fix for #316. | ||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 4 | -4/+50 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 30 | -0/+2173 |