Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ / | |||||
| * | | Nullify deleted pointers. | archshift | 2014-06-19 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'master' into GlobalFixes | Howaner | 2014-06-17 | 7 | -65/+111 |
| |\| | |||||
| * | | 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 |
| | | | |||||
* | | | 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 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 4 | -33/+81 |
| | | |||||
* | | 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 |
| | | |||||
* | | 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 |
| | | | | | | | |||||
* | | | | | | | 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 |