Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed confusion over Item Frame directions | Tiger Wang | 2015-03-13 | 2 | -65/+65 |
| | |||||
* | Merge branch 'master' into Inventory | Howaner | 2015-03-09 | 4 | -72/+78 |
|\ | |||||
| * | Added OnTeleportEntity hook for plugins. | joshi07 | 2015-03-05 | 2 | -12/+21 |
| | | | | | | | | | | Plugins may or may not allow teleport to the new position. Updated the HookNotify plugin with it. | ||||
| * | Changed C-styled casts to static_cast and removed unneeded casts | DevToaster | 2015-02-28 | 1 | -34/+34 |
| | | |||||
| * | Replaced short int with int for Player experience | DevToaster | 2015-02-28 | 1 | -1/+1 |
| | | |||||
| * | modified: src/Entities/Player.cpp | DevToaster | 2015-02-28 | 2 | -27/+27 |
| | | | | | | | | modified: src/Entities/Player.h | ||||
| * | use DoSetSpeed in AddSpeed* in Entity.cpp | Raekye | 2015-02-26 | 1 | -10/+4 |
| | | |||||
| * | Spacing | Howaner | 2015-02-07 | 1 | -1/+1 |
| | | |||||
| * | cPlayer should override IsOnGround() | Howaner | 2015-02-07 | 2 | -3/+3 |
| | | |||||
| * | Added IsOnGround() to cEntity | Howaner | 2015-02-07 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into Inventory | Howaner | 2015-02-06 | 2 | -10/+32 |
|\| | |||||
| * | Converted cServer to use the cNetwork API. | Mattes D | 2015-01-27 | 2 | -10/+32 |
| | | |||||
* | | Merge branch 'master' into Inventory | Howaner | 2015-01-25 | 38 | -91/+206 |
|\| | |||||
| * | Fixed type-conversion warnings. | Mattes D | 2015-01-18 | 3 | -7/+7 |
| | | |||||
| * | Converted cPickupEntity to std::chrono | Tycho | 2015-01-16 | 2 | -12/+12 |
| | | |||||
| * | Converted MinecartEntity to std::chrono | Tycho | 2015-01-16 | 2 | -8/+8 |
| | | |||||
| * | Converted cExpOrbEntity to std::chrono | Tycho | 2015-01-16 | 2 | -7/+7 |
| | | |||||
| * | Converted ArrowEntityTiers to std::chrono | Tycho | 2015-01-16 | 2 | -7/+7 |
| | | |||||
| * | Initial convertion of a_Dt to std::chrono | Tycho | 2015-01-11 | 38 | -69/+69 |
| | | | | | | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay | ||||
| * | APIDump: Updated the player block placement documentation. | Mattes D | 2014-12-24 | 1 | -1/+2 |
| | | | | | | | | The hooks now have fewer parameters but are called on all player-placed blocks (#1618). | ||||
| * | Replaced a std::hash specialization with explicit type. | Mattes D | 2014-12-24 | 1 | -1/+1 |
| | | | | | | | | std::hash is problematic in gcc / clang, one has a class, the other a struct. | ||||
| * | Refactored all player block placing to go through hooks. | Mattes D | 2014-12-24 | 2 | -0/+114 |
| | | | | | | | | Fixes #1618. | ||||
* | | Merge branch 'master' into Inventory | Howaner | 2014-12-17 | 1 | -0/+6 |
|\| | |||||
| * | Added braces to 'if' according to the code guidelines | gushromp | 2014-12-15 | 1 | -0/+2 |
| | | |||||
| * | Updated cPlayer::DoMoveToWorld to send target world's weather info to Player | blashyrk | 2014-12-15 | 1 | -0/+4 |
| | | |||||
* | | Own classes for all windows. | Howaner | 2014-12-13 | 2 | -1/+2 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-12-06 | 2 | -11/+40 |
|\ | | | | | | | | | Conflicts: src/OSSupport/Thread.cpp | ||||
| * | BasicStyle: Added missing braces to control statements. | Mattes D | 2014-12-05 | 2 | -10/+39 |
| | | |||||
| * | Fixed reported parentheses around comparisons. | Mattes D | 2014-12-05 | 1 | -1/+1 |
| | | |||||
* | | Merged branch 'origin/master' into c++11. | Mattes D | 2014-12-04 | 2 | -7/+12 |
|\| | |||||
| * | Updated whitespace in comment, changed conditional to logical equivalent due to popular demand | Jonathan Fabian | 2014-12-04 | 1 | -2/+2 |
| | | |||||
| * | Fix Spaces to Tabs | Jonathan Fabian | 2014-12-03 | 1 | -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 Fabian | 2014-12-03 | 1 | -6/+11 |
| | | |||||
| * | Minecart.h: Fixed integral conversion warning. | Mattes D | 2014-11-27 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-11-23 | 1 | -0/+3 |
|\| | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h | ||||
| * | Renamed GetSettedViewDistance() to GetRequestedViewDistance() | Howaner | 2014-11-15 | 1 | -1/+1 |
| | | |||||
| * | Use m_UsedViewDistance and m_SetViewDistance. | Howaner | 2014-11-14 | 1 | -0/+3 |
| | | |||||
* | | Compilation fixes | Tiger Wang | 2014-11-23 | 1 | -7/+5 |
| | | |||||
* | | Merged branch 'master' into c++11. | Mattes D | 2014-10-24 | 1 | -2/+1 |
|\| | |||||
| * | Merge pull request #1565 from mc-server/MergedIniFile | Mattes D | 2014-10-24 | 1 | -1/+1 |
| |\ | | | | | | | Merged ini file | ||||
| | * | Merged IniFile into main MCS sources. | Mattes D | 2014-10-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-23 | 33 | -342/+500 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h | ||||
| * | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 2 | -100/+92 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * \ \ | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 9 | -34/+40 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | | | | Optimized chunk loader | Howaner | 2014-10-02 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merged branch 'master' into c++11. | Mattes D | 2014-10-23 | 21 | -161/+311 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 15 | -188/+192 |
| | | | | | |||||
| * | | | | cItemFrame: Fixed a forgotten rename. | Mattes D | 2014-10-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Properly exported cItemFrame and cHangingEntity to Lua. | Mattes D | 2014-10-21 | 4 | -37/+55 |
| | | | | | |||||
| * | | | | Exported individual projectile classes to Lua API. | Mattes D | 2014-10-21 | 16 | -117/+253 |
| | |_|/ | |/| | | | | | | | | | | They used to be exported, but then they were moved to separate files and those werent' added to the ToLua processing list. | ||||
| * | | | Merged branch 'master' of git://github.com/sriehl/MCServer | Mattes D | 2014-10-21 | 2 | -100/+92 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | convert old style casts to fix warnings | Steven Riehl | 2014-10-12 | 2 | -101/+93 |
| | | | | |||||
* | | | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-20 | 15 | -99/+99 |
| | | | | |||||
* | | | | Migrated cSleep and cTimer to std::chrono | Tiger Wang | 2014-10-20 | 2 | -9/+5 |
|/ / / | |||||
* | | | LuaState: Pushing a cEntity pushes the correct class name. | Mattes D | 2014-10-19 | 1 | -5/+5 |
| | | | | | | | | | | | | This makes Lua scripts easier, as they don't need to cast values from cEntity to the specific descendant. | ||||
* | | | Merge pull request #1502 from mc-server/furnaces | Tiger Wang | 2014-10-18 | 1 | -6/+6 |
|\ \ \ | | | | | | | | | Improved furnaces | ||||
| * | | | Fixed failure for cRankManager to restart | Tiger Wang | 2014-10-18 | 1 | -6/+6 |
| | |/ | |/| | |||||
* | | | Functions in cPluginManager get references instead of pointers. | Mattes D | 2014-10-15 | 7 | -19/+25 |
| | | | |||||
* | | | Fixed style. | Mattes D | 2014-10-13 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Float/Ciel: If it's going to use C++11, it might as well take advantage of it | archshift | 2014-10-09 | 1 | -3/+3 |
| | | |||||
* | | Use static casts instead of C casts, add floor-cast functions | archshift | 2014-10-09 | 1 | -3/+3 |
|/ | |||||
* | cPlayer: Removed useless functions from the Lua API. | madmaxoft | 2014-10-01 | 1 | -2/+6 |
| | |||||
* | Merge pull request #1427 from mc-server/chestcarts | Mattes D | 2014-09-30 | 2 | -18/+65 |
|\ | | | | | Implemented Chest Minecarts | ||||
| * | Compilation fix | Tiger Wang | 2014-09-28 | 1 | -2/+2 |
| | | |||||
| * | Suggestions | Tiger Wang | 2014-09-27 | 2 | -3/+4 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into chestcarts | Tiger Wang | 2014-09-27 | 18 | -112/+350 |
| |\ | | | | | | | | | | | | | Conflicts: src/Entities/Minecart.cpp | ||||
| * | | Implemented Chest Minecarts | Tiger Wang | 2014-09-13 | 2 | -18/+63 |
| | | | |||||
* | | | cRankManager: Added GetAllPlayers() and GetPlayerName() | Howaner | 2014-09-28 | 1 | -0/+5 |
| |/ |/| | |||||
* | | Merge branch 'master' into Fixes | Howaner | 2014-09-26 | 7 | -24/+22 |
|\ \ | |||||
| * | | Removed more unessicary includes | Tycho | 2014-09-26 | 3 | -3/+1 |
| | | | |||||
| * | | Merge pull request #1419 from mc-server/redstoneTests | worktycho | 2014-09-26 | 5 | -21/+21 |
| |\ \ | | | | | | | | | Added test mocking to IncrementalRedstoneSimulator | ||||
| | * \ | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -2/+8 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| | * \ \ | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 11 | -62/+179 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| | * \ \ \ | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 5 | -24/+126 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| | * | | | | | Added first test to show the object can be created | Tycho | 2014-09-17 | 5 | -21/+21 |
| | | | | | | | |||||
* | | | | | | | Fixed players custom name in 1.8 | Howaner | 2014-09-26 | 1 | -3/+4 |
|/ / / / / / | |||||
* | | | | | | Comment style | Howaner | 2014-09-25 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into Fixes | Howaner | 2014-09-25 | 1 | -2/+8 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | HangingEntity: Silenced a crash. | madmaxoft | 2014-09-25 | 1 | -2/+8 |
| | |_|/ / | |/| | | | | | | | | | | | | | Vanilla worlds sometimes contain data that this was asserting upon. Changed into a log. | ||||
* / | | | | Fixed hanging direction bugs. | Howaner | 2014-09-25 | 2 | -1/+16 |
|/ / / / | |||||
* | | | | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 10 | -89/+244 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/ClientHandle.h src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/World.cpp src/World.h | ||||
| * | | | | Made ExpBottleEntity break on entities. | archshift | 2014-09-23 | 2 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | Fixes #1369 | ||||
| * | | | | A few compiler warning fixes | Chris Darnell | 2014-09-23 | 3 | -42/+45 |
| | | | | | |||||
| * | | | | Merge pull request #1398 from mc-server/1.8-Protocol | Alexander Harkness | 2014-09-22 | 3 | -3/+5 |
| |\ \ \ \ | | | | | | | | | | | | | 1.8 Protocol Update | ||||
| | * \ \ \ | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-19 | 2 | -5/+27 |
| | |\ \ \ \ | |||||
| | * | | | | | Derp | Howaner | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Exported player list states to extra functions. | Howaner | 2014-09-18 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-14 | 5 | -25/+125 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | * | | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-13 | 1 | -11/+13 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h | ||||
| | * | | | | | 1.8: Fixed hangings. | Howaner | 2014-09-11 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Added the player list to the 1.8 protocol. | Howaner | 2014-09-09 | 2 | -2/+4 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Made it compile with clang | Chris Darnell | 2014-09-22 | 2 | -4/+4 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Fixed minor style issues. | madmaxoft | 2014-09-17 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Implementing Spectator Mode | nesco | 2014-09-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Adding some proprieties of the spectator game mode in player.cpp : - Players can't toss items - Players can't touch the ground | ||||
| * | | | | Preparing 1.8 update | nesco | 2014-09-17 | 1 | -5/+15 |
| | | | | | |||||
| * | | | | Preparing 1.8 update | nesco | 2014-09-16 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | Partially added Spectator gamemode | ||||
| * | | | | Pre 1.8 release | nesco | 2014-09-16 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | Added Spectator gamemode | ||||
| * | | | | Preparing 1.8 changes | nesco | 2014-09-16 | 1 | -0/+3 |
| | |_|/ | |/| | | | | | | Added Spectator Gamemode | ||||
| * | | | Entities experience water resistance | Tiger Wang | 2014-09-13 | 2 | -16/+31 |
| | | | | |||||
| * | | | Merge pull request #1353 from mc-server/Effects | Mattes D | 2014-09-13 | 3 | -9/+94 |
| |\ \ \ | | |_|/ | |/| | | Added speed entity effect. | ||||
| | * | | Added extra mushroom handler. | Howaner | 2014-09-12 | 1 | -7/+0 |
| | | | | |||||
| | * | | Merge branch 'master' into Effects | Howaner | 2014-09-12 | 3 | -5/+9 |
| | |\| | |||||
| | * | | Renamed SetWalkSpeed() to SetRelativeWalkSpeed() | Howaner | 2014-09-02 | 1 | -4/+4 |
| | | | | |||||
| | * | | Merge branch 'master' into Effects | Howaner | 2014-09-02 | 9 | -30/+318 |
| | |\ \ | |||||
| | * | | | Fixed potion removing in creative mode. | Howaner | 2014-08-30 | 1 | -4/+2 |
| | | | | | |||||
| | * | | | Added slowness effect and added entity support. | Howaner | 2014-08-30 | 2 | -16/+65 |
| | | | | | |||||
| | * | | | Added speed entity effect. | Hownaer | 2014-08-28 | 2 | -0/+45 |
| | | | | | |||||
| * | | | | Fixed friction being applied whilst airborne | Tiger Wang | 2014-09-12 | 1 | -11/+13 |
| | |_|/ | |/| | | | | | | | | | | Reported by tonibm9 in #1300. | ||||
| * | | | Fixed player spawning in unknown world. | Mattes D | 2014-09-06 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | This may happen if the admin removes a world. | ||||
| * | | | Fixed security: Player cannot spawn in a disabled world. | Mattes D | 2014-09-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc" | archshift | 2014-09-04 | 1 | -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, etc | archshift | 2014-09-04 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | Snow Golems must also be above 64Y to spawn snow (as of 1.8). | ||||
| * | | | Fixed style and alpha-sorting. | madmaxoft | 2014-09-03 | 2 | -4/+4 |
| | | | | |||||
| * | | | EntityEffect.cpp: Enable 1.8's leaping potion | archshift | 2014-09-03 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-02 | 1 | -2/+6 |
|\| | | |||||
| * | | Pickups combine only within one chunk. | madmaxoft | 2014-09-01 | 1 | -2/+6 |
| | | | | | | | | | | | | This greatly improves performance of the tick thread. | ||||
* | | | Added the new functions to APIDump. | Howaner | 2014-09-02 | 1 | -1/+1 |
| | | | |||||
* | | | Added SetCustomName() to players. | Howaner | 2014-09-02 | 2 | -1/+61 |
| | | | |||||
* | | | Added name tag | Howaner | 2014-09-01 | 4 | -3/+8 |
| | | | |||||
* | | | Added CustomName to cMonster. | Howaner | 2014-09-01 | 1 | -3/+6 |
|/ / | |||||
* | | Fixed previous commit's wrong assumptions. | madmaxoft | 2014-09-01 | 1 | -10/+10 |
| | | | | | | | | The equipment-getting functions return a copy already, so we can't take a pointer, really. | ||||
* | | Fixed MSVC compilation, improved performance. | madmaxoft | 2014-09-01 | 1 | -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. | madmaxoft | 2014-09-01 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'Hircine/Enchantments' | madmaxoft | 2014-09-01 | 6 | -8/+264 |
|\ \ | |||||
| * | | Fixed style | Jaume Aloy | 2014-08-31 | 3 | -8/+9 |
| | | | |||||
| * | | Added a_Digger check | Jaume Aloy | 2014-08-30 | 1 | -2/+2 |
| | | | |||||
| * | | More Enchantments | Jaume Aloy | 2014-08-22 | 1 | -57/+70 |
| | | | | | | | | | | | | - Added Thorns and Respiration enchantments | ||||
| * | | Protection Enchantments, some fixes | Jaume Aloy | 2014-08-21 | 3 | -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 BlockHandler | Jaume Aloy | 2014-08-19 | 1 | -1/+0 |
| | | | |||||
| * | | Fixes | Jaume Aloy | 2014-08-19 | 4 | -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 switch | Jaume Aloy | 2014-08-19 | 1 | -3/+2 |
| | | | |||||
| * | | Added more enchantments and some fixes | Jaume Aloy | 2014-08-19 | 4 | -7/+61 |
| | | | | | | | | | | | | | | | | | | | | | - Removed Debug messages - Added Punch enchantment effect - Added Silk Touch enchantment - Added Unbreaking enchantment effect | ||||
| * | | Added some Enchantments | Jaume Aloy | 2014-08-19 | 3 | -6/+89 |
| | | | | | | | | | | | | | | | | | | - Bow enchantments: Infinity, Flame and Power - Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite, Sharpness | ||||
* | | | Merge branch 'master' into fixes | madmaxoft | 2014-08-30 | 1 | -18/+18 |
|\ \ \ | |||||
| * | | | Fixed MSVC2008 compilation. | madmaxoft | 2014-08-30 | 1 | -18/+18 |
| | |/ | |/| | | | | | | | It was getting confused about which sqrt() overload to call. | ||||
* | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-08-29 | 4 | -247/+220 |
|\| | | | | | | | | | | | | | | Conflicts: src/Server.cpp | ||||
| * | | Fixed a typo. | Mattes D | 2014-08-28 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #1324 from ChriPiv/master | Mattes D | 2014-08-28 | 1 | -2/+92 |
| |\ \ | | | | | | | | | Implement ability to push minecarts on curved rails | ||||
| | * | | Change comment formatting | Christophe Piveteau | 2014-08-24 | 1 | -20/+12 |
| | | | | |||||
| | * | | Adjust comment formatting | Christophe Piveteau | 2014-08-18 | 1 | -20/+40 |
| | | | | |||||
| | * | | Added a lot of comments | Christophe Piveteau | 2014-08-15 | 1 | -30/+36 |
| | | | | |||||
| | * | | Clarify comment message | Christophe Piveteau | 2014-08-15 | 1 | -2/+2 |
| | | | | |||||
| | * | | End of comment moved away from new line | Christophe Piveteau | 2014-08-15 | 1 | -2/+1 |
| | | | | |||||
| | * | | Add some comments | Christophe Piveteau | 2014-08-15 | 1 | -10/+21 |
| | | | | |||||
| | * | | Further changes in coding style | Christophe Piveteau | 2014-08-14 | 1 | -38/+28 |
| | | | | |||||
| | * | | Further fixing of coding style errors | Christophe Piveteau | 2014-08-13 | 1 | -26/+22 |
| | | | | |||||
| | * | | Another intendation error | Christophe Piveteau | 2014-08-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fixed braces and intendation errors | Christophe Piveteau | 2014-08-13 | 1 | -3/+11 |
| | | | | |||||
| | * | | Implement ability to push minecarts on curved rails | Christophe Piveteau | 2014-08-13 | 1 | -2/+70 |
| | | | | |||||
| * | | | RankMgr: Default rank is applied to players without any rank. | Mattes D | 2014-08-24 | 1 | -1/+5 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into Ranks | Mattes D | 2014-08-22 | 1 | -4/+13 |
| |\ \ \ | |||||
| | * | | | Player: Silenced a few type conversion warnings. | Mattes D | 2014-08-18 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Player saving creates the "players" folder, if needed. | Mattes D | 2014-08-17 | 1 | -0/+1 |
| | | |/ | | |/| | | | | | | | | | Fixes #1268. | ||||
| | * | | Better OnPlayerMoving hook. | Howaner | 2014-08-16 | 1 | -2/+10 |
| | |/ | |||||
| * | | Removed last remnant of cGroup. | Mattes D | 2014-08-21 | 1 | -1/+0 |
| | | | |||||
| * | | Removed cGroup and cGroupManager. | Mattes D | 2014-08-21 | 1 | -2/+0 |
| | | | |||||
| * | | cPlayer: Exported the LoadRank function to Lua API. | Mattes D | 2014-08-20 | 1 | -2/+2 |
| | | | |||||
| * | | cPlayer reads ranks from cRankManager. | Mattes D | 2014-08-19 | 2 | -224/+85 |
| |/ | |||||
| * | Fixed tolua error with static initialization | archshift | 2014-08-11 | 2 | -3/+12 |
| | | |||||
| * | Player.cpp: change unnamed enum to constant integers | archshift | 2014-08-11 | 2 | -7/+8 |
| | | |||||
| * | Spaces | Tycho | 2014-08-10 | 1 | -1/+1 |
| | | |||||
| * | Fixed potential crash in Player.cpp | Tycho | 2014-08-10 | 1 | -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. | Howaner | 2014-08-10 | 1 | -4/+2 |
| | | |||||
| * | On destroy ender crystal, create bedrock and fire | archshift | 2014-08-06 | 1 | -3/+3 |
| | | |||||
* | | Removed unused code | Tiger Wang | 2014-08-29 | 1 | -1/+0 |
|/ | |||||
* | CheckBasicStyle: multi-level indent change. | madmaxoft | 2014-08-04 | 1 | -1/+1 |
| | |||||
* | Attempt to fix knockback and swimming. | Howaner | 2014-08-04 | 1 | -15/+13 |
| | |||||
* | Added cPlayer::GetUUID(). | madmaxoft | 2014-08-03 | 1 | -0/+3 |
| | |||||
* | Fixed a ToLua warning - operator = not supported. | madmaxoft | 2014-08-03 | 2 | -2/+2 |
| | |||||
* | Entity.cpp: Air timer comment fix | archshift | 2014-08-03 | 1 | -1/+1 |
| | |||||
* | Code reduction and clarity fixes | archshift | 2014-08-03 | 2 | -29/+16 |
| | |||||
* | Removed unused cPlayer::FoodPoison function | archshift | 2014-08-03 | 2 | -12/+0 |
| | |||||
* | Entity.cpp: On portal check, use if-else for current dimension | archshift | 2014-08-03 | 1 | -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/NameToUUID | Mattes D | 2014-08-01 | 2 | -6/+9 |
|\ | | | | | Name to UUID | ||||
| * | Merged branch 'master' into NameToUUID. | madmaxoft | 2014-07-31 | 4 | -81/+328 |
| |\ | |||||
| * | | Fixed UUIDs handling in cPlayer. | madmaxoft | 2014-07-31 | 2 | -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. | Howaner | 2014-07-31 | 3 | -22/+38 |
| |/ |/| | |||||
* | | Merged branch 'howaner/Options'. | madmaxoft | 2014-07-30 | 1 | -6/+8 |
|\ \ | |||||
| * | | Add "Broadcasting" settings to world.ini | Howaner | 2014-07-27 | 1 | -6/+8 |
| |/ | |||||
* | | Entity.h: Moved constants out of some unnamed enum | archshift | 2014-07-30 | 1 | -14/+14 |
| | | |||||
* | | Slight cleanup after portals | Tiger Wang | 2014-07-29 | 1 | -1/+1 |
| | | |||||
* | | Detrailed whitespace | Tiger Wang | 2014-07-29 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 31 | -50/+196 |
|\ \ | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * \ | Merge pull request #1236 from Howaner/Inventory2 | Mattes D | 2014-07-27 | 3 | -8/+11 |
| |\ \ | | |/ | |/| | Fix item durability. | ||||
| | * | Merge branch 'master' into Inventory2 | Howaner | 2014-07-26 | 26 | -33/+33 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/BlockInfo.cpp | ||||
| | * | | Fix item durability. | Howaner | 2014-07-23 | 3 | -8/+11 |
| | | | | | | | | | | | | Fixes #1181 | ||||
| * | | | SplashPotionEntity: Use `const cItem &` instead of a cItem | archshift | 2014-07-26 | 2 | -2/+2 |
| | | | | |||||
| * | | | Fixed indentations, removed redundant init code in SplashPotionEntity.cpp | archshift | 2014-07-26 | 3 | -6/+2 |
| | | | | |||||
| * | | | Moved potion static functions to EntityEffect to create splash potions through world | archshift | 2014-07-26 | 5 | -9/+156 |
| | |/ | |/| | |||||
| * | | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 26 | -33/+33 |
| |/ | |||||
* | | Suggestions | Tiger Wang | 2014-07-23 | 4 | -16/+23 |
| | | |||||
* | | Speed improvements, crash fixes, & self-suggestions | Tiger Wang | 2014-07-22 | 4 | -35/+37 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 12 | -134/+212 |
|\| | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 4 | -66/+66 |
| | | |||||
| * | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -28/+28 |
| | | |||||
| * | Merge pull request #1213 from mc-server/chat-color | Mattes D | 2014-07-20 | 1 | -1/+1 |
| |\ | | | | | | | Refactored cChatColor | ||||
| | * | Removed references to deprecated cChatColor::Color | archshift | 2014-07-19 | 1 | -1/+1 |
| | | | |||||
| * | | Line tracer invalid chunk fix | Tiger Wang | 2014-07-20 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | * Fixes #1230 * Additionally improved speed in some scenarios | ||||
| * | | Added m_TicksAlive to entities, allows projectiles to hit their creators | archshift | 2014-07-20 | 3 | -3/+14 |
| | | | |||||
| * | | Added destroy-timer system to splash potion entities | archshift | 2014-07-20 | 2 | -3/+24 |
| |/ | |||||
| * | Code style: Fixed braces on separate lines. | madmaxoft | 2014-07-19 | 1 | -1/+2 |
| | | |||||
| * | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #1214 from mc-server/anti-glob | Mattes D | 2014-07-19 | 1 | -6/+59 |
| |\ | | | | | | | CMake - Explicitly lists all source files | ||||
| | * | Subdirs: Only add_library if not using MSVC | archshift | 2014-07-19 | 1 | -2/+4 |
| | | | |||||
| | * | Entities/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+56 |
| | | | |||||
| * | | Merge pull request #1223 from mc-server/fixes | Mattes D | 2014-07-19 | 5 | -32/+10 |
| |\ \ | | | | | | | | | Fixed small issues throughout the codebase | ||||
| | * | | Minecart: slimmed down SpawnOn by keeping subtype in the payload enum | archshift | 2014-07-19 | 2 | -20/+7 |
| | | | | |||||
| | * | | Fixed clamping issues | archshift | 2014-07-19 | 3 | -12/+3 |
| | |/ | |||||
| * | | Splash potions: Renamed PotionParticleType to PotionColor for clarity | archshift | 2014-07-19 | 2 | -10/+10 |
| | | | |||||
| * | | Fixed splash potion color on toss | archshift | 2014-07-19 | 2 | -0/+16 |
| |/ | |||||
| * | Merge branch 'Entities' | madmaxoft | 2014-07-18 | 1 | -4/+1 |
| |\ | |||||
| | * | Fixed many slime bugs. | Howaner | 2014-07-17 | 1 | -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. | ||||
* | | | Suggestions | Tiger Wang | 2014-07-21 | 4 | -65/+70 |
| | | | |||||
* | | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 4 | -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 issues | Tiger Wang | 2014-07-18 | 3 | -45/+12 |
| | | | |||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 43 | -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 needed | archshift | 2014-07-18 | 1 | -0/+1 |
| | | | |||||
| * | | Fixed NULL being passed instead of a double to AddEntityEffect | archshift | 2014-07-17 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed tabs used for alignment. | madmaxoft | 2014-07-17 | 9 | -25/+25 |
| | | | |||||
| * | | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 4 | -8/+8 |
| | | | |||||
| * | | Player.cpp: Fixed compile error | archshift | 2014-07-17 | 1 | -1/+1 |
| | | | |||||
| * | | Player.cpp: Added Wither death message | archshift | 2014-07-17 | 1 | -0/+1 |
| | | | |||||
| * | | Basic style fixes. | madmaxoft | 2014-07-17 | 8 | -29/+29 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mc-server/MCServer | madmaxoft | 2014-07-17 | 1 | -23/+8 |
| |\| | |||||
| | * | Fixed mob knockback | Tiger Wang | 2014-07-17 | 1 | -23/+8 |
| | | | | | | | | | | | | * Fixes #901 | ||||
| * | | Normalized comments. | madmaxoft | 2014-07-17 | 29 | -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. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | |||||
| * | Updated cPawn::KilledBy signature for custom death messages. | madmaxoft | 2014-07-17 | 2 | -3/+3 |
| | | |||||
| * | Merge branch 'master' into potions | madmaxoft | 2014-07-17 | 9 | -22/+43 |
| |\ | |||||
| | * | Merge pull request #1193 from mc-server/deathmessages | Mattes D | 2014-07-17 | 9 | -22/+43 |
| | |\ | | | | | | | | | Death messages | ||||
| | | * | Resolved backwards compatibility issues | Tiger Wang | 2014-07-16 | 1 | -1/+1 |
| | | | | |||||
| | | * | Tailored death messages | Tiger Wang | 2014-07-04 | 9 | -22/+43 |
| | | | | |||||
| * | | | Fixed formatting for cWitherSkullEntity | madmaxoft | 2014-07-17 | 2 | -3/+13 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into potions | madmaxoft | 2014-07-17 | 2 | -3/+12 |
| |\| | | |||||
| | * | | Another fix for excessive food drain | Tiger Wang | 2014-07-16 | 2 | -1/+10 |
| | | | | |||||
| | * | | Merge pull request #1192 from mc-server/skinuuid | Mattes D | 2014-07-16 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | | | Skins | ||||
| | | * | | Player properties are now retrieved | Tiger Wang | 2014-07-14 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Restructured cSplashPotionEntity code. | madmaxoft | 2014-07-15 | 3 | -70/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The callback doesn't need declaration in the header. Renamed PotionName to PotionParticleType. | ||||
| * | | | | Only the cEntityEffect::effXXX constants are Lua-exported. | madmaxoft | 2014-07-15 | 2 | -72/+102 |
| | | | | | | | | | | | | | | | | | | | | The rest of the classes don't need exporting, there's no interface using them anyway. | ||||
| * | | | | Reformatted EntityEffect code. | madmaxoft | 2014-07-15 | 1 | -25/+29 |
| | | | | | |||||
| * | | | | Fixed a MSVC warning in cEntityEffect::CreateEntityEffect(). | madmaxoft | 2014-07-15 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into potions | madmaxoft | 2014-07-15 | 8 | -14/+15 |
| |\| | | | |||||
| | * | | | Maybe improved arrow sinking | Tiger Wang | 2014-07-14 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Made CreateProjectile a pointer | worktycho | 2014-07-13 | 2 | -4/+5 |
| | | | | | |||||
| | * | | | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 5 | -7/+7 |
| | |/ / | |||||
| | * | | Merge pull request #1154 from mc-server/trappedchests | Tiger Wang | 2014-07-13 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | Implemented trapped chests & others | ||||
| | | * | | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 1 | -1/+1 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes | ||||
| * | | | Readability and clarity changes | archshift | 2014-07-14 | 3 | -29/+23 |
| | | | | |||||
| * | | | EntityEffect: Inlined functions, added explicit copy constructor and operator. | archshift | 2014-07-14 | 2 | -20/+29 |
| | | | | |||||
| * | | | Changed separating comment style from asterisks to slashes. | archshift | 2014-07-14 | 2 | -93/+93 |
| | | | | |||||
| * | | | Added splash potions to NBT serialization and retrieval | archshift | 2014-07-12 | 2 | -1/+9 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-12 | 2 | -85/+172 |
| |\| | | |||||
| | * | | Simplified the player data loading. | madmaxoft | 2014-07-11 | 1 | -9/+8 |
| | | | | |||||
| | * | | Player data filenames are based on UUID. | madmaxoft | 2014-07-11 | 2 | -67/+132 |
| | | | | |||||
| | * | | Fixed a missing return value. | madmaxoft | 2014-07-11 | 1 | -0/+2 |
| | | | | |||||
| | * | | Preparation for player UUID-based storage: LoadFromFile() | madmaxoft | 2014-07-11 | 2 | -21/+42 |
| | | | | |||||
| * | | | For now, removed creator member from Entity Effect for pointer safety | archshift | 2014-07-12 | 5 | -94/+84 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-10 | 15 | -151/+334 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
| | * | | Fixed arrow collection animation | Tiger Wang | 2014-07-09 | 2 | -22/+4 |
| | | | | | | | | | | | | | | | | * Fixed piston extension non-solidness | ||||
| | * | | Merge pull request #1135 from mc-server/fixes | Tiger Wang | 2014-07-09 | 12 | -83/+205 |
| | |\ \ | | | |/ | | |/| | Fixes to projectiles and the undead | ||||
| | | * | Added extra space before comments | Tiger Wang | 2014-07-07 | 1 | -6/+6 |
| | | | | |||||
| | | * | Changed everything to callbacks | Tiger Wang | 2014-07-05 | 3 | -80/+33 |
| | | | | |||||
| | | * | Crash and compile fix | Tiger Wang | 2014-07-04 | 2 | -4/+9 |
| | | | | |||||
| | | * | Suggestions | Tiger Wang | 2014-07-04 | 6 | -6/+15 |
| | | | | |||||
| | | * | Various fixed | Tiger Wang | 2014-07-04 | 3 | -10/+107 |
| | | | | | | | | | | | | | | | | | | | | * Fixed potential invalid pointer dereferencing, fixes #1117 * Fixed ender pearls not being loaded properly | ||||
| | | * | Eps comparison | Tiger Wang | 2014-07-04 | 2 | -2/+2 |
| | | | | |||||
| | | * | Suggestions | Tiger Wang | 2014-07-02 | 2 | -8/+14 |
| | | | | |||||
| | | * | Vector clamping fixes | Tiger Wang | 2014-07-01 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | Thank you, @madmaxoft. | ||||
| | | * | Implemented Vector3<>::Floor() | Tiger Wang | 2014-06-30 | 1 | -2/+3 |
| | | | | |||||
| | | * | Suggestions | Tiger Wang | 2014-06-29 | 2 | -3/+6 |
| | | | | |||||
| | | * | An unification of code style | Tiger Wang | 2014-06-28 | 1 | -1/+1 |
| | | | | |||||
| | | * | Some Entity.cpp style improvements | Tiger Wang | 2014-06-22 | 2 | -13/+8 |
| | | | | |||||
| | | * | Fixed multiple issues with projectiles | Tiger Wang | 2014-06-22 | 8 | -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/enderchest | Mattes D | 2014-07-02 | 2 | -15/+29 |
| | |\ \ | | | | | | | | | | | Properly implemented enderchests | ||||
| | | * | | Suggestion | Tiger Wang | 2014-07-02 | 1 | -13/+13 |
| | | | | | |||||
| | | * | | Properly implemented enderchests | Tiger Wang | 2014-06-29 | 2 | -2/+16 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'origin/master' | Tiger Wang | 2014-07-02 | 1 | -27/+25 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp | ||||
| | | * | | | Fixes. | Howaner | 2014-06-30 | 1 | -3/+3 |
| | | | | | | |||||
| | | * | | | Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGE | Howaner | 2014-06-30 | 1 | -26/+24 |
| | | | | | | |||||
| | * | | | | Fixed player teleport food drain | Tiger Wang | 2014-07-02 | 2 | -1/+14 |
| | |/ / / | |||||
| | * / / | Fixed respawning | Tiger Wang | 2014-06-29 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | | | | * Fixes #1103 | ||||
| | * | | Likely fixed too quick food depletion | Tiger Wang | 2014-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | * Fixes FS427 properly, hopefully | ||||
| | * | | Fixed server forcing players afloat | Tiger Wang | 2014-06-28 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | * Fixes #1131 | ||||
| | * | | Merged branch 'howaner/Bow'. | Mattes D | 2014-06-26 | 3 | -13/+46 |
| | |\ \ | | | | | | | | | | | | | | | | Removed the pickup collection broadcast due to bad code. | ||||
| | | * | | Add comment. | Howaner | 2014-06-26 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | GameMode check | Howaner | 2014-06-26 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Merge branch 'master' into Bow | Howaner | 2014-06-26 | 2 | -4/+1 |
| | | |\| | |||||
| | | * | | derp | Howaner | 2014-06-17 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | The same: Float, not Double | Howaner | 2014-06-17 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Float, not Double | Howaner | 2014-06-17 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Split Broadcast Sound Effect function call in multiple lines. | Howaner | 2014-06-16 | 1 | -2/+16 |
| | | | | | |||||
| | | * | | Fix bow sound and creative arrow pickup. | Howaner | 2014-06-16 | 1 | -10/+22 |
| | | | | | |||||
| | | * | | Add bow charging animation | Howaner | 2014-06-16 | 2 | -2/+6 |
| | | | | | |||||
| | * | | | Merged branch 'howaner/Pickups'. | Mattes D | 2014-06-26 | 1 | -6/+27 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Fixed a comment and changed CombineCount to short. | Howaner | 2014-06-26 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | Optimize combining. | Howaner | 2014-06-24 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | Better combining. | Howaner | 2014-06-24 | 1 | -3/+20 |
| | | | | | |||||
| | | * | | Fix pickup combining over the maximum stack size. | Howaner | 2014-06-24 | 1 | -4/+8 |
| | |/ / | |||||
| * | | | EntityEffects.x -> EntityEffect.x, Object-Oriented effects | archshift | 2014-06-19 | 10 | -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-value | archshift | 2014-06-17 | 5 | -35/+19 |
| | | | | |||||
| * | | | Added the OnEntityAddEffect hook. | madmaxoft | 2014-06-17 | 2 | -0/+11 |
| | | | | |||||
| * | | | Entity Effects: Clarified user, added it to AddEntityEffect | archshift | 2014-06-17 | 5 | -13/+30 |
| | | | | | | | | | | | | | | | | Added second AddEntityEffect with a pass-by-value of the class. | ||||
| * | | | Changed the AddEntityEffect() params for easier calls. | madmaxoft | 2014-06-17 | 5 | -47/+50 |
| | | | | |||||
| * | | | Entity Effect: Separates total duration and ticks of activity | archshift | 2014-06-17 | 3 | -22/+23 |
| | | | | | | | | | | | | | | | | Changed HandleEntityEffect to use cEntityEffect's ticks instead of a static counter | ||||
| * | | | Fixed MSVC compilation. | madmaxoft | 2014-06-17 | 1 | -4/+7 |
| | | | | |||||
| * | | | Pawn: renamed HandleEntityEffects to HandleEntityEffect | archshift | 2014-06-17 | 4 | -6/+8 |
| | | | | | | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua | ||||
| * | | | Cave spider now poisons its victim, added IsPawn function to Entity | archshift | 2014-06-17 | 2 | -1/+2 |
| | | | | |||||
| * | | | Added wither damage type, wither entity effect. | archshift | 2014-06-17 | 2 | -1/+16 |
| | | | | |||||
| * | | | Monster: added IsUndead(), undead-specific entity effects | archshift | 2014-06-17 | 1 | -6/+0 |
| | | | | |||||
| * | | | Applies splash potion effects to mobs as well as players | archshift | 2014-06-17 | 2 | -8/+12 |
| | | | | |||||
| * | | | Removed long function wrapping | archshift | 2014-06-17 | 1 | -2/+1 |
| | | | | |||||
| * | | | Entity effect type: use 'eff' as a prefix instead of 'ef' | archshift | 2014-06-17 | 4 | -41/+41 |
| | | | | |||||
| * | | | Added splash potion functionality | archshift | 2014-06-17 | 5 | -14/+87 |
| | | | | |||||
| * | | | Entity: only fire critical hit if damage type is physical | archshift | 2014-06-17 | 1 | -1/+2 |
| | | | | |||||
| * | | | Player: made healing instantaneous | archshift | 2014-06-17 | 2 | -2/+2 |
| | | | | |||||
| * | | | Implemented drinkable potions, noeffect entity effect, | archshift | 2014-06-17 | 3 | -0/+16 |
| | | | | | | | | | | | | | | | | Clears entity effects on death | ||||
| * | | | Implemented milk, added documentation to Pawn.h | archshift | 2014-06-17 | 3 | -1/+36 |
| | | | | |||||
| * | | | Pawn.cpp: fixed effect iterator BAD_ACCESS | archshift | 2014-06-17 | 2 | -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 typedef | archshift | 2014-06-17 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | Typedef'd std::map<cEntityEffect::eType, cEntityEffect> to tEffectMap | ||||
| * | | | EntityEffect: read-only getters, added user and distance modifier fields | archshift | 2014-06-17 | 3 | -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 seconds | archshift | 2014-06-17 | 2 | -26/+2 |
| | | | | | | | | | | | | | | | | http://minecraft.gamepedia.com/Hunger#Behavior | ||||
| * | | | Entity effects: Added handlers for entity effects | archshift | 2014-06-17 | 4 | -13/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | Implemented hunger, instant health, damage, poison, regen Added "template" entity effect implementations | ||||
| * | | | Added iterator on tick to manage entity effect duration | archshift | 2014-06-17 | 1 | -1/+18 |
| | | | | |||||
| * | | | cPawn: Remove unused m_bBurnable | archshift | 2014-06-17 | 2 | -2/+0 |
| | | | | |||||
| * | | | Moved Effects.h to EntityEffects.h, added initial impl | archshift | 2014-06-17 | 6 | -33/+113 |
| | | | | |||||
| * | | | Added classes for splash potions and wither skulls | archshift | 2014-06-17 | 5 | -0/+149 |
| | |/ | |/| | |||||
* | | | Conforms to standards | Tiger Wang | 2014-06-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 5 | -37/+82 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| * | | Nullify deleted pointers. | archshift | 2014-06-19 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into GlobalFixes | Howaner | 2014-06-17 | 7 | -65/+111 |
| |\| | |||||
| | * | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 4 | -33/+81 |
| | | | |||||
| * | | Wrong arrow commit. | Howaner | 2014-05-30 | 1 | -4/+0 |
| | | | |||||
| * | | Add throw sound and fix arrow server crash. | Howaner | 2014-05-28 | 2 | -5/+4 |
| | | | |||||
| * | | Fix Y-Position from arrow entity. | Howaner | 2014-05-28 | 1 | -0/+1 |
| | | | |||||
* | | | Fixed invalid iterators | Tiger Wang | 2014-06-21 | 3 | -2/+12 |
| | | | |||||
* | | | More suggestions | Tiger Wang | 2014-06-21 | 3 | -4/+6 |
| | | | |||||
* | | | Implemented PR suggestions | archshift | 2014-06-16 | 3 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | Furnace.txt: newline BlockID: removed extraneous dimension mapping cEntity: fixed typo cPlayer: WorldPtr typedef | ||||
* | | | Reverted portal creation code | Tiger Wang | 2014-06-14 | 2 | -103/+0 |
| | | | | | | | | | | | | It wasn't really working and needs more development | ||||
* | | | Fixed compile | worktycho | 2014-06-12 | 1 | -1/+1 |
| | | | |||||
* | | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 4 | -50/+112 |
| | | | |||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 5 | -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 D | 2014-06-08 | 3 | -15/+18 |
| | | | | | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | | Added queue for adding entities to cWorld. | Mattes D | 2014-06-08 | 3 | -4/+5 |
| | | | | | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed. | ||||
| * | | Fix itemframe break. | Howaner | 2014-06-04 | 1 | -1/+3 |
| | | | |||||
* | | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 2 | -41/+92 |
| | | | |||||
* | | | Fixed compilation | Tiger Wang | 2014-06-05 | 1 | -1/+1 |
| | | | |||||
* | | | Suggestions | Tiger Wang | 2014-06-04 | 2 | -2/+5 |
| | | | |||||
* | | | Configurable portals | Tiger Wang | 2014-06-04 | 2 | -14/+33 |
| | | | |||||
* | | | Suggestions | Tiger Wang | 2014-06-04 | 2 | -5/+9 |
| | | | |||||
* | | | Added checks for no downfall biomes | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 3 | -12/+4 |
|\| | | |||||
| * | | Player permissions aren't logged to console anymore. | madmaxoft | 2014-06-03 | 1 | -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/ProjectileHitBlock | Mattes D | 2014-06-01 | 1 | -2/+2 |
| |\ \ | | | | | | | | | OnProjectileHitBlock tweak. | ||||
| | * | | Used recommendations | STRWarrior | 2014-05-31 | 1 | -2/+1 |
| | | | | |||||
| | * | | Using recommendations (I think) | STRWarrior | 2014-03-30 | 1 | -1/+2 |
| | | | | |||||
| | * | | Added a BlockHitPos parameter to OnProjectileHitBlock | STRWarrior | 2014-03-30 | 1 | -2/+2 |
| | | | | |||||
| | * | | Added a blockface parameter to the OnProjectileHitBlock hook. | STRWarrior | 2014-03-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #951 from worktycho/chunksparsing/structs | Mattes D | 2014-05-31 | 1 | -3/+2 |
| |\ \ \ | | |_|/ | |/| | | Chunksparsing with segments | ||||
| | * | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-24 | 6 | -16/+300 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 8 | -136/+125 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.h | ||||
| | * \ \ \ | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-01 | 27 | -890/+1015 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-04-27 | 10 | -184/+328 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h | ||||
| | * | | | | | | Implemented Chunk Sparsing with segments | Tycho | 2014-04-26 | 1 | -3/+2 |
| | | | | | | | | |||||
* | | | | | | | | Implemented bed homes | Tiger Wang | 2014-06-01 | 3 | -16/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented bed home positions * Fixed some inventory and health server/client mismatches after world change | ||||
* | | | | | | | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 4 | -11/+150 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'master' into achievementtranslate | Tiger Wang | 2014-05-25 | 3 | -16/+62 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp | ||||
| * | | | | | | Fixed datatype conversion warning. | Mattes D | 2014-05-23 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1015 from mc-server/Stats | xdot | 2014-05-21 | 2 | -14/+60 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Statistics | ||||
| | * | | | | | | Cleaned up cPlayer::UpdateMovementStats; Wither achievements | andrew | 2014-05-20 | 2 | -14/+60 |
| | | | | | | | | |||||
* | | | | | | | | Update Player.cpp | Alexander Harkness | 2014-05-20 | 1 | -19/+19 |
| | | | | | | | | |||||
* | | | | | | | | Fixed a cactus Y position issue | Tiger Wang | 2014-05-19 | 1 | -2/+3 |
| | | | | | | | | |||||
* | | | | | | | | Simplified cacti conditions | Tiger Wang | 2014-05-19 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Added client translation to achievements | Tiger Wang | 2014-05-19 | 1 | -4/+4 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1010 from mc-server/cactidamage | Alexander Harkness | 2014-05-19 | 2 | -0/+27 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Implemented cacti damage | ||||
| * | | | | | | Derp | Alexander Harkness | 2014-05-19 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Should have fixed assumptions about entity width. | Alexander Harkness | 2014-05-19 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | @madmaxoft can you comment? | ||||
| * | | | | | | Fixed clanging errors. | Alexander Harkness | 2014-05-19 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | Please @tigerw make sure this is correct. | ||||
| * | | | | | | Implemented cacti damage | Tiger Wang | 2014-05-18 | 2 | -0/+26 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | + Implemented cacti damage * Fixed pickup tossing (PR #994 bug) | ||||
* | | | | | | There's no "round" function in MSVC2008. | madmaxoft | 2014-05-18 | 2 | -4/+4 |
| | | | | | | |||||
* | | | | | | Fixes | andrew | 2014-05-13 | 2 | -16/+14 |
| | | | | | | |||||
* | | | | | | Movement Statistics | andrew | 2014-05-12 | 3 | -11/+96 |
| | | | | | | |||||
* | | | | | | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() | andrew | 2014-05-12 | 5 | -4/+95 |
| | | | | | | |||||
* | | | | | | Fixed compilation | andrew | 2014-05-11 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Fixed stat serialization | andrew | 2014-05-11 | 1 | -10/+21 |
| | | | | | | |||||
* | | | | | | Statistic Manager | andrew | 2014-05-11 | 2 | -2/+26 |
|/ / / / / | |||||
* | | | | | Initialise m_HasTeleported in both constructors | worktycho | 2014-05-09 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into fixes | Tiger Wang | 2014-05-06 | 1 | -3/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Vector3.h | ||||
| * \ \ \ \ | Merge branch 'master' into redstoneimprovements | Tiger Wang | 2014-05-04 | 27 | -885/+983 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | | | | Redstone simulator now directly accesses cChunk | Tiger Wang | 2014-04-27 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes | ||||
* | | | | | | Suggestions'd #2 | Tiger Wang | 2014-05-06 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Suggestions'd | Tiger Wang | 2014-05-06 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | A bit of reformatting. | madmaxoft | 2014-05-02 | 1 | -5/+10 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into fixes. | madmaxoft | 2014-05-02 | 28 | -835/+1050 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Fixed a MSVC warning. | madmaxoft | 2014-04-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #940 from Howaner/GlobalFixes | Mattes D | 2014-04-28 | 8 | -32/+70 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add entity invulnerable | ||||
| | * | | | | | Fixes | Howaner | 2014-04-26 | 2 | -11/+14 |
| | | | | | | | |||||
| | * | | | | | Change m_InvulnerableTicks description again again :D | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Change m_InvulnerableTicks description again. | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Change m_InvulnerableTicks description | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into GlobalFixes | Howaner | 2014-04-26 | 1 | -7/+34 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | * | | | | | Add entity invulnerable | Howaner | 2014-04-26 | 8 | -26/+61 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #954 from mc-server/projectiles-split | Mattes D | 2014-04-28 | 18 | -852/+910 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files. | ||||
| | * | | | | | | Fixed projectile source filenames, indentations | archshift | 2014-04-28 | 17 | -58/+58 |
| | | | | | | | | |||||
| | * | | | | | | Fixed ToLua errors, added newlines | archshift | 2014-04-27 | 18 | -19/+19 |
| | | | | | | | | |||||
| | * | | | | | | Fixed ToLua issues | archshift | 2014-04-27 | 8 | -19/+16 |
| | | | | | | | | |||||
| | * | | | | | | Moved cFireworkEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 4 | -115/+115 |
| | | | | | | | | |||||
| | * | | | | | | Moved cGhastFireballEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 4 | -74/+83 |
| | | | | | | | | |||||
| | * | | | | | | Moved cFireChargeEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 4 | -82/+88 |
| | | | | | | | | |||||
| | * | | | | | | Moved cThrownSnowballEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 4 | -74/+83 |
| | | | | | | | | |||||
| | * | | | | | | Moved cExpBottleEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 4 | -52/+61 |
| | | | | | | | | |||||
| | * | | | | | | Moved cThrownEnderPearl out of ProjectileEntity.h | archshift | 2014-04-27 | 4 | -86/+94 |
| | | | | | | | | |||||
| | * | | | | | | Moved cThrownEggEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 4 | -90/+99 |
| | | | | | | | | |||||
| | * | | | | | | Moved cArrowEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 4 | -280/+291 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Fixed warnings. | madmaxoft | 2014-04-27 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Added static const, initialized fields. | archshift | 2014-04-27 | 1 | -0/+2 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #941 from archshift/master | Mattes D | 2014-04-26 | 3 | -6/+32 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Fixed lots of warnings, and other small changes. | ||||
| | * | | | | More small fixes. | archshift | 2014-04-26 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Further refactored, Reverted Minecart change | archshift | 2014-04-26 | 4 | -17/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | Other small changes. | ||||
| | * | | | | Moved switch{} out of GetArmorCoverAgainst(). | archshift | 2014-04-26 | 2 | -5/+29 |
| | | | | | | |||||
| | * | | | | Fixed a couple more warnings. | archshift | 2014-04-26 | 2 | -21/+17 |
| | | | | | | |||||
| * | | | | | Merge pull request #920 from axisd/master | Mattes D | 2014-04-25 | 1 | -7/+34 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Mobs shouldn't burn when it's Raining | ||||
| | * | | | | Fix formatting | r.ramazanov | 2014-04-25 | 1 | -9/+15 |
| | | | | | | |||||
| | * | | | | Fix for clang | r.ramazanov | 2014-04-25 | 1 | -5/+1 |
| | | | | | | |||||
| | * | | | | Mobs shouldn't burn when it's Raining & Mob Knockback is far too much | r.ramazanov | 2014-04-25 | 1 | -8/+5 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | r.ramazanov | 2014-04-23 | 5 | -10/+39 |
| | |\ \ \ \ | |||||
| | * | | | | | Mobs shouldn't burn when it's Raining #906 | r.ramazanov | 2014-04-23 | 1 | -9/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mob Knockback is far too much #776 | ||||
| | * | | | | | Mobs shouldn't burn when it's Raining #906 | r.ramazanov | 2014-04-21 | 1 | -5/+12 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #935 from archshift/projectile-fixes | Mattes D | 2014-04-25 | 2 | -7/+69 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | Chicken eggs and ender pearls can hit entities. | ||||
| | * | | | | | Creator not user. | archshift | 2014-04-25 | 2 | -5/+5 |
| | | | | | | | |||||
| | * | | | | | Comments for TrySpawnChicken() and TeleportUser(). | archshift | 2014-04-25 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Rename spawn chicken method, Initialize m_HasTeleported. | archshift | 2014-04-25 | 2 | -4/+5 |
| | | | | | | | |||||
| | * | | | | | Chicken eggs and ender pearls can hit entities. | archshift | 2014-04-25 | 2 | -7/+66 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | Fixed warning by adding dedicated m_HasTeleported for fired arrows. | ||||
| * / | | | | Cmake generated projects for IDEs include headers in project files. | archshift | 2014-04-25 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | A tiny speed improvement in ApplyFoodExhaustion() | Tiger Wang | 2014-04-27 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | More comments! | Tiger Wang | 2014-04-27 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Also fixed a potential issue with position sending - if someone moved slowly enough, their position would never be updated. | ||||
* | | | | | Implemented suggestions | Tiger Wang | 2014-04-24 | 1 | -7/+6 |
| | | | | | |||||
* | | | | | Merge branch 'master' into fixes | Tiger Wang | 2014-04-24 | 5 | -10/+39 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * | | | | Merge pull request #925 from archshift/master | Mattes D | 2014-04-23 | 2 | -0/+16 |
| |\ \ \ \ | | | | | | | | | | | | | Added monsters.ini rule for fireproof mobs. | ||||
| | * | | | | Renamed getter and setter for IsFireproof. | archshift | 2014-04-23 | 2 | -3/+3 |
| | | | | | | |||||
| | * | | | | Fireproof status getter and setter. | archshift | 2014-04-23 | 2 | -0/+16 |
| | | | | | | |||||
| * | | | | | Merge pull request #923 from archshift/master | Mattes D | 2014-04-22 | 2 | -3/+15 |
| |\| | | | | | | | | | | | | | | | | Added flag for fireproof entities. | ||||
| | * | | | | Fixed indentation and changed m_Fireproof to m_IsFireproof. | archshift | 2014-04-22 | 2 | -14/+14 |
| | | | | | | |||||
| | * | | | | Lay foundation for fireproof entities. | archshift | 2014-04-22 | 2 | -3/+15 |
| | |/ / / | | | | | | | | | | | | | | | | Prevent any entities with the m_Fireproof flag from taking fire or lava damage. | ||||
| * | | | | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 3 | -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. | jfhumann | 2014-04-21 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | Fixed Flint and Steel, reverted Minecart change, renamed a parameter name | jfhumann | 2014-04-19 | 3 | -4/+5 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 7 | -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 code | jfhumann | 2014-04-18 | 3 | -6/+7 |
| | | | | | | |||||
* | | | | | | Some change to Entity.cpp | Tiger Wang | 2014-04-23 | 6 | -122/+100 |
|/ / / / / | | | | | | | | | | | | | | | | * Added comments to BroadcastMovementUpdate() and the collision tracer | ||||
* | / / / | Fixed #906 | Tiger Wang | 2014-04-18 | 1 | -0/+10 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #891 from mc-server/fixes | Mattes D | 2014-04-17 | 6 | -118/+118 |
|\ \ \ \ | | | | | | | | | | | Fixes to redstone & general | ||||
| * | | | | Entities handle chunks properly again | Tiger Wang | 2014-04-12 | 6 | -118/+118 |
| |/ / / | | | | | | | | | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty | ||||
* / / / | Added new AI rules | Tiger Wang | 2014-04-17 | 4 | -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. | madmaxoft | 2014-04-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | This bug has been introduced in 8825d30aabbee8cb2e452dc5a17deb6f9b6892a7. This change fixes #854. | ||||
* | | | Removed debugging log from entity physics handling. | madmaxoft | 2014-04-05 | 1 | -1/+2 |
| | | | |||||
* | | | Added cPlayer:SendRotation() API function. | madmaxoft | 2014-04-05 | 2 | -0/+17 |
| | | | |||||
* | | | Documented the units and range for entity rotations. | madmaxoft | 2014-04-03 | 1 | -7/+7 |
|/ / | |||||
* | | Merge branch 'MacFixes' | Tycho | 2014-04-02 | 4 | -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 Barney | 2014-03-25 | 2 | -3/+1 |
| | | | | | | | | | | | | Also had to undefine TOLUA_TEMPLATE_BIND a couple of times. | ||||
| * | | Added newlines. Without them, the files would not compile. | Samuel Barney | 2014-03-25 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #842 from mc-server/ProjectileHooks | Mattes D | 2014-03-29 | 1 | -1/+11 |
|\ \ \ | | |/ | |/| | Projectile hooks | ||||
| * | | Fixed the OnProjectileHitBlock hook not stopping projectiles. | STRWarrior | 2014-03-29 | 1 | -1/+1 |
| | | | |||||
| * | | Added HOOK_PROJECTILE_HIT_BLOCK. | STRWarrior | 2014-03-29 | 1 | -0/+5 |
| | | | |||||
| * | | Fixed error when the hook gets called. | STRWarrior | 2014-03-29 | 1 | -1/+0 |
| | | | |||||
| * | | Added HOOK_PROJECTILE_HIT_ENTITY | STRWarrior | 2014-03-29 | 1 | -0/+6 |
| | | | |||||
* | | | Fixed #721 and FS439 | Tiger Wang | 2014-03-29 | 1 | -0/+1 |
|/ / | |||||
* / | Ender crystals | andrew | 2014-03-25 | 3 | -11/+102 |
|/ | |||||
* | Plugins can set flying speed. | madmaxoft | 2014-03-20 | 2 | -75/+118 |
| | |||||
* | Rewritten player speeds to be relative unit-less. | madmaxoft | 2014-03-20 | 2 | -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 cleanup | Tiger Wang | 2014-03-20 | 1 | -12/+9 |
| | |||||
* | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-18 | 14 | -75/+213 |
|\ | | | | | | | | | Conflicts: src/ChunkMap.cpp | ||||
| * | Merge pull request #782 from mc-server/beds | Mattes D | 2014-03-16 | 1 | -3/+14 |
| |\ | | | | | | | Beds now work properly, fixes #707 | ||||
| | * | Beds now work properly fixes #707 | Tiger Wang | 2014-03-09 | 1 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp | ||||
| * | | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-15 | 9 | -96/+90 |
| |\ \ | |||||
| | * \ | Merge remote-tracking branch 'xdot/master' | madmaxoft | 2014-03-12 | 3 | -4/+3 |
| | |\ \ | |||||
| | | * | | Unified Matrix4 code | andrew | 2014-03-11 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Unified Vector classes | andrew | 2014-03-11 | 2 | -3/+2 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'origin/SnowBall' | madmaxoft | 2014-03-12 | 2 | -2/+25 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | TakeDamage now has the cThrownSnowballEntity instead of the creator's object. | STRWarrior | 2014-03-11 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Snowballs now actualy hurt other entities. | STRWarrior | 2014-03-11 | 2 | -2/+25 |
| | | | | | | | | | | | | | | | | | | | | 3 damage for blazes and 1 for the ender dragon. Otherwise 0 | ||||
| * | | | | Add item frame saving. | Howaner | 2014-03-15 | 4 | -44/+119 |
| | | | | | |||||
| * | | | | Add health and age load to pickup's. | Howaner | 2014-03-15 | 2 | -16/+22 |
| | | | | | |||||
| * | | | | Add ExpOrb saving. | Howaner | 2014-03-15 | 3 | -10/+34 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'origin/master' into awesometnt | Tiger Wang | 2014-03-10 | 6 | -105/+93 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| * | | | | Merge pull request #768 from Howaner/BlockEntitys | Tiger Wang | 2014-03-09 | 2 | -20/+36 |
| |\| | | | | | | | | | | | | | Add TNT load/save | ||||
| | * | | | Change TNT Fuse to ticks | Howaner | 2014-03-08 | 2 | -11/+11 |
| | | | | | |||||
| | * | | | Add TNT Save/Load and add Netbeans projects to .gitignore | Howaner | 2014-03-08 | 2 | -17/+33 |
| | |/ / | |||||
| * | | | Merge pull request #731 from mc-server/ballisticmissiles | Tiger Wang | 2014-03-09 | 4 | -85/+57 |
| |\ \ \ | | | | | | | | | | | Ballistic firework missiles | ||||
| | * | | | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 6 | -43/+42 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| | * | | | CheckBlockInteractionsRate() fixed & enabled | Tiger Wang | 2014-03-09 | 2 | -35/+1 |
| | | | | | |||||
| | * | | | Removed unneeded includes in Player.cpp | Tiger Wang | 2014-02-27 | 1 | -7/+0 |
| | | | | | |||||
| | * | | | Implemented ballistic missiles (fireworks) | Tiger Wang | 2014-02-27 | 2 | -43/+56 |
| | | | | | | | | | | | | | | | | | | | | + Added fireworks | ||||
* | | | | | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-10 | 3 | -5/+5 |
|\| | | | | |||||
| * | | | | Fixed #778 - stack overflow.com | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
| * | | | Fixed issues with int vs size_t and a few other warnings | Tycho | 2014-03-08 | 2 | -4/+4 |
| | |/ | |/| | |||||
* / | | Added extra awesomeness to TNT | Tiger Wang | 2014-03-05 | 3 | -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::XXX | andrew | 2014-03-01 | 4 | -14/+14 |
| | | |||||
* | | Shortened enums | andrew | 2014-03-01 | 1 | -2/+2 |
| | | |||||
* | | Exported and documented cScoreboard | andrew | 2014-03-01 | 1 | -18/+3 |
| | | |||||
* | | Fixed multiple gcc warnings about unused params. | madmaxoft | 2014-02-28 | 2 | -1/+12 |
| | | |||||
* | | Moved common cGroupManager code to a separate function. | madmaxoft | 2014-02-28 | 1 | -7/+11 |
| | | | | | | | | This fixes my concerns in PR #709. | ||||
* | | Merge pull request #709 from Howaner/GlobalFixes | Mattes D | 2014-02-28 | 1 | -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() Function | Howaner | 2014-02-21 | 1 | -6/+1 |
| | | |||||
| * | Add 'Group not found', when the Server load the users.ini and add auto generate from users.ini | Howaner | 2014-02-21 | 1 | -1/+5 |
| | | |||||
* | | Small improvements to boats. | STRWarrior | 2014-02-24 | 1 | -3/+7 |
| | | |||||
* | | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 9 | -5/+279 |
|\| | |||||
| * | Merge branch 'master' into itemframes | Tiger Wang | 2014-02-18 | 3 | -0/+87 |
| |\ | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp | ||||
| | * | Properly exported and documented paintings | Tiger Wang | 2014-02-18 | 1 | -2/+2 |
| | | | |||||
| | * | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 3 | -0/+87 |
| | | | | | | | | | | | | + Implemented paintings | ||||
| * | | Changed BlockFace type to eBlockFace | Tiger Wang | 2014-02-18 | 2 | -13/+26 |
| | | | |||||
| * | | Added a brace | Tiger Wang | 2014-02-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ==== { } { __ } { | | } ==== REMOVE ALL THE BRACES!! | ||||
| * | | Implemented item frames, a part of #689 | Tiger Wang | 2014-02-18 | 3 | -0/+153 |
| |/ | | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!) | ||||
| * | Links sent via chat messages are clickable. | madmaxoft | 2014-02-16 | 1 | -1/+2 |
| | | | | | | | | Fixes #658. | ||||
| * | Fixed minor formatting issues from #682 | Tiger Wang | 2014-02-16 | 3 | -16/+3 |
| | | | | | | | | | | - Removed unused PlaySoundEffect * Simplified and parenthesised code | ||||
| * | Replace random Float Generation and broadcast the Exp Pickup Sound | Howaner | 2014-02-16 | 2 | -9/+4 |
| | | |||||
| * | Add Exp Bottle Effects | Howaner | 2014-02-16 | 4 | -1/+23 |
| | | |||||
| * | Disable Hunger Death | Howaner | 2014-02-16 | 1 | -1/+7 |
| | | |||||
| * | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 1 | -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/NotchDeath | Alexander Harkness | 2014-02-15 | 1 | -0/+6 |
| |\ | | | | | | | NotchApple | ||||
| | * | If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/Notch | STRWarrior | 2014-02-15 | 1 | -0/+6 |
| | | | |||||
| * | | Made player jump reset less ambiguous | Tiger Wang | 2014-02-12 | 1 | -1/+2 |
| | | | |||||
| * | | Fixed #627 | Tiger Wang | 2014-02-11 | 1 | -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 bugs | andrew | 2014-02-17 | 1 | -0/+3 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 6 | -25/+11 |
|\ | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| * | Merge pull request #649 from mc-server/GroupsPermissions | Mattes D | 2014-02-05 | 2 | -14/+0 |
| |\ | | | | | | | Removed deprecated HasCommand function | ||||
| | * | Removed deprecated HasCommand function | STRWarrior | 2014-02-05 | 2 | -14/+0 |
| | | | |||||
| * | | Fixed most of the reordering warnings | Tycho | 2014-02-05 | 4 | -11/+11 |
| | | | |||||
* | | | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 3 | -22/+22 |
|\| | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| * | | Improved Type safety of eBlockFace | Tycho | 2014-02-04 | 3 | -22/+22 |
| |/ | | | | | | | May Fix #640 | ||||
* | | Fixed a boat ASSERT | Tiger Wang | 2014-02-09 | 1 | -2/+8 |
| | | |||||
* | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 2 | -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 functions | Tiger Wang | 2014-02-06 | 1 | -6/+4 |
| | | |||||
* | | Added more chat functions | Tiger Wang | 2014-02-06 | 1 | -1/+0 |
| | | |||||
* | | Fixed annoying creative on fire bug | Tiger Wang | 2014-02-05 | 2 | -0/+20 |
| | | |||||
* | | Added more SendMessageXXX() functions | Tiger Wang | 2014-02-04 | 1 | -0/+4 |
| | | |||||
* | | Pickup constructor no longer exported | Tiger Wang | 2014-02-03 | 3 | -4/+8 |
| | | | | | | | | | | It didn't do anything without Initialize() exported, anyway, pickups are spawned with cWorld. | ||||
* | | Added SendMessageXXX() to cPlayer | Tiger Wang | 2014-02-03 | 1 | -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 bug | Tiger Wang | 2014-02-03 | 1 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-03 | 2 | -3/+4 |
|\| | |||||
| * | Merge pull request #602 from mc-server/improvementsandfixes | Mattes D | 2014-02-03 | 2 | -3/+4 |
| |\ | | | | | | | Redstone crash fix and current console line replace function | ||||
| | * | Creative players take Plugin damage | Tiger Wang | 2014-02-02 | 2 | -3/+4 |
| | | | |||||
* | | | Server now handles join messages also | Tiger Wang | 2014-02-03 | 1 | -1/+7 |
|/ / | | | | | | | * Revised as well hook documentation | ||||
* | | Merge pull request #585 from daniel0916/hooks | Mattes D | 2014-02-01 | 1 | -0/+2 |
|\ \ | |/ |/| | Added "player destroying" and "player destroyed" hooks | ||||
| * | Removed "player destroying" hook | daniel0916 | 2014-02-01 | 1 | -3/+1 |
| | | |||||
| * | Added "player destroying" and "player destroyed" hooks | daniel0916 | 2014-01-25 | 1 | -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. | STRWarrior | 2014-01-29 | 1 | -2/+0 |
| | | |||||
* | | Bottle o' Enchanting spawns an experience orb. | STRWarrior | 2014-01-29 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #589 from mc-server/minecartimprovements | Mattes D | 2014-01-26 | 2 | -101/+397 |
|\ \ | | | | | | | Minecart improvements | ||||
| * | | Rail speed tweak | Tiger Wang | 2014-01-25 | 1 | -2/+2 |
| | | | |||||
| * | | Added more minecart powered rail directions | Tiger Wang | 2014-01-24 | 1 | -3/+63 |
| | | | |||||
| * | | Begin implementing ascending rails | Tiger Wang | 2014-01-19 | 2 | -2/+45 |
| | | | |||||
| * | | Added one more direction into collision checks | Tiger Wang | 2014-01-19 | 1 | -26/+51 |
| | | | | | | | | | | | | | | | * Added direction XM_XP * Improved performance, thanks STR and xoft | ||||
| * | | Minecart improvements and fixes | Tiger Wang | 2014-01-19 | 1 | -33/+43 |
| | | | | | | | | | | | | | | | | | | * Fixed curved rails * Fixed detector rails in certain situations * Fixed powered rails and others passing bad meta to SnapToRail() | ||||
| * | | Added more rail functionality | Tiger Wang | 2014-01-19 | 1 | -14/+0 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into minecartimprovements | Tiger Wang | 2014-01-19 | 7 | -42/+58 |
| |\| | |||||
| * | | Minecart collision and general improvements | Tiger Wang | 2014-01-18 | 2 | -70/+242 |
| | | | | | | | | | | | | | | | | | | + Implemented collision on one type of rail * Improved curved rails somewhat * Fixed a crash bug | ||||
* | | | Two minor changes | Tiger Wang | 2014-01-25 | 1 | -5/+3 |
| | | | |||||
* | | | Implemented fall damage for mobs | Tiger Wang | 2014-01-25 | 3 | -5/+8 |
| | | | | | | | | | | | | | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros | ||||
* | | | Implemented pickup combining | Tiger Wang | 2014-01-25 | 1 | -0/+55 |
| | | | | | | | | | | | | | | | * Fixes FS393 * Part of #131 | ||||
* | | | All mobs now drown (fixes #54) | Tiger Wang | 2014-01-25 | 4 | -127/+130 |
| | | | | | | | | | | | | | | | * Implemented mob drowning * Iron Golems and squids are excluded | ||||
* | | | Miscellaneous improvements | Tiger Wang | 2014-01-24 | 1 | -10/+4 |
| | | | |||||
* | | | Removed unused ReferenceManager | Tiger Wang | 2014-01-24 | 2 | -45/+1 |
| | | | |||||
* | | | Fixed crash with failed entity-loading. | madmaxoft | 2014-01-24 | 1 | -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' | madmaxoft | 2014-01-24 | 2 | -43/+59 |
|\ \ \ | |||||
| * | | | Fixed indentation once and for all. | Mike Hunsinger | 2014-01-24 | 1 | -31/+31 |
| | | | | |||||
| * | | | Fixed indentation and doxygen comments... For real this time. | Mike Hunsinger | 2014-01-24 | 1 | -3/+3 |
| | | | | |||||
| * | | | Fixed spacing and doxycomments. | Mike Hunsinger | 2014-01-24 | 2 | -6/+6 |
| | | | | |||||
| * | | | Split TossItem into three Toss functions (Held, Equipped and Pickup) | Mike Hunsinger | 2014-01-23 | 2 | -50/+66 |
| | |/ | |/| | |||||
* | | | Fixed compilation on VC2008 | tonibm19 | 2014-01-22 | 1 | -0/+1 |
| | | | |||||
* | | | Scoreboard protocol support | andrew | 2014-01-21 | 1 | -6/+11 |
| | | | |||||
* | | | Scoreboard deserialization | andrew | 2014-01-20 | 2 | -3/+26 |
| | | | |||||
* | | | Scoreboard improvements | andrew | 2014-01-19 | 1 | -4/+4 |
| | | | |||||
* | | | Basic scoreboard implementation | andrew | 2014-01-19 | 2 | -1/+62 |
|/ / | |||||
* | | Exported cFloater to the Lua API. | STRWarrior | 2014-01-19 | 1 | -3/+7 |
| | | |||||
* | | Merge pull request #534 from mc-server/SpawnMinecart | Mattes D | 2014-01-17 | 2 | -7/+16 |
|\ \ | | | | | | | Added cWorld::SpawnMinecart. | ||||
| * | | Changed GetContent function. | STRWarrior | 2014-01-16 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed server crash. | STRWarrior | 2014-01-12 | 1 | -1/+1 |
| | | | |||||
| * | | Renamed cEmptyMinecart to cRideableMinecart | STRWarrior | 2014-01-12 | 2 | -6/+7 |
| | | | |||||
| * | | EmptyMinecarts should be able to get a block inside of them. | STRWarrior | 2014-01-12 | 2 | -3/+11 |
| | | | |||||
* | | | Removed internal cEntity::GetRot() usage. | madmaxoft | 2014-01-17 | 3 | -7/+7 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/customnames' | madmaxoft | 2014-01-17 | 5 | -30/+33 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 5 | -27/+25 |
| | | | |||||
| * | | OBSOLETE'd obsolete functions | Tiger Wang | 2014-01-15 | 1 | -2/+2 |
| | | | |||||
| * | | Implemented Ctrl-Q drop stack | Tiger Wang | 2014-01-15 | 1 | -3/+8 |
| | | | | | | | | | | | | Also fixed an issue with TossItems not respecting count. | ||||
* | | | Disabled excessive entity-related logging in Debug mode. | madmaxoft | 2014-01-16 | 1 | -1/+11 |
|/ / | |||||
* | | Furnace minecarts now stop being active after a while. | STRWarrior | 2014-01-15 | 2 | -2/+19 |
| | | |||||
* | | First implementation for furnace minecarts. | STRWarrior | 2014-01-15 | 2 | -1/+23 |
| | | |||||
* | | Yes newline at end of file :D | Tiger Wang | 2014-01-14 | 1 | -1/+5 |
| | | |||||
* | | Final improvements to Minecarts | Tiger Wang | 2014-01-13 | 3 | -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 improvements | Tiger Wang | 2014-01-13 | 4 | -4/+34 |
| | | | | | | | | | | * Players now search for an area around themselves to teleport to when detaching from something | ||||
* | | Multiple enhancements and fixes to minecarts | Tiger Wang | 2014-01-12 | 3 | -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 Redshaw | 2013-12-31 | 1 | -2/+2 |
| | |||||
* | Fixed compilation in VC2008. | madmaxoft | 2013-12-30 | 1 | -2/+4 |
| | | | | Also removed an unused inline header file (yuck). | ||||
* | converted commneted paramater names to the unused macro | Tycho Bickerstaff | 2013-12-22 | 3 | -5/+13 |
| | |||||
* | Merge branch 'master' of github.com:mc-server/MCServer | Tycho Bickerstaff | 2013-12-22 | 5 | -29/+273 |
|\ | |||||
| * | Server now handles death messages | Tiger Wang | 2013-12-26 | 1 | -0/+16 |
| | | |||||
| * | Merge pull request #461 from mc-server/repeaters | Mattes D | 2013-12-26 | 2 | -7/+41 |
| |\ | | | | | | | Repeaters, pressure plates, and others | ||||
| | * | Braced up some code | Tiger Wang | 2013-12-25 | 1 | -0/+2 |
| | | | |||||
| | * | Used IsGamemodeCreative() function | Tiger Wang | 2013-12-25 | 1 | -1/+1 |
| | | | |||||
| | * | Fixed comments in main.cpp and Player.cpp | Tiger Wang | 2013-12-24 | 1 | -1/+1 |
| | | | |||||
| | * | Improved knockback animation | Tiger Wang | 2013-12-24 | 1 | -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 positions | Tiger Wang | 2013-12-23 | 1 | -5/+2 |
| | | | |||||
| | * | Clarified some code in Player.cpp | Tiger Wang | 2013-12-23 | 1 | -2/+5 |
| | | | |||||
| | * | Fixed a comment in Entity.cpp | Tiger Wang | 2013-12-23 | 1 | -1/+1 |
| | | | |||||
| | * | Implemented knockback and critical hit | Tiger Wang | 2013-12-22 | 1 | -4/+21 |
| | | | |||||
| | * | Implemented fall particles | Tiger Wang | 2013-12-22 | 1 | -3/+18 |
| | | | |||||
| * | | Fixed Parentheses. | STRWarrior | 2013-12-25 | 1 | -2/+2 |
| | | | |||||
| * | | You are now able to sweep mobs to your position using fishing rods. | STRWarrior | 2013-12-25 | 2 | -12/+142 |
| | | | |||||
| * | | finally removed them all? | Alexander Harkness | 2013-12-24 | 1 | -1/+1 |
| | | | |||||
| * | | Fishing underground is slower and fishing while raining is faster. | STRWarrior | 2013-12-22 | 1 | -0/+15 |
| | | | |||||
| * | | Fixed compiler warnings. | STRWarrior | 2013-12-22 | 1 | -2/+2 |
| | | | |||||
| * | | Fishing now uses a countdown instead of a random number each tick. | STRWarrior | 2013-12-22 | 2 | -12/+29 |
| | | | |||||
| * | | Floater now dissapears when the player doesn't have an fishing rod equipped. | STRWarrior | 2013-12-21 | 2 | -0/+32 |
| | | | |||||
* | | | Root is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 1 | -2/+2 |
| | | | |||||
* | | | ChunkSender is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 2 | -5/+5 |
|/ / | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-21 | 6 | -41/+54 |
|\ \ | |||||
| * | | You could now only get fish from non-source blocks. Fixed it. | STRWarrior | 2013-12-21 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed bug where you could get fish from non-source blocks. | STRWarrior | 2013-12-21 | 1 | -1/+1 |
| |/ | |||||
| * | Fixed bug where the floater could pop in the water while you could already get a fish. | STRWarrior | 2013-12-20 | 1 | -2/+2 |
| | | |||||
| * | More reordering fixes. | madmaxoft | 2013-12-20 | 3 | -7/+16 |
| | | |||||
| * | Sorted a few constructors to remove warnings. | madmaxoft | 2013-12-20 | 5 | -32/+36 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-20 | 1 | -1/+1 |
|\| | |||||
| * | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 5 | -0/+120 |
|\| | |||||
| * | Merge pull request #450 from mc-server/redstonefixes | Mattes D | 2013-12-19 | 1 | -0/+18 |
| |\ | | | | | | | Multiple fixes | ||||
| | * | Fixed PlayerAbilities and creative | Tiger Wang | 2013-12-19 | 1 | -0/+18 |
| | | | |||||
| * | | Fixed #include in Floater.cpp. | STRWarrior | 2013-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | The floater now actualy dives under water. | STRWarrior | 2013-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | Implented IsFishing, SetIsFishing and GetFloaterID(). | STRWarrior | 2013-12-19 | 2 | -0/+12 |
| | | | |||||
| * | | Added cFloater class. | STRWarrior | 2013-12-19 | 3 | -0/+90 |
| |/ | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-18 | 8 | -35/+149 |
|\| | |||||
| * | Boats drop a boat pickup when destroyed by hand. You can now actualy use boats. | STRWarrior | 2013-12-16 | 2 | -3/+33 |
| | | |||||
| * | Added HandleSpeedFromAttachee so an entity can override the function. | STRWarrior | 2013-12-16 | 2 | -4/+15 |
| | | |||||
| * | Fixed cClientHandle::Tick() being called from two threads. | madmaxoft | 2013-12-16 | 2 | -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. | STRWarrior | 2013-12-15 | 1 | -1/+3 |
| | | |||||
| * | Merge pull request #437 from mc-server/ShootTo_function | STRWarrior | 2013-12-15 | 2 | -0/+13 |
| |\ | | | | | | | Shoot to function | ||||
| | * | Renamed ShootTo function to ForceSetSpeed. | STRWarrior | 2013-12-15 | 2 | -3/+3 |
| | | | |||||
| | * | This adds a function that allows you to 'shoot' a player towards a direction. | STRWarrior | 2013-12-15 | 2 | -0/+13 |
| | | | |||||
| * | | Fixed indentation. | madmaxoft | 2013-12-15 | 1 | -1/+1 |
| |/ | |||||
| * | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function | STRWarrior | 2013-12-15 | 2 | -1/+45 |
| | | |||||
| * | cPlayer is using the broadcast functions. | STRWarrior | 2013-12-15 | 1 | -3/+3 |
| | | |||||
| * | Exported E_EFFECTS_<Effect> to lua. Forgot to commit Globals.h. | STRWarrior | 2013-12-14 | 1 | -1/+2 |
| | | |||||
| * | Added E_EFFECT_<Effect> | STRWarrior | 2013-12-14 | 2 | -3/+32 |
| | | |||||
| * | Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. | STRWarrior | 2013-12-14 | 1 | -1/+9 |
| | | |||||
* | | moved entities to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-11 | 3 | -10/+23 |
|\| | |||||
| * | Exported the cTNTEntity | STRWarrior | 2013-12-14 | 1 | -2/+6 |
| | | |||||
| * | Merge pull request #423 from mc-server/redstoneimprovements | Mattes D | 2013-12-14 | 1 | -2/+7 |
| |\ | | | | | | | Redstone and configuration improvements | ||||
| | * | Improved player permissions logging | Tiger Wang | 2013-12-14 | 1 | -1/+1 |
| | | | |||||
| | * | Fixes to redstone wire and torches | Tiger Wang | 2013-12-14 | 1 | -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 generated | Tiger Wang | 2013-12-14 | 1 | -1/+6 |
| | | | |||||
| * | | Fixed not getting XP from mobs. | STRWarrior | 2013-12-14 | 1 | -1/+1 |
| |/ | |||||
| * | Using "a_ClosestPlayer != NULL" in cExpOrb. | STRWarrior | 2013-12-13 | 1 | -1/+1 |
| | | |||||
| * | ExpOrbs now move. | STRWarrior | 2013-12-11 | 1 | -4/+8 |
| | | |||||
* | | more cmake | Tycho Bickerstaff | 2013-12-10 | 1 | -0/+7 |
|/ | |||||
* | Fixed angle normalization typo. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 3 | -9/+6 |
|\ | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Fixed normalizing large angles. | madmaxoft | 2013-12-08 | 1 | -6/+3 |
| | | |||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 3 | -3/+3 |
| | | | | | | | | Ref.: #407 | ||||
* | | Renamed animation function | Tiger Wang | 2013-12-07 | 1 | -3/+3 |
| | | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | | Puking now uses GetEyeHeight() | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | Fixed eating using wrong animation | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | Tools make a sound when breaking, fixes #266 | Tiger Wang | 2013-12-06 | 2 | -2/+5 |
|/ | |||||
* | Fixed VC2008 compilation, normalized include paths. | madmaxoft | 2013-11-27 | 1 | -1/+1 |
| | |||||
* | Fixed some of tiger's derpyness. | Alexander Harkness | 2013-11-27 | 1 | -2/+2 |
| | |||||
* | Hopefully fixed last of the Linux compile errors | Tiger Wang | 2013-11-26 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 3 | -0/+90 |
| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 1 | -2/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 4 | -70/+298 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 18 | -0/+6466 |