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 |
|
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 |
|
archshift
|
5a0625eccc
|
Moar alignment.
|
2014-04-26 11:00:59 -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
|
d50f8f6f11
|
Changed the old invulnerable methods from the wither to the new.
|
2014-04-26 17:47:25 +02:00 |
|
Howaner
|
619592b5a0
|
Withers now use the new invulnerable.
|
2014-04-26 17:37:35 +02:00 |
|
Howaner
|
49f6819829
|
Fixes
|
2014-04-26 16:44:15 +02:00 |
|
Mattes D
|
1139b117c4
|
Merge pull request #863 from mc-server/chunkysparsing
Chunky sparsing
|
2014-04-26 15:12:10 +02:00 |
|
jfhumann
|
a1765a2896
|
Fixed unitialized member in gZipFile (CID 43673)
|
2014-04-26 14:23:53 +02:00 |
|
Mattes D
|
e5d08aa9a9
|
Merge pull request #936 from archshift/patch-1
Use libc++ on OSX
|
2014-04-26 13:45:13 +02:00 |
|
archshift
|
80b97fd9dd
|
Fixed mobs that don't naturally spawn.
|
2014-04-25 20:49:55 -07:00 |
|
archshift
|
acff6148b6
|
Moved switch{} out of GetArmorCoverAgainst().
|
2014-04-25 19:49:08 -07:00 |
|
archshift
|
b2f40a7a11
|
Removed unused assignments.
|
2014-04-25 18:18:46 -07:00 |
|
archshift
|
73edd2b961
|
Fixed a couple more warnings.
|
2014-04-25 17:15:12 -07:00 |
|
archshift
|
2c0bb7b717
|
Moved the weather picker out of TickWeather(), squashing a warning and improving readability.
|
2014-04-25 16:55:38 -07:00 |
|
archshift
|
d094beb45a
|
Needs the -stdlib linker flag too.
|
2014-04-25 16:40:57 -07:00 |
|
jfhumann
|
26568a852e
|
Fixed a memory leak in tolua_cWorld_ChunkStay. (CID 43618)
|
2014-04-26 01:35:25 +02:00 |
|
archshift
|
c124fc39d4
|
Removed impossible default case.
Squashed a warning.
|
2014-04-25 16:32:34 -07:00 |
|
archshift
|
083cec5a09
|
Removed extraneous switch{} in Start()
Squashed a warning.
|
2014-04-25 16:27:15 -07:00 |
|
jfhumann
|
f2b7cb138f
|
Fixes resource leaks in the yggdrasil authenticator. (CID 43617)
|
2014-04-26 01:21:06 +02:00 |
|
archshift
|
5ffdaa8142
|
Moved huge conditional out of InStateChasing(), improving readability
Squashed a warning.
|
2014-04-25 15:49:11 -07:00 |
|
jfhumann
|
c8d5fcfffa
|
Fix for minor resource leak (CID 43616)
|
2014-04-26 00:43:01 +02: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 |
|
madmaxoft
|
087210302f
|
Updated MSVC side of CMake files after recent changes.
|
2014-04-25 23:45:16 +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 |
|
jfhumann
|
03402efc49
|
Should fix CIDs 43631, 43632 and 43633
|
2014-04-25 23:39:10 +02:00 |
|
Mattes D
|
20e0465fd1
|
Merge pull request #938 from archshift/xcode-oops
Oops, forgot some CMakeLists in #937
|
2014-04-25 23:38:45 +02:00 |
|
Tiger Wang
|
05f52192c9
|
Implemented comments
|
2014-04-25 21:22:43 +01:00 |
|
archshift
|
0e0c9d8248
|
Missed these CMakeLists.
|
2014-04-25 12:24:09 -07:00 |
|
archshift
|
d64e46186f
|
Merge remote-tracking branch 'upstream/master'
|
2014-04-25 10:50:10 -07:00 |
|
worktycho
|
e2718418bb
|
Merge pull request #937 from archshift/xcode-headers
Cmake generated projects for IDEs include headers in project files.
|
2014-04-25 18:33:30 +01:00 |
|
archshift
|
0f9e399351
|
Move to line 47.
|
2014-04-25 10:32:39 -07:00 |
|
archshift
|
e47dab84f3
|
Cmake generated projects for IDEs include headers in project files.
|
2014-04-25 09:56:15 -07:00 |
|