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 |
|