Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 1 | -7/+7 |
|\ | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | 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 | 1 | -1/+1 |
| |/ | |||||
* / | Optimized chunk loader | Howaner | 2014-10-02 | 1 | -1/+0 |
|/ | |||||
* | cRankManager: Added GetAllPlayers() and GetPlayerName() | Howaner | 2014-09-28 | 1 | -0/+5 |
| | |||||
* | Merge branch 'master' into Fixes | Howaner | 2014-09-26 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 1 | -7/+73 |
| |\ | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| * \ | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 1 | -9/+0 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| * | | | Added first test to show the object can be created | Tycho | 2014-09-17 | 1 | -2/+2 |
| | | | | |||||
* | | | | Fixed players custom name in 1.8 | Howaner | 2014-09-26 | 1 | -3/+4 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 1 | -19/+35 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * \ \ | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-19 | 1 | -5/+24 |
| |\ \ \ | |||||
| | * | | | 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 | ||||
| * | | | 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 | 1 | -9/+0 |
| |\| | | |||||
| | * | | Added extra mushroom handler. | Howaner | 2014-09-12 | 1 | -7/+0 |
| | | | | |||||
| | * | | Merge branch 'master' into Effects | Howaner | 2014-09-12 | 1 | -1/+5 |
| | |\| | |||||
| | * | | Merge branch 'master' into Effects | Howaner | 2014-09-02 | 1 | -0/+23 |
| | |\ \ | |||||
| | * | | | Fixed potion removing in creative mode. | Howaner | 2014-08-30 | 1 | -4/+2 |
| | | | | | |||||
| * | | | | Added the player list to the 1.8 protocol. | Howaner | 2014-09-09 | 1 | -1/+3 |
| | |_|/ | |/| | | |||||
| * | | | 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 |
| | |/ | |/| | |||||
* / | | Added SetCustomName() to players. | Howaner | 2014-09-02 | 1 | -1/+46 |
|/ / | |||||
* | | Merge remote-tracking branch 'Hircine/Enchantments' | madmaxoft | 2014-09-01 | 1 | -0/+23 |
|\ \ | |/ |/| | |||||
| * | Fixed style | Jaume Aloy | 2014-08-31 | 1 | -0/+3 |
| | | |||||
| * | Protection Enchantments, some fixes | Jaume Aloy | 2014-08-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | - 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. | ||||
| * | Added more enchantments and some fixes | Jaume Aloy | 2014-08-19 | 1 | -0/+20 |
| | | | | | | | | | | | | | | - Removed Debug messages - Added Punch enchantment effect - Added Silk Touch enchantment - Added Unbreaking enchantment effect | ||||
* | | 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 cGroup and cGroupManager. | Mattes D | 2014-08-21 | 1 | -2/+0 |
| | | |||||
* | | cPlayer reads ranks from cRankManager. | Mattes D | 2014-08-19 | 1 | -201/+55 |
|/ | |||||
* | Fixed tolua error with static initialization | archshift | 2014-08-11 | 1 | -0/+9 |
| | |||||
* | Player.cpp: change unnamed enum to constant integers | archshift | 2014-08-11 | 1 | -1/+1 |
| | |||||
* | 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 |
| | |||||
* | Code reduction and clarity fixes | archshift | 2014-08-03 | 1 | -10/+7 |
| | |||||
* | Removed unused cPlayer::FoodPoison function | archshift | 2014-08-03 | 1 | -9/+0 |
| | |||||
* | Merge pull request #1255 from mc-server/NameToUUID | Mattes D | 2014-08-01 | 1 | -5/+8 |
|\ | | | | | Name to UUID | ||||
| * | Merged branch 'master' into NameToUUID. | madmaxoft | 2014-07-31 | 1 | -44/+50 |
| |\ | |||||
| * | | Fixed UUIDs handling in cPlayer. | madmaxoft | 2014-07-31 | 1 | -5/+8 |
| | | | | | | | | | | | | 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 | 1 | -17/+36 |
| |/ |/| | |||||
* | | Merged branch 'howaner/Options'. | madmaxoft | 2014-07-30 | 1 | -6/+8 |
|\ \ | |||||
| * | | Add "Broadcasting" settings to world.ini | Howaner | 2014-07-27 | 1 | -6/+8 |
| |/ | |||||
* | | Slight cleanup after portals | Tiger Wang | 2014-07-29 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| * | | Fix item durability. | Howaner | 2014-07-23 | 1 | -2/+2 |
| |/ | | | | | Fixes #1181 | ||||
* | | Suggestions | Tiger Wang | 2014-07-23 | 1 | -1/+1 |
| | | |||||
* | | Speed improvements, crash fixes, & self-suggestions | Tiger Wang | 2014-07-22 | 1 | -2/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 1 | -64/+62 |
|\| | | | | | | | | | | | | | | | 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 | 1 | -54/+54 |
| | | |||||
| * | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 1 | -28/+28 |
| | | |||||
| * | Removed references to deprecated cChatColor::Color | archshift | 2014-07-19 | 1 | -1/+1 |
| | | |||||
| * | Code style: Fixed braces on separate lines. | madmaxoft | 2014-07-19 | 1 | -1/+2 |
| | | |||||
| * | Fixed clamping issues | archshift | 2014-07-19 | 1 | -4/+1 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-07-21 | 1 | -20/+5 |
| | | |||||
* | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 1 | -18/+17 |
| | | | | | | | | | | | | | | | | | | * 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 | 1 | -32/+8 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 1 | -162/+274 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -4/+4 |
| | | |||||
| * | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | |||||
| * | 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 | 1 | -5/+5 |
| | | |||||
| * | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -21/+21 |
| | | | | | | | | | | 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. | ||||
| * | Merge branch 'master' into potions | madmaxoft | 2014-07-17 | 1 | -7/+28 |
| |\ | |||||
| | * | Merge pull request #1193 from mc-server/deathmessages | Mattes D | 2014-07-17 | 1 | -7/+28 |
| | |\ | | | | | | | | | Death messages | ||||
| | | * | Tailored death messages | Tiger Wang | 2014-07-04 | 1 | -7/+28 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into potions | madmaxoft | 2014-07-17 | 1 | -2/+11 |
| |\| | | |||||
| | * | | Another fix for excessive food drain | Tiger Wang | 2014-07-16 | 1 | -0/+9 |
| | | | | |||||
| | * | | 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 |
| | | | | | |||||
| * | | | | Merge branch 'master' into potions | madmaxoft | 2014-07-15 | 1 | -1/+1 |
| |\| | | | |||||
| | * | | | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-12 | 1 | -72/+142 |
| |\| | | |||||
| | * | | Simplified the player data loading. | madmaxoft | 2014-07-11 | 1 | -9/+8 |
| | | | | |||||
| | * | | Player data filenames are based on UUID. | madmaxoft | 2014-07-11 | 1 | -54/+111 |
| | | | | |||||
| | * | | Fixed a missing return value. | madmaxoft | 2014-07-11 | 1 | -0/+2 |
| | | | | |||||
| | * | | Preparation for player UUID-based storage: LoadFromFile() | madmaxoft | 2014-07-11 | 1 | -21/+33 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-10 | 1 | -42/+60 |
| |\| | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
| | * | Merge pull request #1138 from mc-server/enderchest | Mattes D | 2014-07-02 | 1 | -13/+20 |
| | |\ | | | | | | | | | Properly implemented enderchests | ||||
| | | * | Suggestion | Tiger Wang | 2014-07-02 | 1 | -13/+13 |
| | | | | |||||
| | | * | Properly implemented enderchests | Tiger Wang | 2014-06-29 | 1 | -0/+7 |
| | | | | |||||
| | * | | 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 | 1 | -1/+9 |
| | |/ / | |||||
| | * / | 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 | ||||
| | * | Merge branch 'master' into Bow | Howaner | 2014-06-26 | 1 | -0/+1 |
| | |\ | |||||
| | * | | Add bow charging animation | Howaner | 2014-06-16 | 1 | -1/+5 |
| | | | | |||||
| * | | | EntityEffects.x -> EntityEffect.x, Object-Oriented effects | archshift | 2014-06-19 | 1 | -37/+0 |
| | | | | | | | | | | | | | | | | 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 | -1/+1 |
| | | | | |||||
| * | | | Pawn: renamed HandleEntityEffects to HandleEntityEffect | archshift | 2014-06-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua | ||||
| * | | | Entity effect type: use 'eff' as a prefix instead of 'ef' | archshift | 2014-06-17 | 1 | -6/+6 |
| | | | | |||||
| * | | | Implemented milk, added documentation to Pawn.h | archshift | 2014-06-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Pawn.cpp: fixed effect iterator BAD_ACCESS | archshift | 2014-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | EntityEffect: read-only getters, added user and distance modifier fields | archshift | 2014-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | 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 | 1 | -20/+1 |
| | | | | | | | | | | | | | | | | http://minecraft.gamepedia.com/Hunger#Behavior | ||||
| * | | | Entity effects: Added handlers for entity effects | archshift | 2014-06-17 | 1 | -13/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | Implemented hunger, instant health, damage, poison, regen Added "template" entity effect implementations | ||||
| * | | | Moved Effects.h to EntityEffects.h, added initial impl | archshift | 2014-06-17 | 1 | -3/+3 |
| |/ / | |||||
* | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 1 | -1/+30 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | 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' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 1 | -1/+29 |
| | | |||||
* | | Fixed invalid iterators | Tiger Wang | 2014-06-21 | 1 | -0/+1 |
| | | |||||
* | | More suggestions | Tiger Wang | 2014-06-21 | 1 | -1/+1 |
| | | |||||
* | | Implemented PR suggestions | archshift | 2014-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Furnace.txt: newline BlockID: removed extraneous dimension mapping cEntity: fixed typo cPlayer: WorldPtr typedef | ||||
* | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 1 | -15/+6 |
| | | |||||
* | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 1 | -10/+10 |
|\| | | | | | | | | | | | | | | | | | 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 | 1 | -8/+10 |
| | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | Added queue for adding entities to cWorld. | Mattes D | 2014-06-08 | 1 | -2/+0 |
| | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed. | ||||
* | | Fixed compilation | Tiger Wang | 2014-06-05 | 1 | -1/+1 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-06-04 | 1 | -0/+1 |
| | | |||||
* | | Configurable portals | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | |||||
* | | Suggestions | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 1 | -7/+0 |
|\| | |||||
| * | 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. | ||||
* | | Implemented bed homes | Tiger Wang | 2014-06-01 | 1 | -13/+22 |
| | | | | | | | | | | | | + 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 | 1 | -10/+26 |
|/ | |||||
* | Merge branch 'master' into achievementtranslate | Tiger Wang | 2014-05-25 | 1 | -14/+57 |
|\ | | | | | | | | | Conflicts: src/Entities/Player.cpp | ||||
| * | Cleaned up cPlayer::UpdateMovementStats; Wither achievements | andrew | 2014-05-20 | 1 | -14/+57 |
| | | |||||
* | | Update Player.cpp | Alexander Harkness | 2014-05-20 | 1 | -19/+19 |
| | | |||||
* | | Added client translation to achievements | Tiger Wang | 2014-05-19 | 1 | -4/+4 |
|/ | |||||
* | There's no "round" function in MSVC2008. | madmaxoft | 2014-05-18 | 1 | -3/+3 |
| | |||||
* | Fixes | andrew | 2014-05-13 | 1 | -10/+11 |
| | |||||
* | Movement Statistics | andrew | 2014-05-12 | 1 | -9/+77 |
| | |||||
* | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() | andrew | 2014-05-12 | 1 | -4/+66 |
| | |||||
* | Fixed stat serialization | andrew | 2014-05-11 | 1 | -10/+21 |
| | |||||
* | Statistic Manager | andrew | 2014-05-11 | 1 | -2/+19 |
| | |||||
* | Suggestions'd #2 | Tiger Wang | 2014-05-06 | 1 | -1/+1 |
| | |||||
* | Suggestions'd | Tiger Wang | 2014-05-06 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into fixes. | madmaxoft | 2014-05-02 | 1 | -9/+12 |
|\ | |||||
| * | Add entity invulnerable | Howaner | 2014-04-26 | 1 | -9/+12 |
| | | |||||
* | | A tiny speed improvement in ApplyFoodExhaustion() | Tiger Wang | 2014-04-27 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'master' into fixes | Tiger Wang | 2014-04-24 | 1 | -5/+6 |
|\| | | | | | | | | | Conflicts: src/World.h | ||||
| * | Fixed Flint and Steel, reverted Minecart change, renamed a parameter name | jfhumann | 2014-04-19 | 1 | -2/+2 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 1 | -19/+15 |
| |\ | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -4/+5 |
| | | | |||||
* | | | Some change to Entity.cpp | Tiger Wang | 2014-04-23 | 1 | -16/+6 |
| |/ |/| | | | | | * Added comments to BroadcastMovementUpdate() and the collision tracer | ||||
* | | Merge pull request #891 from mc-server/fixes | Mattes D | 2014-04-17 | 1 | -1/+1 |
|\ \ | | | | | | | Fixes to redstone & general | ||||
| * | | Entities handle chunks properly again | Tiger Wang | 2014-04-12 | 1 | -1/+1 |
| |/ | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty | ||||
* / | Added new AI rules | Tiger Wang | 2014-04-17 | 1 | -18/+14 |
|/ | | | | | | | + 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 | ||||
* | Added cPlayer:SendRotation() API function. | madmaxoft | 2014-04-05 | 1 | -0/+11 |
| | |||||
* | Fixed #721 and FS439 | Tiger Wang | 2014-03-29 | 1 | -0/+1 |
| | |||||
* | Plugins can set flying speed. | madmaxoft | 2014-03-20 | 1 | -3/+30 |
| | |||||
* | Rewritten player speeds to be relative unit-less. | madmaxoft | 2014-03-20 | 1 | -2/+2 |
| | | | | 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. | ||||
* | Unified Vector classes | andrew | 2014-03-11 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 1 | -29/+17 |
|\ | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| * | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 1 | -1/+1 |
| | | |||||
| * | Shortened enums | andrew | 2014-03-01 | 1 | -2/+2 |
| | | |||||
| * | Exported and documented cScoreboard | andrew | 2014-03-01 | 1 | -18/+3 |
| | | |||||
| * | 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 |
| | | | |||||
* | | | CheckBlockInteractionsRate() fixed & enabled | Tiger Wang | 2014-03-09 | 1 | -25/+0 |
| | | | |||||
* | | | Removed unneeded includes in Player.cpp | Tiger Wang | 2014-02-27 | 1 | -7/+0 |
|/ / | |||||
* | | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 1 | -2/+15 |
|\| | |||||
| * | Fixed minor formatting issues from #682 | Tiger Wang | 2014-02-16 | 1 | -10/+1 |
| | | | | | | | | | | - Removed unused PlaySoundEffect * Simplified and parenthesised code | ||||
| * | Add Exp Bottle Effects | Howaner | 2014-02-16 | 1 | -0/+9 |
| | | |||||
| * | Disable Hunger Death | Howaner | 2014-02-16 | 1 | -1/+7 |
| | | |||||
| * | 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 | 1 | -13/+0 |
|\ | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| * | Removed deprecated HasCommand function | STRWarrior | 2014-02-05 | 1 | -13/+0 |
| | | |||||
* | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 1 | -10/+0 |
| | | | | | | | | | | | | | | * 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 |
| | | |||||
* | | Fixed annoying creative on fire bug | Tiger Wang | 2014-02-05 | 1 | -0/+17 |
| | | |||||
* | | 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 | 1 | -2/+2 |
|\| | |||||
| * | Merge pull request #602 from mc-server/improvementsandfixes | Mattes D | 2014-02-03 | 1 | -2/+2 |
| |\ | | | | | | | Redstone crash fix and current console line replace function | ||||
| | * | Creative players take Plugin damage | Tiger Wang | 2014-02-02 | 1 | -2/+2 |
| | | | |||||
* | | | 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 | ||||
* | | Two minor changes | Tiger Wang | 2014-01-25 | 1 | -5/+3 |
| | | |||||
* | | Implemented fall damage for mobs | Tiger Wang | 2014-01-25 | 1 | -4/+2 |
| | | | | | | | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros | ||||
* | | All mobs now drown (fixes #54) | Tiger Wang | 2014-01-25 | 1 | -103/+14 |
| | | | | | | | | | | * Implemented mob drowning * Iron Golems and squids are excluded | ||||
* | | Merge remote-tracking branch 'MikeHunsinger/master' | madmaxoft | 2014-01-24 | 1 | -42/+51 |
|\ \ | |||||
| * | | 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 | 1 | -3/+3 |
| | | | |||||
| * | | Split TossItem into three Toss functions (Held, Equipped and Pickup) | Mike Hunsinger | 2014-01-23 | 1 | -49/+58 |
| |/ | |||||
* | | 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 | 1 | -1/+21 |
| | | |||||
* | | Scoreboard improvements | andrew | 2014-01-19 | 1 | -4/+4 |
| | | |||||
* | | Basic scoreboard implementation | andrew | 2014-01-19 | 1 | -0/+52 |
|/ | |||||
* | Removed internal cEntity::GetRot() usage. | madmaxoft | 2014-01-17 | 1 | -2/+2 |
| | |||||
* | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -3/+3 |
| | |||||
* | Implemented Ctrl-Q drop stack | Tiger Wang | 2014-01-15 | 1 | -3/+8 |
| | | | | Also fixed an issue with TossItems not respecting count. | ||||
* | Yes newline at end of file :D | Tiger Wang | 2014-01-14 | 1 | -1/+5 |
| | |||||
* | Detaching improvements | Tiger Wang | 2014-01-13 | 1 | -0/+26 |
| | | | | | * Players now search for an area around themselves to teleport to when detaching from something | ||||
* | Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure. | Morgan Redshaw | 2013-12-31 | 1 | -2/+2 |
| | |||||
* | 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 | 1 | -3/+20 |
|\ | | | | | 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 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 |
| | | |||||
| * | Implemented fall particles | Tiger Wang | 2013-12-22 | 1 | -3/+18 |
| | | |||||
* | | finally removed them all? | Alexander Harkness | 2013-12-24 | 1 | -1/+1 |
| | | |||||
* | | Floater now dissapears when the player doesn't have an fishing rod equipped. | STRWarrior | 2013-12-21 | 1 | -0/+29 |
|/ | |||||
* | Sorted a few constructors to remove warnings. | madmaxoft | 2013-12-20 | 1 | -21/+22 |
| | |||||
* | 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 |
| | | |||||
* | | Implented IsFishing, SetIsFishing and GetFloaterID(). | STRWarrior | 2013-12-19 | 1 | -0/+2 |
|/ | |||||
* | Fixed cClientHandle::Tick() being called from two threads. | madmaxoft | 2013-12-16 | 1 | -22/+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 |
| | |||||
* | Renamed ShootTo function to ForceSetSpeed. | STRWarrior | 2013-12-15 | 1 | -1/+1 |
| | |||||
* | This adds a function that allows you to 'shoot' a player towards a direction. | STRWarrior | 2013-12-15 | 1 | -0/+10 |
| | |||||
* | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function | STRWarrior | 2013-12-15 | 1 | -0/+32 |
| | |||||
* | cPlayer is using the broadcast functions. | STRWarrior | 2013-12-15 | 1 | -3/+3 |
| | |||||
* | Added E_EFFECT_<Effect> | STRWarrior | 2013-12-14 | 1 | -3/+3 |
| | |||||
* | Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. | STRWarrior | 2013-12-14 | 1 | -1/+9 |
| | |||||
* | 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 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | | | | | | | 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 | 1 | -1/+4 |
|/ | |||||
* | 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 |
| | |||||
* | 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 | 1 | -28/+78 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+1715 |