Tiger Wang
719551c31f
Fix failed merge and other issues
2014-07-18 20:12:27 +01:00
Tiger Wang
37140ae578
Merge branch 'master' into portals
...
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
2014-07-18 20:10:51 +01:00
archshift
ffe44c13d0
Moved ChatColor.h out of defines where it was not needed
2014-07-17 23:25:14 -07:00
archshift
bc94ad4b5a
Fixed NULL being passed instead of a double to AddEntityEffect
2014-07-17 14:34:58 -07:00
madmaxoft
c03161f75d
Fixed tabs used for alignment.
2014-07-17 23:16:55 +02:00
madmaxoft
d0cc9aedb3
More trailing whitespace fixes.
2014-07-17 23:16:54 +02:00
archshift
488ecb6912
Player.cpp: Fixed compile error
2014-07-17 14:08:54 -07:00
archshift
5c0789e15e
Player.cpp: Added Wither death message
2014-07-17 14:08:21 -07:00
madmaxoft
5e198c6730
Basic style fixes.
2014-07-17 22:50:58 +02:00
madmaxoft
2423fbf2ef
Normalized comments.
...
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.
2014-07-17 22:15:34 +02:00
madmaxoft
7d0fc85d00
Merge branch 'master' into potions
2014-07-17 11:01:26 +02:00
Mattes D
98244e96d1
Merge pull request #1193 from mc-server/deathmessages
...
Death messages
2014-07-17 10:12:22 +02:00
madmaxoft
e66b81b395
Merge remote-tracking branch 'origin/master' into potions
2014-07-17 10:06:13 +02:00
Tiger Wang
174906efca
Another fix for excessive food drain
2014-07-16 22:22:45 +01:00
Mattes D
e444106d09
Merge pull request #1192 from mc-server/skinuuid
...
Skins
2014-07-16 13:30:57 +02:00
madmaxoft
8e946da8ac
Merge branch 'master' into potions
2014-07-15 09:01:32 +02:00
Tiger Wang
4e24f711ab
Player properties are now retrieved
2014-07-14 19:49:31 +01:00
Howaner
d529971e27
Changed BroadcastSoundEffect function to take floating pos.
2014-07-13 02:08:02 +02:00
archshift
83c69134c0
Merge remote-tracking branch 'origin/master' into potions
2014-07-11 17:37:28 -07:00
madmaxoft
f73042fb02
Simplified the player data loading.
2014-07-11 23:12:57 +02:00
madmaxoft
ebea2b7efc
Player data filenames are based on UUID.
2014-07-11 13:13:10 +02:00
madmaxoft
6cea81e383
Fixed a missing return value.
2014-07-11 00:06:58 +02:00
madmaxoft
2bd486660a
Preparation for player UUID-based storage: LoadFromFile()
2014-07-11 00:06:05 +02:00
archshift
e824cd09b3
Merge remote-tracking branch 'origin/master' into potions
...
Conflicts:
src/Entities/Player.cpp
src/Entities/ProjectileEntity.cpp
2014-07-09 23:28:27 -07:00
Tiger Wang
a0d2df9327
Tailored death messages
2014-07-04 10:55:09 +01:00
Mattes D
39fff19955
Merge pull request #1138 from mc-server/enderchest
...
Properly implemented enderchests
2014-07-02 22:59:21 +02:00
Tiger Wang
abb49d3f33
Suggestion
2014-07-02 18:51:37 +01:00
Tiger Wang
f5659a08b8
Merge remote-tracking branch 'origin/master'
...
Conflicts:
src/Entities/Player.cpp
2014-07-02 18:48:05 +01:00
Tiger Wang
c1ae5513ec
Fixed player teleport food drain
2014-07-02 18:46:13 +01:00
Howaner
8e11f7a1f6
Fixes.
2014-06-30 21:50:40 +02:00
Howaner
aa753a92c0
Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGE
2014-06-30 15:12:56 +02:00
Tiger Wang
b9d4431f6f
Fixed respawning
...
* Fixes #1103
2014-06-29 22:44:16 +01:00
Tiger Wang
dde641ce83
Properly implemented enderchests
2014-06-29 11:36:38 +01:00
Tiger Wang
35dc056f03
Likely fixed too quick food depletion
...
* Fixes FS427 properly, hopefully
2014-06-28 21:10:59 +01:00
Howaner
eaf36766f6
Merge branch 'master' into Bow
2014-06-26 15:49:53 +02:00
Tiger Wang
7615ed90c0
Merge branch 'master' into portals
...
Conflicts:
src/Chunk.cpp
src/Entities/Entity.h
src/Entities/Player.h
2014-06-21 22:14:23 +01:00
Tiger Wang
6e681269d9
Fixed invalid iterators
2014-06-21 22:07:38 +01:00
Tiger Wang
1296c5dce7
More suggestions
2014-06-21 20:42:29 +01:00
archshift
e8143de01b
Nullify deleted pointers.
2014-06-19 01:49:56 -07:00
archshift
f5529e544c
EntityEffects.x -> EntityEffect.x, Object-Oriented effects
...
Changed effect map to take a pointer of the effect as a result.
2014-06-18 22:54:14 -07:00
archshift
9e8361976b
Entity Effects: Clarified user, added it to AddEntityEffect
...
Added second AddEntityEffect with a pass-by-value of the class.
2014-06-17 11:39:22 -07:00
madmaxoft
e289fe4dd7
Changed the AddEntityEffect() params for easier calls.
2014-06-17 11:39:21 -07:00
archshift
5b2b6e0615
Pawn: renamed HandleEntityEffects to HandleEntityEffect
...
Exported entity effect functions for ToLua and documented them in APIDesc.lua
2014-06-17 11:39:21 -07:00
archshift
73cea7065d
Entity effect type: use 'eff' as a prefix instead of 'ef'
2014-06-17 11:39:20 -07:00
archshift
1eb04a48ee
Implemented milk, added documentation to Pawn.h
2014-06-17 11:39:19 -07:00
archshift
615152eb8c
Pawn.cpp: fixed effect iterator BAD_ACCESS
...
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
2014-06-17 11:39:19 -07:00
archshift
a9a4c9c6b2
EntityEffect: read-only getters, added user and distance modifier fields
...
User: the pawn that uses or produces the entity effect (drinks/throws a potion)
Distance modifier: the potency modifier from splash potion effectivity radius
2014-06-17 11:39:19 -07:00
archshift
2123173202
Player: Removed food-poisoning-specific code, set duration to 30 seconds
...
http://minecraft.gamepedia.com/Hunger#Behavior
2014-06-17 11:39:19 -07:00
archshift
481f05b011
Entity effects: Added handlers for entity effects
...
Implemented hunger, instant health, damage, poison, regen
Added "template" entity effect implementations
2014-06-17 11:39:19 -07:00
archshift
87b1bfaf2a
Moved Effects.h to EntityEffects.h, added initial impl
2014-06-17 11:17:32 -07:00
Howaner
e50423991e
Add bow charging animation
2014-06-16 21:57:23 +02:00
Tycho
ee50790398
Merge branch 'master' of github.com:mc-server/MCServer
2014-06-16 15:12:50 +01:00
archshift
b2fbcaf1bf
Implemented PR suggestions
...
Furnace.txt: newline
BlockID: removed extraneous dimension mapping
cEntity: fixed typo
cPlayer: WorldPtr typedef
2014-06-15 20:27:27 -07:00
Tiger Wang
29567c5610
Portals animate and delay correctly
2014-06-12 15:21:07 +01:00
Tiger Wang
bfa8aaf41b
Merge branch 'master' into portals
...
Conflicts:
src/ClientHandle.cpp
src/Entities/Player.cpp
src/Entities/Player.h
src/Protocol/Protocol125.cpp
src/Protocol/Protocol17x.cpp
2014-06-10 20:51:22 +01:00
Mattes D
af4a21ea06
Fixed deadlock when moving players to other worlds.
...
Fixes #1039 , fixes #851
2014-06-08 21:58:30 +02:00
Mattes D
b904223b9d
Added queue for adding entities to cWorld.
...
This alone doesn't work properly yet, further changes to cPlayer are needed.
2014-06-08 21:58:29 +02:00
Tiger Wang
f22a1b226c
Fixed compilation
2014-06-05 08:25:26 +01:00
Tiger Wang
873043c8e4
Suggestions
2014-06-04 21:51:19 +01:00
Tiger Wang
ccbf6cc446
Configurable portals
2014-06-04 20:00:55 +01:00
Tiger Wang
74cd4f5521
Suggestions
2014-06-04 18:59:56 +01:00
Tiger Wang
86e5273cd1
Merge remote-tracking branch 'origin/master' into portals
2014-06-04 13:14:38 +01:00
madmaxoft
c0015d01c6
Player permissions aren't logged to console anymore.
...
This was only logspam on most servers and there are alternative ways to list players' permissions.
2014-06-03 19:50:27 +02:00
Tiger Wang
576f89c1d5
Implemented bed homes
...
+ Implemented bed home positions
* Fixed some inventory and health server/client mismatches after world
change
2014-06-01 18:46:59 +01:00
Tiger Wang
8bff3e5af2
Implemented end and nether portals
2014-05-31 22:28:51 +01:00
Tiger Wang
f55f5ec47f
Merge branch 'master' into achievementtranslate
...
Conflicts:
src/Entities/Player.cpp
2014-05-24 23:21:39 +01:00
andrew
07baf9bdd3
Cleaned up cPlayer::UpdateMovementStats; Wither achievements
2014-05-20 15:52:59 +03:00
Alexander Harkness
507df71845
Update Player.cpp
2014-05-20 13:35:39 +01:00
Tiger Wang
42c36429d7
Added client translation to achievements
2014-05-19 20:40:56 +01:00
madmaxoft
a651c865e4
There's no "round" function in MSVC2008.
2014-05-18 22:49:27 +02:00
andrew
466ff2204f
Fixes
2014-05-13 14:53:15 +03:00
andrew
aea866f5b1
Movement Statistics
2014-05-12 21:38:52 +03:00
andrew
b3d2b5b2c9
cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()
2014-05-12 17:05:09 +03:00
andrew
e3c6c8f3dd
Fixed stat serialization
2014-05-11 20:30:54 +03:00
andrew
c7c3724a3e
Statistic Manager
2014-05-11 14:57:06 +03:00
Tiger Wang
cca8376a01
Suggestions'd #2
2014-05-06 19:38:01 +01:00
Tiger Wang
1df7dbe7c9
Suggestions'd
2014-05-05 23:45:35 +01:00
madmaxoft
839447f0bb
Merge branch 'master' into fixes.
2014-05-02 19:34:28 +02:00
Tiger Wang
15767badac
A tiny speed improvement in ApplyFoodExhaustion()
2014-04-26 23:52:18 +01:00
Howaner
7e76f030aa
Add entity invulnerable
2014-04-26 00:32:30 +02:00
Tiger Wang
48904ae201
Merge branch 'master' into fixes
...
Conflicts:
src/World.h
2014-04-24 18:57:25 +01:00
Tiger Wang
7f5cf417de
Some change to Entity.cpp
...
* Added comments to BroadcastMovementUpdate() and the collision tracer
2014-04-23 21:06:46 +01:00
jfhumann
f48d43f050
Fixed Flint and Steel, reverted Minecart change, renamed a parameter name
2014-04-19 20:51:52 +02:00
jfhumann
67344a3782
Merge remote-tracking branch 'origin/master' into fixes
...
Conflicts:
src/Authenticator.cpp
src/ClientHandle.cpp
src/Entities/Minecart.cpp
src/Protocol/Protocol17x.cpp
2014-04-18 21:44:58 +02:00
jfhumann
013da806ec
Did some static analysis, fixed some bugs and optimized a lot of code
2014-04-18 21:09:44 +02:00
Mattes D
b7e074b10b
Merge pull request #891 from mc-server/fixes
...
Fixes to redstone & general
2014-04-17 22:37:00 +02:00
Tiger Wang
bdea8706d8
Added new AI rules
...
+ 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
2014-04-17 18:50:25 +01:00
Tiger Wang
c0c47d33c5
Entities handle chunks properly again
...
* Entities properly handle chunks
* Changed EntityStatus enums to be less shouty
2014-04-12 13:16:48 +01:00
madmaxoft
1cab52f867
Added cPlayer:SendRotation() API function.
2014-04-05 12:09:30 +02:00
Tiger Wang
6dea7993f2
Fixed #721 and FS439
2014-03-28 23:25:11 +00:00
madmaxoft
b370cacf0c
Plugins can set flying speed.
2014-03-20 16:14:40 +01:00
madmaxoft
64d9390069
Rewritten player speeds to be relative unit-less.
...
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.
2014-03-20 15:45:42 +01:00
andrew
b4bf13aa4f
Unified Vector classes
2014-03-11 16:02:25 +02:00
Tiger Wang
c2978a3457
Merge branch 'master' into ballisticmissiles
...
Conflicts:
src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
Tiger Wang
c05a1db88d
CheckBlockInteractionsRate() fixed & enabled
2014-03-09 12:48:52 +00:00
andrew
d73cdba1f6
g_BlockXXX => cBlockInfo::XXX
2014-03-01 21:34:19 +02:00
andrew
692a84af31
Shortened enums
2014-03-01 14:20:29 +02:00
andrew
5c44945287
Exported and documented cScoreboard
2014-03-01 12:08:40 +02:00
madmaxoft
35def963f0
Moved common cGroupManager code to a separate function.
...
This fixes my concerns in PR #709 .
2014-02-28 15:31:20 +01:00
Mattes D
6ad4b78a7b
Merge pull request #709 from Howaner/GlobalFixes
...
Add 'Group not found', when the Server load the users.ini and add auto g...
2014-02-28 14:28:50 +01:00
Tiger Wang
9ac9249aca
Removed unneeded includes in Player.cpp
2014-02-27 21:49:10 +00:00
Howaner
3777873f22
Remove users.ini generation in Player.cpp and use the CheckUsers() Function
2014-02-21 15:10:31 +01:00
Howaner
21febaf4b3
Add 'Group not found', when the Server load the users.ini and add auto generate from users.ini
2014-02-21 14:53:46 +01:00
andrew
83d3a2eedf
Manual merge (Fixed conflicts)
2014-02-20 15:37:15 +02:00
andrew
3b24bc870b
Map item handler; Fixed several bugs
2014-02-17 16:27:12 +02:00
Tiger Wang
4908b6f500
Fixed minor formatting issues from #682
...
- Removed unused PlaySoundEffect
* Simplified and parenthesised code
2014-02-16 13:37:36 +00:00
Howaner
f3bd288f02
Add Exp Bottle Effects
2014-02-16 01:19:30 +01:00
Howaner
d15d6acc58
Disable Hunger Death
2014-02-16 01:18:10 +01:00
Alexander Harkness
584f7bd806
Merge pull request #679 from mc-server/NotchDeath
...
NotchApple
2014-02-15 19:04:13 +00:00
STRWarrior
0040a88b9b
If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/Notch
2014-02-15 19:51:05 +01:00
Tiger Wang
91ebb6cef0
Made player jump reset less ambiguous
2014-02-12 21:53:46 +00:00
Tiger Wang
06239c8336
Fixed #627
...
- 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)
2014-02-11 22:09:56 +00:00
Tiger Wang
9d1c9097e3
Merge remote-tracking branch 'origin/master' into playerimprovements
...
Conflicts:
src/Root.cpp
src/Root.h
src/World.cpp
2014-02-09 00:14:42 +00:00
Tiger Wang
88a64ec40d
Improved chat messaging functions
...
* Moved string manipulation into cClientHandle and therefore...
+ Added configuration option for prefixes.
* Cleaned up code.
* Updated documentation for API.
2014-02-07 18:58:52 +00:00
Tiger Wang
aa8b46e947
Server internally uses new functions
2014-02-05 23:24:16 +00:00
STRWarrior
89ec774fd6
Removed deprecated HasCommand function
2014-02-05 20:20:11 +01:00
Tiger Wang
ea2ce1595f
Fixed annoying creative on fire bug
2014-02-04 23:27:13 +00:00
Tiger Wang
6de8c09fe0
Fixed a crash bug
2014-02-03 22:24:22 +00:00
Tiger Wang
a3759c1462
Merge remote-tracking branch 'origin/master' into playerimprovements
2014-02-03 21:25:42 +00:00
Tiger Wang
b5e898a608
Server now handles join messages also
...
* Revised as well hook documentation
2014-02-03 21:12:44 +00:00
Mattes D
b090547c17
Merge pull request #602 from mc-server/improvementsandfixes
...
Redstone crash fix and current console line replace function
2014-02-02 22:02:25 -08:00
Tiger Wang
b89419f603
Creative players take Plugin damage
2014-02-02 12:47:17 +00:00
Mattes D
33759197e9
Merge pull request #585 from daniel0916/hooks
...
Added "player destroying" and "player destroyed" hooks
2014-02-01 05:08:08 -08:00
daniel0916
dbbd47b96d
Removed "player destroying" hook
2014-02-01 13:27:44 +01:00
Tiger Wang
6fa3a0cf70
Two minor changes
2014-01-25 19:05:44 +00:00
Tiger Wang
7468ba0f10
Implemented fall damage for mobs
...
+ Implemented mobile fall damage
* Formatting fixes
+ Defined new Position->Integer macros
2014-01-25 19:02:13 +00:00
daniel0916
bac750b24e
Added "player destroying" and "player destroyed" hooks
...
Hooks:
HOOK_PLAYER_DESTROYING
HOOK_PLAYER_DESTROYED
Idea from: https://github.com/mc-server/MCServer/issues/473
2014-01-25 11:25:22 +01:00
Tiger Wang
fd7fc7e59e
All mobs now drown ( fixes #54 )
...
* Implemented mob drowning
* Iron Golems and squids are excluded
2014-01-24 23:58:51 +00:00
madmaxoft
8a254faaf7
Merge remote-tracking branch 'MikeHunsinger/master'
2014-01-24 08:55:41 +01:00
Mike Hunsinger
7c12247263
Fixed indentation once and for all.
2014-01-23 20:11:10 -07:00
Mike Hunsinger
9926ea58e8
Fixed indentation and doxygen comments... For real this time.
2014-01-23 20:01:08 -07:00
Mike Hunsinger
11948b1d4b
Fixed spacing and doxycomments.
2014-01-23 19:54:00 -07:00
Mike Hunsinger
41b05416c7
Split TossItem into three Toss functions (Held, Equipped and Pickup)
2014-01-23 00:27:39 -07:00
tonibm19
d59a0156ce
Fixed compilation on VC2008
2014-01-22 16:58:25 +01:00
andrew
aa61f55b74
Scoreboard protocol support
2014-01-21 15:58:17 +02:00
andrew
7728f4bcbe
Scoreboard deserialization
2014-01-20 16:10:39 +02:00
andrew
f321b5d224
Scoreboard improvements
2014-01-19 16:02:37 +02:00
andrew
2b94361059
Basic scoreboard implementation
2014-01-19 14:20:57 +02:00
madmaxoft
aec5200893
Removed internal cEntity::GetRot() usage.
2014-01-17 11:11:17 +01:00
Tiger Wang
74645fdfaa
Removed obsoleted functions
2014-01-16 19:00:49 +00:00
Tiger Wang
3c31f2d8d8
Implemented Ctrl-Q drop stack
...
Also fixed an issue with TossItems not respecting count.
2014-01-15 22:36:19 +00:00
Tiger Wang
e3b839b69f
Yes newline at end of file :D
2014-01-14 18:16:13 +00:00
Tiger Wang
edefa27a48
Detaching improvements
...
* Players now search for an area around themselves to teleport to when
detaching from something
2014-01-12 23:23:36 +00:00
Morgan Redshaw
782818ffb5
Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure.
2013-12-30 21:30:20 -07:00
Tiger Wang
f1142af455
Server now handles death messages
2013-12-26 14:55:19 +00:00
Mattes D
e0e01d0615
Merge pull request #461 from mc-server/repeaters
...
Repeaters, pressure plates, and others
2013-12-25 23:57:02 -08:00
Tiger Wang
40c2826a21
Braced up some code
2013-12-25 14:05:37 +00:00
Tiger Wang
508e505ace
Used IsGamemodeCreative() function
2013-12-24 23:47:04 +00:00
Tiger Wang
ae6cb01e56
Fixed comments in main.cpp and Player.cpp
2013-12-24 15:16:30 +00:00
Alexander Harkness
af6389ea7a
finally removed them all?
2013-12-24 10:30:36 +00:00
Tiger Wang
1014c737a4
Improved player fall particle positions
2013-12-23 21:18:01 +00:00
Tiger Wang
9c796bf6b4
Clarified some code in Player.cpp
2013-12-23 09:51:41 +00:00
Tiger Wang
945ba36d1b
Implemented fall particles
2013-12-22 20:03:09 +00:00
STRWarrior
bd6574230a
Floater now dissapears when the player doesn't have an fishing rod equipped.
2013-12-21 17:31:05 +01:00
madmaxoft
d6de11da07
Sorted a few constructors to remove warnings.
2013-12-20 16:39:20 +01:00
Mattes D
39251bccd3
Merge pull request #450 from mc-server/redstonefixes
...
Multiple fixes
2013-12-19 13:58:49 -08:00
Tiger Wang
03a8dfc4a8
Fixed PlayerAbilities and creative
2013-12-19 20:53:47 +00:00
STRWarrior
3d70d7198d
Implented IsFishing, SetIsFishing and GetFloaterID().
2013-12-19 17:33:21 +01:00
madmaxoft
f521cbeb31
Fixed cClientHandle::Tick() being called from two threads.
...
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 .
2013-12-16 10:41:51 +01:00
STRWarrior
007d668c1b
Server saves if a player is flying.
2013-12-15 21:25:13 +01:00
STRWarrior
5e75408b3b
Renamed ShootTo function to ForceSetSpeed.
2013-12-15 20:19:58 +01:00
STRWarrior
0efd74f114
This adds a function that allows you to 'shoot' a player towards a direction.
2013-12-15 18:54:54 +01:00
STRWarrior
b10d0b95cb
Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function
2013-12-15 14:48:17 +01:00
STRWarrior
9c2089dc5a
cPlayer is using the broadcast functions.
2013-12-15 10:52:54 +01:00
STRWarrior
71250b275f
Added E_EFFECT_<Effect>
2013-12-14 22:23:20 +01:00
STRWarrior
37069288d5
Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison.
2013-12-14 18:03:00 +01:00
Tiger Wang
4622d4ac09
Improved player permissions logging
2013-12-14 02:54:08 +00:00
Tiger Wang
0aeece7fda
Fixes to redstone wire and torches
...
+ 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.
2013-12-14 02:40:54 +00:00
Tiger Wang
4e11095441
Groups.ini and Users.ini are now generated
2013-12-14 02:02:26 +00:00
Tiger Wang
1d554677b4
Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures
...
Conflicts:
src/Bindings/Bindings.cpp
src/Bindings/Bindings.h
src/Blocks/BlockHandler.cpp
2013-12-08 14:02:45 +00:00
madmaxoft
044fd237b6
Moved bindings-related to a Bindings subfolder.
...
Ref.: #407
2013-12-08 12:17:54 +01:00
Tiger Wang
30ead79049
Renamed animation function
...
Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just
players can have animations, you know.
2013-12-06 23:47:07 +00:00
Tiger Wang
ec226e00ab
Puking now uses GetEyeHeight()
2013-12-06 20:41:58 +00:00
Tiger Wang
289e8cba21
Fixed eating using wrong animation
2013-12-06 20:28:27 +00:00
Tiger Wang
44d5fd1e87
Tools make a sound when breaking, fixes #266
2013-12-06 19:59:14 +00:00
madmaxoft
2113ca3844
Fixed VC2008 compilation, normalized include paths.
2013-11-27 09:17:25 +01:00
Alexander Harkness
3b790bbf67
Fixed some of tiger's derpyness.
2013-11-27 07:27:19 +00:00
Tiger Wang
2ef9cf700d
Hopefully fixed last of the Linux compile errors
2013-11-26 22:50:33 +00:00
Tiger Wang
e3db69c4ae
Attempt to fix compilation
2013-11-24 18:44:22 +00:00
Alexander Harkness
c3cd436ec3
Merge remote-tracking branch 'origin/master' into foldermove2
...
Conflicts:
GNUmakefile
2013-11-24 14:37:03 +00:00
Alexander Harkness
675b4aa878
Moved source to src
2013-11-24 14:19:41 +00:00