Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into chestcarts | Tiger Wang | 2014-09-27 | 1 | -42/+45 |
|\ | | | | | | | | | Conflicts: src/Entities/Minecart.cpp | ||||
| * | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 1 | -42/+43 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/ClientHandle.h src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/World.cpp src/World.h | ||||
| | * | A few compiler warning fixes | Chris Darnell | 2014-09-23 | 1 | -40/+41 |
| | | | |||||
| | * | Made it compile with clang | Chris Darnell | 2014-09-22 | 1 | -2/+2 |
| | | | |||||
| * | | Added name tag | Howaner | 2014-09-01 | 1 | -2/+3 |
| |/ | |||||
* / | Implemented Chest Minecarts | Tiger Wang | 2014-09-13 | 1 | -8/+33 |
|/ | |||||
* | Fixed MSVC2008 compilation. | madmaxoft | 2014-08-30 | 1 | -18/+18 |
| | | | | It was getting confused about which sqrt() overload to call. | ||||
* | Fixed a typo. | Mattes D | 2014-08-28 | 1 | -1/+1 |
| | |||||
* | Change comment formatting | Christophe Piveteau | 2014-08-24 | 1 | -20/+12 |
| | |||||
* | Adjust comment formatting | Christophe Piveteau | 2014-08-18 | 1 | -20/+40 |
| | |||||
* | Added a lot of comments | Christophe Piveteau | 2014-08-15 | 1 | -30/+36 |
| | |||||
* | Clarify comment message | Christophe Piveteau | 2014-08-15 | 1 | -2/+2 |
| | |||||
* | End of comment moved away from new line | Christophe Piveteau | 2014-08-15 | 1 | -2/+1 |
| | |||||
* | Add some comments | Christophe Piveteau | 2014-08-15 | 1 | -10/+21 |
| | |||||
* | Further changes in coding style | Christophe Piveteau | 2014-08-14 | 1 | -38/+28 |
| | |||||
* | Further fixing of coding style errors | Christophe Piveteau | 2014-08-13 | 1 | -26/+22 |
| | |||||
* | Another intendation error | Christophe Piveteau | 2014-08-13 | 1 | -2/+2 |
| | |||||
* | Fixed braces and intendation errors | Christophe Piveteau | 2014-08-13 | 1 | -3/+11 |
| | |||||
* | Implement ability to push minecarts on curved rails | Christophe Piveteau | 2014-08-13 | 1 | -2/+70 |
| | |||||
* | Minecart: slimmed down SpawnOn by keeping subtype in the payload enum | archshift | 2014-07-19 | 1 | -15/+1 |
| | |||||
* | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 1 | -4/+4 |
| | |||||
* | Normalized comments. | madmaxoft | 2014-07-17 | 1 | -46/+46 |
| | | | | | 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. | ||||
* | Add entity invulnerable | Howaner | 2014-04-26 | 1 | -5/+9 |
| | |||||
* | reverted the revert of the minecart collision detection fix. | jfhumann | 2014-04-21 | 1 | -2/+1 |
| | |||||
* | Fixed Flint and Steel, reverted Minecart change, renamed a parameter name | jfhumann | 2014-04-19 | 1 | -1/+2 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 1 | -19/+19 |
|\ | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp | ||||
| * | Added new AI rules | Tiger Wang | 2014-04-17 | 1 | -19/+19 |
| | | | | | | | | | | | | | | + 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 | ||||
* | | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 1 | -1/+1 |
|/ | |||||
* | Fixed issues with int vs size_t and a few other warnings | Tycho | 2014-03-08 | 1 | -2/+2 |
| | |||||
* | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 1 | -8/+8 |
| | |||||
* | Fixed most of the reordering warnings | Tycho | 2014-02-05 | 1 | -5/+5 |
| | |||||
* | Rail speed tweak | Tiger Wang | 2014-01-25 | 1 | -2/+2 |
| | |||||
* | Added more minecart powered rail directions | Tiger Wang | 2014-01-24 | 1 | -3/+63 |
| | |||||
* | Begin implementing ascending rails | Tiger Wang | 2014-01-19 | 1 | -2/+42 |
| | |||||
* | Added one more direction into collision checks | Tiger Wang | 2014-01-19 | 1 | -26/+51 |
| | | | | | * Added direction XM_XP * Improved performance, thanks STR and xoft | ||||
* | Minecart improvements and fixes | Tiger Wang | 2014-01-19 | 1 | -33/+43 |
| | | | | | | * Fixed curved rails * Fixed detector rails in certain situations * Fixed powered rails and others passing bad meta to SnapToRail() | ||||
* | Merge remote-tracking branch 'origin/master' into minecartimprovements | Tiger Wang | 2014-01-19 | 1 | -16/+19 |
|\ | |||||
| * | Merge pull request #534 from mc-server/SpawnMinecart | Mattes D | 2014-01-17 | 1 | -4/+7 |
| |\ | | | | | | | Added cWorld::SpawnMinecart. | ||||
| | * | Renamed cEmptyMinecart to cRideableMinecart | STRWarrior | 2014-01-12 | 1 | -3/+4 |
| | | | |||||
| | * | EmptyMinecarts should be able to get a block inside of them. | STRWarrior | 2014-01-12 | 1 | -2/+4 |
| | | | |||||
| * | | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 1 | -12/+12 |
| | | | |||||
* | | | Minecart collision and general improvements | Tiger Wang | 2014-01-18 | 1 | -68/+237 |
|/ / | | | | | | | | | | | + Implemented collision on one type of rail * Improved curved rails somewhat * Fixed a crash bug | ||||
* | | Furnace minecarts now stop being active after a while. | STRWarrior | 2014-01-15 | 1 | -1/+11 |
| | | |||||
* | | First implementation for furnace minecarts. | STRWarrior | 2014-01-15 | 1 | -1/+22 |
| | | |||||
* | | Final improvements to Minecarts | Tiger Wang | 2014-01-13 | 1 | -56/+263 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed curved rails being a little broken + Implemented detector rails + Implemented block collisions on rails * Fixed snapping to rail - Removed minecart physics conditions in Entity.cpp as minecarts use their own simulator when on rails Fixes #148 and #217; partially implemented #215. This is Cave Johnson, and we're done here. | ||||
* | | Multiple enhancements and fixes to minecarts | Tiger Wang | 2014-01-12 | 1 | -128/+182 |
|/ | | | | | | + They are destroyed instantly by creative mode * Physics is much improved + Basic implementation of powered rails | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 1 | -0/+541 |