Tiger Wang 696a7bc52e Merge branch 'master' into fixes ...

Conflicts:
	src/Vector3.h

2014-05-06 20:15:19 +01:00

..

ArrowEntity.cpp

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

ArrowEntity.h

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

Boat.cpp

Add entity invulnerable

2014-04-26 00:32:30 +02:00

Boat.h

Add entity invulnerable

2014-04-26 00:32:30 +02:00

CMakeLists.txt

Cmake generated projects for IDEs include headers in project files.

2014-04-25 09:56:15 -07:00

Effects.h

Added newlines. Without them, the files would not compile.

2014-03-25 10:33:52 -06:00

EnderCrystal.cpp

Ender crystals

2014-03-25 20:59:33 +02:00

EnderCrystal.h

Ender crystals

2014-03-25 20:59:33 +02:00

Entity.cpp

Suggestions'd

2014-05-05 23:45:35 +01:00

Entity.h

A bit of reformatting.

2014-05-02 19:40:12 +02:00

ExpBottleEntity.cpp

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

ExpBottleEntity.h

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

ExpOrb.cpp

Some change to Entity.cpp

2014-04-23 21:06:46 +01:00

ExpOrb.h

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.

2014-03-25 11:15:05 -06:00

FallingBlock.cpp

Merge branch 'master' into redstoneimprovements

2014-05-04 14:15:10 +01:00

FallingBlock.h

Moved source to src

2013-11-24 14:19:41 +00:00

FireChargeEntity.cpp

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

FireChargeEntity.h

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

FireworkEntity.cpp

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

FireworkEntity.h

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

Floater.cpp

Fixed most of the reordering warnings

2014-02-05 09:43:49 -08:00

Floater.h

Added newlines. Without them, the files would not compile.

2014-03-25 10:33:52 -06:00

GhastFireballEntity.cpp

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

GhastFireballEntity.h

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

HangingEntity.cpp

Add item frame saving.

2014-03-15 02:45:25 +01:00

HangingEntity.h

Add item frame saving.

2014-03-15 02:45:25 +01:00

ItemFrame.cpp

Add item frame saving.

2014-03-15 02:45:25 +01:00

ItemFrame.h

Add item frame saving.

2014-03-15 02:45:25 +01:00

Minecart.cpp

Further refactored, Reverted Minecart change

2014-04-26 09:25:30 -07:00

Minecart.h

Add entity invulnerable

2014-04-26 00:32:30 +02:00

Painting.cpp

Fixed multiple gcc warnings about unused params.

2014-02-28 16:26:23 +01:00

Painting.h

Fixed multiple gcc warnings about unused params.

2014-02-28 16:26:23 +01:00

Pawn.cpp

Moved source to src

2013-11-24 14:19:41 +00:00

Pawn.h

Moved source to src

2013-11-24 14:19:41 +00:00

Pickup.cpp

Entities handle chunks properly again

2014-04-12 13:16:48 +01:00

Pickup.h

Entities handle chunks properly again

2014-04-12 13:16:48 +01:00

Player.cpp

Suggestions'd #2

2014-05-06 19:38:01 +01:00

Player.h

Merge branch 'master' into fixes.

2014-05-02 19:34:28 +02:00

ProjectileEntity.cpp

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

ProjectileEntity.h

Fixed ToLua errors, added newlines

2014-04-27 09:42:31 -07:00

ThrownEggEntity.cpp

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

ThrownEggEntity.h

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

ThrownEnderPearlEntity.cpp

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

ThrownEnderPearlEntity.h

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

ThrownSnowballEntity.cpp

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

ThrownSnowballEntity.h

Fixed projectile source filenames, indentations

2014-04-27 17:05:18 -07:00

TNTEntity.cpp

Some change to Entity.cpp

2014-04-23 21:06:46 +01:00

TNTEntity.h

Change TNT Fuse to ticks

2014-03-08 12:24:33 +01:00