Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mc-server/MCServer | HaoTNN | 2015-06-03 | 4 | -11/+29 |
|\ | |||||
| * | Fix comments | tycho | 2015-05-28 | 2 | -6/+9 |
| | | |||||
| * | Made -Weverything an error. | tycho | 2015-05-24 | 3 | -9/+19 |
| | | |||||
| * | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-23 | 2 | -2/+2 |
| |\ | |||||
| * | | Make -Werror disabling file only | tycho | 2015-05-19 | 2 | -2/+7 |
| | | | | | | | | | | | | Ad fix a load of warnings | ||||
* | | | Merge remote-tracking branch 'upstream/master' | HaoTNN | 2015-05-23 | 2 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. | Lukas Pioch | 2015-05-23 | 2 | -2/+2 |
| |/ | |||||
* / | Fixes lit furnace issue in #2051 | haotnn | 2015-05-19 | 1 | -0/+1 |
|/ | |||||
* | Improved hoppers | Tiger Wang | 2015-05-11 | 2 | -27/+16 |
| | | | | * Fixes #1994 | ||||
* | More style checking. | Mattes D | 2015-05-09 | 2 | -2/+2 |
| | | | | Spaces around some operators are checked. | ||||
* | Merge pull request #1826 from mc-server/UnifyPacketizer | Mattes D | 2015-03-24 | 3 | -14/+28 |
|\ | | | | | Unify packetizer | ||||
| * | Changed cEntity::m_UniqueID to UInt32. | Mattes D | 2015-03-21 | 3 | -14/+28 |
| | | |||||
* | | Correct world height validations. | Tommy Santerre | 2015-03-20 | 1 | -2/+2 |
|/ | | | | | Unify the way we test block above the current one (Height - 1 instead of a_RelY + 1). Allow generation of world of flat height = 255 | ||||
* | Removed unwanted base classes from Lua API. | Mattes D | 2015-03-19 | 1 | -0/+2 |
| | |||||
* | Moved window code into cpp files | Howaner | 2015-03-10 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into Inventory | Howaner | 2015-01-25 | 13 | -13/+13 |
|\ | |||||
| * | Initial convertion of a_Dt to std::chrono | Tycho | 2015-01-11 | 13 | -13/+13 |
| | | | | | | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay | ||||
* | | Merge branch 'master' into Inventory | Howaner | 2014-12-17 | 1 | -2/+2 |
|\| | |||||
| * | NULL -> nullptr | Tiger Wang | 2014-12-17 | 1 | -2/+2 |
| | | |||||
* | | Own classes for all windows. | Howaner | 2014-12-13 | 6 | -3/+6 |
|/ | |||||
* | MobSpawner fixes. | Howaner | 2014-12-01 | 3 | -3/+10 |
| | |||||
* | Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. | Howaner | 2014-11-29 | 3 | -57/+12 |
| | |||||
* | Merge branch 'master' into MobSpawner | Howaner | 2014-11-29 | 16 | -24/+25 |
|\ | |||||
| * | BlockEntities: Removed the extra semicolon. | Mattes D | 2014-11-27 | 16 | -24/+25 |
| | | |||||
* | | Finished mob spawner implementation. | Howaner | 2014-11-18 | 13 | -121/+10 |
| | | |||||
* | | Merge branch 'master' into MobSpawner | Howaner | 2014-11-18 | 31 | -735/+274 |
|\| | | | | | | | | | Conflicts: MCServer/Plugins/Core | ||||
| * | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 16 | -54/+64 |
| | | |||||
| * | Fixed trailing whitespace. | Mattes D | 2014-10-21 | 2 | -2/+2 |
| | | |||||
| * | Merged branch 'master' of git://github.com/sriehl/MCServer | Mattes D | 2014-10-21 | 8 | -97/+64 |
| |\ | |||||
| | * | fix std:min call, include algorithm and compare same type | Steven Riehl | 2014-10-12 | 1 | -2/+2 |
| | | | |||||
| | * | refactor an if block to std::min | Steven Riehl | 2014-10-12 | 1 | -4/+1 |
| | | | |||||
| | * | convert old style casts to fix warnings | Steven Riehl | 2014-10-12 | 8 | -105/+74 |
| | | | |||||
| * | | cLuaState: cBlockEntity descendants are pushed with proper class type. | Mattes D | 2014-10-19 | 16 | -25/+62 |
| | | | |||||
| * | | Furnaces now update their block entity type | Tiger Wang | 2014-10-18 | 1 | -2/+4 |
| | | | | | | | | | | | | Therefore improving cChunk's variable boundary checking. | ||||
| * | | Simpler code. | Alexander Harkness | 2014-10-18 | 1 | -3/+2 |
| | | | |||||
| * | | Nullptr? | Alexander Harkness | 2014-10-16 | 1 | -2/+2 |
| | | | |||||
| * | | Fixed a number of stylistic issues. | Alexander Harkness | 2014-10-16 | 1 | -7/+7 |
| | | | |||||
| * | | Improved furnaces | Tiger Wang | 2014-10-03 | 2 | -142/+109 |
| |/ | | | | | | | | | | | | | | | * Fixed progress bar on 1.8 * Fixed bugs * Improved code * Fixes #1068 * Fixes #1070 | ||||
| * | Removed WSSCompact | Tiger Wang | 2014-09-30 | 24 | -437/+0 |
| | | |||||
| * | Compilation fix | Tiger Wang | 2014-09-28 | 1 | -2/+2 |
| | | |||||
| * | Suggestions | Tiger Wang | 2014-09-27 | 3 | -9/+8 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into chestcarts | Tiger Wang | 2014-09-27 | 24 | -41/+19 |
| |\ | | | | | | | | | | | | | Conflicts: src/Entities/Minecart.cpp | ||||
| * | | Implemented Chest Minecarts | Tiger Wang | 2014-09-13 | 7 | -7/+2 |
| | | | |||||
* | | | Fixed compile errors. | Howaner | 2014-09-27 | 2 | -42/+42 |
| | | | |||||
* | | | Merge branch 'master' into MobSpawner | Howaner | 2014-09-26 | 24 | -41/+19 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: src/MobSpawner.h src/Mobs/Monster.h | ||||
| * | | Removed more unessicary includes | Tycho | 2014-09-26 | 22 | -35/+12 |
| | | | |||||
| * | | Merge pull request #1419 from mc-server/redstoneTests | worktycho | 2014-09-26 | 2 | -4/+5 |
| |\ \ | | | | | | | | | Added test mocking to IncrementalRedstoneSimulator | ||||
| | * | | Added first test to show the object can be created | Tycho | 2014-09-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the server | Tycho | 2014-09-11 | 2 | -4/+5 |
| | |/ | | | | | | | | | | THis wil hopefully allow for unit testing | ||||
| * | | Fixed dispender direction bug | Howaner | 2014-09-25 | 1 | -1/+1 |
| | | | |||||
| * | | A few compiler warning fixes | Chris Darnell | 2014-09-23 | 1 | -1/+1 |
| |/ | |||||
* | | Implemented mob spawner. | Howaner | 2014-09-19 | 3 | -43/+323 |
| | | |||||
* | | Created MobSpawnerEntity class. | Howaner | 2014-09-17 | 4 | -1/+165 |
|/ | |||||
* | Added Y-wise asserts to signs. | Mattes D | 2014-09-06 | 1 | -0/+1 |
| | | | | This should help detect #1313's second case. | ||||
* | Merge pull request #1365 from mc-server/coverityFixes | Mattes D | 2014-09-01 | 1 | -5/+4 |
|\ | | | | | Coverity fixes | ||||
| * | Fixed style. | madmaxoft | 2014-09-01 | 1 | -1/+2 |
| | | |||||
| * | Changed null check to assert | worktycho | 2014-08-31 | 1 | -5/+3 |
| | | | | | | Changed the null check to clarify that the function should not be called before the entity has been attached to a world. | ||||
* | | Rewrited furnace.txt loading. | Howaner | 2014-08-31 | 1 | -1/+1 |
|/ | |||||
* | Fixed style. | madmaxoft | 2014-08-30 | 1 | -2/+3 |
| | |||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-08-29 | 4 | -9/+38 |
|\ | | | | | | | | | Conflicts: src/Server.cpp | ||||
| * | Fixed potential null dereference | Tycho | 2014-08-10 | 1 | -5/+5 |
| | | | | | | | | Fixes CID 70466 | ||||
| * | Fixed style issues | Tycho | 2014-08-06 | 2 | -2/+5 |
| | | |||||
| * | Fixed multiple inhertance being output by tolua | Tycho | 2014-08-06 | 2 | -6/+10 |
| | | |||||
| * | Removed dependecy of redstone simulator on NoteBlock | Tycho | 2014-08-05 | 2 | -1/+13 |
| | | |||||
| * | Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity Directly | Tycho | 2014-08-05 | 2 | -3/+13 |
| | | |||||
* | | Improved command block security | Tiger Wang | 2014-08-29 | 1 | -6/+19 |
|/ | |||||
* | Fixed a bug who can used from hacked clients. | Howaner | 2014-08-02 | 1 | -0/+2 |
| | |||||
* | Use "default:" in switch. | Howaner | 2014-07-31 | 1 | -3/+6 |
| | |||||
* | Renamed "select..." methods to "set..." and better IsValidEffect() function. | Howaner | 2014-07-31 | 2 | -51/+15 |
| | |||||
* | Updated documentation. | Howaner | 2014-07-31 | 1 | -3/+3 |
| | |||||
* | Renamed functions and added beacon json saving. | Howaner | 2014-07-31 | 2 | -46/+44 |
| | |||||
* | Added window update. | Howaner | 2014-07-30 | 1 | -0/+23 |
| | |||||
* | Added beacon load/save. | Howaner | 2014-07-30 | 1 | -0/+3 |
| | |||||
* | Changed return type from GetPrimaryPotion() and GetSecondaryPotion() | Howaner | 2014-07-30 | 1 | -2/+2 |
| | |||||
* | Exported the beacon. | Howaner | 2014-07-30 | 2 | -17/+27 |
| | |||||
* | Added beacon. | Howaner | 2014-07-30 | 3 | -32/+337 |
| | |||||
* | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 3 | -4/+4 |
| | |||||
* | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 8 | -12/+12 |
| | |||||
* | Code style: Fixed braces on separate lines. | madmaxoft | 2014-07-19 | 3 | -3/+6 |
| | |||||
* | Subdirs: Only add_library if not using MSVC | archshift | 2014-07-19 | 1 | -1/+3 |
| | |||||
* | BlockEntities/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+35 |
| | |||||
* | Fixed spaces before commas. | madmaxoft | 2014-07-18 | 1 | -2/+2 |
| | |||||
* | Basic style fixes. | madmaxoft | 2014-07-17 | 10 | -11/+11 |
| | |||||
* | Normalized comments. | madmaxoft | 2014-07-17 | 4 | -10/+10 |
| | | | | | 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. | ||||
* | Fixed a DropSpenser AddFace bug | Tiger Wang | 2014-07-15 | 1 | -1/+1 |
| | |||||
* | Pass cItem by reference. | madmaxoft | 2014-07-15 | 1 | -1/+1 |
| | | | | Fixes CID 66445. | ||||
* | Fixed Issue with Comparing agast the wrong chest, potentially causing crashes. | worktycho | 2014-07-13 | 1 | -7/+7 |
| | |||||
* | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 1 | -1/+1 |
| | |||||
* | cHopperEntity: Simplified chest conditions. | madmaxoft | 2014-07-12 | 1 | -10/+4 |
| | |||||
* | cChestEntity: Renamed a member to avoid confusion. | madmaxoft | 2014-07-12 | 2 | -8/+9 |
| | |||||
* | Fixed alignment. | madmaxoft | 2014-07-12 | 1 | -2/+3 |
| | |||||
* | Suggestions and bug fix | Tiger Wang | 2014-07-12 | 2 | -10/+18 |
| | | | | | | * Fixed hoppers pushing/pulling to/from (trapped)chests that do not form a double-chest with the chest type directly connected to said hopper; thank you, @madmaxoft | ||||
* | Suggestions | Tiger Wang | 2014-07-11 | 1 | -4/+4 |
| | |||||
* | Made things consistent | Tiger Wang | 2014-07-08 | 1 | -4/+5 |
| | |||||
* | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 4 | -13/+36 |
| | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes | ||||
* | Properly implemented enderchests | Tiger Wang | 2014-06-29 | 2 | -93/+44 |
| | |||||
* | Fixed crashes in HopperEntity. | Mattes D | 2014-06-24 | 1 | -19/+58 |
| | | | | | Some of the coords were off and some functions were assuming too much. Fixes the crash reported in http://forum.mc-server.org/showthread.php?tid=1497 | ||||
* | Chests don't open if obstructed | Tiger Wang | 2014-06-22 | 1 | -0/+13 |
| | | | | * Fixes FS383 | ||||
* | Merge branch 'master' into GlobalFixes | Howaner | 2014-06-17 | 2 | -22/+94 |
|\ | |||||
| * | DispenserEntity code cleanup after PR merge. | madmaxoft | 2014-06-11 | 2 | -30/+30 |
| | | |||||
| * | - Fixed a lot of alignment | JoannisO | 2014-06-05 | 1 | -7/+7 |
| | | |||||
| * | - Removed the code that removed fireworks from a dispenser even thought | JoannisO | 2014-06-04 | 1 | -3/+0 |
| | | | | | | they weren't launched. | ||||
| * | - Fixed variable names in a function. | JoannisO | 2014-06-04 | 1 | -2/+2 |
| | | |||||
| * | - Fixed a lot of astethics | JoannisO | 2014-06-04 | 2 | -14/+17 |
| | | |||||
| * | - Fixed an issue where there were 2 "DispChunk"-s in the same function. | JoannisO | 2014-06-03 | 1 | -16/+5 |
| | | | | | | Resused the initial one. | ||||
| * | - Fixed a bug where I didn't return anything in the GetShootVector | JoannisO | 2014-06-03 | 1 | -0/+2 |
| | | | | | | function. This was however passed as "working" by GCC. | ||||
| * | - Fixed a bug where I used the FireCharge ITEM instead of the Projectile | JoannisO | 2014-06-03 | 1 | -1/+1 |
| | | | | | | ENUM | ||||
| * | - Cleaned up the code massively | JoannisO | 2014-06-03 | 2 | -90/+31 |
| | | | | | | | | | | | | | | - Stopped using cChunk in the GetShootVector class. Parameter is now the Metadata of the block - Stopped using cChunk in the SpawnProjectileFromDispenser method now using coordinates and finding the chunk by itself. - Removed the matrix calculations from GetShootVector. | ||||
| * | - Added doxy comments and exported to lua | Joannis | 2014-06-03 | 2 | -22/+64 |
| | | | | | | | | - Manipulation of the ShootVector is not to be done by the function that wants to spawn a projectile. | ||||
| * | - Changed the name of the ProjectileLookVector method. | JoannisO | 2014-05-31 | 2 | -3/+3 |
| | | | | | | | | Note: I still think the new name is unclear. Any other suggestions are welcome. | ||||
| * | - Prefixed all args with "a_" | JoannisO | 2014-05-29 | 2 | -6/+10 |
| | | | | | | - Added braces around the cases. | ||||
| * | - Removed breaks. I thought it wouldn't compile without them but the | JoannisO | 2014-05-28 | 1 | -2/+0 |
| | | | | | | issue was appearantly solved with an earlier commit. | ||||
| * | - Fixed an issue where dispensers would only shoot arrows (appearantly | JoannisO | 2014-05-28 | 1 | -33/+24 |
| | | | | | | | | some commits didn't come through) - Cleaned up the code according to suggestions. | ||||
| * | - Implemented vertical dispensing for projectiles. | Joannis | 2014-05-28 | 2 | -16/+40 |
| | | | | | | - Fixed some terrible commit issues on my side. | ||||
| * | - Fixed the ampersands and asterisks to fit the format. | Joannis | 2014-05-27 | 2 | -8/+8 |
| | | | | | | - Fixed the method "SpawnProjectileFromDispenser" to use CamelCasing. | ||||
| * | - Added support for more types of projectiles in the Dispenser | JoannisO | 2014-05-26 | 2 | -38/+51 |
| | | | | | | | | - Improved the method of spawning projectiles in the world - Added another method for spawning the projectiles | ||||
| * | Added Arrow- and FireCharge-Dispensing to DispenserEntity. | JoannisO | 2014-05-26 | 2 | -27/+95 |
| | | |||||
* | | Code improvements | Howaner | 2014-05-28 | 1 | -5/+2 |
| | | |||||
* | | Fix skull bugs. | Howaner | 2014-05-28 | 1 | -0/+5 |
|/ | |||||
* | Added static const, initialized fields. | archshift | 2014-04-27 | 2 | -1/+4 |
| | |||||
* | Cmake generated projects for IDEs include headers in project files. | archshift | 2014-04-25 | 1 | -0/+1 |
| | |||||
* | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 3 | -11/+16 |
|\ | | | | | | | | | 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 | ||||
| * | Fixed Flint and Steel, reverted Minecart change, renamed a parameter name | jfhumann | 2014-04-19 | 1 | -5/+5 |
| | | |||||
| * | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 3 | -8/+13 |
| | | |||||
* | | Fixed formatting, made function static. | madmaxoft | 2014-04-19 | 2 | -13/+18 |
| | | |||||
* | | Some tweaks | STRWarrior | 2014-04-12 | 1 | -5/+17 |
| | | | | | | | | | | GetPyramidLevel returns 0 when no layers were found, 1 for one layer etc. Auto adjust the minY and/or maxY to 0 if the beacon is low. | ||||
* | | Removed debug message. | STRWarrior | 2014-04-12 | 1 | -1/+0 |
| | | |||||
* | | Simplefied GetPyramidLevel | STRWarrior | 2014-04-12 | 1 | -10/+3 |
| | | |||||
* | | Implemented the skeleton code for the beacon. | STRWarrior | 2014-04-12 | 3 | -0/+153 |
|/ | | | | There is no handling for the GUI. It can now check how big the pyramid is under the beacon. | ||||
* | Fixed a few MSVC type warnings. | Mattes D | 2014-04-03 | 1 | -1/+1 |
| | |||||
* | Fixed double to float conversions. | madmaxoft | 2014-03-16 | 1 | -1/+1 |
| | |||||
* | Add fireball interact | Howaner | 2014-03-14 | 1 | -0/+6 |
| | |||||
* | Change TNT Fuse to ticks | Howaner | 2014-03-08 | 1 | -1/+1 |
| | |||||
* | Add Flower Pots | Howaner | 2014-03-07 | 3 | -0/+210 |
| | |||||
* | Documented the changes in cJukeboxEntity. | madmaxoft | 2014-02-28 | 1 | -2/+3 |
| | |||||
* | Merge pull request #709 from Howaner/GlobalFixes | Mattes D | 2014-02-28 | 2 | -16/+48 |
|\ | | | | | Add 'Group not found', when the Server load the users.ini and add auto g... | ||||
| * | Better Jukebox API | Howaner | 2014-02-21 | 2 | -16/+48 |
| | | |||||
* | | Fixed compilation in MSVC (forward class definitions). | madmaxoft | 2014-02-24 | 2 | -0/+2 |
| | | |||||
* | | BlockEntities is warnings free | Tycho | 2014-02-24 | 6 | -3/+11 |
|/ | |||||
* | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 5 | -189/+189 |
| | |||||
* | Add break to Protocol17x.cpp and use new comment delimiter | Howaner | 2014-02-19 | 1 | -7/+7 |
| | |||||
* | Add Heads completely | Howaner | 2014-02-18 | 3 | -5/+3 |
| | |||||
* | Add Skulls/Heads | Howaner | 2014-02-17 | 3 | -0/+191 |
| | |||||
* | Fixed typographical error | Tiger Wang | 2014-02-15 | 1 | -2/+1 |
| | |||||
* | Removed debug messages again | Tiger Wang | 2014-02-15 | 1 | -6/+0 |
| | |||||
* | Added proper debug messages | Tiger Wang | 2014-02-13 | 1 | -3/+8 |
| | |||||
* | Fancy stuff with constant references | Tiger Wang | 2014-02-13 | 1 | -2/+2 |
| | |||||
* | Added more missing GetClassStatic()s | Tiger Wang | 2014-02-12 | 2 | -0/+4 |
| | |||||
* | Removed some unneeded BroadcastWholeWindow()s | Tiger Wang | 2014-02-12 | 4 | -23/+2 |
| | |||||
* | Changed inheritance a bit | Tiger Wang | 2014-02-12 | 7 | -33/+47 |
| | | | | * cBlockEntityWithItems now inherits from cBlockEntityWindowOwner | ||||
* | Fixed #190 | Tiger Wang | 2014-02-11 | 1 | -2/+67 |
| | | | | + Hoppers now collect pickups above them | ||||
* | Fixed #612 | Tiger Wang | 2014-02-11 | 2 | -0/+16 |
| | | | | * Chests send contents updates to client | ||||
* | Minor style improvements for the merged PR. | Mattes D | 2014-01-23 | 1 | -4/+4 |
| | |||||
* | Command block fixes 2 | andrew | 2014-01-23 | 1 | -6/+20 |
| | |||||
* | Removed unneeded paramters | Tiger Wang | 2014-01-19 | 1 | -1/+1 |
| | |||||
* | Changed SendBlockEntity format slightly | Tiger Wang | 2014-01-19 | 1 | -24/+2 |
| | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug | ||||
* | Improved command blocks | Tiger Wang | 2014-01-19 | 1 | -5/+37 |
| | | | | | | | * Their command and previous output are displayed on the client * They have a BlockHandler implementation, so you can't place blocks on them anymore + As a side effect, implemented UpdateBlockEntity | ||||
* | Command block fixes | andrew | 2014-01-18 | 2 | -38/+5 |
| | |||||
* | Parse the MC|AdvCdm plugin message | andrew | 2014-01-18 | 1 | -0/+2 |
| | |||||
* | Command blocks: Execute() | andrew | 2014-01-18 | 1 | -5/+27 |
| | |||||
* | Command block (de)serialization | andrew | 2014-01-18 | 2 | -3/+42 |
| | |||||
* | Basic command block implementation | andrew | 2014-01-18 | 3 | -11/+271 |
| | |||||
* | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 2 | -4/+4 |
| | |||||
* | Fixed a few MSVC warnings. | madmaxoft | 2014-01-06 | 2 | -5/+4 |
| | |||||
* | Fixed compilation in VC2008. | madmaxoft | 2013-12-30 | 1 | -2/+1 |
| | | | | Also removed an unused inline header file (yuck). | ||||
* | converted commneted paramater names to the unused macro | Tycho Bickerstaff | 2013-12-22 | 2 | -2/+8 |
| | |||||
* | Chunk is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 3 | -3/+3 |
| | |||||
* | fixed hidden bug with furnaces ignoring time burnt | Tycho Bickerstaff | 2013-12-21 | 1 | -1/+1 |
| | | | | | | this patch fixes an issue with furnaces where they would ignore the time burnt in setBurnTimes this did not cause a problem as this function was only called with the same value as the one it was using for time burnt | ||||
* | ChunkSender is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-20 | 2 | -4/+4 |
|\ | |||||
| * | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 2 | -4/+4 |
| | | |||||
* | | added blocks and blockentities | Tycho Bickerstaff | 2013-12-19 | 1 | -0/+11 |
|/ | |||||
* | Fixed multiple inheritance in ToLua++. | madmaxoft | 2013-12-16 | 5 | -20/+20 |
| | | | | This fixes #422. | ||||
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | | | | | | | | Ref.: #407 | ||||
* | | Added basic ender chests | Tiger Wang | 2013-12-07 | 3 | -10/+201 |
| | | | | | | | | Note that they just mirror chests now, so no per player inventory. | ||||
* | | Fixed pickups spawning for BlockEntities | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
|/ | |||||
* | Moved json includes to where they are really needed. | madmaxoft | 2013-11-28 | 1 | -0/+1 |
| | |||||
* | Fixed VC2008 compilation, normalized include paths. | madmaxoft | 2013-11-27 | 5 | -5/+5 |
| | |||||
* | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 5 | -5/+5 |
| | |||||
* | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 5 | -5/+5 |
| | |||||
* | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 5 | -5/+5 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 1 | -0/+5 |
| | | | | | Conflicts: GNUmakefile | ||||
* | Moved source to src | Alexander Harkness | 2013-11-24 | 21 | -0/+3033 |