Mattes D
0b758946ac
Merge pull request #951 from worktycho/chunksparsing/structs
...
Chunksparsing with segments
2014-05-31 10:12:54 +02:00
Howaner
92d9ab0f6d
Wrong arrow commit.
2014-05-30 22:25:57 +02:00
Howaner
e7a7c45c36
Add throw sound and fix arrow server crash.
2014-05-28 16:39:59 +02:00
Howaner
d4f90259b8
Fix Y-Position from arrow entity.
2014-05-28 16:12:10 +02:00
Tiger Wang
f55f5ec47f
Merge branch 'master' into achievementtranslate
...
Conflicts:
src/Entities/Player.cpp
2014-05-24 23:21:39 +01:00
Tycho
4ab8288116
Merge branch 'master' into chunksparsing/structs
2014-05-24 12:44:49 +01:00
Mattes D
941cb88ae4
Fixed datatype conversion warning.
2014-05-23 12:33:30 +02:00
xdot
671c73c639
Merge pull request #1015 from mc-server/Stats
...
Statistics
2014-05-21 11:14:44 +03: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
2bfe962e28
Fixed a cactus Y position issue
2014-05-19 22:15:39 +01:00
Tiger Wang
4008af6925
Simplified cacti conditions
2014-05-19 21:17:28 +01:00
Tiger Wang
42c36429d7
Added client translation to achievements
2014-05-19 20:40:56 +01:00
Alexander Harkness
1de4408a18
Merge pull request #1010 from mc-server/cactidamage
...
Implemented cacti damage
2014-05-19 14:01:50 +01:00
Alexander Harkness
6de0257bbe
Derp
2014-05-19 13:31:19 +01:00
Alexander Harkness
dc39d88d3f
Should have fixed assumptions about entity width.
...
@madmaxoft can you comment?
2014-05-19 10:35:21 +01:00
Alexander Harkness
70cf4a5eaf
Fixed clanging errors.
...
Please @tigerw make sure this is correct.
2014-05-19 07:31:53 +01:00
Tiger Wang
6167c79e7a
Implemented cacti damage
...
+ Implemented cacti damage
* Fixed pickup tossing (PR #994 bug)
2014-05-18 22:41:42 +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
6cb3483954
Fixed compilation
2014-05-11 21:41:25 +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
Tycho
d478e3cfb1
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.h
2014-05-10 05:05:44 -07:00
worktycho
17c7c31130
Initialise m_HasTeleported in both constructors
2014-05-09 16:56:29 +01:00
Tiger Wang
696a7bc52e
Merge branch 'master' into fixes
...
Conflicts:
src/Vector3.h
2014-05-06 20:15:19 +01: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
Tiger Wang
0d1804e439
Merge branch 'master' into redstoneimprovements
...
Conflicts:
src/ClientHandle.cpp
src/Entities/FallingBlock.cpp
src/Mobs/AggressiveMonster.cpp
src/Simulator/IncrementalRedstoneSimulator.cpp
2014-05-04 14:15:10 +01:00
madmaxoft
5082d55e85
A bit of reformatting.
2014-05-02 19:40:12 +02:00
madmaxoft
839447f0bb
Merge branch 'master' into fixes.
2014-05-02 19:34:28 +02:00
Tycho
8780b324ff
Merge branch 'master' into chunksparsing/structs
2014-05-01 11:50:40 -07:00
madmaxoft
dffd38e53b
Fixed a MSVC warning.
2014-04-28 22:21:49 +02:00
Mattes D
709015369d
Merge pull request #940 from Howaner/GlobalFixes
...
Add entity invulnerable
2014-04-28 20:58:15 +02:00
Mattes D
c063051645
Merge pull request #954 from mc-server/projectiles-split
...
Totally refactored ProjectileEntity.h, splitting up into several files.
2014-04-28 12:32:02 +02:00
archshift
9b0cb3fd97
Fixed projectile source filenames, indentations
2014-04-27 17:05:18 -07:00
madmaxoft
9dc9713a9c
Fixed warnings.
2014-04-27 23:12:52 +02:00
archshift
15324f3bbd
Fixed ToLua errors, added newlines
2014-04-27 09:42:31 -07:00
Tiger Wang
bbc5faa723
Redstone simulator now directly accesses cChunk
...
* Redstone simulator performance improvements
* Added return values to some functions
* Minor fixes
2014-04-27 17:35:41 +01:00
Tycho
57b8ee9163
Merge branch 'master' into chunksparsing/structs
...
Conflicts:
src/Chunk.cpp
src/Chunk.h
2014-04-27 06:35:27 -07:00
archshift
cc39d314ae
Fixed ToLua issues
2014-04-26 17:58:06 -07:00
archshift
e3c3795aa4
Moved cFireworkEntity out of ProjectileEntity.h
2014-04-26 17:50:05 -07:00
archshift
cb93a57963
Moved cGhastFireballEntity out of ProjectileEntity.h
2014-04-26 17:41:07 -07:00
archshift
de7eaa5735
Moved cFireChargeEntity out of ProjectileEntity.h
2014-04-26 17:35:31 -07:00
archshift
08b77f4880
Moved cThrownSnowballEntity out of ProjectileEntity.h
2014-04-26 17:24:44 -07:00
archshift
2f9580ad65
Moved cExpBottleEntity out of ProjectileEntity.h
2014-04-26 17:19:45 -07:00
archshift
bc5c28a0be
Moved cThrownEnderPearl out of ProjectileEntity.h
2014-04-26 17:08:39 -07:00
archshift
de23a115a5
Moved cThrownEggEntity out of ProjectileEntity.h
2014-04-26 17:02:47 -07:00
archshift
477b3e7861
Moved cArrowEntity out of ProjectileEntity.h
2014-04-26 16:45:39 -07:00
Tiger Wang
15767badac
A tiny speed improvement in ApplyFoodExhaustion()
2014-04-26 23:52:18 +01:00
Tiger Wang
b4b3b5ce64
More comments!
...
* Also fixed a potential issue with position sending - if someone moved
slowly enough, their position would never be updated.
2014-04-26 23:50:24 +01:00
archshift
e2194e6e90
Added static const, initialized fields.
2014-04-26 15:32:14 -07:00
Mattes D
da931da603
Merge pull request #941 from archshift/master
...
Fixed lots of warnings, and other small changes.
2014-04-26 23:26:59 +02:00
archshift
7841bad27a
More small fixes.
2014-04-26 14:05:00 -07:00
Tycho
e40f9d6e5b
Implemented Chunk Sparsing with segments
2014-04-26 10:50:23 -07:00
archshift
aef2c8ec62
Further refactored, Reverted Minecart change
...
Other small changes.
2014-04-26 09:25:30 -07:00
Howaner
49f6819829
Fixes
2014-04-26 16:44:15 +02:00
archshift
acff6148b6
Moved switch{} out of GetArmorCoverAgainst().
2014-04-25 19:49:08 -07:00
archshift
73edd2b961
Fixed a couple more warnings.
2014-04-25 17:15:12 -07:00
Howaner
e5683ede63
Change m_InvulnerableTicks description again again :D
2014-04-26 00:41:00 +02:00
Howaner
ed1aa02d0c
Change m_InvulnerableTicks description again.
2014-04-26 00:37:40 +02:00
Howaner
ad1410f46e
Change m_InvulnerableTicks description
2014-04-26 00:37:09 +02:00
Howaner
7fd9fe9d5f
Merge branch 'master' into GlobalFixes
2014-04-26 00:34:42 +02:00
Howaner
7e76f030aa
Add entity invulnerable
2014-04-26 00:32:30 +02:00
Mattes D
a4f21908b2
Merge pull request #920 from axisd/master
...
Mobs shouldn't burn when it's Raining
2014-04-25 23:48:00 +02:00
Mattes D
43cca14763
Merge pull request #935 from archshift/projectile-fixes
...
Chicken eggs and ender pearls can hit entities.
2014-04-25 23:41:04 +02:00
archshift
e47dab84f3
Cmake generated projects for IDEs include headers in project files.
2014-04-25 09:56:15 -07:00
archshift
8aa82d048d
Creator not user.
2014-04-25 06:26:08 -07:00
archshift
256691461b
Comments for TrySpawnChicken() and TeleportUser().
2014-04-25 05:49:18 -07:00
archshift
cb7f1ee4bb
Rename spawn chicken method, Initialize m_HasTeleported.
2014-04-25 05:39:35 -07:00
r.ramazanov
4cd2d57c64
Fix formatting
2014-04-25 12:06:22 +04:00
r.ramazanov
827c3760db
Fix for clang
2014-04-25 10:58:48 +04:00
r.ramazanov
a72744f5c3
Mobs shouldn't burn when it's Raining & Mob Knockback is far too much
2014-04-25 10:08:36 +04:00
archshift
ec9787bae2
Chicken eggs and ender pearls can hit entities.
...
Fixed warning by adding dedicated m_HasTeleported for fired arrows.
2014-04-24 19:16:16 -07:00
Tiger Wang
c949c1e755
Implemented suggestions
2014-04-24 22:03:47 +01: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
r.ramazanov
103c867f1f
Merge branch 'master' of https://github.com/mc-server/MCServer
2014-04-23 18:15:28 +04:00
r.ramazanov
5deb35c5cf
Mobs shouldn't burn when it's Raining #906
...
Mob Knockback is far too much #776
2014-04-23 18:15:04 +04:00
Mattes D
0d0e0af2d8
Merge pull request #925 from archshift/master
...
Added monsters.ini rule for fireproof mobs.
2014-04-23 09:46:06 +02:00
archshift
8768669428
Renamed getter and setter for IsFireproof.
2014-04-23 00:12:37 -07:00
archshift
a37b36adab
Fireproof status getter and setter.
2014-04-22 12:59:31 -10:00
Mattes D
b3a9b73278
Merge pull request #923 from archshift/master
...
Added flag for fireproof entities.
2014-04-22 15:04:04 +02:00
archshift
06f41699af
Fixed indentation and changed m_Fireproof to m_IsFireproof.
2014-04-22 02:36:39 -10:00
archshift
bca7f29490
Lay foundation for fireproof entities.
...
Prevent any entities with the m_Fireproof flag from taking fire or lava damage.
2014-04-22 01:59:34 -10:00
Mattes D
6492aa000b
Merge pull request #909 from jfhumann/fixes
...
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
2014-04-22 13:34:32 +02:00
jfhumann
865e8e22e5
reverted the revert of the minecart collision detection fix.
2014-04-21 14:04:36 +02:00
r.ramazanov
a967313839
Mobs shouldn't burn when it's Raining #906
2014-04-21 13:13:25 +04: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
Tiger Wang
6cb63a768d
Fixed #906
2014-04-18 12:59:14 +01: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
143a5e61fc
Fixed Endiannes conversion routines for floats and doubles.
...
This bug has been introduced in 8825d30aab
.
This change fixes #854 .
2014-04-05 22:34:05 +02:00
madmaxoft
d43c5a9c47
Removed debugging log from entity physics handling.
2014-04-05 22:25:40 +02:00
madmaxoft
1cab52f867
Added cPlayer:SendRotation() API function.
2014-04-05 12:09:30 +02:00