| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #3225 from cuberite/FixAutoAPI | Mattes D | 2016-06-05 | 8 | -12/+180 |
| |\ | | | | | Fixed auto-generated api | ||||
| | * | Bindings: Fixed cBoundingBox API. | Mattes D | 2016-06-05 | 6 | -12/+164 |
| | | | |||||
| | * | Bindings: Add a const-ptr variant to all stack getter functions | Mattes D | 2016-06-05 | 2 | -0/+16 |
| |/ | |||||
| * | Merge pull request #3219 from QUSpilPrgm/master | Mattes D | 2016-06-04 | 10 | -110/+335 |
| |\ | | | | | Update dispenser code to let them act more like in Vanilla | ||||
| | * | Makes tall grass and large flowers bonemealable | QUSpilPrgm | 2016-06-03 | 6 | -12/+132 |
| | | | | | | | | | Adds the bonemeal particle effect to some more places | ||||
| | * | Update Dispensers and let them act more like in Vanilla | QUSpilPrgm | 2016-06-03 | 10 | -106/+211 |
| |/ | | | | | | | | - Added code to make bonemeal, potions, minecarts, XP bottles and boats work inside dispensers - Dispensers are now able to place TNT if the block is transparent but not air - Added return value that indicates the success of pumpkin, melon, sugarcane and cactus growing functions - Changed return value of "GrowRipePlant" so that it actually indicates if the block was able to grow - Fixed "GrowSugarcane" and "GrowCactus" in "GrowRipePlant" so that it only grows them a single block | ||||
| * | Debuggers: Added the forgotten Inject.lua file. | Mattes D | 2016-06-02 | 1 | -0/+57 |
| | | | | | This works as a test for inter-plugin calls, the "testcall" command injects this file into the Core plugin. | ||||
| * | Fixed fall damage | Tiger Wang | 2016-06-02 | 4 | -44/+17 |
| | | | | | * Fixes #3216 | ||||
| * | LuaState: Inter-plugin calls now support simple tables. (#3220) | Mattes D | 2016-05-31 | 5 | -55/+204 |
| | | |||||
| * | Merge pull request #3078 from cuberite/AddTerrainGenDocs | Mattes D | 2016-05-29 | 42 | -175/+1150 |
| |\ | | | | | Add terrain gen docs | ||||
| | * | Docs: Added TOC and GrownBiomes to generator docs. | Mattes D | 2016-05-29 | 34 | -174/+308 |
| | | | |||||
| | * | Added GrownBiomeGenVisualiser. | Mattes D | 2016-05-29 | 8 | -1/+842 |
| |/ | |||||
| * | Added GetTeamNames to cScoreboard (#3217) | PlasmaPower | 2016-05-29 | 6 | -0/+64 |
| | | | | Resolves #3210 | ||||
| * | Fixed remaining issue from #3199 (#3207) | Alexander Harkness | 2016-05-29 | 1 | -0/+2 |
| | | | | Added an alias for oak boats as oakboat, as the other boats have. | ||||
| * | Don't let redstone blocks power adjacent blocks. (#3214) | QUSpilPrgm | 2016-05-28 | 2 | -3/+2 |
| | | | | | | * Don't let redstone blocks power adjacent blocks. This fixes issue #2966 | ||||
| * | Made redstone handlers static | Tiger Wang | 2016-05-28 | 2 | -31/+93 |
| | | | | | * Improvements to performance? Maybe. Can't hurt (he says). | ||||
| * | Fixed wooden slabs only burning for 15 ticks. (#3212) | Samantha Neubeck | 2016-05-24 | 1 | -1/+1 |
| | | |||||
| * | Add JimSVMI83 to backers file. | Alexander Harkness | 2016-05-21 | 1 | -0/+1 |
| | | |||||
| * | Some 1.9 Crafting Recipes and Items. (#3199) | Alexander Harkness | 2016-05-20 | 3 | -140/+224 |
| | | |||||
| * | Added Utking to backers file. | Alexander Harkness | 2016-05-16 | 1 | -0/+1 |
| | | |||||
| * | Added "Chissled Stone Bricks" recipe (#3192) | LogicParrot | 2016-05-15 | 1 | -0/+1 |
| | | |||||
| * | Added needed information to Issue template (#3188) | Julian Laubstein | 2016-05-15 | 1 | -0/+5 |
| | | |||||
| * | 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135) | Pokechu22 | 2016-05-14 | 35 | -101/+5374 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Semistable update to 15w31a I'm going through snapshots in a sequential order since it should make things easier, and since protocol version history is written. * Update to 15w34b protocol Also, fix an issue with the Entity Equipment packet from the past version. Clients are able to connect and do stuff! * Partially update to 15w35e Chunk data doesn't work, but the client joins. I'm waiting to do chunk data because chunk data has an incomplete format until 15w36d. * Add '/blk' debug command This command lets one see what block they are looking at, and makes figuring out what's supposed to be where in a highly broken chunk possible. * Fix CRLF normalization in CheckBasicStyle.lua Normally, this doesn't cause an issue, but when running from cygwin, it detects the CR as whitespace and creates thousands of violations for every single line. Lua, when run on windows, will normalize automatically, but when run via cygwin, it won't. The bug was simply that gsub was returning a replaced version, but not changing the parameter, so the replaced version was ignored. * Update to 15w40b This includes chunk serialization. Fully functional chunk serialization for 1.9. I'm not completely happy with the chunk serialization as-is (correct use of palettes would be great), but cuberite also doesn't skip sending empty chunks so this performance optimization should probably come later. The creation of a full buffer is suboptimal, but it's the easiest way to implement this code. * Write long-by-long rather than creating a buffer This is a bit faster and should be equivalent. However, the code still doesn't look too good. * Update to 15w41a protocol This includes the new set passengers packet, which works off of the ridden entity, not the rider. That means, among other things, that information about the previously ridden vehicle is needed when detaching. So a new method with that info was added. * Update to 15w45a * 15w51b protocol * Update to 1.9.0 protocol Closes #3067. There are still a few things that need to be worked out (picking up items, effects, particles, and most importantly inventory), but in general this should work. I'll make a few more changes tomorrow to get the rest of the protocol set up, along with 1.9.1/1.9.2 (which did make a few changes). Chunks, however, _are_ working, along with most other parts of the game (placing/breaking blocks). * Fix item pickup packet not working That was a silly mistake, but at least it was an easy one. * 1.9.2 protocol support * Fix version info found in server list ping Thus, the client reports that it can connect rather than saying that the server is out of date. This required creating separate classes for 1.9.1 and 1.9.2, unfortunately. * Fix build errors generated by clang These didn't happen in MSVC. * Add protocol19x.cpp and protocol19x.h to CMakeLists * Ignore warnings in protocol19x that are ignored in protocol18x * Document BLOCK_FACE and DIG_STATUS constants * Fix BLOCK_FACE links and add separate section for DIG_STATUS * Fix bat animation and object spawning The causes of both of these are explained in #3135, but the gist is that both were typos. * Implement Use Item packet This means that buckets, bows, fishing rods, and several other similar items now work when not looking at a block. * Handle DIG_STATUS_SWAP_ITEM_IN_HAND * Add support for spawn eggs and potions The items are transformed from the 1.9 version to the 1.8 version when reading and transformed back when sending. * Remove spammy potion debug logging * Fix wolf collar color metadata The wrong type was being used, causing several clientside issues (including the screen going black). * Fix 1.9 chunk sending in the nether The nether and the end don't send skylight. * Fix clang build errors * Fix water bottles becoming mundane potions This happened because the can become splash potion bit got set incorrectly. Water bottles and mundane potions are only differentiated by the fact that water bottles have a metadata of 0, so setting that bit made it a mundane potion. Also add missing break statements to the read item NBT switch, which would otherwise break items with custom names and also cause incorrect "Unimplemented NBT data when parsing!" logging. * Copy Protocol18x as Protocol19x Aditionally, method and class names have been swapped to clean up other diffs. This commit is only added to make the following diffs more readable; it doesn't make any other changes (beyond class names). * Make thrown potions use the correct appearence This was caused by potions now using metadata. * Add missing api doc for cSplashPotionEntity::GetItem * Fix compile error in SplashPotionEntity.cpp * Fix fix of cSplashPotionEntity API doc * Temporarilly disable fall damage particles These were causing issues in 1.9 due to the changed effect ID. * Properly send a kick packet when connecting with an invalid version This means that the client no longer waits on the server screen with no indication whatsoever. However, right now the server list ping isn't implemented for unknown versions, so it'll only load "Old" on the ping. I also added a GetVarIntSize method to cByteBuffer. This helps clean up part of the code here (and I think it could clean up other parts), but it may make sense for it to be moved elsewhere (or declared in a different way). * Handle server list pings from unrecognized versions This isn't the cleanest way of writing it (it feels odd to use ProtocolRecognizer to send packets, and the addition of m_InPingForUnrecognizedVersion feels like the wrong technique), but it works and I can't think of a better way (apart from creating a full separate protocol class to handle only the ping... which would be worse). * Use cPacketizer for the disconnect packet This also should fix clang build errors. * Add 1.9.3 / 1.9.4 support * Fix incorrect indentation in APIDesc | ||||
| * | Fixed death on teleportation or leaving Minecart (#3181) | LogicParrot | 2016-05-03 | 4 | -6/+32 |
| | | |||||
| * | Fix crash on world travel (#3180) | LogicParrot | 2016-05-03 | 1 | -1/+1 |
| | | |||||
| * | Fix Crash on stopping the server (#3176) | LogicParrot | 2016-05-01 | 3 | -2/+14 |
| | | |||||
| * | Proper minecart DoSetSpeed Override (#3174) | LogicParrot | 2016-04-30 | 1 | -1/+1 |
| | | | | Closes #3173, Introduced in #3037. | ||||
| * | Updated the Core submodule (#3172) | LogicParrot | 2016-04-30 | 1 | -0/+0 |
| | | |||||
| * | Disable Enderman Spawn (Issue #3108) (#3170) | benf516 | 2016-04-30 | 1 | -2/+2 |
| | | | | Temporarily disabled enderman spawning until the glitches can be fixed | ||||
| * | Merge pull request #3165 from LogicParrot/chunkLayer2 | LogicParrot | 2016-04-24 | 2 | -62/+61 |
| |\ | | | | | ChunkLayers now stored in std::map [revised] | ||||
| | * | ChunkLayers now stored in std::map | LogicParrot | 2016-04-24 | 2 | -62/+61 |
| |/ | |||||
| * | Merge pull request #3164 from LogicParrot/clientHandle3 | LogicParrot | 2016-04-24 | 1 | -2/+3 |
| |\ | | | | | Fixed some logout crashes | ||||
| | * | Fixed some logout crashes | LogicParrot | 2016-04-24 | 1 | -2/+3 |
| |/ | |||||
| * | Merge pull request #3163 from cuberite/revert-3153-chunkLayer | LogicParrot | 2016-04-24 | 2 | -54/+62 |
| |\ | | | | | Revert "ChunkLayers now stored in std::map" | ||||
| | * | Revert "ChunkLayers now stored in std::map" | LogicParrot | 2016-04-24 | 2 | -54/+62 |
| |/ | |||||
| * | Merge pull request #3153 from LogicParrot/chunkLayer | LogicParrot | 2016-04-24 | 2 | -62/+54 |
| |\ | | | | | ChunkLayers now stored in std::map | ||||
| | * | ChunkLayers now stored in std::map | LogicParrot | 2016-04-23 | 2 | -62/+54 |
| |/ | |||||
| * | Merge pull request #3160 from LogicParrot/clientHandleThread | LogicParrot | 2016-04-23 | 1 | -2/+13 |
| |\ | | | | | ClientHandle destruction thread safety | ||||
| | * | ClientHandle destruction thread safety | LogicParrot | 2016-04-23 | 1 | -2/+13 |
| |/ | |||||
| * | Merge pull request #3090 from LogicParrot/outOfWorld | LogicParrot | 2016-04-23 | 4 | -63/+33 |
| |\ | | | | | Out of world | ||||
| | * | Out of world blocks are now always considered air blocks | LogicParrot | 2016-04-23 | 4 | -63/+33 |
| |/ | |||||
| * | Updated readme to inform that clang 3.4 is minimum required version. (#3158) | taylor24 | 2016-04-23 | 1 | -1/+1 |
| | | | | | | | | * Update README.md * Update README.md * Update COMPILING.md * Update COMPILING.md * Update COMPILING.md | ||||
| * | Merge pull request #3149 from LogicParrot/meta | LogicParrot | 2016-04-23 | 16 | -91/+54 |
| |\ | | | | | Reduced unnecessary block updates and some code cleanup | ||||
| | * | Reduced unnecessary block updates | LogicParrot | 2016-04-22 | 16 | -91/+54 |
| |/ | |||||
| * | Merge pull request #3048 from Woazboat/minecarts | LogicParrot | 2016-04-22 | 1 | -10/+56 |
| |\ | | | | | Fix minecart block collision on curved rails | ||||
| | * | Fix minecart block collision on curved rails | Woazboat | 2016-04-22 | 1 | -10/+56 |
| |/ | |||||
| * | Merge pull request #3156 from LogicParrot/hashFix | LogicParrot | 2016-04-22 | 1 | -6/+4 |
| |\ | | | | | Updated vector hashing bit operations | ||||
| | * | Updated vector hashing bit operations | LogicParrot | 2016-04-22 | 1 | -6/+4 |
| |/ | |||||
| * | Merge pull request #3150 from LogicParrot/worldTweaks | LogicParrot | 2016-04-19 | 3 | -17/+16 |
| |\ | | | | | Auto clean bad world linkages | ||||
| | * | Auto clean bad world linkages | LogicParrot | 2016-04-19 | 3 | -17/+16 |
| |/ | |||||
| * | Proper fix for #3136 (#3143) | Alexander Harkness | 2016-04-19 | 1 | -17/+11 |
| | | |||||
| * | Merge pull request #3148 from LogicParrot/pathFinderFix | LogicParrot | 2016-04-18 | 4 | -11/+21 |
| |\ | | | | | Fix issues below y = 0 | ||||
| | * | Fix issues below y = 0 | LogicParrot | 2016-04-18 | 4 | -11/+21 |
| |/ | |||||
| * | Merge pull request #3146 from LogicParrot/snowFix | LogicParrot | 2016-04-16 | 1 | -2/+4 |
| |\ | | | | | Prevented snow from killing grass | ||||
| | * | Prevented snow from killing grass | LogicParrot | 2016-04-16 | 1 | -2/+4 |
| |/ | |||||
| * | Merge pull request #3129 from LogicParrot/quietMeta | LogicParrot | 2016-04-16 | 10 | -26/+39 |
| |\ | | | | | Updated cChunk::SetMeta, fixed grass growth | ||||
| | * | Updated cChunk::SetMeta, fixed grass growth, reduced markDirty/setMeta usage | LogicParrot | 2016-04-16 | 10 | -26/+39 |
| |/ | |||||
| * | Merge pull request #3144 from cuberite/issue-template | Julian Laubstein | 2016-04-16 | 1 | -0/+7 |
| |\ | | | | | Create ISSUE_TEMPLATE | ||||
| | * | Create ISSUE_TEMPLATE | Julian Laubstein | 2016-04-16 | 1 | -0/+7 |
| |/ | |||||
| * | Merge pull request #3037 from marvinkopf/minecart | LogicParrot | 2016-04-15 | 2 | -41/+54 |
| |\ | | | | | Add speed limit enforcement for minecarts | ||||
| | * | Add speed limit enforcement for minecarts | Marvin Kopf | 2016-04-15 | 2 | -41/+54 |
| |/ | |||||
| * | Merge pull request #3140 from cuberite/revert-3137-issue3136 | LogicParrot | 2016-04-14 | 3 | -14/+27 |
| |\ | | | | | Revert "Issue3136" | ||||
| | * | Revert "Issue3136" | LogicParrot | 2016-04-14 | 3 | -14/+27 |
| |/ | |||||
| * | Merge pull request #3139 from LogicParrot/freezeFix | LogicParrot | 2016-04-13 | 2 | -39/+42 |
| |\ | | | | | Fix occasional freeze bug | ||||
| | * | Fix occasional freeze bug | LogicParrot | 2016-04-13 | 2 | -39/+42 |
| |/ | |||||
| * | Merge pull request #3137 from cuberite/issue3136 | Alexander Harkness | 2016-04-13 | 3 | -27/+14 |
| |\ | | | | | Issue3136 | ||||
| | * | Fixed port override code. | Alexander Harkness | 2016-04-12 | 3 | -27/+14 |
| |/ | |||||
| * | Merge pull request #3133 from LogicParrot/readme10 | LogicParrot | 2016-04-07 | 1 | -2/+3 |
| |\ | | | | | Added more links to README | ||||
| | * | Added more links to README | LogicParrot | 2016-04-07 | 1 | -2/+3 |
| |/ | |||||
| * | Merge pull request #3132 from LogicParrot/readme | Alexander Harkness | 2016-04-07 | 1 | -1/+7 |
| |\ | | | | | Rewrite README.md's contribution section | ||||
| | * | Rewrite README.md's contribution section | LogicParrot | 2016-04-07 | 1 | -1/+7 |
| |/ | |||||
| * | Merge pull request #3128 from LogicParrot/typo | Alexander Harkness | 2016-04-06 | 1 | -1/+1 |
| |\ | | | | | Readme typo fix | ||||
| | * | Readme typo fix | LogicParrot | 2016-04-06 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #3126 from cuberite/revert-3100-mobTick2 | LogicParrot | 2016-04-06 | 2 | -40/+56 |
| |\ | | | | | Revert "Move mob tick code to cChunk" | ||||
| | * | Revert "Move mob tick code to cChunk" | LogicParrot | 2016-04-06 | 2 | -40/+56 |
| |/ | |||||
| * | Merge pull request #3100 from LogicParrot/mobTick2 | LogicParrot | 2016-04-06 | 2 | -56/+40 |
| |\ | | | | | Move mob tick code to cChunk | ||||
| | * | Move mob tick code to cChunk | LogicParrot | 2016-04-06 | 2 | -56/+40 |
| |/ | |||||
| * | Merge pull request #3102 from LogicParrot/burn | LogicParrot | 2016-04-06 | 1 | -7/+34 |
| |\ | | | | | Manual mob burn code | ||||
| | * | Manual mob burn code | LogicParrot | 2016-04-06 | 1 | -7/+34 |
| |/ | |||||
| * | Merge pull request #3125 from LogicParrot/noFall3 | LogicParrot | 2016-04-06 | 2 | -5/+5 |
| |\ | | | | | Minor improvements to player freeze | ||||
| | * | Minor improvements to player freeze | LogicParrot | 2016-04-05 | 2 | -5/+5 |
| |/ | |||||
| * | Merge pull request #3124 from LogicParrot/noFall2 | LogicParrot | 2016-04-05 | 8 | -76/+99 |
| |\ | | | | | Improve Player freeze code | ||||
| | * | Improved player freeze code | LogicParrot | 2016-04-05 | 8 | -76/+99 |
| |/ | |||||
| * | Merge pull request #3121 from LogicParrot/loops | LogicParrot | 2016-04-04 | 1 | -1/+1 |
| |\ | | | | | Prevent Nether teleportation loops | ||||
| | * | Prevent Nether teleportation loops | LogicParrot | 2016-04-04 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #3097 from LogicParrot/noFall | LogicParrot | 2016-04-04 | 5 | -29/+138 |
| |\ | | | | | Never fall through unloaded or unsent chunks | ||||
| | * | Players never fall through unloaded chunks or end up inside solids on teleport | LogicParrot | 2016-03-31 | 5 | -29/+138 |
| |/ | |||||
| * | Merge pull request #3118 from LogicParrot/fixWorld | LogicParrot | 2016-03-31 | 1 | -1/+1 |
| |\ | | | | | Fix adding players to world | ||||
| | * | Fix adding players to world | LogicParrot | 2016-03-31 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #3116 from LogicParrot/bedFix | LogicParrot | 2016-03-31 | 1 | -2/+4 |
| |\ | | | | | Player death crashfix | ||||
| | * | Player death crashfix | LogicParrot | 2016-03-31 | 1 | -2/+4 |
| |/ | |||||
| * | Merge pull request #3105 from LogicParrot/chunkStability | LogicParrot | 2016-03-31 | 3 | -32/+19 |
| |\ | | | | | Entities are never lost | ||||
| | * | Entities are never lost | LogicParrot | 2016-03-30 | 3 | -32/+19 |
| |/ | |||||
| * | Merge pull request #3109 from LogicParrot/moveToNewWorld | Alexander Harkness | 2016-03-30 | 3 | -6/+24 |
| |\ | | | | | MoveToWorld defaults to spawnpoint | ||||
| | * | MoveToWorld defaults to spawnpoint | LogicParrot | 2016-03-30 | 3 | -6/+24 |
| |/ | |||||
| * | Merge pull request #3091 from LogicParrot/bed | LogicParrot | 2016-03-30 | 3 | -5/+48 |
| |\ | | | | | Bed's world is now saved | ||||
| | * | Bed's world is now saved | LogicParrot | 2016-03-29 | 3 | -5/+48 |
| |/ | |||||
| * | Merge pull request #3096 from mathias-github/icons | Julian Laubstein | 2016-03-29 | 10 | -4/+2 |
| |\ | | | | | Updated icons and logo | ||||
| | * | Updated icons and logo | Mathias | 2016-03-28 | 10 | -4/+2 |
| |/ | |||||
| * | Merge pull request #3099 from LogicParrot/passive | LogicParrot | 2016-03-28 | 1 | -0/+1 |
| |\ | | | | | Fix passive mob destruction crashes | ||||
| | * | Fix passive mob destruction crashes | LogicParrot | 2016-03-28 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #3093 from mathias-github/patch-2 | Alexander Harkness | 2016-03-26 | 1 | -0/+1 |
| |\ | | | | | Added donator to list | ||||
| | * | Added donator to list | Mathias | 2016-03-25 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #2994 from LogicParrot/mobTick | LogicParrot | 2016-03-23 | 1 | -18/+41 |
| |\ | | | | | Rewrite mob tick code | ||||
| | * | Rewrite mob tick code | LogicParrot | 2016-03-23 | 1 | -18/+41 |
| |/ | |||||
| * | Merge pull request #3086 from cuberite/revert-2872-LuaCallback | Mattes D | 2016-03-21 | 22 | -1314/+1951 |
| |\ | | | | | Revert "Lua callback" | ||||
| | * | Revert "Lua callback" | Mattes D | 2016-03-21 | 22 | -1314/+1951 |
| |/ | |||||
| * | Merge pull request #3084 from cuberite/seadragon91-patch-1 | Mattes D | 2016-03-19 | 2 | -5/+5 |
| |\ | | | | | Fixed misuse of comma. | ||||
| | * | Fixed misuse of comma. | Lukas Pioch | 2016-03-18 | 2 | -5/+5 |
| |/ | |||||
| * | Fixed leaping potion not giving jump boost | Blitz Rakete | 2016-03-18 | 1 | -0/+1 |
| | | |||||
| * | Merge pull request #2872 from cuberite/LuaCallback | Mattes D | 2016-03-17 | 22 | -1951/+1314 |
| |\ | | | | | Lua callback | ||||
| | * | Changed cLuaWindow callbacks to use cLuaState::cCallback. | Mattes D | 2016-03-17 | 7 | -182/+242 |
| | | | |||||
| | * | Removed the cPluginLua::cResettable class. | Mattes D | 2016-03-17 | 2 | -82/+1 |
| | | | | | | | | | The functionality provided by that class has been superseded by cLuaState::cCallback, with better multithreading support. | ||||
| | * | Changed world tasks to use cLuaState::cCallback. | Mattes D | 2016-03-17 | 2 | -69/+40 |
| | | | |||||
| | * | Changed plugin hook registrations to use cLuaState::cCallback. | Mattes D | 2016-03-17 | 5 | -1008/+190 |
| | | | |||||
| | * | Removed cWebPlugin, WebAdmin uses cLuaState::cCallback. | Mattes D | 2016-03-17 | 14 | -630/+637 |
| | | | |||||
| | * | Added cLuaState::cCallback for representing (resettable) Lua callbacks. | Mattes D | 2016-03-17 | 2 | -7/+231 |
| |/ | |||||
| * | Merge pull request #3081 from Arthur2e5/master | Mattes D | 2016-03-17 | 1 | -44/+54 |
| |\ | | | | | Some careless review on compile.sh | ||||
| | * | Shallow clone to the correct branch | Mingye Wang (Arthur2e5) | 2016-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | Shallow clones are faster, and we always want the correct branch to be cloned.. | ||||
| | * | Sanity check (quoting, etc.) for compile.sh | Mingye Wang (Arthur2e5) | 2016-03-16 | 1 | -18/+21 |
| | | | |||||
| | * | compile: some portability-related tweaks | Mingye Wang (Arthur2e5) | 2016-03-16 | 1 | -25/+32 |
| |/ | | | | | | echo -n are not POSIX-sh-portable, so use printf. Neither are parentheses inside [ ]. Some of the usage are clearly better covered by `case`, so let's use it. | ||||
| * | Merge pull request #3079 from mathias-github/patch-1 | Alexander Harkness | 2016-03-14 | 1 | -1/+1 |
| |\ | | | | | Fixed melon block recipe | ||||
| | * | Fixed melon block recipe | Mathias | 2016-03-14 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #3076 from cuberite/FixHttpAuthFlag | Julian Laubstein | 2016-03-11 | 1 | -1/+2 |
| |\ | | | | | HTTP: Added missing HasAuth flag initialization. | ||||
| | * | HTTP: Added missing HasAuth flag initialization. | Mattes D | 2016-03-11 | 1 | -1/+2 |
| |/ | |||||
| * | Merge pull request #3069 from cuberite/FixHttpHeaderParsing | Mattes D | 2016-03-03 | 1 | -0/+1 |
| |\ | | | | | HTTP: Fixed header parsing. | ||||
| | * | HTTP: Fixed header parsing. | Mattes D | 2016-03-03 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #3068 from cuberite/FinishHttpResponse | Julian Laubstein | 2016-03-03 | 1 | -0/+1 |
| |\ | | | | | WebAdmin: Finish HTTP responses. | ||||
| | * | WebAdmin: Finish HTTP responses. | Mattes D | 2016-03-03 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #3060 from tonibm19/master | Mattes D | 2016-03-01 | 1 | -1/+4 |
| |\ | | | | | Fixed horse bug | ||||
| | * | fixed horse bug | tonibm19 | 2016-03-01 | 1 | -1/+4 |
| |/ | | | | horse could be "controlled" without a saddle or being tamed | ||||
| * | Merge pull request #3031 from cuberite/RenameHttpClasses | Mattes D | 2016-03-01 | 41 | -902/+1973 |
| |\ | | | | | Refactor HTTP parsing | ||||
| | * | HTTP: Fixed typos and bad leftovers. | Mattes D | 2016-03-01 | 3 | -3/+4 |
| | | | |||||
| | * | Renamed HTTPResponse to HTTPOutgoingResponse. | Mattes D | 2016-03-01 | 6 | -14/+13 |
| | | | |||||
| | * | WebAdmin uses the new HTTP parser framework. | Mattes D | 2016-03-01 | 23 | -883/+912 |
| | | | |||||
| | * | HTTP: Fixed response parser, unified API. | Mattes D | 2016-03-01 | 6 | -22/+35 |
| | | | |||||
| | * | Fixed HTTP parsing when in insecure mode. | Mattes D | 2016-03-01 | 1 | -2/+6 |
| | | | | | | | | | | | Parsing would ignore the size of data already buffered, resulting in bad_alloc exception. Fixes #2898. | ||||
| | * | Added unit test for parsing HTTP request. | Mattes D | 2016-03-01 | 7 | -0/+230 |
| | | | |||||
| | * | Renamed HTTPServer folder to HTTP. | Mattes D | 2016-03-01 | 31 | -140/+407 |
| | | | | | | | | | It contains client code as well. | ||||
| | * | Added HTTPResponseParser. | Mattes D | 2016-03-01 | 6 | -0/+508 |
| | | | |||||
| | * | Moved cHTTPRequest to a separate file, renamed to cHTTPRequestParser. | Mattes D | 2016-03-01 | 13 | -325/+347 |
| | | | |||||
| | * | Renamed the HTTP classes to indicate they're for server. | Mattes D | 2016-03-01 | 9 | -77/+75 |
| |/ | |||||
| * | Merge pull request #3057 from tonibm19/master | Mattes D | 2016-03-01 | 1 | -0/+5 |
| |\ | | | | | Mobs no longer spawn at the top of the nether. | ||||
| | * | Mobs no longer spawn at the top of the nether. | tonibm19 | 2016-03-01 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't really know if this is the right place for the check, but it works. Add bedrock check fix typo Using code provided by NiLSpace and fixed a horse's bug -Horses can no longer be "controlled" if they're not tamed and saddled removed unrelated horse code Fixed mobs spawning above bedrock | ||||
| * | | Merge pull request #3040 from Woazboat/master | Alexander Harkness | 2016-02-27 | 1 | -0/+8 |
| |\ \ | |/ |/| | Added more information about contributing to Cuberite | ||||
| | * | Added more information about contributing to Cuberite | Woazboat | 2016-02-26 | 1 | -0/+8 |
| |/ | |||||
| * | Merge pull request #3052 from cuberite/FixIntGens | Mattes D | 2016-02-24 | 4 | -23/+20 |
| |\ | | | | | Fix int gens | ||||
| | * | Fixed LinearUpscale's bounds checking. | Mattes D | 2016-02-24 | 1 | -4/+4 |
| | | | |||||
| | * | Made ProtIntGen's max size compile-time-configurable. | Mattes D | 2016-02-24 | 1 | -1/+13 |
| | | | |||||
| | * | Removed old and wrong code from Globals.h. | Mattes D | 2016-02-24 | 1 | -16/+1 |
| | | | |||||
| | * | Fixed includes in IntGen. | Mattes D | 2016-02-24 | 1 | -2/+2 |
| |/ | |||||
| * | Merge pull request #3044 from LogicParrot/chunkRemove | LogicParrot | 2016-02-23 | 1 | -1/+1 |
| |\ | | | | | Fixed removing entities from parent chunks | ||||
| | * | Fixed removing entities from parent chunks | LogicParrot | 2016-02-22 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2897 from cuberite/FlushLuaSsl | Mattes D | 2016-02-21 | 1 | -2/+10 |
| |\ | | | | | LuaTCPLink: Report data received via SSL just before connection closed. | ||||
| | * | LuaTCPLink: Report data received via SSL just before connection closed. | Mattes D | 2016-02-21 | 1 | -2/+10 |
| |/ | |||||
| * | Merge pull request #3035 from marvinkopf/hotfix-parentchunk | Tiger Wang | 2016-02-21 | 1 | -2/+8 |
| |\ | | | | | Hotfix: Add check if entity is in chunk before changing tick status | ||||
| | * | Add check if entity is in chunk before changing tick status | Marvin Kopf | 2016-02-21 | 1 | -2/+8 |
| |/ | |||||
| * | Merge pull request #3032 from cuberite/3030-fix | Alexander Harkness | 2016-02-20 | 1 | -9/+1 |
| |\ | | | | | Fix #3030 | ||||
| | * | Fix #3030 | Alexander Harkness | 2016-02-20 | 1 | -9/+1 |
| |/ | | | | Logicparrot's instructions | ||||
| * | Merge pull request #3026 from iam10K/master | worktycho | 2016-02-19 | 1 | -4/+12 |
| |\ | | | | | Stop Tamed Wolf from following player when he is flying | ||||
| | * | Stop Wolf from following player when he is flying | Tyler Encke | 2016-02-19 | 1 | -4/+12 |
| | | | | | | | | | | | | | Check to make sure player is not flying before allowing wolf to move to player. Fixed isFlying to IsFlying | ||||
| * | | Merge pull request #3029 from mathias-github/master | Alexander Harkness | 2016-02-19 | 1 | -0/+1 |
| |\ \ | | | | | | | Added BACKERS to list of files in Windows build | ||||
| | * | | Added BACKERS to list of files in Windows build | Mathias | 2016-02-19 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #3027 from LogicParrot/readmes | Julian Laubstein | 2016-02-19 | 2 | -0/+30 |
| |\ \ \ | |/ / |/| | | Added testing instructions | ||||
| | * | | Added testing instructions | LogicParrot | 2016-02-19 | 2 | -0/+30 |
| |/ / | |||||
| * | | Merge pull request #2986 from LogicParrot/entityDestroy_approach4 | LogicParrot | 2016-02-19 | 18 | -179/+266 |
| |\ \ | | | | | | | [Queue approach] Fix entity destruction in unticking chunks | ||||
| | * | | Proper entity destruction in non-ticking chunks | LogicParrot | 2016-02-19 | 18 | -179/+266 |
| |/ / | |||||
| * | | Merge pull request #3020 from cuberite/ice_block | Julian Laubstein | 2016-02-18 | 1 | -1/+5 |
| |\| | | | | | Don't remove water after ice block has been destroyed | ||||
| | * | Don't remove water after ice block has been destroyed | Lukas Pioch | 2016-02-18 | 1 | -1/+5 |
| |/ | |||||
| * | Merge pull request #3009 from marvinkopf/pushing | LogicParrot | 2016-02-17 | 2 | -27/+11 |
| |\ | | | | | [WIP] Fix minecart entity collision | ||||
| | * | Fix minecart entity collision | Marvin Kopf | 2016-02-16 | 2 | -27/+11 |
| |/ | | | | | * Minecarts no longer handle a collision if the entity is behind them. * Minecarts will leave the pushing after a collision on a straight rail to the entity. | ||||
| * | Merge pull request #3010 from LogicParrot/stringFix | LogicParrot | 2016-02-16 | 1 | -2/+2 |
| |\ | | | | | Fix unicode handling in StringUtils::TrimString | ||||
| | * | Fix unicode handling in StringUtils::TrimString | LogicParrot | 2016-02-16 | 1 | -2/+2 |
| |/ | |||||
| * | Merge pull request #2985 from marvinkopf/poweredrail | Tiger Wang | 2016-02-09 | 2 | -1/+10 |
| |\ | | | | | Update RedstoneSimulator to delete unused cached PowerData | ||||
| | * | Update RedstoneSimulator to delete unused cached PowerData | Marvin Kopf | 2016-02-09 | 2 | -1/+10 |
| | | | | | | | | | When a new block was placed that has a corresponding RedstoneHandler the PowerData for the position was cached, but never deleted and remained unchanged when the block got destroyed. The RedstoneSimulator now erases all cached PowerData for positions where the block doesn't have a RedstoneHandler (i.e. Air). | ||||
| * | | Merge pull request #2996 from LogicParrot/message2 | LogicParrot | 2016-02-09 | 2 | -1/+2 |
| |\ \ | | | | | | | Add forum link to linkage error message | ||||
| | * | | Write to console when autofixing linkages | LogicParrot | 2016-02-09 | 1 | -0/+1 |
| | | | | |||||
| | * | | Add forum link to linkage error message | LogicParrot | 2016-02-09 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2995 from LogicParrot/message | LogicParrot | 2016-02-08 | 1 | -2/+2 |
| |\ \ | | | | | | | Improve world linkage error message | ||||
| | * | | Improve world linkage error message | LogicParrot | 2016-02-08 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #2989 from LogicParrot/blockBreak | LogicParrot | 2016-02-08 | 1 | -0/+2 |
| |\ \ | | | | | | | Prevent player falling when block breaking is denied | ||||
| | * | | Prevent player from falling when block breaking is denied | LogicParrot | 2016-02-08 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #2992 from LogicParrot/posix | LogicParrot | 2016-02-08 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | Remove nproc to allow BSD compilation | ||||
| | * | | Remove nproc to allow BSD compilation | LogicParrot | 2016-02-08 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2990 from LogicParrot/defaultWorld | LogicParrot | 2016-02-08 | 1 | -1/+2 |
| |\ \ | | | | | | | Add DefaultWorld to newly generated INI | ||||
| | * | | Add DefaultWorld to newly generated INI | LogicParrot | 2016-02-08 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge pull request #2962 from LogicParrot/createAndInitialize | LogicParrot | 2016-02-08 | 5 | -45/+14 |
| |\ \ \ | |/ / |/| | | [PhantomWorlds - 5] Remove CreateAndInitializeWorld | ||||
| | * | | remove cWorld::createAndInitializeWorld | LogicParrot | 2016-02-08 | 5 | -45/+14 |
| |/ / | |||||
| * | | Merge pull request #2961 from LogicParrot/enforce | LogicParrot | 2016-02-08 | 3 | -3/+50 |
| |\ \ | | | | | | | [PhantomWorlds - 4] Prevent server from starting if there's bad world linkage | ||||
| | * | | Prevent server from starting if there's bad world linkage | LogicParrot | 2016-02-05 | 3 | -3/+50 |
| | | | | |||||
| * | | | Merge pull request #2953 from LogicParrot/worldRebuild | LogicParrot | 2016-02-08 | 2 | -3/+71 |
| |\ \ \ | | | | | | | | | [PhantomWorlds - 3] Regenerate worlds with proper dimension types and linkages | ||||
| | * | | | Proper world linkages and dimension types for newly created world.ini's | LogicParrot | 2016-02-06 | 2 | -3/+71 |
| | | | | | |||||
| * | | | | Merge pull request #2969 from LogicParrot/ini | LogicParrot | 2016-02-07 | 1 | -1/+1 |
| |\ \ \ \ | |_|_|/ |/| | | | Ignore trailing and leading spaces in INI values | ||||
| | * | | | Ignore trailing and leading spaces in INI values# Please enter the commit message for your changes. Lines starting | LogicParrot | 2016-02-05 | 2 | -21/+21 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #2981 from Drahoslav7/master | Tiger Wang | 2016-02-07 | 1 | -2/+3 |
| |\ \ \ | | | | | | | | | Fix Pickups of BlockFlower | ||||
| | * | | | Fix Pickups of BlockFlower | Drahoslav Bednář | 2016-02-06 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | BlockMeta is handled correctly, when converting to pickups, so flowers now drops right flower type. | ||||
| * | | | | Merge pull request #2978 from cuberite/checker | LogicParrot | 2016-02-07 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / |/| | | | Style checker - Prevent whitespace-only lines | ||||
| | * | | | Style checker - Prevent whitespace-only lines | LogicParrot | 2016-02-06 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #2974 from LogicParrot/perl | Julian Laubstein | 2016-02-06 | 406 | -4497/+4497 |
| |\ \ \ | | | | | | | | | Bulk clearing of whitespace | ||||
| | * | | | Bulk clearing of whitespace | LogicParrot | 2016-02-05 | 406 | -4497/+4497 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #2958 from LogicParrot/fence | LogicParrot | 2016-02-06 | 1 | -11/+15 |
| |\ \ \ | |/ / |/| | | Pathfinder now properly treats nonsolids above fence | ||||
| | * | | Pathfinder now properly treats nonsolids above fence | LogicParrot | 2016-02-04 | 1 | -11/+15 |
| | | | | |||||
| * | | | Merge pull request #2972 from marvinkopf/PlayerAutoComplete | LogicParrot | 2016-02-05 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Tab completion for player names now case insensitive. | ||||
| | * | | | Tab completion for player names now case insensitive. | Marvin Kopf | 2016-02-05 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #2954 from kevinr/implement-acacia-block-height | LogicParrot | 2016-02-05 | 2 | -1/+13 |
| |\ \ \ \ | |/ / / |/| | | | Implement acacia block height | ||||
| | * | | | add self to CONTRIBUTORS | Kevin Riggle | 2016-02-04 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | implement height logic for Acacia blocks | Kevin Riggle | 2016-02-04 | 1 | -1/+12 |
| | | | | | |||||
| * | | | | Correct typo in documentation. | Alexander Harkness | 2016-02-05 | 1 | -1/+1 |
| | |_|/ |/| | | |||||
| * | | | Merge pull request #2960 from LogicParrot/interspecies | Julian Laubstein | 2016-02-04 | 1 | -11/+25 |
| |\ \ \ | | | | | | | | | Prevent interspecies breeding | ||||
| | * | | | Prevent interspecies breeding | LogicParrot | 2016-02-04 | 1 | -11/+25 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #2942 from mathias-github/master | Julian Laubstein | 2016-02-04 | 8 | -143/+14 |
| |\ \ \ | | | | | | | | | Minor update | ||||
| | * | | | Minor update | Mathias | 2016-02-02 | 8 | -143/+14 |
| | | | | | |||||
| * | | | | Merge pull request #2955 from LogicParrot/worldBackwards | LogicParrot | 2016-02-04 | 1 | -1/+1 |
| |\ \ \ \ | |_|/ / |/| | | | Fix unexpected world creation introduced by #2821 | ||||
| | * | | | Fix unexpected world creation introduced by #2821 | LogicParrot | 2016-02-04 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #2939 from LogicParrot/m_Target | LogicParrot | 2016-02-04 | 17 | -83/+294 |
| |\ \ \ | |_|/ |/| | | cMonster::m_target safety across worlds | ||||
| | * | | cMonster::m_Target safety across worlds | LogicParrot | 2016-02-03 | 17 | -83/+294 |
| |/ / | |||||
| * | | Merge pull request #2941 from LogicParrot/chunkBug2 | LogicParrot | 2016-02-03 | 4 | -8/+57 |
| |\ \ | |/ |/| | [Attempt 2] Fixed cChunk::m_Entities corruption upon world travel | ||||
| | * | Fixed cChunk::m_Entities corruption upon world travel | LogicParrot | 2016-02-02 | 4 | -8/+57 |
| | | | |||||
| * | | Merge pull request #2903 from marvinkopf/FixTabAutoComplete | LogicParrot | 2016-02-02 | 1 | -1/+21 |
| |\ \ | | | | | | | Fix TabAutoComplete | ||||
| | * | | Fix TabAutoComplete | Marvin Kopf | 2016-02-02 | 1 | -1/+21 |
| | |/ | | | | | | | For tab on '/command s' the server now returns 'subcommand' instead of '/command subcommand'. | ||||
| * | | Merge pull request #2908 from marvinkopf/FixMineCartSpeed | LogicParrot | 2016-02-02 | 3 | -0/+22 |
| |\ \ | |/ |/| | Fix cPawn push logic | ||||
| | * | Fix cPawn pushing | Marvin Kopf | 2016-02-02 | 3 | -0/+22 |
| |/ | | | | cPawn instances can no longer push an entity they are attached to. cEntity now has a IsAttachedTo method. | ||||
| * | Merge pull request #2936 from mathias-github/master | Julian Laubstein | 2016-01-31 | 19 | -35/+35 |
| |\ | | | | | Updated old forum links | ||||
| | * | Updated old forum links | Mathias | 2016-01-31 | 19 | -35/+35 |
| |/ | |||||
| * | Merge pull request #2913 from mathias-github/master | Alexander Harkness | 2016-01-30 | 7 | -7/+7 |
| |\ | | | | | MCServer to Cuberite | ||||
| | * | MCServer to Cuberite | Mathias | 2016-01-29 | 7 | -7/+7 |
| |/ | |||||
| * | Merge pull request #2910 from LogicParrot/posix | LogicParrot | 2016-01-29 | 1 | -1/+1 |
| |\ | | | | | compile.sh - posix-compatible program existence checking | ||||
| | * | compile.sh - posix-compatible program existence checking | LogicParrot | 2016-01-29 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2909 from mathias-github/readme | Julian Laubstein | 2016-01-28 | 3 | -17/+12 |
| |\ | | | | | Front-end update | ||||
| | * | Front-end update | Mathias | 2016-01-28 | 3 | -17/+12 |
| |/ | |||||
| * | Merge pull request #2907 from cuberite/LuaNoSslVerify | Mattes D | 2016-01-24 | 2 | -4/+4 |
| |\ | | | | | LuaTcpSsl: Disabled cert verification due to missing CA chain. | ||||
| | * | LuaTcpSsl: Disabled cert verification due to missing CA chain. | Mattes D | 2016-01-24 | 2 | -4/+4 |
| |/ | |||||
| * | Merge pull request #2899 from cuberite/FixHttpParsing | Mattes D | 2016-01-22 | 1 | -2/+6 |
| |\ | | | | | Fixed HTTP parsing when in insecure mode. | ||||
| | * | Fixed HTTP parsing when in insecure mode. | Mattes D | 2016-01-22 | 1 | -2/+6 |
| |/ | | | | | Parsing would ignore the size of data already buffered, resulting in bad_alloc exception. Fixes #2898. | ||||
| * | Merge pull request #2882 from LogicParrot/wolfSpread2 | LogicParrot | 2016-01-22 | 13 | -83/+214 |
| |\ | | | | | Improved tamed wolf pack cooperation and projectile reactions | ||||
| | * | Improved tamed wolf pack cooperation and projectile reactions | LogicParrot | 2016-01-22 | 13 | -83/+214 |
| |/ | |||||
| * | Merge pull request #2894 from LogicParrot/spider | LogicParrot | 2016-01-22 | 13 | -163/+221 |
| |\ | | | | | Spiders now friendly at daylight, new cChunk functions | ||||
| | * | Spiders now friendly at daylight, new cChunk functions | LogicParrot | 2016-01-21 | 13 | -163/+221 |
| | | | |||||
| * | | Merge pull request #2901 from birkett/servicefix | Julian Laubstein | 2016-01-22 | 2 | -10/+6 |
| |\ \ | | | | | | | Fix running as a service. | ||||
| | * | | Fix running as a service. | Anthony Birkett | 2016-01-21 | 2 | -10/+6 |
| |/ / | | | | | | | | | | | | | | | | | | | Two problems identified, both traced to commit 4315a11 (main.cpp) ParseArguments() was no longer being called before checking cRoot::m_RunAsService. This led to m_RunAsService never being set (we use -d on the command line to instigate a service start). (Root.cpp) Terminate events were being ignored when running as a service. We only need to ignore the cin.good() call, not terminate events as a whole. | ||||
| * | | Merge pull request #2895 from LogicParrot/readme | LogicParrot | 2016-01-18 | 1 | -1/+1 |
| |\ \ | |/ |/| | Readme update - compile.sh works for *nix | ||||
| | * | Readme update - compile.sh works for *nix | LogicParrot | 2016-01-18 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2884 from LogicParrot/sort | LogicParrot | 2016-01-18 | 4 | -404/+404 |
| |\ | | | | | Sorted .ini and .txt files alphabetically | ||||
| | * | Alphabetically sorted configuration files | LogicParrot | 2016-01-17 | 4 | -404/+404 |
| | | | |||||
| * | | Merge pull request #2871 from cuberite/seadragon91-patch1 | worktycho | 2016-01-17 | 2 | -2/+2 |
| |\ \ | | | | | | | Fixed race conditions | ||||
| | * | | Fixed race conditions | Lukas Pioch | 2016-01-17 | 2 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #2887 from LogicParrot/water | LogicParrot | 2016-01-17 | 1 | -1/+1 |
| |\ \ | | | | | | | Use IsBlockWater in cPath | ||||
| | * | | Use IsBlockWater in cPath | LogicParrot | 2016-01-17 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #2885 from SteveWinfield/master | LogicParrot | 2016-01-17 | 3 | -3/+0 |
| |\ \ | |/ |/| | No second spawn broadcast necessary | ||||
| | * | No second spawn broadcast necessary | WinfieldSteve | 2016-01-17 | 3 | -3/+0 |
| |/ | |||||
| * | Merge pull request #2881 from LogicParrot/knockback | LogicParrot | 2016-01-17 | 1 | -0/+4 |
| |\ | | | | | Fixed wrong knockback direction after explosion damage | ||||
| | * | Fixed wrong knockback direction after explosion damage | LogicParrot | 2016-01-16 | 1 | -0/+4 |
| | | | |||||
| * | | Merge pull request #2883 from jammet/patch-8 | worktycho | 2016-01-17 | 1 | -0/+1 |
| |\ \ | |/ |/| | Update crafting.txt | ||||
| | * | Update crafting.txt | jammet | 2016-01-17 | 1 | -0/+1 |
| |/ | | | Added Mossy Cobblestone recipe | ||||
| * | Merge pull request #2877 from LogicParrot/spawn2 | LogicParrot | 2016-01-16 | 2 | -183/+184 |
| |\ | | | | | Fixed non-natural spawning near player (egg, breeding, etc.) | ||||
| | * | Fixed non-natural spawning near player (egg, breeding, etc.) | LogicParrot | 2016-01-16 | 2 | -183/+184 |
| | | | |||||
| * | | Merge pull request #2878 from LogicParrot/wolf2 | LogicParrot | 2016-01-16 | 7 | -61/+79 |
| |\ \ | |/ |/| | Fix crash when tamed wolf is hit by arrows | ||||
| | * | Fix crash when tamed wolf is hit by arrows | LogicParrot | 2016-01-16 | 7 | -61/+79 |
| |/ | |||||
| * | Merge pull request #2875 from LogicParrot/fallDamage | LogicParrot | 2016-01-16 | 1 | -1/+5 |
| |\ | | | | | Fix fall damage crash when tamed wolves neabry | ||||
| | * | Fix fall damage crash when tamed wolves neabry | LogicParrot | 2016-01-16 | 1 | -1/+5 |
| | | | |||||
| * | | Merge pull request #2869 from LogicParrot/typos | LogicParrot | 2016-01-13 | 1 | -35/+42 |
| |\| | | | | | compile.sh - 70 columns print limit | ||||
| | * | compile.sh - 70 columns print limit | LogicParrot | 2016-01-13 | 1 | -35/+42 |
| | | | |||||
| * | | Merge pull request #2868 from bibo38/namelength | Mattes D | 2016-01-13 | 2 | -0/+8 |
| |\ \ | |/ |/| | Limited the username length to 16 characters. | ||||
| | * | Limited the username length to 16 characters. | bibo38 | 2016-01-13 | 2 | -0/+8 |
| | | | | | | | | | | | | | This fixes a client crash, because Minecraft requires that a username is not longer than 16 characters. See also: http://minecraft.gamepedia.com/The_Player#Name Fixes #2545 | ||||
| * | | Merge pull request #2867 from LogicParrot/compile2 | LogicParrot | 2016-01-13 | 1 | -0/+3 |
| |\ \ | |/ |/| | compile.sh - Added updating note | ||||
| | * | compile.sh - added updating note | LogicParrot | 2016-01-13 | 1 | -0/+3 |
| |/ | |||||
| * | Merge pull request #2864 from LogicParrot/compile | LogicParrot | 2016-01-12 | 1 | -26/+52 |
| |\ | | | | | Made compile.sh more generic | ||||
| | * | Made compile.sh more generic | LogicParrot | 2016-01-12 | 1 | -26/+52 |
| |/ | | | | kk | ||||
| * | Merge pull request #2863 from LogicParrot/spawn | LogicParrot | 2016-01-12 | 1 | -54/+63 |
| |\ | | | | | Do not spawn mobs too close to player | ||||
| | * | Do not spawn mobs too close to player | LogicParrot | 2016-01-12 | 1 | -54/+63 |
| |/ | |||||
| * | Merge pull request #2862 from LogicParrot/creeper | LogicParrot | 2016-01-12 | 1 | -2/+2 |
| |\ | | | | | Fixed creeper calling TargetIsInRange with null m_Target | ||||
| | * | Fixed creeper calling TargetIsInRange with null m_Target | LogicParrot | 2016-01-12 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #2861 from LogicParrot/hotfix | Mattes D | 2016-01-12 | 1 | -29/+31 |
| |\ \ | |/ |/| | Fixed crash introduced by #2821 | ||||
| | * | Fixed crash introduced by #2821 | LogicParrot | 2016-01-12 | 1 | -29/+31 |
| |/ | |||||
| * | Merge pull request #2859 from LogicParrot/attack2 | LogicParrot | 2016-01-12 | 7 | -24/+28 |
| |\ | | | | | Fix mob attack interval | ||||
| | * | Fix mob attack interval | LogicParrot | 2016-01-12 | 7 | -24/+28 |
| | | | |||||
| * | | Merge pull request #2860 from LogicParrot/wolfChecks | LogicParrot | 2016-01-12 | 1 | -1/+14 |
| |\ \ | |/ |/| | Friendly wolf attack safety checks | ||||
| | * | Friendly wolf attack safety checks | LogicParrot | 2016-01-12 | 1 | -1/+14 |
| |/ | |||||
| * | Merge pull request #2857 from LogicParrot/wolf | LogicParrot | 2016-01-12 | 11 | -149/+292 |
| |\ | | | | | AI: Tamed wolf defends owner | ||||
| | * | Tamed wolf assists owner (attack / defence) | LogicParrot | 2016-01-12 | 11 | -149/+292 |
| | | | |||||
| * | | Merge pull request #2853 from cuberite/DetailedBlockAreaLogging | Mattes D | 2016-01-12 | 1 | -4/+12 |
| |\ \ | | | | | | | Added detailed logging to cBlockArea::Read() bad Y coords. | ||||
| | * | | Added detailed logging to cBlockArea::Read() bad Y coords. | Mattes D | 2016-01-12 | 1 | -4/+12 |
| |/ / | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=2307 | ||||
| * | | Merge pull request #2849 from cuberite/export_getseed | Mattes D | 2016-01-12 | 3 | -0/+5 |
| |\ \ | | | | | | | Exported GetSeed to lua and added file extension opendb to .gitignore. | ||||
| | * | | Exported GetSeed to lua and added file extension opendb to .gitignore. | Lukas Pioch | 2016-01-12 | 3 | -0/+5 |
| |/ / | |||||
| * | | Merge pull request #2821 from LogicParrot/world2 | LogicParrot | 2016-01-12 | 2 | -3/+49 |
| |\ \ | | | | | | | Fix pre - #2815 default world linkage configs | ||||
| | * | | Fix pre - #2815 default world linkage configs | Safwat Halaby | 2015-12-25 | 2 | -3/+49 |
| | | | | |||||
| * | | | Merge pull request #2855 from bibo38/mobheads | worktycho | 2016-01-12 | 7 | -19/+130 |
| |\ \ \ | |_|/ |/| | | Changed the format of the MobHead data | ||||
| | * | | Changed the format of the MobHead data to allow MobHeads working on MInecraft 1.8 | bibo38 | 2016-01-11 | 7 | -19/+130 |
| | | | | | | | | | | | | | | | | | | | The NBT format now carries the texture data and transmit it to the client. See: http://minecraft.gamepedia.com/Head#Block_entity Related to #2674 | ||||
| * | | | Merge pull request #2848 from Nakkar/master | Alexander Harkness | 2016-01-11 | 1 | -3/+5 |
| |\ \ \ | |/ / |/| | | Fix for issue #2218 | ||||
| | * | | Fixed issue #2218 | Austin Martin | 2016-01-11 | 1 | -3/+5 |
| |/ / | |||||
| * | | Added "core.help" permission to Default rank. | Mattes D | 2016-01-10 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #2851 from bibo38/decompressfix | Mattes D | 2016-01-10 | 1 | -13/+18 |
| |\ \ | | | | | | | Fixed not working packet decompression | ||||
| | * | | Fixed not working packet decompression | bibo38 | 2016-01-10 | 1 | -13/+18 |
| |/ / | | | | | | | | | | | | | A compressed packed contains always the uncompressed size, but in the code this size was threatened as the compressed data size. This created a failure, when the client compressed a packet. See: http://wiki.vg/Protocol#With_compression Fixes #2841 Fixes #2467 | ||||
| * | | Merge pull request #2847 from cuberite/FixClangWarnings | worktycho | 2016-01-07 | 7 | -33/+50 |
| |\ \ | | | | | | | Fixed Clang warnings. | ||||
| | * | | Fixed Clang warnings. | Mattes D | 2016-01-06 | 7 | -33/+50 |
| |/ / | |||||
| * | | Merge pull request #2844 from mathias-github/silktouch | Mattes D | 2016-01-05 | 2 | -2/+29 |
| |\ \ | | | | | | | Added blocks that can't be mined with silktouch | ||||
| | * | | Fixed typo | Mathias | 2016-01-03 | 1 | -1/+1 |
| | | | | |||||
| | * | | More blocks that can't be mined with silktouch | Mathias | 2016-01-03 | 1 | -1/+28 |
| |/ / | |||||
| * | | Merge pull request #2842 from ameuret/typo-ammount | Mattes D | 2016-01-03 | 2 | -4/+4 |
| |\ \ | | | | | | | Typo [ammount] | ||||
| | * | | Fix typo (ammount) | Arnaud Meuret | 2016-01-02 | 2 | -4/+4 |
| |/ / | |||||
| * | | Merge pull request #2840 from cuberite/RenameToCuberite | Julian Laubstein | 2016-01-02 | 54 | -257/+112 |
| |\ \ | | | | | | | Renamed leftover strings to Cuberite / Server, as needed. | ||||
| | * | | Updated plugins with the rename to Cuberite. | Mattes D | 2016-01-01 | 3 | -0/+0 |
| | | | | |||||
| | * | | Renamed leftover strings to Cuberite / Server, as needed. | Mattes D | 2016-01-01 | 51 | -257/+112 |
| |/ / | | | | | | | Also upgraded the user setting file for MSVC to 2013. | ||||
| * | | Merge pull request #2838 from cuberite/clang-3.8-ignore-flag | worktycho | 2015-12-30 | 1 | -0/+6 |
| |\ \ | | | | | | | Clang-3.8: Added ignore flag for double promotion | ||||
| | * | | Clang-3.8: Added ignore flag for double promotion | Lukas Pioch | 2015-12-30 | 1 | -0/+6 |
| |/ / | |||||
| * | | Merge pull request #2836 from cuberite/FixDefaultWorldGenParams | Mattes D | 2015-12-30 | 1 | -1/+1 |
| |\ \ | | | | | | | Fixed default Nether generator params. | ||||
| | * | | Fixed default Nether generator params. | Mattes D | 2015-12-30 | 1 | -1/+1 |
| |/ / | | | | | | | The prefab file is "NetherFort" | ||||
| * | | Merge pull request #2831 from cuberite/BlockingSslClientSocketFix | Mattes D | 2015-12-30 | 3 | -11/+24 |
| |\ \ | | | | | | | Changed m_IsConnected to an atomic bool, added logging. | ||||
| | * | | Fixed problems in cBlockingSslClientSocket. | Mattes D | 2015-12-30 | 3 | -11/+24 |
| |/ / | |||||
| * | | Merge pull request #2837 from cuberite/FixMonsterBurn | Julian Laubstein | 2015-12-30 | 1 | -3/+15 |
| |\ \ | | | | | | | Fixed the monster burn code. | ||||
| | * | | Fixed the monster burn code. | Mattes D | 2015-12-30 | 1 | -3/+15 |
| |/ / | | | | | | | The old code failed when the monster was out of Y range. | ||||
| * | | Debuggers plugin: Added "uuid" console command. | Mattes D | 2015-12-28 | 2 | -0/+37 |
| | | | |||||
| * | | Removed excessive logging in redstone simulator. | Mattes D | 2015-12-28 | 1 | -7/+0 |
| | | | |||||
| * | | Merge pull request #2829 from LogicParrot/fences2 | Julian Laubstein | 2015-12-27 | 3 | -34/+13 |
| |\ \ | | | | | | | Deleted cPath::BlockTypeIsFence | ||||
| | * | | Deleted cPath::BlockTypeIsFence | LogicParrot | 2015-12-27 | 3 | -34/+13 |
| |/ / | |||||
| * | | Merge pull request #2825 from Gargaj/snowlayers | Alexander Harkness | 2015-12-27 | 1 | -1/+1 |
| |\ \ | | | | | | | fix crafting recipe for snow layers | ||||
| | * | | fix crafting recipe for snow layers | Gargaj | 2015-12-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #2828 from LogicParrot/contrib | LogicParrot | 2015-12-27 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Update CONTRIBUTORS | ||||
| | * | | | Update CONTRIBUTORS | LogicParrot | 2015-12-27 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #2814 from SafwatHalaby/chunk2 | Safwat Halaby | 2015-12-26 | 3 | -1/+116 |
| |\ \ \ | | | | | | | | | Freeze player until chunk is loaded | ||||
| | * | | | Freeze player until chunk is loaded | Safwat Halaby | 2015-12-25 | 3 | -1/+116 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #2820 from cuberite/UrlParser | worktycho | 2015-12-26 | 8 | -4/+515 |
| |\ \ \ | | | | | | | | | Added the cUrlParser class, exported to Lua API. | ||||
| | * | | | Added the cUrlParser class, exported to Lua API. | Mattes D | 2015-12-25 | 8 | -4/+515 |
| | | | | | |||||
| * | | | | Merge pull request #2789 from cuberite/apidump-analytics | Mattes D | 2015-12-26 | 8 | -57/+6780 |
| |\ \ \ \ | |_|_|/ |/| | | | Added analytics to APIDump | ||||
| | * | | | Added analytics to APIDump | Alexander Harkness | 2015-12-26 | 8 | -57/+6780 |
| |/ / / | |||||
| * | | | Added ProtoProxy and MCADefrag binaries to .gitignore | Julian Laubstein | 2015-12-26 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #2822 from SafwatHalaby/fence | Safwat Halaby | 2015-12-25 | 1 | -2/+9 |
| |\ \ \ | |/ / |/| | | Update fences and gates list | ||||
| | * | | Update fences and gates list | Safwat Halaby | 2015-12-25 | 1 | -2/+9 |
| |/ / | | | | | | | Update fences and gates list | ||||
| * | | Merge pull request #2795 from SafwatHalaby/doors | Safwat Halaby | 2015-12-25 | 10 | -215/+396 |
| |\ \ | |/ |/| | "Special blocks" handling | ||||
| | * | PF - "Special blocks" handling | Safwat Halaby | 2015-12-24 | 14 | -219/+400 |
| | | | |||||
| * | | Merge pull request #2815 from SafwatHalaby/world | Safwat Halaby | 2015-12-25 | 2 | -4/+18 |
| |\ \ | | | | | | | Nether and End in settings.ini by default, and created at startup | ||||
| | * | | Nether and End in settings.ini by default, and created at startup | Safwat Halaby | 2015-12-25 | 2 | -4/+18 |
| |/ / | |||||
| * | | Merge pull request #2816 from SafwatHalaby/redstone | Safwat Halaby | 2015-12-24 | 17 | -20/+20 |
| |\ \ | | | | | | | Silenced the Redstone Simulator console spam | ||||
| | * | | Silenced the Redstone Simulator console spam | Safwat Halaby | 2015-12-24 | 17 | -20/+20 |
| | |/ | |||||
| * | | Merge pull request #2801 from cuberite/ExposeJson | Mattes D | 2015-12-24 | 8 | -48/+500 |
| |\ \ | |/ |/| | Added a Json parser and serializer to Lua API. | ||||
| | * | Added a Json parser and serializer to Lua API. | Mattes D | 2015-12-24 | 8 | -48/+500 |
| |/ | |||||
| * | Merge pull request #2811 from cuberite/isblockfence | Safwat Halaby | 2015-12-24 | 1 | -0/+24 |
| |\ | | | | | Added IsBlockFence method to defines.h | ||||
| | * | Added IsBlockFence method to defines | Julian Laubstein | 2015-12-24 | 1 | -0/+24 |
| |/ | |||||
| * | Merge pull request #2808 from cuberite/freebsd32fix | worktycho | 2015-12-23 | 1 | -0/+1 |
| |\ | | | | | Fixed builds on FreeBSD 32bit | ||||
| | * | Fixed builds on FreeBSD 32bit | Julian Laubstein | 2015-12-23 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #2807 from cuberite/UpdateLibEvent | worktycho | 2015-12-23 | 1 | -0/+0 |
| |\ | | | | | Updated LibEvent. | ||||
| | * | Updated LibEvent. | Mattes D | 2015-12-23 | 1 | -0/+0 |
| |/ | | | | Includes a fix to Unicode error messages for Windows builds. | ||||
| * | Merge pull request #2806 from SafwatHalaby/gargraj-chicken | Safwat Halaby | 2015-12-23 | 1 | -0/+5 |
| |\ | | | | | [Gargaj] - Baby chickens don't lay eggs | ||||
| | * | Chicken egg code early bailout | Safwat Halaby | 2015-12-23 | 1 | -19/+21 |
| | | | |||||
| | * | Baby chickens don't lay eggs | Gargaj | 2015-12-23 | 1 | -16/+19 |
| | | | |||||
| * | | Fixed return value description in doxycomment. | Mattes D | 2015-12-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #2802 from mathias-github/master | Mattes D | 2015-12-23 | 3 | -42/+412 |
| |\ \ | | | | | | | Added 1.7 item names | ||||
| | * | | Added 1.7 item names | Mathias | 2015-12-22 | 3 | -42/+412 |
| |/ / | |||||
| * | | Merge pull request #2800 from cuberite/rconbuild-fix | Julian Laubstein | 2015-12-22 | 4 | -83/+34 |
| |\ \ | | | | | | | Removed offending tr1 references. | ||||
| | * | | Removed offending tr1 references. | Alexander Harkness | 2015-12-22 | 4 | -83/+34 |
| | |/ | |||||
| * | | Merge pull request #2790 from Gargaj/waterbottle | Safwat Halaby | 2015-12-22 | 3 | -0/+98 |
| |\ \ | |/ |/| | Add handling of water bottle | ||||
| | * | add handling of water bottle | Gargaj | 2015-12-22 | 3 | -0/+98 |
| |/ | |||||
| * | Merge pull request #2796 from cuberite/MojangCert | Alexander Harkness | 2015-12-22 | 2 | -2/+25 |
| |\ | | | | | Added GeoTrust Root Certificate | ||||
| | * | Added GeoTrust Root Certificate | worktycho | 2015-12-22 | 1 | -1/+24 |
| | | | |||||
| | * | Ignore == if followed by \ | worktycho | 2015-12-22 | 1 | -1/+1 |
| |/ | | | | Ignore the space before == rule if immediately followed by a \. If it is imediatly followed by a \, then this is likely the base64 padding at the end of a certificate, which is followed by \n. | ||||
| * | Merge pull request #2788 from SafwatHalaby/jump | Safwat Halaby | 2015-12-22 | 3 | -81/+151 |
| |\ | | | | | PF - Improved mob jumping | ||||
| | * | PF - Improved mob jumping | Safwat Halaby | 2015-12-21 | 3 | -81/+151 |
| | | | |||||
| * | | Merge pull request #2791 from then0rTh/master | Safwat Halaby | 2015-12-21 | 1 | -1/+1 |
| |\ \ | |/ |/| | cTeam:GetName returning wrong name | ||||
| | * | cTeam:GetName returning wrong name | then0rTh | 2015-12-21 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2786 from SafwatHalaby/revert | Safwat Halaby | 2015-12-21 | 4 | -103/+38 |
| |\ | | | | | Revert "Changed cPath to have a reset method". | ||||
| | * | Revert "Changed cPath to have a reset method". | Safwat Halaby | 2015-12-21 | 4 | -103/+38 |
| |/ | |||||
| * | Merge pull request #2783 from cuberite/seadragon91-patch-spawnpoint-fix | Mattes D | 2015-12-20 | 1 | -3/+4 |
| |\ | | | | | Fixed spawn point generation. Wrong number for divisions and wrong highest spawn point | ||||
| | * | Fixed spawn point. Wrong number for divisions and wrong highest spawn point. | Lukas Pioch | 2015-12-20 | 1 | -3/+4 |
| |/ | |||||
| * | Merge pull request #2780 from cuberite/SpawnRace | Lukas Pioch | 2015-12-20 | 2 | -2/+4 |
| |\ | | | | | Fix race condition | ||||
| | * | Fix race condition | tycho | 2015-12-20 | 2 | -2/+4 |
| |/ | |||||
| * | Merge pull request #2779 from cuberite/seadragon91-patch-clang-3.7 | worktycho | 2015-12-19 | 5 | -7/+7 |
| |\ | | | | | Fixes for clang-3.7 | ||||
| | * | Fixes for clang-3.7 | Lukas Pioch | 2015-12-19 | 5 | -7/+7 |
| |/ | |||||
| * | HTTPS Newsletter | Alexander Harkness | 2015-12-19 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #2542 from Haxi52/pinkstone | Tiger Wang | 2015-12-19 | 55 | -3122/+2337 |
| |\ | | | | | Reorganised the redstone simulator | ||||
| | * | Reorganised the redstone simulator | Tiger Wang | 2015-12-18 | 55 | -3122/+2337 |
| | | | | | | | | | | | | | -> Many thanks to @worktycho for the idea, and @Haxi52 for the implementation plan! * Uses classes and inheritance now * Speed should be improved | ||||
| * | | Merge pull request #2776 from cuberite/AtomicBoolIsthread | Lukas Pioch | 2015-12-19 | 1 | -1/+2 |
| |\ \ | | | | | | | Use atomic bool for isthread terminate | ||||
| | * | | Use atomic bool for isthread terminate | tycho | 2015-12-19 | 1 | -1/+2 |
| |/ / | |||||
| * | | Merge pull request #2778 from cuberite/httpschanges | Alexander Harkness | 2015-12-19 | 22 | -1785/+1742 |
| |\ \ | | | | | | | Added HTTPS links wherever they are supported. | ||||
| | * | | Added HTTPS links wherever they are supported. | Alexander Harkness | 2015-12-19 | 22 | -1785/+1742 |
| |/ / | |||||
| * | | Merge pull request #2774 from cuberite/worktycho-patch-1 | Lukas Pioch | 2015-12-18 | 1 | -1/+1 |
| |\ \ | | | | | | | Fix off by two error in ReadString | ||||
| | * | | Fix off by two error in ReadString | worktycho | 2015-12-18 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2769 from cuberite/FastNBTAsserts | Alexander Harkness | 2015-12-18 | 1 | -2/+6 |
| |\ \ | | | | | | | Check for invalid tags when reading a compound tag | ||||
| | * | | Check for invalid tags when reading a compound tag | tycho | 2015-12-18 | 1 | -2/+6 |
| |/ / | |||||
| * | | Merge pull request #2759 from cuberite/ExplosionAPI | Mattes D | 2015-12-18 | 11 | -144/+243 |
| |\ \ | |/ |/| | Revised the explosion-related Lua API and docs. | ||||
| | * | Revised the explosion-related Lua API and docs. | Mattes D | 2015-12-18 | 11 | -144/+243 |
| |/ | | | | Fixes #2746. | ||||
| * | Merge pull request #2770 from cuberite/RemoveChunkDataCollector | Mattes D | 2015-12-18 | 1 | -20/+0 |
| |\ | | | | | Removed unused class cChunkDataCollector. | ||||
| | * | Removed unused class cChunkDataCollector. | Mattes D | 2015-12-18 | 1 | -20/+0 |
| |/ | |||||
| * | Merge pull request #2758 from cuberite/FastNBTFix | Mattes D | 2015-12-18 | 1 | -5/+1 |
| |\ | | | | | Fixed String Parsing crash bug | ||||
| | * | Fixed String Parsing crash bug | tycho | 2015-12-18 | 1 | -5/+1 |
| |/ | | | | Check string length against actual remaining data, not an abitary constant | ||||
| * | Merge pull request #2755 from cuberite/coverage | Mattes D | 2015-12-18 | 3 | -0/+5 |
| |\ | | | | | Working coverage build | ||||
| | * | Working coverage build | tycho | 2015-12-18 | 3 | -0/+5 |
| |/ | |||||
| * | Merge pull request #2751 from cuberite/PieceStructuresFix | Mattes D | 2015-12-17 | 2 | -5/+5 |
| |\ | | | | | PieceStructures generator: Fixed wrong merge conflict resolution. | ||||
| | * | PieceStructures generator: Fixed wrong merge conflict resolution. | Mattes D | 2015-12-17 | 2 | -5/+5 |
| |/ | | | | | Also improved reporting messages. Ref.: http://forum.mc-server.org/showthread.php?tid=2256 | ||||
| * | Merge pull request #2761 from cuberite/fixed_warnings | Lukas Pioch | 2015-12-17 | 9 | -19/+10 |
| |\ | | | | | Moved variables into scope, removed unused variables and fixed variables | ||||
| | * | Moved variables into scope, removed unused variables and fixed variables | Lukas Pioch | 2015-12-17 | 9 | -19/+10 |
| |/ | |||||
| * | Merge pull request #2753 from cuberite/pathFix | Safwat Halaby | 2015-12-16 | 4 | -37/+109 |
| |\ | | | | | Path fix | ||||
| | * | Changed cPath to have a reset method. | tycho | 2015-12-16 | 4 | -38/+103 |
| | | | | | | | | | | | | | Also reverts "Changed raw cPath to an unique_ptr, fixes memory leak" This reverts commit 1515d37684b469f212bb9858cca6128d74e591b6. | ||||
| | * | Delete copy and move constructors from cPath | tycho | 2015-12-15 | 1 | -0/+7 |
| | | | | | | | | | cPath is not safe to copy or move due to pointers into the std::map m_Map. | ||||
| * | | Merge pull request #2754 from Gargaj/horsefix | worktycho | 2015-12-15 | 3 | -2/+29 |
| |\ \ | |/ |/| | Allow horse control | ||||
| | * | allow horse control (still quite buggy) | Gargaj | 2015-12-15 | 3 | -2/+29 |
| |/ | |||||
| * | Merge pull request #2750 from cuberite/wrng | Lukas Pioch | 2015-12-15 | 1 | -1/+1 |
| |\ | | | | | Fixed warning regarding an uninitialized value | ||||
| | * | Fixed warning regarding an uninitialized value | Julian Laubstein | 2015-12-15 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2749 from cuberite/wrng | worktycho | 2015-12-15 | 1 | -1/+1 |
| |\ | | | | | Fixed warning regarding an uninitialized value | ||||
| | * | Fixed warning regarding an uninitialized value | Julian Laubstein | 2015-12-15 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2748 from cuberite/fix_memory_leak | Safwat Halaby | 2015-12-15 | 2 | -9/+9 |
| |\ | | | | | Changed raw cPath to an unique_ptr, fixes memory leak (Fixes #2745) | ||||
| | * | Changed raw cPath to an unique_ptr, fixes memory leak | Lukas Pioch | 2015-12-15 | 2 | -9/+9 |
| |/ | |||||
| * | Merge pull request #2638 from Gargaj/master | worktycho | 2015-12-14 | 16 | -128/+294 |
| |\ | | | | | Implement block heights + adapt ground checks | ||||
| | * | blockheight mechanism | Gargaj | 2015-12-13 | 16 | -128/+294 |
| | | | |||||
| * | | Merge pull request #2744 from cuberite/HopperMetaStrip | worktycho | 2015-12-13 | 1 | -0/+6 |
| |\ \ | |/ |/| | Strip meta from hopper on converting to pickup | ||||
| | * | Strip meta from hopper on converting to pickup | Julian Laubstein | 2015-12-13 | 1 | -0/+6 |
| |/ | |||||
| * | Merge pull request #2743 from SafwatHalaby/wart | Safwat Halaby | 2015-12-13 | 1 | -1/+5 |
| |\ | | | | | Set overgrown wart age to 3 | ||||
| | * | Set overgrown wart age to 3 | Safwat Halaby | 2015-12-13 | 1 | -1/+5 |
| |/ | |||||
| * | Merge pull request #2708 from Gargaj/onuse | Safwat Halaby | 2015-12-13 | 55 | -77/+120 |
| |\ | | | | | Allow use failures to propagate from the entity/block to the player | ||||
| | * | allow use failures to propagate from the entity/block to the player | Gargaj | 2015-12-13 | 55 | -77/+120 |
| |/ | |||||
| * | Merge pull request #2737 from Gargaj/snowgolem | Safwat Halaby | 2015-12-13 | 1 | -5/+5 |
| |\ | | | | | Snow golems are supposed to be "neutral" | ||||
| | * | snow golems are "neutral" | Gargaj | 2015-12-13 | 1 | -5/+5 |
| |/ | |||||
| * | Merge pull request #2738 from Gargaj/mobinheritance | Safwat Halaby | 2015-12-13 | 4 | -1/+64 |
| |\ | | | | | Sheep color inheritance | ||||
| | * | sheep color inheritance | Gargaj | 2015-12-13 | 4 | -1/+64 |
| |/ | |||||
| * | Merge pull request #2741 from SafwatHalaby/mTarget2 | Safwat Halaby | 2015-12-13 | 1 | -1/+0 |
| |\ | | | | | Remove stray "return" | ||||
| | * | Remove stray "return" | Safwat Halaby | 2015-12-13 | 1 | -1/+0 |
| |/ | |||||
| * | Merge pull request #2740 from SafwatHalaby/mTarget | Safwat Halaby | 2015-12-13 | 2 | -11/+15 |
| |\ | | | | | Fixed mobs attacking Creative Mode players | ||||
| | * | Fixed mobs attacking Creative Mode players | Safwat Halaby | 2015-12-13 | 2 | -11/+15 |
| |/ | |||||
| * | Merge pull request #2668 from SafwatHalaby/decouple2 | Safwat Halaby | 2015-12-13 | 8 | -335/+486 |
| |\ | | | | | Decoupled cMonster and path recalc logic, re-implemented recalc. | ||||
| | * | Decoupled cMonster and path recalc logic, re-implemented recalc | Safwat Halaby | 2015-12-13 | 8 | -335/+486 |
| |/ | |||||
| * | Merge pull request #2739 from Gargaj/patch-6 | Safwat Halaby | 2015-12-13 | 1 | -0/+1 |
| |\ | | | | | Stop pathfinding over cobble walls | ||||
| | * | Stop pathfinding over cobble walls | Gargaj | 2015-12-13 | 1 | -0/+1 |
| |/ | | | Also 1.5 blocks high, shouldn't pathfind over it. | ||||
| * | Merge pull request #2735 from SafwatHalaby/mathias2 | Safwat Halaby | 2015-12-12 | 1 | -15/+19 |
| |\ | | | | | Attempt 2 - Fixed a few crafting recipes | ||||
| | * | Fixed a few crafting recipes | Mathias | 2015-12-12 | 1 | -15/+19 |
| |/ | |||||
| * | Merge pull request #2732 from Gargaj/patch-5 | Safwat Halaby | 2015-12-12 | 1 | -2/+2 |
| |\ | | | | | Nether wart only ages to 3 | ||||
| | * | Nether wart only ages to 3 | Gargaj | 2015-12-12 | 1 | -2/+2 |
| |/ | | | See http://minecraft.gamepedia.com/Nether_Wart | ||||
| * | Merge pull request #2721 from bmintz/patch-1 | worktycho | 2015-12-11 | 1 | -0/+2 |
| |\ | | | | | Put the entire "automatic compile" script in a code block for security | ||||
| | * | Merge branch 'master' into patch-1 | Benjamin Mintz | 2015-12-11 | 0 | -0/+0 |
| | |\ | |/ |/| | |||||
| * | | Merge pull request #2727 from Gargaj/patch-4 | Alexander Harkness | 2015-12-10 | 2 | -1/+2 |
| |\ \ | | | | | | | Test for correct coordinates when fishing | ||||
| | * | | Test for correct coordinates when fishing | Gargaj | 2015-12-10 | 2 | -1/+2 |
| |/ / | | | | | | | Fun fact: this was able to actually deadlock the server depending on where you were standing :) | ||||
| | * | Test for correct coordinates when fishing | Gargaj | 2015-12-11 | 2 | -1/+2 |
| | | | | | | | | | Fun fact: this was able to actually deadlock the server depending on where you were standing :) | ||||
| | * | Put the entire compile.sh script in a code block for security | Benjamin Mintz | 2015-12-11 | 1 | -0/+2 |
| |/ | | | | | This makes sure that sh will error out if the connection is interrupted. See here: https://www.seancassidy.me/dont-pipe-to-your-shell.html | ||||
| * | Merge pull request #2720 from cuberite/OreNestsFix | Julian Laubstein | 2015-12-09 | 1 | -2/+2 |
| |\ | | | | | Fixed opposite condition in OreNests finisher. | ||||
| | * | Fixed opposite condition in OreNests finisher. | Mattes D | 2015-12-09 | 1 | -2/+2 |
| |/ | |||||
| * | Merge pull request #2706 from Gargaj/deadcreeper | Mattes D | 2015-12-09 | 1 | -1/+1 |
| |\ | | | | | Stop creepers from exploding even if they just died | ||||
| | * | stop creepers from exploding even if they just died | Gargaj | 2015-12-08 | 1 | -1/+1 |
| |/ | |||||
| * | Small spelling issues fixed | Julian Laubstein | 2015-12-08 | 1 | -3/+3 |
| | | |||||
| * | Merge pull request #2713 from Gargaj/patch-2 | Mattes D | 2015-12-06 | 1 | -1/+1 |
| |\ | | | | | Tilling dirt should send block update | ||||
| | * | Tilling dirt should send block update | Gargaj | 2015-12-06 | 1 | -1/+1 |
| |/ | | | | There are BUD switches that are built on this (https://www.youtube.com/watch?v=Bk_ChvmtCNY) but more prominently, torches placed on dirt blocks should pop off when the dirt block is tilled. | ||||
| * | Merge pull request #2714 from Gargaj/patch-3 | Safwat Halaby | 2015-12-06 | 1 | -5/+5 |
| |\ | | | | | Spawn chickens from eggs as babies | ||||
| | * | Spawn chickens from eggs as babies | Gargaj | 2015-12-05 | 1 | -5/+5 |
| |/ | | | This actually works now with the breeding patch (would also close https://github.com/cuberite/cuberite/pull/2366) | ||||
| * | Merge pull request #2694 from SafwatHalaby/documentation | worktycho | 2015-12-04 | 2 | -5/+34 |
| |\ | | | | | Update COMPILING.md | ||||
| | * | Update COMPILING.md | Safwat Halaby | 2015-12-03 | 2 | -5/+34 |
| |/ | |||||
| * | Merge pull request #2704 from Gargaj/patch-1 | Mattes D | 2015-12-03 | 1 | -2/+2 |
| |\ | | | | | Fix wolf collars | ||||
| | * | fix wolf collars | Gargaj | 2015-12-03 | 1 | -2/+2 |
| |/ | | | | I don't know why this had an inversion but it consistently made the wrong collar color (i.e. yellow dye made the collar blue) | ||||
| * | Merge pull request #2707 from Gargaj/rabbitstew | Mattes D | 2015-12-03 | 4 | -56/+25 |
| |\ | | | | | Merge cItemMushroomSoupHandler into cItemFoodHandler | ||||
| | * | Merge mushroom soup into generic food handler | Gargaj | 2015-12-03 | 4 | -56/+25 |
| | | | | | | | | | ...and fix eating the bowl when eating rabbit stew | ||||
| * | | Merge pull request #2711 from cuberite/FixFreeBSDBuild | Julian Laubstein | 2015-12-03 | 1 | -8/+1 |
| |\ \ | |/ |/| | Use C++11 auto instead of per-platform types. | ||||
| | * | Use C++11 auto instead of per-platform types. | Mattes D | 2015-12-03 | 1 | -8/+1 |
| |/ | | | | Closes #2686. | ||||
| * | Merge pull request #2699 from SafwatHalaby/breedDocs | Mattes D | 2015-12-03 | 2 | -5/+25 |
| |\ | | | | | Breeding documentation | ||||
| | * | Added documentation for breeding code | Safwat Halaby | 2015-11-30 | 2 | -5/+25 |
| | | | |||||
| * | | Merge pull request #2422 from cuberite/PieceStructuresGen | Mattes D | 2015-12-03 | 58 | -12062/+18116 |
| |\ \ | |/ |/| | Added PieceStructures generator. | ||||
| | * | Changed Nether defaults to use PieceStructures. | Mattes D | 2015-12-01 | 1 | -1/+1 |
| | | | |||||
| | * | Added more details to the cubeset format documentation. | Mattes D | 2015-12-01 | 2 | -6/+35 |
| | | | |||||
| | * | Added PieceStructures generator. | Mattes D | 2015-12-01 | 56 | -12057/+18082 |
| |/ | |||||
| * | Merge pull request #2696 from Gargaj/breeding | Safwat Halaby | 2015-11-30 | 11 | -19/+209 |
| |\ | | | | | Implement aging + breeding | ||||
| | * | implement breeding | Gargaj | 2015-11-29 | 11 | -19/+209 |
| |/ | |||||
| * | Updated DumpInfo plugin | NiLSPACE | 2015-11-29 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #2693 from cuberite/NormalizeOrePocketConfigNames | Mattes D | 2015-11-28 | 1 | -2/+2 |
| |\ | | | | | Normalized OrePockets generator config names. | ||||
| | * | Normalized OrePockets generator config names. | Mattes D | 2015-11-27 | 1 | -2/+2 |
| |/ | | | | All INI values use AllInitialCapsStyle, no underscores. | ||||
| * | Merge pull request #2670 from cuberite/OrePockets | Julian Laubstein | 2015-11-25 | 6 | -267/+649 |
| |\ | | | | | Added OrePockets and DirtPockets finish gens. | ||||
| | * | OrePockets finisher is now configurable. | Mattes D | 2015-11-25 | 4 | -26/+127 |
| | | | |||||
| | * | Added OrePockets and DirtPockets finish gens. | Mattes D | 2015-11-25 | 5 | -267/+548 |
| |/ | |||||
| * | Merge pull request #2687 from Gargaj/signfix | worktycho | 2015-11-24 | 1 | -1/+6 |
| |\ | | | | | Fix escaped characters in signs | ||||
| | * | fix escaped characters in signs (fixes #1736, fixes #2170) | Gargaj | 2015-11-24 | 1 | -1/+6 |
| |/ | |||||
| * | Merge pull request #2688 from bendl/master | Alexander Harkness | 2015-11-24 | 1 | -1/+1 |
| |\ | | | | | Fixed 'Install on DigitalOcean' link in README.md | ||||
| | * | Fixed 'Install on DigitalOcean' link in README.md | Ben Lancaster | 2015-11-24 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2685 from dave-tucker/fxenum | Julian Laubstein | 2015-11-24 | 31 | -56/+124 |
| |\ | | | | | Add enum for Sound and Particle Effects | ||||
| | * | Add enum for Sound and Particle Effects | Dave Tucker | 2015-11-24 | 31 | -56/+124 |
| |/ | | | | | | Fixes #2603 Signed-off-by: Dave Tucker <dave@dtucker.co.uk> | ||||
| * | Merge pull request #2645 from Gargaj/followedarray | worktycho | 2015-11-23 | 11 | -12/+67 |
| |\ | | | | | Allow multiple followable items | ||||
| | * | change from single followable item to multiple | Gargaj | 2015-11-23 | 11 | -12/+67 |
| |/ | |||||
| * | Fixed display of helpmessage | Julian Laubstein | 2015-11-23 | 1 | -1/+1 |
| | | |||||
| * | Changed static_cast to FloorC | Julian Laubstein | 2015-11-23 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #2683 from Gargaj/patch-1 | Alexander Harkness | 2015-11-23 | 1 | -0/+1 |
| |\ | | | | | add Golden Carrot | ||||
| | * | add Golden Carrot | Gargaj | 2015-11-23 | 1 | -0/+1 |
| |/ | | | Yay! | ||||
| * | Merge pull request #2680 from cuberite/vhE | NiLSPACE | 2015-11-23 | 3 | -11/+11 |
| |\ | | | | | Converted some height validations to use cChunkDef::IsValidHeight() | ||||
| | * | Adjusted height validation using cChunkDef::IsValidHeight() | Julian Laubstein | 2015-11-23 | 3 | -11/+11 |
| |/ | |||||
| * | Merge pull request #2678 from cuberite/ln | Julian Laubstein | 2015-11-23 | 1 | -9/+9 |
| |\ | | | | | Adjusted in help messages for consistency | ||||
| | * | Added dash to helpstring output | Julian Laubstein | 2015-11-23 | 1 | -1/+1 |
| | | | |||||
| | * | Removed dashes in help messages for consistency | Julian Laubstein | 2015-11-23 | 1 | -8/+8 |
| |/ | |||||
| * | Merge pull request #2679 from cuberite/vh | Julian Laubstein | 2015-11-23 | 1 | -1/+6 |
| |\ | | | | | Added cChunkDef::IsValidWidth() | ||||
| | * | Added cChunkDef::IsValidWidth() | Julian Laubstein | 2015-11-23 | 1 | -1/+6 |
| |/ | |||||
| * | Merge pull request #2676 from SafwatHalaby/revert | Safwat Halaby | 2015-11-22 | 1 | -1/+1 |
| |\ | | | | | Revert "Changed description to "Cuberite - Minecraft in C++!"" | ||||
| | * | Revert "Changed description to "Cuberite - Minecraft in C++!"" | Safwat Halaby | 2015-11-22 | 1 | -1/+1 |
| |/ | | | | This reverts commit f4406c047e0d1d11631e350fa61ad04d92b950ba. | ||||
| * | Merge pull request #2673 from SafwatHalaby/sh | Safwat Halaby | 2015-11-21 | 2 | -33/+31 |
| |\ | | | | | compile.sh is now sh-compatible. (Unix, etc.) | ||||
| | * | compile.sh is now sh-compatible. (Unix, etc.) | Safwat Halaby | 2015-11-21 | 2 | -33/+31 |
| |/ | |||||
| * | Merge pull request #2672 from SafwatHalaby/readme | Safwat Halaby | 2015-11-21 | 1 | -10/+18 |
| |\ | | | | | Readme update - organized the installation methods | ||||
| | * | Readme update - organized the installation methods | Safwat Halaby | 2015-11-21 | 1 | -10/+18 |
| |/ | |||||
| * | Merge pull request #2671 from SafwatHalaby/compile | Mattes D | 2015-11-21 | 1 | -0/+11 |
| |\ | | | | | compile.sh - Automatically choose master branch | ||||
| | * | compile.sh - Automatically choose master branch | Safwat Halaby | 2015-11-21 | 1 | -0/+11 |
| |/ | |||||
| * | Merge pull request #2660 from cuberite/worktycho-patch-2 | Alexander Harkness | 2015-11-20 | 1 | -0/+3 |
| |\ | | | | | Fix musl + clang 3.6 compile error | ||||
| | * | Fix musl + clang 3.6 compile error | worktycho | 2015-11-19 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #2663 from SafwatHalaby/minor | Julian Laubstein | 2015-11-20 | 1 | -1/+1 |
| |\ \ | | | | | | | Changed server description to "Cuberite - Minecraft in C++!" | ||||
| | * | | Changed description to "Cuberite - Minecraft in C++!" | Safwat Halaby | 2015-11-20 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2661 from tboerger/musl-fixes | worktycho | 2015-11-19 | 2 | -7/+11 |
| |\ \ | |/ |/| | Musl fixes | ||||
| | * | Include execinfo.h only on __GLIBC__ | Thomas Boerger | 2015-11-19 | 1 | -1/+3 |
| | | | |||||
| | * | Define stacktrace functions only if __GLIBC__ is defined | Thomas Boerger | 2015-11-19 | 1 | -5/+7 |
| | | | |||||
| | * | Check for __GLIBC__ to detect correct strerror_r version | Thomas Boerger | 2015-11-19 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2451 from cuberite/mobchartoint | worktycho | 2015-11-17 | 4 | -41/+92 |
| |\ | | | | | Changed mob age from char to int | ||||
| | * | changed mob age from char to int | Julian Laubstein | 2015-11-16 | 4 | -41/+92 |
| |/ | |||||
| * | Fixed some markdown. | Alexander Harkness | 2015-11-15 | 1 | -2/+2 |
| | | |||||
| * | Merge pull request #2648 from cuberite/getting-star | Alexander Harkness | 2015-11-15 | 3 | -43/+65 |
| |\ | | | | | Minor documentation changes. | ||||
| | * | Edited contributors. | Alexander Harkness | 2015-11-15 | 1 | -1/+2 |
| | | | |||||
| | * | Improved compiling file. | Alexander Harkness | 2015-11-15 | 1 | -28/+51 |
| | | | |||||
| | * | Fixed typos, and improved contributing file. | Alexander Harkness | 2015-11-15 | 1 | -14/+12 |
| | | | |||||
| * | | Merge pull request #2642 from SamOatesPlugins/master | worktycho | 2015-11-15 | 3 | -72/+175 |
| |\ \ | |/ |/| | Improved spawn location calculations. | ||||
| | * | Improved spawn location calculations. | samoatesgames | 2015-11-13 | 3 | -72/+175 |
| | | | | | | | | | | | | | | | | | | | | | - Supports Overworld and Nether spawns. - Supports spawning under objects, but still above ground (e.g. under the leaves of a tree). - Protects against spawning in oceans. - Protects against spawning in water. - Uses a radial search about the origin, rather than a linear. - Correctly calculates Nether spawn on spawn world generation (fixes: cuberite#2548) - Fixes a bug in CheckPlayerSpawnPoint() where the X offset was used in both the X and Z coords (BLOCKTYPE BlockType = GetBlock(a_PosX + Coords[i].x, a_PosY, a_PosZ + Coords[i].x);) | ||||
| * | | Fixed typo in getting-started. | Alexander Harkness | 2015-11-15 | 1 | -1/+1 |
| | | | |||||
| * | | Fix api docs link. | Alexander Harkness | 2015-11-15 | 1 | -1/+1 |
| | | | |||||
| * | | Update getting started to new information. | Alexander Harkness | 2015-11-15 | 1 | -24/+10 |
| |/ | |||||
| * | Merge pull request #2641 from cuberite/worktycho-patch-1 | Julian Laubstein | 2015-11-13 | 1 | -0/+4 |
| |\ | | | | | Blocks outside the world are never solid | ||||
| | * | Blocks outside the world are never solid | worktycho | 2015-11-13 | 1 | -0/+4 |
| |/ | | | Fixes #2539 | ||||
| * | Merge pull request #2632 from Gargaj/patch-1 | worktycho | 2015-11-11 | 1 | -4/+14 |
| |\ | | | | | Avoid reading out of bounds | ||||
| | * | Avoid reading out of bounds | Gargaj | 2015-11-10 | 1 | -4/+14 |
| |/ | | | | as per https://github.com/cuberite/cuberite/pull/2630#discussion_r44377411 | ||||
| * | Merge pull request #2634 from cuberite/vh | worktycho | 2015-11-10 | 1 | -0/+6 |
| |\ | | | | | Added cChunkDef::IsValidHeight() | ||||
| | * | Added cChunkDef::IsValidHeight() | Julian Laubstein | 2015-11-10 | 1 | -0/+6 |
| |/ | |||||
| * | Merge pull request #2631 from Gargaj/divby0 | worktycho | 2015-11-10 | 1 | -1/+1 |
| |\ | | | | | Avoid division by zero | ||||
| | * | Avoid division by zero | Gargaj | 2015-11-10 | 1 | -1/+1 |
| |/ | | | | It won't do much because direction will still be a nullvector, but it at least avoids a CPU spike. | ||||
| * | Merge pull request #2633 from cuberite/IncludeBrewingRecipes | Julian Laubstein | 2015-11-10 | 1 | -0/+1 |
| |\ | | | | | Added brewing.txt to list of files packed with the windows build. | ||||
| | * | Added brewing.txt to list of files packed with the windows build. | Mattes D | 2015-11-10 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #2630 from Gargaj/shallowwater | Julian Laubstein | 2015-11-10 | 1 | -3/+11 |
| |\ | | | | | Fix damage in shallow water (fixes #2622) | ||||
| | * | fix shallow water + add future code for liquid fall dampening | Gargaj | 2015-11-10 | 1 | -3/+11 |
| |/ | |||||
| * | Merge pull request #2629 from Gargaj/slabfix | worktycho | 2015-11-09 | 1 | -3/+27 |
| |\ | | | | | Remove slab from inventory when using it on another slab (fixes #2610) | ||||
| | * | remove slab from inventory when using it on another slab (fixes #2610) | Gargaj | 2015-11-09 | 1 | -3/+27 |
| |/ | |||||
| * | Merge pull request #2628 from Gargaj/creeperdeflate | Alexander Harkness | 2015-11-09 | 2 | -2/+2 |
| |\ | | | | | Idle/deflating creeper should send -1 | ||||
| | * | idle/deflating creeper should be -1 | Gargaj | 2015-11-09 | 2 | -2/+2 |
| |/ | | | | according to http://wiki.vg/Entities#Creeper | ||||
| * | Merge pull request #2627 from Gargaj/patch-1 | Lukas Pioch | 2015-11-09 | 1 | -0/+4 |
| |\ | | | | | Add comment to Attack() return values | ||||
| | * | Add comment to Attack() return values | Gargaj | 2015-11-09 | 1 | -0/+4 |
| |/ | |||||
| * | Merge pull request #2625 from Gargaj/chilloutyo | worktycho | 2015-11-09 | 3 | -1/+8 |
| |\ | | | | | Neutral mobs should be neutral | ||||
| | * | neutral mobs shouldn't chase the player unless aggro'd | Gargaj | 2015-11-08 | 3 | -1/+8 |
| |/ | | | | | | | | | | | | | | | | | code style neutral mobs shouldn't chase the player unless aggro'd neutral mobs shouldn't chase the player unless aggro'd Merge branch 'chilloutyo' of github.com:Gargaj/cuberite into chilloutyo Conflicts: src/Mobs/PassiveAggressiveMonster.h code style Merge branch 'chilloutyo' of github.com:Gargaj/cuberite into chilloutyo | ||||
| * | Merge pull request #2626 from cuberite/worktycho-patch-1 | Julian Laubstein | 2015-11-08 | 1 | -1/+1 |
| |\ | | | | | Fix memory leak | ||||
| | * | Fix memory leak | worktycho | 2015-11-08 | 1 | -1/+1 |
| |/ | | | Fixes CID 132249 | ||||
| * | Merge pull request #2615 from Gargaj/cavespider-attack | worktycho | 2015-11-08 | 16 | -27/+48 |
| |\ | | | | | Fix cavespider poisoning even if attack is in cooldown | ||||
| | * | fix cavespider poisoning even if attack is in cooldown | Gargaj | 2015-11-08 | 16 | -27/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style fix cavespider poisoning even if attack is in cooldown make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack Merge branch 'master' into cavespider-attack Merge branch 'master' into cavespider-attack fix cavespider poisoning even if attack is in cooldown make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style fix cavespider poisoning even if attack is in cooldown make attack function more responsive fix cavespider poisoning even if attack is in cooldown make attack function more responsive Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack code style Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack Merge branch 'master' into cavespider-attack Merge branch 'master' into cavespider-attack Merge branch 'cavespider-attack' of github.com:Gargaj/cuberite into cavespider-attack | ||||
| * | | Merge pull request #2616 from Gargaj/patch-1 | Julian Laubstein | 2015-11-08 | 1 | -0/+2 |
| |\ \ | | | | | | | Fix chicken flying | ||||
| | * | | Fix chicken flying | Gargaj | 2015-11-08 | 1 | -0/+2 |
| |/ / | | | | | | | | | | | | | | | | | | | The gravity might not be correct but my rough timing (with a stopwatch) seems to be close. Merge branch 'master' into patch-1 Merge branch 'master' into patch-1 Merge branch 'master' into patch-1 | ||||
| * | | Merge pull request #2619 from cuberite/worktycho-patch-1 | Alexander Harkness | 2015-11-08 | 1 | -1/+4 |
| |\ \ | | | | | | | Use .travis.yml to whitelist coverity_scan for push builds. | ||||
| | * | | Use .travis.yml to whitelist coverity_scan for push builds. | worktycho | 2015-11-08 | 1 | -1/+4 |
| |/ / | |||||
| * | | Merge pull request #2620 from Gargaj/pressureplatesnd | Julian Laubstein | 2015-11-08 | 1 | -0/+9 |
| |\ \ | |/ |/| | Add sound to stone pressure plates | ||||
| | * | add sound to stone pressure plates | Gargaj | 2015-11-08 | 1 | -0/+9 |
| |/ | | | | add sound to stone pressure plates | ||||
| * | Merge pull request #2624 from Gargaj/patch-2 | worktycho | 2015-11-07 | 1 | -3/+6 |
| |\ | | | | | Only send creeper metadata updates on change | ||||
| | * | Only send creeper updates when there is a change | Gargaj | 2015-11-07 | 1 | -3/+6 |
| |/ | | | Otherwise this keeps spamming the metadata packet for all the creepers on the server. | ||||
| * | Merge pull request #2609 from bibo38/slimeblock | worktycho | 2015-11-07 | 6 | -129/+238 |
| |\ | | | | | Slimeblock implementation | ||||
| | * | Refactored code to use vectors in the cPistonHandler class | bibo38 | 2015-11-07 | 3 | -52/+42 |
| | | | |||||
| | * | Added some code improvements | bibo38 | 2015-11-07 | 2 | -22/+42 |
| | | | |||||
| | * | Renamed GetDirectionVec into VectorFromMetaData to improve code readability. | bibo38 | 2015-11-07 | 2 | -6/+6 |
| | | | |||||
| | * | Commented the GetDirectionVec method | bibo38 | 2015-11-07 | 1 | -0/+3 |
| | | | |||||
| | * | Fixed the style problems and added some comments | bibo38 | 2015-11-07 | 2 | -6/+18 |
| | | | |||||
| | * | Removed unused CanPull method | bibo38 | 2015-11-07 | 1 | -11/+0 |
| | | | |||||
| | * | Extracted block moving code into a seperate method | bibo38 | 2015-11-07 | 2 | -77/+52 |
| | | | |||||
| | * | Replaced the usage of pistonMeta with a direction vector to allow better meta value abstraction | bibo38 | 2015-11-07 | 2 | -73/+63 |
| | | | |||||
| | * | Fixed pulling/pushing of breakable blocks, which are not required to be moved | bibo38 | 2015-11-07 | 1 | -3/+20 |
| | | | |||||
| | * | Implemented the basic slime block pulling | bibo38 | 2015-11-07 | 1 | -17/+62 |
| | | | |||||
| | * | Implemented the SlimeBlock into the CanPush method to allow slimeblocks to work correctly when pushed | bibo38 | 2015-11-07 | 1 | -15/+26 |
| | | | |||||
| | * | Piston extension now works with the new recursive CanPushBlock method. | bibo38 | 2015-11-07 | 1 | -36/+41 |
| | | | |||||
| | * | Added the CanPushBlock method for the piston push check. | bibo38 | 2015-11-07 | 2 | -24/+41 |
| | | | | | | | | | This allows the recursive check for blocks to push, which is needed to implement the slime blocks into the piston system. | ||||
| | * | Implemented the slime block dropping behaviour. | bibo38 | 2015-11-07 | 3 | -0/+35 |
| | | | | | | | | | Fixes #2530 | ||||
| * | | Merge pull request #2621 from Gargaj/pressureplatepower | worktycho | 2015-11-07 | 1 | -4/+4 |
| |\ \ | |/ |/| | Fix pressure plate power levels | ||||
| | * | Merge branch 'pressureplatepower' of github.com:Gargaj/cuberite into pressureplatepower | Gargaj | 2015-11-07 | 0 | -0/+0 |
| | |\ | |||||
| | | * | fix pressure plate power levels | Gargaj | 2015-11-07 | 1 | -4/+4 |
| | | | | |||||
| | * | | fix pressure plate power levels | Gargaj | 2015-11-07 | 1 | -4/+4 |
| |/ / | |||||
| * | | Merge pull request #2618 from Gargaj/deadmeansdead | worktycho | 2015-11-07 | 1 | -1/+1 |
| |\ \ | | | | | | | Fix mobs firing when already dead | ||||
| | * | | don't attack if dead | Gargaj | 2015-11-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #2617 from Gargaj/pushcomestoshove | worktycho | 2015-11-07 | 1 | -0/+36 |
| |\ \ \ | |/ / |/| | | Implement pushing/shoving | ||||
| | * | | code style | Gargaj | 2015-11-07 | 1 | -3/+3 |
| | | | | |||||
| | * | | implement pushing/shoving based on @NiLSPACE's suggestion | Gargaj | 2015-11-07 | 1 | -0/+36 |
| |/ / | |||||
| * | | Merge pull request #2611 from Gargaj/chickenfall | Julian Laubstein | 2015-11-06 | 2 | -0/+6 |
| |\ \ | |/ |/| | Chickens shouldn't take fall damage [re-pull] | ||||
| | * | chickens don't take fall damage | Gargaj | 2015-11-06 | 2 | -0/+6 |
| |/ | |||||
| * | Added ignore=dirty to new submodules | Julian Laubstein | 2015-11-05 | 1 | -1/+8 |
| | | |||||
| * | Merge pull request #2593 from cuberite/enderegg | Julian Laubstein | 2015-11-05 | 2 | -92/+103 |
| |\ | | | | | Destroy an ender crystal when hit by an egg. | ||||
| | * | Destroy an ender crystal, damage a dragon when hit by an egg. | Alexander Harkness | 2015-11-05 | 2 | -92/+103 |
| | | | |||||
| * | | Merge pull request #2607 from cuberite/IgnoreLibArtefacts | Mattes D | 2015-11-05 | 7 | -0/+0 |
| |\ \ | | | | | | | Ignore MSVC build artefacts in submodularised libraries. | ||||
| | * | | Ignore MSVC build artefacts in submodularised libraries. | Mattes D | 2015-11-05 | 7 | -0/+0 |
| |/ / | |||||
| * | | Merge pull request #2606 from cuberite/MSVCWarnings | Mattes D | 2015-11-05 | 1 | -3/+1 |
| |\ \ | | | | | | | MSVC: Reviewed warnings, disabled a useless one, re-enabled an old one. | ||||
| | * | | MSVC: Reviewed warnings, disabled a useless one, re-enabled an old one. | Mattes D | 2015-11-05 | 1 | -3/+1 |
| |/ / | |||||
| * | | Merge pull request #2605 from cuberite/SubmoduleChange | Julian Laubstein | 2015-11-05 | 194 | -212340/+51 |
| |\ \ | | | | | | | Outsourced all libraries | ||||
| | * | | Outsourced all libraries into submodules | Julian Laubstein | 2015-11-04 | 194 | -212340/+51 |
| | | | | |||||
| * | | | Merge pull request #2601 from Gargaj/patch-1 | Mattes D | 2015-11-04 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | Fix being set on fire while directly being under lava | ||||
| | * | | Fix being set on fire while directly being under lava | Gargaj | 2015-11-04 | 1 | -1/+1 |
| |/ / | | | | | Right now you will be on fire if there is a block of lava right above you, even if it doesn't pour down. | ||||
| * | | Merge pull request #2597 from cuberite/faviconChange | Alexander Harkness | 2015-11-04 | 1 | -0/+0 |
| |\ \ | | | | | | | Changed server favicon to more commonly used one | ||||
| | * | | Changed server favicon to more commonly used one | Julian Laubstein | 2015-11-03 | 1 | -0/+0 |
| |/ / | |||||
| * | | Merge pull request #2497 from Seadragon91/brewing | Julian Laubstein | 2015-11-03 | 40 | -9/+1858 |
| |\ \ | | | | | | | Implemented brewing | ||||
| | * | | Implemented brewing | Lukas Pioch | 2015-11-03 | 40 | -9/+1858 |
| |/ / | |||||
| * | | Merge pull request #2595 from cengizIO/master | Mattes D | 2015-11-03 | 1 | -9/+11 |
| |\ \ | | | | | | | Use an unreserved qualifier for thread local storage | ||||
| | * | | Use an unreserved qualifier for thread local storage | Cengiz Can | 2015-11-03 | 1 | -9/+11 |
| |/ / | | | | | | | Fixes #1906 | ||||
| * | | Merge pull request #2464 from bibo38/assertfix | Mattes D | 2015-11-03 | 1 | -20/+23 |
| |\ \ | | | | | | | Fixed failed assertation | ||||
| | * | | Fixed failed assertation | bibo38 | 2015-11-03 | 1 | -20/+23 |
| |/ / | | | | | | | | | This was caused by a monster with a negative Y-axis. Fixes #2336 | ||||
| * | | Merge pull request #2591 from cuberite/chunkprepare-deadlock | worktycho | 2015-11-03 | 1 | -1/+4 |
| |\ \ | | | | | | | Fix deadlock, resolves #2521 | ||||
| | * \ | Merge branch 'master' into chunkprepare-deadlock | Alexander Harkness | 2015-11-02 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | Fix deadlock, resolves #2521 | Alexander Harkness | 2015-11-02 | 1 | -1/+4 |
| | | |/ | |/| | |||||
| * | | | Examined a fix for #2588 | Tiger Wang | 2015-11-02 | 1 | -0/+6 |
| | |/ |/| | |||||
| * | | Merge pull request #2594 from cuberite/bearbin-patch-1 | Alexander Harkness | 2015-11-02 | 1 | -1/+1 |
| |\ \ | |/ |/| | Fix shell location. | ||||
| | * | Fix shell location. | Alexander Harkness | 2015-11-02 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2587 from cuberite/bountysource-not-gratipay | Alexander Harkness | 2015-11-01 | 1 | -2/+2 |
| |\ | | | | | Removed mentions of Gratipay, replaced with Bountysource. | ||||
| | * | Removed mentions of Gratipay, replaced with Bountysource. | Alexander Harkness | 2015-11-01 | 1 | -2/+2 |
| |/ | |||||
| * | Merge pull request #2586 from bibo38/drownpotion | worktycho | 2015-11-01 | 2 | -0/+16 |
| |\ | | | | | Implemented the Water Breathing Potion functionality. | ||||
| | * | Implemented the Water Breathing Potion functionality. | bibo38 | 2015-11-01 | 2 | -0/+16 |
| |/ | | | | Fixes #2556 | ||||
| * | Fixed typo that slipped through #2584 | Alexander Harkness | 2015-10-31 | 1 | -1/+1 |
| | | |||||
| * | Fixed help text again, another part had changed. | Alexander Harkness | 2015-10-31 | 1 | -1/+1 |
| | | |||||
| * | Fixed outdated help text in easyinstall. | Alexander Harkness | 2015-10-31 | 1 | -1/+1 |
| | | |||||
| * | Fixed typo in description. | Alexander Harkness | 2015-10-31 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #2584 from bibo38/firepotion | Alexander Harkness | 2015-10-31 | 6 | -8/+37 |
| |\ | | | | | Implemented the FireResistence potion effects. | ||||
| | * | Implemented the FireResistence potion effects. | bibo38 | 2015-10-31 | 6 | -8/+37 |
| |/ | | | | | This not only provides fire resistence, but also prevents blaze fireballs. See #2556 | ||||
| * | Merge pull request #2549 from cuberite/TouchGround | Alexander Harkness | 2015-10-31 | 1 | -3/+3 |
| |\ | | | | | Debug mode: Fixed assertion, if player below y < 0 | ||||
| | * | Debug mode: Fixed assertion, if player below y < 0 | Lukas Pioch | 2015-10-31 | 1 | -3/+3 |
| |/ | |||||
| * | Merge pull request #2581 from bibo38/clangfix | Lukas Pioch | 2015-10-30 | 1 | -1/+1 |
| |\ | | | | | Changed for-loop iterator in File.cpp | ||||
| | * | Changed for-loop iterator in File.cpp to a reference type to reduce object copying and fix the clang build. | bibo38 | 2015-10-30 | 1 | -1/+1 |
| |/ | | | | Fixes #2580 | ||||
| * | Merge pull request #2567 from cuberite/cave_spider | Lukas Pioch | 2015-10-29 | 1 | -0/+11 |
| |\ | | | | | Added cave spider to MobSpawner | ||||
| | * | Added cave spider to MobSpawner | Lukas Pioch | 2015-10-29 | 1 | -0/+11 |
| |/ | |||||
| * | Merge pull request #2578 from cuberite/revert-2574-pressure-plate-fix | Mattes D | 2015-10-29 | 1 | -45/+14 |
| |\ | | | | | Revert "Pressure plate fix" | ||||
| | * | Revert "Pressure plate fix" | Mattes D | 2015-10-29 | 1 | -45/+14 |
| |/ | |||||
| * | Merge pull request #2574 from Schwertspize/pressure-plate-fix | Alexander Harkness | 2015-10-28 | 1 | -14/+45 |
| |\ | | | | | Pressure plate fix | ||||
| | * | fixed pressure plate bugs | Schwertspize | 2015-10-28 | 1 | -14/+45 |
| |/ | |||||
| * | Merge pull request #2576 from Schwertspize/patch-1 | Alexander Harkness | 2015-10-28 | 1 | -2/+3 |
| |\ | | | | | Added myself to list, ran it through `sort -f` | ||||
| | * | Added myself to list, ran it through `sort -f` | Schwertspize | 2015-10-28 | 1 | -2/+3 |
| |/ | |||||
| * | Merge pull request #2575 from Schwertspize/patch-1 | Alexander Harkness | 2015-10-28 | 1 | -1/+0 |
| |\ | | | | | remove contentless bullet point | ||||
| | * | remove contentless bullet point | Schwertspize | 2015-10-28 | 1 | -1/+0 |
| |/ | | | white space is for free, but thats not neccesairy | ||||
| * | Fix wrong teleport permission. (solves #2369) | Alexander Harkness | 2015-10-28 | 1 | -4/+4 |
| | | |||||
| * | Merge pull request #2566 from cuberite/update_submodules | Mattes D | 2015-10-27 | 2 | -0/+0 |
| |\ | | | | | Updated Core and ProtectionAreas | ||||
| | * | Updated Core and ProtectionAreas | Lukas Pioch | 2015-10-27 | 2 | -0/+0 |
| |/ | |||||
| * | Merge pull request #2564 from cuberite/update_jsoncpp_no_jsoncpp | Mattes D | 2015-10-26 | 4 | -12/+12 |
| |\ | | | | | Update Loops required for JsonCPP | ||||
| | * | Update Loops required for JsonCPP | Lukas Pioch | 2015-10-26 | 4 | -12/+12 |
| |/ | |||||
| * | Debuggers: Added a plugin channel test with funny chars in data. | Mattes D | 2015-10-21 | 2 | -0/+17 |
| | | |||||
| * | Fixed a crash when sending messages too early after connection. | Mattes D | 2015-10-21 | 1 | -1/+12 |
| | | |||||
| * | Merge pull request #2517 from cuberite/ReTypingOfBlocks | Mattes D | 2015-10-15 | 1 | -7/+12 |
| |\ | | | | | ReTyped block ids | ||||
| | * | ReTyped block ids | Julian Laubstein | 2015-10-15 | 1 | -7/+12 |
| |/ | |||||
| * | Merge pull request #2544 from cuberite/worktycho-patch-1 | NiLSPACE | 2015-10-12 | 1 | -1/+0 |
| |\ | | | | | Removed unused typedef | ||||
| | * | Removed unused typedef | worktycho | 2015-10-12 | 1 | -1/+0 |
| |/ | |||||
| * | Merge pull request #2543 from Seadragon91/pluginmanager_hooks | NiLSPACE | 2015-10-12 | 1 | -0/+3 |
| |\ | | | | | Added missing hooks to cPluginManager | ||||
| | * | Added missing hooks to cPluginManager | Lukas Pioch | 2015-10-12 | 1 | -0/+3 |
| |/ | |||||
| * | APIDump: Added a missing endline to the NewlyUndocumented output file. | Mattes D | 2015-10-11 | 1 | -0/+1 |
| | | |||||
| * | Merge pull request #2537 from cuberite/NetworkSslClientTest | Mattes D | 2015-10-11 | 2 | -0/+60 |
| |\ | | | | | Added 'net sclient' command to NetworkTest plugin. | ||||
| | * | Added 'net sclient' command to NetworkTest plugin. | Mattes D | 2015-10-09 | 2 | -0/+60 |
| |/ | |||||
| * | Merge pull request #2535 from cuberite/FixGitQueries | worktycho | 2015-10-09 | 1 | -0/+3 |
| |\ | | | | | Added WORKING_DIRECTORY specification to git queries used in CMake. | ||||
| | * | Added WORKING_DIRECTORY specification to git queries used in CMake. | Mattes D | 2015-10-09 | 1 | -0/+3 |
| |/ | | | | Fixes #2493. | ||||
| * | Merge pull request #2534 from cuberite/FixHTTPSServer | Mattes D | 2015-10-08 | 1 | -0/+2 |
| |\ | | | | | Fixed a possible crash in HTTPS server. | ||||
| | * | Fixed a possible crash in HTTPS server. | Mattes D | 2015-10-08 | 1 | -0/+2 |
| |/ | |||||
| * | Merge pull request #2532 from cuberite/CheckSpaceComparisons | Mattes D | 2015-10-08 | 2 | -5/+13 |
| |\ | | | | | StyleCheck: Check spaces around ==, <=, >= | ||||
| | * | StyleCheck: Check spaces around ==, <=, >= | Mattes D | 2015-10-08 | 2 | -5/+13 |
| |/ | |||||
| * | Merge pull request #2533 from cuberite/LuaTLSClientCertFix | Mattes D | 2015-10-08 | 1 | -12/+2 |
| |\ | | | | | Fixed bindings for cTCPLink:StartTLSClient(). | ||||
| | * | Fixed bindings for cTCPLink:StartTLSClient(). | Mattes D | 2015-10-08 | 1 | -12/+2 |
| |/ | | | | The bindings used to enforce client cert, now it's optional. | ||||
| * | Merge pull request #2528 from OdnetninI/master | Tiger Wang | 2015-10-05 | 1 | -0/+1 |
| |\ | | | | | Fixed flight in Spectator Mode | ||||
| | * | Spectator Mode doesn't fly[FIX] | OdnetninI | 2015-10-05 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #2527 from cuberite/FixPrefabHitBox | Mattes D | 2015-10-05 | 3 | -94/+100 |
| |\ \ | |/ |/| | Fix prefab hit box | ||||
| | * | Updated PlainsVillage prefabs. | Mattes D | 2015-10-05 | 1 | -94/+96 |
| | | | | | | | | | Some connectors had been off by one block. | ||||
| | * | Generator: Fixed missing hitbox assignment. | Mattes D | 2015-10-05 | 2 | -0/+4 |
| |/ | | | | This had caused village houses to generate too close to each other. | ||||
| * | Merge pull request #2525 from cuberite/StreamPerf | Mattes D | 2015-10-05 | 2 | -8/+8 |
| |\ | | | | | Improved the data structure for storing loaded chunks | ||||
| | * | Improved the data structure for storing loaded chunks | tycho | 2015-10-05 | 2 | -8/+8 |
| |/ | | | | Should significantly increase the performance of deciding which chunks to stream | ||||
| * | Merge pull request #2522 from cuberite/FixLoaderGenRaceCondition | worktycho | 2015-10-04 | 10 | -65/+45 |
| |\ | | | | | Fixed a race condition between chunk loader and generator. | ||||
| | * | Fixed a race condition between chunk loader and generator. | Mattes D | 2015-10-04 | 10 | -65/+45 |
| |/ | | | | | | When using ChunkWorx to generate multiple chunks, the server would sometimes fail an assert because it would generate a chunk even when it was successfully loaded. This was caused by chunks queued in cWorld's m_SetChunkDataQueue and thus being marked as "InQueue" although they were already loaded. Solved by adding a new parameter to chunk coord callbacks specifying whether the operation succeeded or failed, and using that instead of the chunk presence flag to decide whether to generate or not. | ||||
| * | Merge pull request #2519 from cuberite/RemoveStyleCheckFromTravis | Mattes D | 2015-10-02 | 2 | -6/+0 |
| |\ | | | | | Removed the BasicStyleCheck from Travis builds. | ||||
| | * | Removed the BasicStyleCheck from Travis builds. | Mattes D | 2015-10-02 | 2 | -6/+0 |
| |/ | | | | The check is being done on dedicated CircleCI "build" now. | ||||
| * | Merge pull request #2509 from cuberite/UTF16Types | Mattes D | 2015-10-02 | 6 | -55/+17 |
| |\ | | | | | Improved typing for utf16 and removed a couple of unused methods. | ||||
| | * | Improved types of utf 16 strings | tycho | 2015-10-02 | 4 | -17/+17 |
| | | | |||||
| | * | Remove a pair of unused broken functions | tycho | 2015-10-02 | 2 | -38/+0 |
| |/ | |||||
| * | Merge pull request #2511 from cuberite/BottomLayerSpawn | worktycho | 2015-10-01 | 1 | -0/+6 |
| |\ | | | | | The bottom layer cannot hold a valid spawn point | ||||
| | * | The bottom layer cannot hold a valid spawn point | worktycho | 2015-10-01 | 1 | -0/+6 |
| |/ | | | | Fixes #2510 | ||||
| * | Merge pull request #2518 from cuberite/UpdateSQLiteCpp | Mattes D | 2015-10-01 | 1 | -0/+0 |
| |\ | | | | | Updated the SQLiteCpp library. | ||||
| | * | Updated the SQLiteCpp library. | Mattes D | 2015-10-01 | 1 | -0/+0 |
| | | | | | | | | | The Windows builds started failing because the library was asking for a submodule that seems to have moved. The submodule wasn't needed anyway. | ||||
| * | | Merge pull request #2515 from Seadragon91/compiling_file | Julian Laubstein | 2015-10-01 | 1 | -36/+18 |
| |\ \ | |/ |/| | Update COMPILING.md | ||||
| | * | Updated COMPILING.md | Lukas Pioch | 2015-10-01 | 1 | -36/+18 |
| |/ | |||||
| * | Merge pull request #2512 from cuberite/AppveyorFix | worktycho | 2015-09-29 | 1 | -1/+0 |
| |\ | | | | | Let appveyor decide what OS to use | ||||
| | * | Let appveyor decide what OS to use | Mattes D | 2015-09-29 | 1 | -1/+0 |
| |/ | |||||
| * | Merge pull request #2508 from cuberite/LogLuaMemoryStats | worktycho | 2015-09-29 | 3 | -0/+118 |
| |\ | | | | | Added LuaState tracker and memory stats logging. | ||||
| | * | Added LuaState tracker and memory stats logging. | Mattes D | 2015-09-28 | 3 | -0/+118 |
| |/ | |||||
| * | Merge pull request #2507 from cuberite/LuaStrictStrings | worktycho | 2015-09-28 | 1 | -1/+4 |
| |\ | | | | | Made Lua API check strings strictly. | ||||
| | * | Made Lua API check strings strictly. | Mattes D | 2015-09-28 | 1 | -1/+4 |
| |/ | | | | Previously nil was accepted as a string in cLuaState::CheckParamString(), now it's reported as an error. | ||||
| * | Merge pull request #2498 from cuberite/UnicodeOnWindows | Tiger Wang | 2015-09-28 | 4 | -12/+15 |
| |\ | | | | | Enabled Unicode support for Windows | ||||
| | * | Added the _UNICODE flag on Windows | Tiger Wang | 2015-09-26 | 4 | -12/+15 |
| | | | |||||
| * | | Merge pull request #2504 from SafwatHalaby/revert | Tiger Wang | 2015-09-28 | 2 | -7/+53 |
| |\ \ | | | | | | | Fix recalc and "mob dancing", Partial revert of #2446 | ||||
| | * | | Partial revert of #2446 | Safwat Halaby | 2015-09-28 | 2 | -7/+53 |
| |/ / | |||||
| * | | Merge pull request #2505 from cuberite/SettableWeather | worktycho | 2015-09-28 | 2 | -4/+49 |
| |\ \ | | | | | | | Added weather intervals to world.ini settings. | ||||
| | * | | Added weather intervals to world.ini settings. | Mattes D | 2015-09-28 | 2 | -4/+49 |
| |/ / | |||||
| * | | Merge pull request #2502 from SafwatHalaby/seaMonsters | Safwat Halaby | 2015-09-27 | 2 | -2/+2 |
| |\ \ | | | | | | | Disabled squids and Guardians pathfinding, #2460 | ||||
| | * | | Disabled squids and Guardians pathfinding, #2460 | Safwat Halaby | 2015-09-27 | 2 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #2465 from electromatter/master | worktycho | 2015-09-27 | 1 | -0/+14 |
| |\ \ | | | | | | | Added BungeeCord support for Protocol18x | ||||
| | * \ | Merge branch 'master' into master | electromatter | 2015-09-22 | 38 | -1006/+394 |
| | |\ \ | |||||
| | * | | | added bungeecord support for protocol18x | Eric Chai | 2015-09-06 | 1 | -0/+14 |
| | | | | | |||||
| * | | | | Merge pull request #2501 from cuberite/APIDumpCheck | Mattes D | 2015-09-27 | 4 | -11/+122 |
| |\ \ \ \ | | | | | | | | | | | Api dump check | ||||
| | * | | | | CI builds fail on newly undocumented API. | Mattes D | 2015-09-27 | 1 | -2/+13 |
| | | | | | | |||||
| | * | | | | APIDump: Added an apicheck command. | Mattes D | 2015-09-27 | 3 | -9/+109 |
| |/ / / / | | | | | | | | | | | | | This checks the current API for undocumented functions against the current list of official undocumented functions (http://apidocs.cuberite.org/_undocumented.lua) and reports any newly found ones. To be used in CI to check against newly introduced API functions without documentation. | ||||
| * | | | | Merge pull request #2500 from cuberite/FileApiExtend | Mattes D | 2015-09-27 | 8 | -108/+616 |
| |\ \ \ \ | | | | | | | | | | | Extended and fixed the cFile API. | ||||
| | * | | | | Extended and fixed the cFile API. | Mattes D | 2015-09-26 | 8 | -108/+616 |
| |/ / / / | |||||
| * | | | | Merge pull request #2496 from SafwatHalaby/compileCommitId | Safwat Halaby | 2015-09-26 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | Fixed compile.sh console commit version, see #2493 | ||||
| | * | | | | Fix compile.sh console commit version, see #2493 | Safwat Halaby | 2015-09-26 | 1 | -3/+3 |
| |/ / / / | |||||
| * | | | | Merge pull request #2463 from cuberite/fixes | Tiger Wang | 2015-09-25 | 4 | -298/+55 |
| |\ \ \ \ | |_|_|/ |/| | | | Prepared ScheduleTask for threading refactor | ||||
| | * | | | Prepared ScheduleTask for threading refactor | Tiger Wang | 2015-09-25 | 4 | -298/+55 |
| |/ / / | | | | | | | | | | | | | * Llama-ified and condensed Schedule/QueueTask - Removed hackery done with piston animations | ||||
| * | | | Merge pull request #2495 from Seadragon91/clang-3.7 | worktycho | 2015-09-25 | 8 | -20/+20 |
| |\ \ \ | | | | | | | | | Maked it compileable for clang-3.7 | ||||
| | * | | | Maked it compileable for clang-3.7 | Lukas Pioch | 2015-09-25 | 8 | -20/+20 |
| |/ / / | |||||
| * | | | Merge pull request #2491 from cuberite/FixLilypadPopout | Mattes D | 2015-09-25 | 1 | -0/+16 |
| |\ \ \ | | | | | | | | | Lilypads drop when not on source water. | ||||
| | * | | | Lilypads drop when not on source water. | Mattes D | 2015-09-25 | 1 | -0/+16 |
| |/ / / | | | | | | | | | | | | | Lilypad blocks now break and drop as items when the block below them changes to non-water or non-source water. Fixes #2404. | ||||
| * | | | Merge pull request #2492 from SafwatHalaby/compileSh | Safwat Halaby | 2015-09-25 | 1 | -4/+8 |
| |\ \ \ | | | | | | | | | Compile.sh namechange to cuberite | ||||
| | * | | | Compile.sh namechange to cuberite | Safwat Halaby | 2015-09-25 | 22 | -42/+46 |
| | | | | | |||||
| * | | | | Merge pull request #2490 from cuberite/cuberite | Mattes D | 2015-09-25 | 21 | -38/+38 |
| |\ \ \ \ | |/ / / |/| | | | Namechange to Cuberite | ||||
| | * | | | Namechange to Cuberite | Mattes D | 2015-09-25 | 21 | -38/+38 |
| |/ / / | |||||
| * | | | Merge pull request #2478 from cuberite/FixArmBuild | Mattes D | 2015-09-25 | 1 | -9/+13 |
| |\ \ \ | | | | | | | | | Fixed flags for ARM native debug build. | ||||
| | * | | | Fixed flags for ARM native debug build. | Mattes D | 2015-09-25 | 1 | -9/+13 |
| |/ / / | | | | | | | | | | Also fixed indentation style to all-tabs. | ||||
| * | | | fixed cast | tycho | 2015-09-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add new "ForEach" function: ForEachLoadedChunk. | tycho | 2015-09-24 | 6 | -1/+99 |
| | |/ |/| | |||||
| * | | Merge pull request #2488 from cuberite/ChatFlag | worktycho | 2015-09-21 | 8 | -227/+32 |
| |\ \ | | | | | | | Refactored cProtocol Chat handling | ||||
| | * | | Refactored cProtocol Chat handling | tycho | 2015-09-21 | 8 | -227/+32 |
| |/ / | |||||
| * | | Merge pull request #2487 from cuberite/sigpipe | Mattes D | 2015-09-19 | 1 | -0/+4 |
| |\ \ | | | | | | | Ignore Sigpipe | ||||
| | * | | Ignore Sigpipe | tycho | 2015-09-19 | 1 | -0/+4 |
| |/ / | |||||
| * | | Merge pull request #2486 from cuberite/clientPerformance | Tiger Wang | 2015-09-19 | 2 | -4/+6 |
| |\ \ | | | | | | | Fixed wrong assumtion regarding RemoveClient | ||||
| | * | | Fixed wrong assumtion regarding RemoveClient | tycho | 2015-09-19 | 2 | -4/+6 |
| |/ / | | | | | | | Remove client can be called with a client that is not present in the chunk | ||||
| * | | Merge pull request #2484 from cuberite/clientPerformance | worktycho | 2015-09-19 | 1 | -1/+1 |
| |\ \ | | | | | | | Fixed erase | ||||
| | * | | Fixed erase | tycho | 2015-09-19 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2479 from cuberite/clientPerformance | Mattes D | 2015-09-19 | 2 | -82/+71 |
| |\ \ | | | | | | | Removed a significant performance issue. | ||||
| | * | | Removed a significant performance issue. | tycho | 2015-09-18 | 2 | -82/+71 |
| |/ / | | | | | | | | | | | Iterating through the list of clients in chunks was taking up a significant amount of time with larger numbers of clients due to processor stalls. Changing the data structure to a vector fixed the issue. | ||||
| * | | Merge pull request #2480 from cuberite/CircleCiCheckBasicStyle | worktycho | 2015-09-17 | 11 | -523/+69 |
| |\ \ | | | | | | | Added CircleCI for stylechecking. | ||||
| | * | | Added CircleCI for stylechecking. | Mattes D | 2015-09-17 | 11 | -523/+69 |
| |/ / | | | | | | | This will allow us to remove the stylecheck from Travis builds, making them a bit faster, and having fast style checks | ||||
| * | | Merge pull request #2457 from cuberite/log | Mattes D | 2015-09-16 | 11 | -135/+175 |
| |\ \ | | | | | | | Increase robustness of the logging subsystem | ||||
| | * | | Increase robustness of the logging subsystem | tycho | 2015-09-15 | 11 | -135/+175 |
| |/ / | |||||
| * | | Merge pull request #2473 from cuberite/APIDumpRename | Mattes D | 2015-09-14 | 2 | -6/+6 |
| |\ \ | | | | | | | APIDump: Fixed ZBS integration filenames after project rename. | ||||
| | * | | APIDump: Fixed ZBS integration filenames after project rename. | Mattes D | 2015-09-14 | 2 | -6/+6 |
| |/ / | |||||
| * | | Merge pull request #2474 from Erbelding/master | Mattes D | 2015-09-14 | 1 | -1/+1 |
| |\ \ | | | | | | | Fixed flint drop rates from 1/30 to 1/10 to match the wiki. | ||||
| | * | | Fixed flint drop rates from 1/30 to 1/10 to match the wiki. | David Erbelding | 2015-09-14 | 1 | -1/+1 |
| |/ / | |||||
| * | | Fixed Lua output folders for Windows builds. | Mattes D | 2015-09-08 | 3 | -32/+32 |
| | | | | | | | | | Fixes #2468. | ||||
| * | | Added gallery web previews to ignore list. | Mattes D | 2015-09-07 | 1 | -0/+2 |
| |/ | |||||
| * | Fixed pack-list for buildservers. | Mattes D | 2015-09-06 | 2 | -13/+13 |
| | | |||||
| * | Merge pull request #2437 from cuberite/outputChange | Mattes D | 2015-09-06 | 167 | -183/+71 |
| |\ | | | | | Output folder change; cmake project name change | ||||
| | * | Renamed output directory to Server | Mattes D | 2015-09-05 | 167 | -183/+71 |
| |/ | |||||
| * | Merge pull request #2459 from cuberite/fixes | Tiger Wang | 2015-09-02 | 1 | -1/+0 |
| |\ | | | | | Fixes #2458 | ||||
| | * | Fixes #2485 | Tiger Wang | 2015-09-02 | 1 | -1/+0 |
| |/ | |||||
| * | Merge pull request #2447 from mjhanninen/fix-freebsd-signal-include | Tiger Wang | 2015-09-02 | 1 | -5/+7 |
| |\ | | | | | Fix FreeBSD build by including signal.h | ||||
| | * | Include signal.h jointly for POSIX systems | Matti Hanninen | 2015-08-27 | 1 | -5/+7 |
| |/ | | | | | Otherwise, for example, FreeBSD the build fails due to SIGKILL not being around. | ||||
| * | Merge pull request #2446 from cuberite/asyncpathfinder | Tiger Wang | 2015-08-27 | 4 | -101/+25 |
| |\ | | | | | Fixed a position bug in the pathfinder | ||||
| | * | Fixed a position bug in the pathfinder | Tiger Wang | 2015-08-22 | 4 | -101/+25 |
| | | | |||||
| * | | Small fix for cEvent | Tiger Wang | 2015-08-27 | 2 | -8/+13 |
| | | | | | | | | | | | Don't bother using atomics since a synchronisation primitive is already being used. | ||||
| * | | Merge pull request #2450 from nicodinh/patch-1 | Mattes D | 2015-08-25 | 1 | -1/+1 |
| |\ \ | | | | | | | Fixed false-positive error message in cRankManager::SetRankVisuals(). | ||||
| | * | | Update cRankManager::SetRankVisuals | AZARI Nicolas | 2015-08-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #2449 from theoduino/master | Tiger Wang | 2015-08-24 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | Fix clang compile error | ||||
| | * | | Fix clang compile error | Theo Tosini | 2015-08-24 | 1 | -1/+1 |
| |/ / | | | | | | | Clang would previously fail on debug builds due to the use of an old-style cast. | ||||
| * | | Merge pull request #2441 from mjhanninen/fix-osx-build-due-cc-flag | Tiger Wang | 2015-08-22 | 1 | -1/+0 |
| |\ \ | | | | | | | Remove Clang compiler flag that breaks OS X build | ||||
| | * | | Revert Clang compiler flag that breaks OS X build | Matti Hänninen | 2015-08-22 | 1 | -1/+0 |
| |/ / | |||||
| * / | Removed unused function | Tiger Wang | 2015-08-22 | 2 | -23/+0 |
| |/ | | | | * Fixes #2444 | ||||
| * | Cast UINT to WORD to appease warning | Tiger Wang | 2015-08-22 | 1 | -6/+5 |
| | | | | | * Additional minor cleanups | ||||
| * | Merge pull request #2427 from cuberite/fixes | Tiger Wang | 2015-08-22 | 7 | -197/+239 |
| |\ | | | | | Fixed and improved restarting | ||||
| | * | Fixed and improved restarting | Tiger Wang | 2015-08-20 | 7 | -197/+239 |
| | | | | | | | | | | | Restarts are now an actual, close-as-possible to application exit+reopen. | ||||
| * | | Merge pull request #2443 from mjhanninen/fix-osx-build-due-warnings | Tiger Wang | 2015-08-22 | 1 | -1/+1 |
| |\ \ | | | | | | | Qualify abs with namespace, use explicit cast | ||||
| | * | | Namespace qualify std::abs, use explicit cast | Matti Hänninen | 2015-08-21 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | | | | Without 'std' namespace qualification Clang (at least Apple Clang 6.1) seems to resolve 'abs' to the 'abs' function in 'cstdlib'. This in turn triggers the 'absolute-value' warning which in turn is promoted to error. Implicit casts trigger 'old-style-cast' warnings which are promoted to errors. | ||||
| * | | Merge pull request #2380 from cuberite/travis | Tiger Wang | 2015-08-20 | 6 | -15/+25 |
| |\ \ | | | | | | | Use container-based infrastructure | ||||
| | * | | Use container-based infrastructure for Travis | Tiger Wang | 2015-08-20 | 6 | -15/+25 |
| | |/ | |||||
| * | | Merge pull request #2379 from cuberite/hunger | Tiger Wang | 2015-08-20 | 8 | -317/+162 |
| |\ \ | |/ |/| | Hopefully fixed food drain bugs | ||||
| | * | Fixed food drain bugs | Tiger Wang | 2015-08-20 | 8 | -317/+162 |
| |/ | |||||
| * | Merge pull request #2391 from SamJBarney/CropGrowthFix | Samuel Barney | 2015-08-19 | 11 | -30/+256 |
| |\ | | | | | Crop/plant growth fix | ||||
| | * | * Logic for handling plant growth has been centralized into cBlockPlant, and all growable plants now inherit from it. | Samuel Barney | 2015-08-19 | 11 | -30/+256 |
| |/ | | | | * Blocks now have an effect upon plant growth, just like in vanilla. | ||||
| * | Merge pull request #2439 from cuberite/AppveyorYml | Mattes D | 2015-08-18 | 1 | -0/+14 |
| |\ | | | | | Added Appveyor yml settings file. | ||||
| | * | Added Appveyor yml settings file. | Mattes D | 2015-08-18 | 1 | -0/+14 |
| |/ | |||||
| * | Merge pull request #2433 from cuberite/WarningFixTrial | Mattes D | 2015-08-18 | 9 | -39/+70 |
| |\ | | | | | Some warning fixes | ||||
| | * | Some warning fixes | Julian Laubstein | 2015-08-18 | 9 | -39/+70 |
| |/ | |||||
| * | Merge pull request #2436 from cuberite/UpdateCompileScript | Julian Laubstein | 2015-08-16 | 1 | -19/+16 |
| |\ | | | | | Updated compile.sh to use new naming | ||||
| | * | Updated compile.sh | Julian Laubstein | 2015-08-16 | 1 | -19/+16 |
| | | | |||||
| * | | Merge pull request #2435 from artur9010/patch-3 | Julian Laubstein | 2015-08-16 | 1 | -1/+1 |
| |\ \ | | | | | | | Update app.yml | ||||
| | * | | Update app.yml | Artur | 2015-08-15 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2430 from cuberite/APIDumpFix | Julian Laubstein | 2015-08-14 | 1 | -0/+255 |
| |\ \ | | | | | | | Readded plugin article | ||||
| | * | | Readded plugin article | Julian Laubstein | 2015-08-14 | 1 | -0/+255 |
| |/ / | |||||
| * | | Merge branch 'bearbot-testing' | Tiger Wang | 2015-08-13 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #2426 from cuberite/APIDumpNameChangeFix | Julian Laubstein | 2015-08-13 | 12 | -275/+20 |
| |\ \ | |/ |/| | Fixed a few missing MCServers in APIDump | ||||
| | * | Fixed a few missing MCServers in APIDump | Julian Laubstein | 2015-08-13 | 12 | -275/+20 |
| |/ | |||||
| * | Merge pull request #2417 from mjhanninen/fix-clang-warnings | Julian Laubstein | 2015-08-12 | 18 | -145/+153 |
| |\ | | | | | Fix compilation warnings related to implicit and old-style casts | ||||
| | * | Fix old style casts and implicit conversions | Matti Hänninen | 2015-08-12 | 18 | -145/+153 |
| |/ | |||||
| * | Merge pull request #2425 from cuberite/APIDumpNameChange | Mattes D | 2015-08-12 | 34 | -209/+204 |
| |\ | | | | | Updated APIDump to follow the namechange | ||||
| | * | Updated APIDump to follow the namechange | Julian Laubstein | 2015-08-11 | 34 | -209/+204 |
| |/ | |||||
| * | Merge pull request #2423 from cuberite/JsonCppCheck | Mattes D | 2015-08-11 | 1 | -0/+3 |
| |\ | | | | | Added check for JsonCpp submodule presence. | ||||
| | * | Added check for JsonCpp submodule presence. | Mattes D | 2015-08-11 | 1 | -0/+3 |
| |/ | |||||
| * | Merge pull request #2424 from cuberite/CompileMSVC2015 | worktycho | 2015-08-10 | 3 | -6/+7 |
| |\ | | | | | Compile MSVC2015 | ||||
| | * | Checked LeakFinder in MSVC2015, enabled support for it. | Mattes D | 2015-08-10 | 2 | -6/+7 |
| | | | |||||
| | * | Fixed SQLiteCpp MSVC2015 compilation. | Mattes D | 2015-08-10 | 1 | -0/+0 |
| |/ | | | | SQLiteCpp had a "noexcept" keyword that MSVC2015 didn't like, upgrading it makes it compile. | ||||
| * | Merge pull request #2421 from cuberite/StackWalkerWarningIgnore | Mattes D | 2015-08-10 | 1 | -0/+1 |
| |\ | | | | | MSVC: Ignore the deprecation warning in 3rd party StackWalker. | ||||
| | * | MSVC: Ignore the deprecation warning in 3rd party StackWalker. | Mattes D | 2015-08-09 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #2420 from cuberite/FlushLog | Julian Laubstein | 2015-08-08 | 1 | -0/+7 |
| |\ | | | | | Flush log file when a warning or error message is output. | ||||
| | * | Flush log file when a warning or error message is output. | Mattes D | 2015-08-08 | 1 | -0/+7 |
| |/ | | | | Fixes #2419. | ||||
| * | Refactored code to use cLuaState | Samuel Barney | 2015-08-07 | 2 | -34/+29 |
| | | | | | Fixes #2377. | ||||
| * | Merge pull request #2415 from nichwall/master | Tiger Wang | 2015-08-02 | 1 | -1/+6 |
| |\ | | | | | Fixes #2413 | ||||
| | * | Fixed Iron Door | Nicholas W | 2015-08-01 | 1 | -1/+6 |
| |/ | |||||
| * | Merge pull request #2412 from cuberite/UnifyComments | Julian Laubstein | 2015-07-31 | 114 | -850/+869 |
| |\ | | | | | Unified the doxy-comment format. | ||||
| | * | Unified the doxy-comment format. | Mattes D | 2015-07-31 | 114 | -850/+869 |
| |/ | |||||
| * | Merge pull request #2400 from cuberite/OffloadBadChunks | Julian Laubstein | 2015-07-31 | 4 | -82/+153 |
| |\ | | | | | Offload bad chunks | ||||
| | * | Chunks that fail to load are offloaded to extra files. | Mattes D | 2015-07-31 | 2 | -61/+107 |
| | | | | | | | | | Ref.: #1970 | ||||
| | * | Added reason parameter to load failures. | Mattes D | 2015-07-31 | 1 | -13/+13 |
| | | | |||||
| | * | Moved AString reading hack to cFile. | Mattes D | 2015-07-31 | 3 | -24/+49 |
| |/ | |||||
| * | Merge pull request #2371 from SamJBarney/WarningFix | Julian Laubstein | 2015-07-29 | 117 | -1119/+1103 |
| |\ | | | | | Warning fixes | ||||
| | * | Silenced and fixed many warning messages across multiple files. | Samuel Barney | 2015-07-29 | 117 | -1119/+1103 |
| |/ | |||||
| * | Merge pull request #2376 from mjhanninen/fix-freebsd-build | Mattes D | 2015-07-29 | 1 | -0/+1 |
| |\ | | | | | Fix FreeBSD build | ||||
| | * | Fix FreeBSD build broken by strict compiler check | Matti Hänninen | 2015-07-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | Downgrade tautological-compare to warning to let the build pass on FreeBSD 10.0. Note that I wasn't able to reproduce the problem on OS X Clang; probably due to Clang version differences. | ||||
| * | | WebAdmin: Changed MCServer to Cuberite | Artur | 2015-07-29 | 2 | -11/+11 |
| | | | |||||
| * | | Merge pull request #2388 from zackp30/armv7-cmake | Mattes D | 2015-07-29 | 1 | -0/+4 |
| |\ \ | | | | | | | Fix compilation on ARMv7. Fixes #2387. | ||||
| | * | | Fix compilation on ARMv7.Fixes #2387. | Zack Piper | 2015-07-24 | 1 | -0/+4 |
| | | | | |||||
| * | | | Merge pull request #2394 from cuberite/FixCustomRecipes | Alexander Harkness | 2015-07-26 | 1 | -0/+8 |
| |\ \ \ | | | | | | | | | Fixed custom recipes result clientside bug. | ||||
| | * | | | Fixed custom recipes result clientside bug. | Mattes D | 2015-07-26 | 1 | -0/+8 |
| |/ / / | | | | | | | | | | Fixes #2345. | ||||
| * | | | Merge pull request #2393 from jammet/patch-8 | Mattes D | 2015-07-26 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | Fixed red carpet crafting recipe. | ||||
| | * | | Update crafting.txt | jammet | 2015-07-26 | 1 | -1/+1 |
| |/ / | | | | | Corrected red carpet recipe. | ||||
| * | | Merge pull request #2383 from cuberite/GoogleTestFix | Julian Laubstein | 2015-07-23 | 1 | -1/+4 |
| |\ \ | | | | | | | Fixed cNetworkSingleton's HasTerminated flag. | ||||
| | * | | Fixed cNetworkSingleton's HasTerminated flag. | Mattes D | 2015-07-23 | 1 | -1/+4 |
| |/ / | | | | | | | Should fix random failures in Google-test. | ||||
| * | | Merge pull request #2375 from jammet/patch-8 | Mattes D | 2015-07-23 | 1 | -2/+2 |
| |\ \ | |/ |/| | Corrected Pillar of Quartz and Chiseled Quartz. | ||||
| | * | Update crafting.txt | jammet | 2015-07-19 | 1 | -2/+2 |
| |/ | | | Corrected Pillar of Quartz and Chiseled Quartz. | ||||
| * | Merge pull request #2372 from jammet/patch-7 | Alexander Harkness | 2015-07-19 | 1 | -1/+1 |
| |\ | | | | | Update crafting.txt | ||||
| | * | Update crafting.txt | jammet | 2015-07-19 | 1 | -1/+1 |
| |/ | | | Corrected QuartzBlock recipe | ||||
| * | Merge pull request #2362 from scribblemaniac/fix-redstone | Tiger Wang | 2015-07-18 | 1 | -2/+4 |
| |\ | | | | | Fixed redstone issue | ||||
| | * | Fixed redstone issue | scribblemaniac | 2015-07-17 | 1 | -2/+4 |
| | | | | | | | | | | | Fixed issue where glowstone blocks would block power transmission in some situations. | ||||
| * | | Merge pull request #2365 from bibo38/coreupdate | Tiger Wang | 2015-07-18 | 1 | -0/+0 |
| |\ \ | | | | | | | Updated the Core submodule reference to the latest commit. | ||||
| | * | | Updated the Core submodule reference to the latest commit. | bibo38 | 2015-07-17 | 1 | -0/+0 |
| | | | | | | | | | | | | | Without this, the Core module always fails on start and cannot be used. See Pull Request #144 of Core. | ||||
| * | | | Added documentation for GetLargeTreeAdjustment | Samuel Barney | 2015-07-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #2295 from bibo38/rabbitcolors | Julian Laubstein | 2015-07-17 | 5 | -54/+109 |
| |\ \ \ | |/ / |/| | | Added Rabbit Metadata values. | ||||
| | * | | Added Rabbit Metadata values. | bibo38 | 2015-07-17 | 5 | -54/+109 |
| |/ / | | | | | | | | | Added the Rabbit Types and the MoreCarrotTicks value. Types are selected randomly on creation. Fixes #1867 | ||||
| * | | Merge pull request #2363 from scribblemaniac/improve-spider-ai | Tiger Wang | 2015-07-16 | 3 | -1/+44 |
| |\ \ | | | | | | | Improved spider AI | ||||
| | * | | Improved spider AI | scribblemaniac | 2015-07-16 | 3 | -1/+44 |
| | |/ | | | | | | | Fixes #2335 | ||||
| * | | Merge pull request #2364 from hallucino/ageable-mobs | Tiger Wang | 2015-07-16 | 14 | -18/+28 |
| |\ \ | | | | | | | Spawn baby mobs | ||||
| | * | | Spawn baby mobs | hallucino | 2015-07-16 | 14 | -18/+28 |
| | | | | |||||
| * | | | Merge pull request #2360 from bibo38/waterfix | Julian Laubstein | 2015-07-16 | 1 | -3/+6 |
| |\ \ \ | |/ / |/| | | Now Water sources will also be created on top of existing water sources. | ||||
| | * | | Now Water sources will also be created on top of existing water sources. | bibo38 | 2015-07-15 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | See also on http://minecraft.gamepedia.com/Water#Source_blocks Fixes #2097 | ||||
| * | | | Merge pull request #2348 from bibo38/customname | Tiger Wang | 2015-07-15 | 2 | -10/+27 |
| |\ \ \ | | | | | | | | | Added CustomName and Health to sended Metadata of Monsters. | ||||
| | * | | | Added CustomName and Health to sended Metadata of Monsters. | bibo38 | 2015-07-15 | 2 | -10/+27 |
| | |/ / | | | | | | | | | | Fixes #2113 | ||||
| * | | | Merge pull request #2353 from SamJBarney/DyedArmor | Julian Laubstein | 2015-07-15 | 10 | -6/+420 |
| |\ \ \ | |_|/ |/| | | Implements Dyed Leather Armor | ||||
| | * | | Leather Armor can now be dyed. | Samuel Barney | 2015-07-15 | 10 | -6/+420 |
| | | | | | | | | | | | | | * Created new color class to handle dye-related coloring | ||||
| * | | | Merge pull request #2350 from SamJBarney/PeonySnowFix | Julian Laubstein | 2015-07-15 | 1 | -1/+7 |
| |\ \ \ | | | | | | | | | Fixed Tall Grass placement | ||||
| | * | | | Fixed tall grass trying to be placed in cold biomes. | Samuel Barney | 2015-07-15 | 1 | -1/+7 |
| | | | | | |||||
| * | | | | Merge pull request #2349 from cuberite/maps | Tiger Wang | 2015-07-15 | 104 | -925/+933 |
| |\ \ \ \ | | | | | | | | | | | Improved maps | ||||
| | * | | | | Improved maps | Tiger Wang | 2015-07-14 | 104 | -925/+933 |
| | | | | | | |||||
| * | | | | | Merge pull request #2036 from cuberite/sign-metamirror | Alexander Harkness | 2015-07-15 | 1 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Should Fix sign flipping. | ||||
| | * | | | | | Fixed bad logic. | Alexander Harkness | 2015-05-16 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Should Fix sign flipping. | Alexander Harkness | 2015-05-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | Fixes #1118 | ||||
| * | | | | | | Merge pull request #2340 from hallucino/ageable-mobs | NiLSPACE | 2015-07-15 | 5 | -28/+156 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Support ageable mobs | ||||
| | * | | | | | | Support ageable mobs | Hallucino | 2015-07-14 | 5 | -28/+156 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Move ageable stuff in Monster directly | ||||
| * | | | | | | Updated submodules | Tiger Wang | 2015-07-15 | 4 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #2356 from LO1ZB/ImproveHunger | Julian Laubstein | 2015-07-14 | 1 | -11/+10 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Fix food drain on movement. | ||||
| | * | | | | | Fix food drain on movement. | LO1ZB | 2015-07-14 | 1 | -11/+10 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #2352 from mmdk95/master | Tiger Wang | 2015-07-14 | 1 | -0/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix duping doors | ||||
| | * | | | | | | Fix duping doors (#1327) | mmdk95 | 2015-07-14 | 1 | -0/+4 |
| | | |_|_|/ / | |/| | | | | |||||
| * | | | | | | Merge pull request #2346 from SamJBarney/TreeGrowthUpdate | Julian Laubstein | 2015-07-14 | 4 | -14/+246 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Sapling Growth Update | ||||
| | * | | | | | Sapling Growth Update | Samuel Barney | 2015-07-13 | 4 | -14/+246 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Growth has been slowed down * Saplings do not grow if they do not have enough space to grow * Saplings do not grow unless the light level is 9 or above * Dark Oak doesn't grow unless it is in a 2x2 Jungle Trees now will grow into a large tree when 2x2 saplings are used. | ||||
| * | | | | | Merge pull request #2351 from SamJBarney/TorchStairFix | worktycho | 2015-07-14 | 1 | -0/+16 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Torches can now be placed on top of upside down stairs. | ||||
| | * | | | | Torches can now be placed on top of upside down stairs. | Samuel Barney | 2015-07-14 | 1 | -0/+16 |
| |/ / / / | |||||
| * | | | | Merge pull request #2347 from SamJBarney/ClampFix | Julian Laubstein | 2015-07-14 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / |/| | | | Replace min-max combo with Clamp in BioGen | ||||
| | * | | | Switched from using std::max(std::min()) to using Clamp | Samuel Barney | 2015-07-13 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Merge pull request #2344 from bibo38/make_ptr | Julian Laubstein | 2015-07-13 | 4 | -73/+73 |
| |\ \ \ | | | | | | | | | Changed allocation of smart pointers via make_xxx | ||||
| | * | | | Changing the shared_ptr/unique_ptr constructors to the make_shared/make_unique functions | bibo38 | 2015-07-12 | 4 | -73/+73 |
| | |/ / | |||||
| * | | | Merge pull request #2339 from mmdk95/master | Tiger Wang | 2015-07-12 | 1 | -2/+2 |
| |\ \ \ | |/ / |/| | | Fixed DropSpenser sound | ||||
| | * | | Fixed DropSpenser sound #2333 | mmdk95 | 2015-07-12 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #2330 from cuberite/libraryupdate | Julian Laubstein | 2015-07-12 | 47 | -7017/+577 |
| |\ \ | | | | | | | Library update | ||||
| | * | | Added JsonCPP library location to search paths | Tiger Wang | 2015-07-12 | 3 | -4/+13 |
| | | | | | | | | | | | | | | | | * Fixed '-dirty' submodule changes Probably fixes an issue somewhere too? | ||||
| | * | | Updated and submodularised JsonCPP | Tiger Wang | 2015-07-10 | 22 | -6527/+13 |
| | | | | | | | | | | | | | | | | Conflicts: lib/jsoncpp | ||||
| | * | | Updated luaexpat | Tiger Wang | 2015-07-10 | 2 | -7/+31 |
| | | | | |||||
| | * | | Updated expat | Tiger Wang | 2015-07-10 | 6 | -352/+296 |
| | | | | |||||
| | * | | Updated zlib | Tiger Wang | 2015-07-10 | 17 | -130/+227 |
| | | | | |||||
| * | | | Merge pull request #2328 from SamJBarney/master | Tiger Wang | 2015-07-10 | 7 | -88/+88 |
| |\ \ \ | |/ / |/| | | Fixes compilation failures on MacOSX 10.10 | ||||
| | * | | Fixed misplaced parens | Samuel Barney | 2015-07-09 | 2 | -5/+5 |
| | | | | |||||
| | * | | Fixes compilation failures on MacOSX 10.10 | Samuel Barney | 2015-07-09 | 7 | -88/+88 |
| |/ / | | | | | | | | | * Replace old c-style casts with c++ casts * Added `-Wno-error=old-style-cast` to Protocol18x.cpp | ||||
| * | | Network: Fixed ServerHandle's address formatting. | Mattes D | 2015-07-07 | 1 | -2/+2 |
| | | | |||||
| * | | (Ender) Chests are obstructed by opaque blocks. | Nounours Heureux | 2015-07-07 | 2 | -15/+13 |
| | | | |||||
| * | | Fixed warnings generated by 64-bit MSVC. | Mattes D | 2015-07-07 | 8 | -32/+32 |
| | | | |||||
| * | | Merge pull request #2319 from SamJBarney/master | Julian Laubstein | 2015-07-06 | 1 | -13/+85 |
| |\ \ | | | | | | | Squashed Bonemeal Plant Growth Update | ||||
| | * | | Squashed Bonemeal Plant Growth Update | Samuel Barney | 2015-07-06 | 1 | -13/+85 |
| |/ / | | | | | | | | | | | * Fixed Crops growing to maturity with only 1 bonemeal * Trees now go through growth stages with bonemeal, as they do in Vanilla Minecraft | ||||
| * | | Merge pull request #2224 from cuberite/ChunkQueueCollapsing | worktycho | 2015-07-04 | 16 | -330/+251 |
| |\ \ | | | | | | | Chunk queue collapsing: MK II | ||||
| | * | | Fixed minor errors in Tycho's code | Tiger Wang | 2015-06-22 | 7 | -92/+83 |
| | | | | | | | | | | | | | Everything should work now :) | ||||
| | * | | Reinstate "Chunk queue collapsing" | Tiger Wang | 2015-06-10 | 12 | -261/+191 |
| | | | | | | | | | | | | | | | | This reinstates commit f36acb683594daff5af3971dcbe3c3a171628b78 and reverts commit adfbc42c021e1bcfcb355933c0fd784306ce0e18. | ||||
| * | | | Merge pull request #2312 from SamJBarney/master | worktycho | 2015-07-03 | 2 | -7/+10 |
| |\ \ \ | | | | | | | | | Fixes grass dying at night | ||||
| | * | | | Moved grabbing the light value to after the transparency check. | Samuel Barney | 2015-07-03 | 1 | -3/+4 |
| | | | | | |||||
| | * | | | Added missing parens | Samuel Barney | 2015-07-03 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Grass now only dies if it has an opaque block above it. | Samuel Barney | 2015-07-03 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | Grass only spreads to a dirt block if the light level is above 4 and the block above it is transparent. | ||||
| | * | | | Farmland is now listed as an opaque block. | Samuel Barney | 2015-07-03 | 1 | -2/+1 |
| |/ / / | | | | | | | | | | Changed spread light falloff for farmland to what it was originally. | ||||
| * | | | Merge pull request #2306 from cuberite/FixNeighborChangedLoop | worktycho | 2015-07-01 | 7 | -46/+65 |
| |\ \ \ | | | | | | | | | Added neighbor specification in the OnNeighborChanged() block callback. | ||||
| | * | | | Added neighbor specification in the OnNeighborChanged() block callback. | Mattes D | 2015-07-01 | 7 | -46/+65 |
| |/ / / | | | | | | | | | | | | | Fixes the OnNeighborChanged endless recursion with large melon / pumpkin fields. Fixes #2213. | ||||
| * | | | APIDump: Fixed a forgotten comma. | Mattes D | 2015-06-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added the Prefabs folder to the files packed by build. | Mattes D | 2015-06-30 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #2303 from cuberite/RemoveObsoleteScript | worktycho | 2015-06-30 | 3 | -97/+1 |
| |\ \ \ | | | | | | | | | Removed the MakeLuaAPI script. | ||||
| | * | | | Removed the MakeLuaAPI script. | Mattes D | 2015-06-30 | 3 | -97/+1 |
| | | | | | | | | | | | | | | | | | It has been superseded by feeding commands to the server directly via stdin. | ||||
| * | | | | Merge pull request #2304 from cuberite/FixBlockAreaHeight | worktycho | 2015-06-30 | 2 | -2/+8 |
| |\ \ \ \ | |/ / / |/| | | | BlockArea: Fixed a crash with areas higher than chunk height. | ||||
| | * | | | BlockArea: Fixed a crash with areas higher than chunk height. | Mattes D | 2015-06-30 | 2 | -2/+8 |
| |/ / / | |||||
| * | | | Fixed typos in the readme. | Mattes D | 2015-06-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #2239 from cuberite/PortalSize | Mattes D | 2015-06-28 | 5 | -0/+56 |
| |\ \ \ | | | | | | | | | Added a size check for portals. | ||||
| | * | | | Added a size check for portals. | STRWarrior | 2015-06-28 | 5 | -0/+56 |
| |/ / / | | | | | | | | | | | | | | | | Made the portal size configurable Alpha-sorted SetXYZNetherPortalXYZ functions | ||||
| * | | | use atomic for state, to avoid torn reads | tycho | 2015-06-27 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #2294 from bibo38/horsefix | worktycho | 2015-06-26 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | Now Horses spawn with correct data values. | ||||
| | * | | | Now Horses spawn with correct data values. | bibo38 | 2015-06-26 | 1 | -3/+3 |
| |/ / / | | | | | | | | | | | | | | | | | | | The max-value of style is 4, of color is 6. See http://wiki.vg/Entities#Horse Also based on the if, the max value of HorseType is 7. Bugfix #2259 | ||||
| * | | | Merge pull request #2241 from lkolbly/master | worktycho | 2015-06-26 | 6 | -21/+40 |
| |\ \ \ | | | | | | | | | Work on NetherPortalScanner. Setup portal scanner to reset PortalCool… | ||||
| | * | | | Work on NetherPortalScanner. Setup portal scanner to reset PortalCooldown. Changed where player is spawned. Added a_InitSpawn flag to CreateAndInitializeWorld. | Lane Kolbly | 2015-06-13 | 6 | -21/+40 |
| | | | | | |||||
| * | | | | Merge pull request #2282 from Haxi52/button-fixes | worktycho | 2015-06-25 | 5 | -10/+58 |
| |\ \ \ \ | | | | | | | | | | | Button fixes | ||||
| | * | | | | Buttons no longer click on when already on. Buttons now play sound when clicking off. | Hax52 | 2015-06-24 | 5 | -10/+58 |
| | | | | | | |||||
| * | | | | | Merge pull request #2290 from bibo38/mousefix | Mattes D | 2015-06-25 | 2 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fixed Middle-Click Button in the ClickWindow-Packet. | ||||
| | * | | | | | Fixed Middle-Click Button in the ClickWindow-Packet. | bibo38 | 2015-06-25 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://wiki.vg/Protocol#Click_Window The MiddleClick has the button 2 and not 0. Now you can max an item in an inventory in Creative mode, without inventory desync. Bugfix #2260 | ||||
| * | | | | | | Merge pull request #2291 from bibo38/doorfix | worktycho | 2015-06-25 | 1 | -1/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Doors now get placed on the server-side. | ||||
| | * | | | | | | Doors now get placed on the server-side. | bibo38 | 2015-06-25 | 1 | -1/+0 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Y-Value is already the lower door block(From ItemHandler.cpp:346). Increasing it once again, places the door into the air, which is blocked by Cuberite. Bugfix #2279 | ||||
| * | | | | | | Merge pull request #2288 from cuberite/melonFix | Mattes D | 2015-06-24 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Call Neighbour changed handlers when a melon is created | ||||
| | * | | | | | | Call Neighbour changed handlers when a melon is created | tycho | 2015-06-23 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should prevent cascading farmland updates on breaking melons | ||||
| * | | | | | | | Merge pull request #2289 from cuberite/HangingFix | worktycho | 2015-06-24 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Added a forgotten break in cHangingEntity constructor. | ||||
| | * | | | | | | Added a forgotten break in cHangingEntity constructor. | Mattes D | 2015-06-24 | 1 | -0/+1 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | This had caused loading the cHangingEntity to fail in debug builds. | ||||
| * | | | | | | Merge pull request #2284 from cuberite/FixBiomeGen | worktycho | 2015-06-23 | 2 | -3/+6 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Generate biomes when pregenerating heights through CompositedHeiGen. | ||||
| | * | | | | | Generate biomes when pregenerating heights through CompositedHeiGen. | Mattes D | 2015-06-23 | 2 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2283. | ||||
| * | | | | | | Merge pull request #2285 from cuberite/MelonFix | worktycho | 2015-06-23 | 2 | -7/+10 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Melon fix | ||||
| | * | | | | | Fixed melon metadata when growing from stem. | Mattes D | 2015-06-23 | 1 | -6/+9 |
| | | | | | | | |||||
| | * | | | | | Fixed right-click with bonemeal. | Mattes D | 2015-06-23 | 1 | -1/+1 |
| |/ / / / / | | | | | | | | | | | | | | | | The client would send invalid right-click events with Y set to 0x7ff, which would crash the server. Only process bonemeal for valid clicks (valid blockface). | ||||
| * | | | | | Merge pull request #2280 from SamJBarney/master | worktycho | 2015-06-22 | 9 | -64/+17 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Rebased version of Code for Grass Growth Fix | ||||
| | * | | | | Rebased version of Code | Samuel Barney | 2015-06-22 | 9 | -64/+17 |
| |/ / / / | |||||
| * | | | | Merge pull request #2274 from cuberite/ItemsRemovalFix | Mattes D | 2015-06-21 | 7 | -85/+156 |
| |\ \ \ \ | | | | | | | | | | | Refactored block placement workflow. | ||||
| | * | | | | Refactored block placement workflow. | Mattes D | 2015-06-21 | 7 | -85/+156 |
| |/ / / / | | | | | | | | | | | | | Multi-blocks can now use the default OnPlayerPlaced() callback in cItemHandler. | ||||
| * | | | | Merge pull request #2267 from cuberite/InfoDumpFix | Mattes D | 2015-06-21 | 1 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | Fixed InfoDump.lua when there are no commands in plugin. | ||||
| | * | | | | Fixed InfoDump.lua when there are no commands in plugin. | Mattes D | 2015-06-20 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #2269 from cuberite/CustomVillages | worktycho | 2015-06-21 | 24 | -17244/+18032 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Added basic support for loading village prefabs from files. | ||||
| | * | | | | Added basic support for loading village prefabs from files. | Mattes D | 2015-06-20 | 24 | -17244/+18032 |
| |/ / / / | |||||
| * | | | | Merge pull request #2255 from cuberite/LoadablePieces | worktycho | 2015-06-19 | 25 | -76/+1785 |
| |\ \ \ \ | | | | | | | | | | | Loadable pieces | ||||
| | * | | | | Added cubeset file format docs. | Mattes D | 2015-06-19 | 2 | -0/+308 |
| | | | | | | |||||
| | * | | | | Externalized cPrefabPiecePool self-test. | Mattes D | 2015-06-19 | 18 | -57/+708 |
| | | | | | | |||||
| | * | | | | PrefabPiecePool: Added loading from cubeset file. | Mattes D | 2015-06-18 | 4 | -3/+589 |
| | | | | | | |||||
| | * | | | | LuaState: Added support for config-style usage. | Mattes D | 2015-06-17 | 3 | -43/+207 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Globals and table values can be queried from the Lua state easily. Use perfect forwarding. | ||||
| * | | | | | Check the return value of InflateString | Tiger Wang | 2015-06-18 | 1 | -2/+1 |
| |/ / / / | | | | | | | | | | | | | Fixes #2256 | ||||
| * | | | | Fixes #2245 | Tiger Wang | 2015-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Whoops :/ | ||||
| * | | | | Merge pull request #2253 from jammet/patch-7 | Alexander Harkness | 2015-06-16 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | Update crafting.txt | ||||
| | * | | | | Update crafting.txt | jammet | 2015-06-16 | 1 | -0/+2 |
| |/ / / / | | | | | | | | | Some more block types you can create by mixing others. | ||||
| * | | | | Merge pull request #2252 from jammet/patch-7 | Alexander Harkness | 2015-06-16 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Update crafting.txt | ||||
| | * | | | | Update crafting.txt | jammet | 2015-06-16 | 1 | -0/+1 |
| |/ / / / | | | | | | | | | You can make Andesite by combining Diorite and Cobblestone in Vanilla. The recipe was missing. | ||||
| * | | | | Merge pull request #2249 from cuberite/old-chunk-serializer | Mattes D | 2015-06-16 | 2 | -62/+0 |
| |\ \ \ \ | | | | | | | | | | | Removed version 2.9 serilization | ||||
| | * | | | | Removed version 29 serilization | tycho | 2015-06-16 | 2 | -62/+0 |
| | | | | | | | | | | | | | | | | | | | | | This has been unused since support for <1.7 has been dropped. | ||||
| * | | | | | Merge pull request #2248 from cuberite/clang3.6 | Alexander Harkness | 2015-06-15 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | Fixed override | ||||
| | * | | | | Fixed override | tycho | 2015-06-15 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | This was causing a compile error in clang 3.6 | ||||
| * | | | | Merge pull request #2244 from martindev2/#2092-TNT-Fire | Tiger Wang | 2015-06-14 | 1 | -0/+5 |
| |\ \ \ \ | | | | | | | | | | | Fix block placement over fire | ||||
| | * | | | | implemented DoesIgnoreBuildCollision on BlockFire to allow blocks to be placed on top | Martin McArthur | 2015-06-14 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Fixed tigers format string | worktycho | 2015-06-14 | 1 | -2/+2 |
| |/ / / / | |||||
| * / / / | Fixed log files' timestamps | Tiger Wang | 2015-06-14 | 3 | -12/+12 |
| |/ / / | | | | | | | | | | | | | Also made Release mode log less technical information about the world storage threads. | ||||
| * | | | Merge pull request #2237 from lkolbly/master | worktycho | 2015-06-13 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Fixing how village doors are generated in 1.8. | ||||
| | * | | | Fixed typo in BlockDoor.h | Lane Kolbly | 2015-06-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #2240 from cuberite/UpdatedPrefabs | NiLSPACE | 2015-06-13 | 6 | -488/+465 |
| |\ \ \ \ | | | | | | | | | | | Updated prefabs from the Gallery server. | ||||
| | * | | | | Updated prefabs from the Gallery server. | Mattes D | 2015-06-13 | 6 | -488/+465 |
| | | | | | | |||||
| * | | | | | Merge pull request #2193 from nounoursheureux/master | Alexander Harkness | 2015-06-13 | 9 | -11/+96 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Added HOOK_KILLED | ||||
| | * | | | | Added documentation for HOOK_KILLED | Nounours Heureux | 2015-06-13 | 2 | -1/+23 |
| | | | | | | |||||
| | * | | | | Added HOOK_KILLED | Nounours Heureux | 2015-06-13 | 9 | -12/+75 |
| |/ / / / | |||||
| * / / / | NetherPortalScanner: Fixed type conversion warnings. | Mattes D | 2015-06-13 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | If defined, not just if. | Alexander Harkness | 2015-06-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed build error on Linux | Alexander Harkness | 2015-06-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #2231 from cuberite/SelfTestRegistering | Alexander Harkness | 2015-06-12 | 11 | -33/+198 |
| |\ \ \ | | | | | | | | | SelfTests are registered and executed after logging framework init. | ||||
| | * | | | SelfTests are registered and executed after logging framework init. | Mattes D | 2015-06-11 | 11 | -33/+198 |
| | |/ / | | | | | | | | | | Fixes #2228. | ||||
| * | | | Update gratipay | Alexander Harkness | 2015-06-11 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #2229 from cuberite/readme-namechange | Alexander Harkness | 2015-06-11 | 4 | -27/+27 |
| |\ \ \ | | | | | | | | | Name change updates. | ||||
| | * | | | Update GETTING-STARTED.md | Alexander Harkness | 2015-06-11 | 1 | -8/+8 |
| | | | | | |||||
| | * | | | Update CONTRIBUTORS | Alexander Harkness | 2015-06-11 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Update LICENSE | Alexander Harkness | 2015-06-11 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Name change updates. | Alexander Harkness | 2015-06-11 | 1 | -14/+14 |
| |/ / / | |||||
| * | | | Update README.md | Alexander Harkness | 2015-06-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | More name change. | Alexander Harkness | 2015-06-11 | 1 | -2/+2 |
| | | | | |||||
| * | | | More name changes. | Alexander Harkness | 2015-06-11 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #2162 from lkolbly/master | Mattes D | 2015-06-10 | 9 | -20/+432 |
| |\ \ | | | | | | | Nether Portal Jumping & Creation Code | ||||
| | * | | Implemented nether portal scanning code. | Lane Kolbly | 2015-06-10 | 9 | -20/+432 |
| | | | | |||||
| * | | | Update build download links. | Alexander Harkness | 2015-06-09 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge pull request #2144 from mc-server/comparators | Alexander Harkness | 2015-06-09 | 10 | -662/+806 |
| |\ \ \ | |/ / |/| | | Redstone improvements [SEE DESC] | ||||
| | * | | Added moar comments | Tiger Wang | 2015-06-07 | 2 | -13/+13 |
| | | | | |||||
| | * | | Vector hasher is now a separate class | Tiger Wang | 2015-06-07 | 3 | -12/+30 |
| | | | | |||||
| | * | | Use emplace to construct structures | Tiger Wang | 2015-06-06 | 2 | -54/+61 |
| | | | | |||||
| | * | | Improved link unpowering speed | Tiger Wang | 2015-06-06 | 1 | -48/+41 |
| | | | | | | | | | | | | | Also fixed compile errors | ||||
| | * | | Changed appropriate containers to unordered_map | Tiger Wang | 2015-06-06 | 5 | -203/+92 |
| | | | | | | | | | | | | | | | | | | | Thanks to @worktycho for guidance! * Potential speed improvements | ||||
| | * | | Improved link power behaviour | Tiger Wang | 2015-06-06 | 2 | -163/+119 |
| | | | | |||||
| | * | | Improved wires and repeaters | Tiger Wang | 2015-06-06 | 2 | -73/+152 |
| | | | | | | | | | | | | | | | | * Fixed repeater cross-chunk power detection + Re-implemented horizontal wire cut-off checking | ||||
| | * | | Fixed wire consuming much resources | Tiger Wang | 2015-06-06 | 1 | -7/+17 |
| | | | | |||||
| | * | | Redstone wire and trapdoor fixes | Tiger Wang | 2015-06-06 | 4 | -311/+323 |
| | | | | | | | | | | | | | | | | | | | * Fixes #1887 * Fixes #1763 * Fixes #1083 | ||||
| | * | | Provides improvements to redstone wire | Tiger Wang | 2015-06-06 | 2 | -94/+70 |
| | | | | | | | | | | | | | Intermediary commit that fixes #1763. | ||||
| | * | | Comparators | Tiger Wang | 2015-06-06 | 7 | -83/+287 |
| | | | | |||||
| * | | | Merge pull request #2221 from mc-server/AreaCountBlocks | Julian Laubstein | 2015-06-08 | 3 | -0/+73 |
| |\ \ \ | | | | | | | | | cBlockArea: Added CountSpecificBlocks() API function. | ||||
| | * | | | cBlockArea: Added CountSpecificBlocks() API function. | Mattes D | 2015-06-08 | 3 | -0/+73 |
| |/ / / | |||||
| * | | | Merge pull request #2212 from mc-server/revert-2179-ChunkQueueCollapsing | Alexander Harkness | 2015-06-07 | 12 | -191/+261 |
| |\ \ \ | | | | | | | | | Revert "Chunk queue collapsing" | ||||
| | * | | | Revert "Chunk queue collapsing" | worktycho | 2015-06-07 | 12 | -191/+261 |
| |/ / / | |||||
| * | | | Merge pull request #2210 from nounoursheureux/bucket-craft | Alexander Harkness | 2015-06-07 | 1 | -1/+8 |
| |\ \ \ | | | | | | | | | Cake crafting now give back the bucket | ||||
| | * | | | Fixed style | Nounours Heureux | 2015-06-07 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Cake crafting now give back the bucket | Nounours Heureux | 2015-06-07 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | Merge pull request #2211 from jan64/master | Alexander Harkness | 2015-06-07 | 1 | -2/+2 |
| |\ \ \ \ | |/ / / |/| | | | Fix incorrent experience sending for 1.7 clients | ||||
| | * | | | Fix incorrent experience sending for 1.7 clients | jan64 | 2015-06-07 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #2153 from mc-server/gcc5 | Alexander Harkness | 2015-06-06 | 2 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | Update SQLite | ||||
| | * | | | | Disable column metadata | tycho | 2015-06-06 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Update SQLite | tycho | 2015-05-28 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Merge pull request #2179 from mc-server/ChunkQueueCollapsing | Tiger Wang | 2015-06-06 | 12 | -261/+191 |
| |\ \ \ \ \ | | | | | | | | | | | | | Chunk queue collapsing | ||||
| | * | | | | | Fix iterating | tycho | 2015-06-05 | 1 | -3/+1 |
| | | | | | | | |||||
| | * | | | | | Made the list of chunks to stream an unordered_set | tycho | 2015-06-05 | 4 | -25/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This should increase performance of chunk streaming | ||||
| | * | | | | | Rewrote ChunkSending queue for significantly improved performance | tycho | 2015-06-05 | 5 | -189/+102 |
| | | | | | | | |||||
| | * | | | | | Moved Chunk Broadcasts over to the regular queue | tycho | 2015-06-05 | 8 | -116/+138 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #2205 from birkett/master | worktycho | 2015-06-05 | 7 | -17/+58 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Daemon support on Linux | ||||
| | * | | | | | Daemon support on Linux. | Anthony Birkett | 2015-06-05 | 7 | -17/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Added null console log listener, avoid printf() when stdout is closed. | ||||
| * | | | | | | Merge pull request #2206 from mc-server/APIDumpTimeStamp | worktycho | 2015-06-05 | 6 | -18/+119 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | APIDump time stamp | ||||
| | * | | | | | | CMake: Added buildinfo workaround for src packs / systems without git. | Mattes D | 2015-06-05 | 1 | -0/+7 |
| | | | | | | | | |||||
| | * | | | | | | Added Build info to the cRoot API. | Mattes D | 2015-06-05 | 3 | -8/+65 |
| | | | | | | | | |||||
| | * | | | | | | Provide some BuildInfo even for non-CI builds. | Mattes D | 2015-06-05 | 2 | -2/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #2204 | ||||
| | * | | | | | | APIDump: Added timestamp to all generated HTML pages. | Mattes D | 2015-06-04 | 2 | -9/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #2204 | ||||
| * | | | | | | | Merge pull request #2207 from mc-server/LineBlockTracerFix | Alexander Harkness | 2015-06-05 | 1 | -6/+13 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed overshoot in cLineBlockTracer. | ||||
| | * | | | | | | | Fixed overshoot in cLineBlockTracer. | Mattes D | 2015-06-05 | 1 | -6/+13 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Fixes #2161. | ||||
| * | | | | | | | Merge pull request #2069 from HaoTNN/master | Mattes D | 2015-06-05 | 4 | -15/+41 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixes lit furnace issue in #2051 | ||||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | HaoTNN | 2015-06-03 | 15 | -108/+362 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fixes multiple furnace issues, including from loading world storage | HaoTNN | 2015-06-03 | 4 | -16/+41 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | HaoTNN | 2015-06-03 | 235 | -1353/+2504 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | HaoTNN | 2015-05-23 | 43 | -135/+229 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | HaoTNN | 2015-05-19 | 39 | -137/+1209 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Fixes lit furnace issue in #2051 | haotnn | 2015-05-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Debuggers: Added a LineBlockTracer console test command. | Mattes D | 2015-06-04 | 2 | -0/+117 |
| | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #2161 | ||||
| * | | | | | | | | | | | Merge pull request #2203 from jan64/master | worktycho | 2015-06-04 | 3 | -1/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | Change SendChatType behavior for < 1.8 clients, update docs | ||||
| | * | | | | | | | | | | Added SendSystemMessage / SendAboveActionBarMessage to the docs | jan64 | 2015-06-03 | 2 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated parameters passed to HOOK_KILLING | ||||
| | * | | | | | | | | | | Changed SendAboveActionBarMessage / SendSystemMessage to be a noop for < 1.8 clients | jan64 | 2015-06-03 | 1 | -1/+11 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #2188 from cengizIO/master | worktycho | 2015-06-04 | 8 | -135/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | Skip unknown cflag for Apple clang & remove cSemaphore | ||||
| | * | | | | | | | | | | Skip unknown cflag for Apple clang & remove cSemaphore | Cengiz Can | 2015-06-04 | 8 | -135/+12 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #2202 from mc-server/CmakeCleanup | Mattes D | 2015-06-03 | 1 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | Cmake cleanup | ||||
| | * | | | | | | | | | CMake: Removed unused legacy LibEvent target. | Mattes D | 2015-06-03 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | CMake: Put projects into solution folders in MSVC. | Mattes D | 2015-06-03 | 1 | -0/+14 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #2199 from jan64/master | Mattes D | 2015-06-03 | 12 | -12/+283 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Added system and above action bar chat messages | ||||
| | * | | | | | | | | Added system and above action bar chat messages | jan64 | 2015-06-02 | 12 | -12/+283 |
| | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #2190 from mc-server/CrashDumpArgs | Mattes D | 2015-06-03 | 3 | -96/+79 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Added cmdline params for crashdump detailness. | ||||
| | * | | | | | | | Added cmdline params for crashdump detailness. | Mattes D | 2015-06-02 | 3 | -96/+79 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Win32-only, also fixed the call scripts. Fixes #2184. | ||||
| * | | | | | | | Merge pull request #2182 from birkett/master | Mattes D | 2015-06-02 | 3 | -11/+11 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use the new style command line parameters for Windows Service support. | ||||
| | * | | | | | | | Use the new style command line parameters for Windows Service support. | Anthony Birkett | 2015-06-01 | 3 | -11/+11 |
| | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore invalid or malformed command line parameters, prevent unhandled exceptions. NOTE: Users will need to reinstall the service, now uses "-d" instead of "/service" in the start parameters. | ||||
| * | | | | | | | Merge pull request #2189 from mc-server/MSVCWarningFixes | Mattes D | 2015-06-02 | 13 | -4/+92 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fixed warnings in MSVC. | ||||
| | * | | | | | | Fixed warnings in MSVC. | Mattes D | 2015-06-02 | 13 | -4/+92 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | It complained about undefined return values or using uninitialized variables. | ||||
| * | | | | | | Merge pull request #2172 from mc-server/LightingCallbacks | Mattes D | 2015-06-01 | 11 | -53/+61 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Made cLightingThread own its callbacks | ||||
| | * | | | | | | Made cLightingThread own its callbacks | tycho | 2015-05-30 | 11 | -53/+61 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #2178 from jammet/patch-7 | Alexander Harkness | 2015-06-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix Daylightsensor recipe | ||||
| | * | | | | | | | Update crafting.txt | jammet | 2015-05-31 | 1 | -6/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix Daylightsensor recipe | jammet | 2015-05-31 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Something like Woodslap^-1 didn't work here, so I split it up into individual recipes. | ||||
| * | | | | | | | | Merge pull request #2180 from mc-server/CraftingFix | Mattes D | 2015-05-31 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed crafting recipe matching. | ||||
| | * | | | | | | | | Fixed crafting recipe matching. | Mattes D | 2015-05-31 | 1 | -0/+3 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2096. | ||||
| * / / / / / / / | ManualBindings: Fixed DoWithXYZ and ForEachInChunk signatures. | Mattes D | 2015-05-31 | 1 | -4/+6 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Fixes forum report http://forum.mc-server.org/showthread.php?tid=1993 | ||||
| * | | | | | | | Merge pull request #2173 from mc-server/CleanCmake | Alexander Harkness | 2015-05-30 | 1 | -8/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Moved shared cmake flags to the CMAKE_C_FLAGS var | ||||
| | * | | | | | | | Moved shared cmake flags to the CMAKE_C_FLAGS var | tycho | 2015-05-30 | 1 | -8/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServer | tycho | 2015-05-30 | 2 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| | * | | | | | | | Updated MagicCarpet submodule. Fixes #2155 | Alexander Harkness | 2015-05-30 | 1 | -0/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed wrong indent. | Alexander Harkness | 2015-05-30 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed minor cast warning | tycho | 2015-05-30 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #2171 from SafwatHalaby/fence | Alexander Harkness | 2015-05-30 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PF - Handle all fencetypes | ||||
| | * | | | | | | | PF - Handle all fencetypes | SafwatHalaby | 2015-05-30 | 1 | -1/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #2163 from mc-server/SimplifySpawn | worktycho | 2015-05-30 | 4 | -136/+156 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Clean up Spawn Prepare | ||||
| | * | | | | | | | Clean up Spawn Prepare | tycho | 2015-05-30 | 4 | -136/+156 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made cSpawnPrepare execute on the same thread since it is a syncronous operation, and most of the code happens on the lighting thread. Also moved cSpawnPrepare into its own file | ||||
| * | | | | | | | | Merge pull request #2169 from linnemannr/master | worktycho | 2015-05-30 | 4 | -2/+20 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix FreeBSD/clang errors caused by -Werror | ||||
| | * | | | | | | | | Fix FreeBSD/clang errors caused by -Werror | linnemannr | 2015-05-30 | 4 | -2/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With FreeBSD/clang, -Werror combined with the configured warning flags yields some fatal errors, specifically related to signed conversion, 64 to 32 bit conversion, and tautological compares. CONTRIBUTORS Add myself to the contributor list src/Generating/FinishGen.cpp In cFinishGenPassiveMobs::GetRandomMob(), change the type of RandMob from size_t to the difference_type of the ListOfSpawnables iterator MobIter. Using size_t triggers a 64 bit to 32 bit conversion if the difference_type of the iterator class is 64 bit Also explicitly cast the noise expression to unsigned long so we don't get a signed conversion warning from the modulo against ListOfSpawnables.size() src/OSSupport/StackTrace.cpp FreeBSD 10 and above includes a non glibc implementation of benchmark() for which size_t, not int, is the return type. To account for this and prevent a signed conversion warning, abstract the type for numItems with a macro btsize src/StringUtils.h In StringToInteger(), correct a tautological compare warning for unsigned types with the template. If T is unsigned, comparing std::numeric_limits<T>::min() to the unsigned result is always false. That control can enter this branch in an evaluated template with an unsigned type T may also permit a signed number to be parsed and erroneously stripped of its signedness at runtime. To guard against this and avoid the warning in the case that the number parsed from the string is non-positive, return false and don't try to parse if T is unsigned and control enters the non-positive branch | ||||
| * | | | | | | | | | Merge pull request #2167 from SafwatHalaby/diags | worktycho | 2015-05-30 | 1 | -5/+12 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | PF - Fixed diagonal cutting | ||||
| | * | | | | | | | | PF - Fixed diagonal cutting | SafwatHalaby | 2015-05-30 | 1 | -5/+12 |
| | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #2166 from SafwatHalaby/squid | Safwat Halaby | 2015-05-30 | 2 | -2/+4 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Disabled squid and Guardian Pathfinding | ||||
| | * | | | | | | | | Disabled squid and Guardian Pathfinding | SafwatHalaby | 2015-05-30 | 2 | -2/+4 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #2165 from SafwatHalaby/creeper | Alexander Harkness | 2015-05-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Fixed creeper explosions | ||||
| | * | | | | | | | Fixed creeper explosions | SafwatHalaby | 2015-05-30 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * / / / / / / | Fix Destroy() calling behaviour | Tiger Wang | 2015-05-30 | 1 | -1/+2 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | * Fixes Core/#142 | ||||
| * | | | | | | Fixed reversed logic in StringToDimension. | Lane Kolbly | 2015-05-30 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #2070 from mc-server/PreventNewWarnings | Julian Laubstein | 2015-05-29 | 195 | -807/+1111 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed a lot of warnings | ||||
| | * \ \ \ \ \ | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-29 | 9 | -32/+43 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/ArrowEntity.cpp | ||||
| | * | | | | | | | Fix comments | tycho | 2015-05-28 | 20 | -64/+82 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-28 | 30 | -118/+483 |
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Inventory.cpp | ||||
| | * | | | | | | | Fix warnings in cPath | tycho | 2015-05-24 | 1 | -9/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-24 | 12 | -197/+497 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix other clang 3.6 commit | tycho | 2015-05-24 | 2 | -2/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix bearbins comments | tycho | 2015-05-24 | 1 | -14/+10 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix clang 3.6 flags to only be used in clang 3.6 | tycho | 2015-05-24 | 2 | -11/+18 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fix comments | tycho | 2015-05-24 | 6 | -63/+73 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Disable -Werror for warnings in tests. | tycho | 2015-05-24 | 5 | -16/+7 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Disable -Werror for warnings in tools. | tycho | 2015-05-24 | 2 | -2/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Made -Weverything an error. | tycho | 2015-05-24 | 110 | -270/+376 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-23 | 19 | -42/+46 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-23 | 4 | -30/+38 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fix tests | tycho | 2015-05-23 | 3 | -2/+9 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Disable warnings in MCADefrag, ProtoProxy and tests | tycho | 2015-05-23 | 2 | -3/+6 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Added pthread as a link flag. | tycho | 2015-05-23 | 1 | -1/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-23 | 21 | -61/+143 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Fix tests | tycho | 2015-05-19 | 1 | -0/+7 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-19 | 2 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Make -Werror disabling file only | tycho | 2015-05-19 | 63 | -96/+201 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ad fix a load of warnings | ||||
| | * | | | | | | | | | | | | Added LuaState support for all integral types | tycho | 2015-05-19 | 9 | -69/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All so added error handling for out of range values | ||||
| | * | | | | | | | | | | | | Fixed some more warnings | tycho | 2015-05-19 | 4 | -37/+37 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Finish fixing windows | tycho | 2015-05-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | More fixed warnings | tycho | 2015-05-19 | 6 | -28/+40 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Properly fix cFile Warnings | tycho | 2015-05-19 | 2 | -11/+11 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed compile and a few more warnings | tycho | 2015-05-19 | 9 | -15/+33 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into PreventNewWarnings | tycho | 2015-05-19 | 36 | -136/+1207 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockLeaves.h | ||||
| | * | | | | | | | | | | | | | Fixed a lot of warnings | tycho | 2015-05-19 | 30 | -273/+286 |
| | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #2157 from beeduck/Issue2106 | Mattes D | 2015-05-29 | 3 | -5/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | Fix for chat and player lists with players in separate worlds | ||||
| | * | | | | | | | | | | | | Merge branch 'Issue2106' of https://github.com/beeduck/MCServer into Issue2106 | b33duck | 2015-05-29 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | Fixed the way connecting clients receive player lists and broadcast chat to worlds | b33duck | 2015-05-28 | 3 | -4/+14 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fix for the way connecting clients receive player lists and broadcast chat | b33duck | 2015-05-29 | 3 | -5/+26 |
| | |/ / / / / / / / / / / / | |||||
| * / / / / / / / / / / / / | Fixed Info.lua documentation | STRWarrior | 2015-05-28 | 1 | -4/+4 |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AdditionalInformation table is called AdditionalInfo | ||||
| * | | | | | | | | | | | | Updated DumpInfo plugin. | STRWarrior | 2015-05-28 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cPluginManager:GetAllPlugins is deprecated | ||||
| * | | | | | | | | | | | | Merge pull request #2154 from SafwatHalaby/skeleton | worktycho | 2015-05-28 | 5 | -19/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | AI - Sane Skeleton | ||||
| | * | | | | | | | | | | | | AI - Sane Skeleton | SafwatHalaby | 2015-05-28 | 5 | -19/+32 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #2156 from SafwatHalaby/exit | Safwat Halaby | 2015-05-28 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | Removed stray "exit" from compile.sh | ||||
| | * | | | | | | | | | | | | Removed stray "exit" from compile.sh | SafwatHalaby | 2015-05-28 | 1 | -1/+0 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #2152 from mc-server/fixes | Mattes D | 2015-05-28 | 1 | -6/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | Potential crash fixes | ||||
| | * | | | | | | | | | | | Potential crash fixes | Tiger Wang | 2015-05-28 | 1 | -6/+3 |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Potentially addresses my comment in #1969 * Probably fixes #2145 | ||||
| * | | | | | | | | | | | Merge pull request #2151 from SafwatHalaby/wolf | Alexander Harkness | 2015-05-28 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | AI - Tweaked wolf speed and teleport threshold | ||||
| | * | | | | | | | | | | | AI - Tweaked wolf speed and teleport threshold | SafwatHalaby | 2015-05-28 | 1 | -1/+2 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #2148 from SafwatHalaby/easy | worktycho | 2015-05-27 | 1 | -2/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | AI - Saner Livestock | ||||
| | * | | | | | | | | | | | AI - Saner Livestock | SafwatHalaby | 2015-05-27 | 1 | -2/+11 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #2061 from mc-server/fixes | Alexander Harkness | 2015-05-27 | 8 | -28/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | Fixes | ||||
| | * | | | | | | | | | | | Fixes #2041 | Tiger Wang | 2015-05-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixes #2003 | Tiger Wang | 2015-05-18 | 2 | -9/+7 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixes #2052 | Tiger Wang | 2015-05-18 | 6 | -16/+33 |
| | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #2143 from jammet/patch-6 | Alexander Harkness | 2015-05-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Corrected Cookie recipe | ||||
| | * | | | | | | | | | | | Corrected Cookie recipe | jammet | 2015-05-26 | 1 | -1/+1 |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | You should get a batch of 8 cookies for 2 wheat and one cocoabean. | ||||
| * | | | | | | | | | | | Merge pull request #2136 from mc-server/clientDestroyRace | Mattes D | 2015-05-26 | 1 | -2/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed ClientHandle not getting properly removed from the world | ||||
| | * | | | | | | | | | | | Fixed ClientHandle not getting properly removed from the world | tycho | 2015-05-26 | 1 | -2/+9 |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when socket is closed whilst the client is being added to the world Fixes #1969 | ||||
| * | | | | | | | | | | | Merge pull request #1848 from scottwillmoore/ImplementTitleCommand | Mattes D | 2015-05-26 | 9 | -0/+317 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Implement backend for /title command | ||||
| | * | | | | | | | | | | | Implement backend for /title command | Scott Moore | 2015-04-13 | 9 | -0/+317 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #2138 from Seadragon91/server_uptime | Mattes D | 2015-05-26 | 3 | -80/+82 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Added method to get the uptime of the server in seconds. | ||||
| | * | | | | | | | | | | | | Added method to get the uptime of the server in seconds. Implements #1650. | Lukas Pioch | 2015-05-26 | 3 | -80/+82 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #2139 from mathias-github/patch-3 | Julian Laubstein | 2015-05-26 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding myself to contributors | ||||
| | * | | | | | | | | | | | | | Update CONTRIBUTORS | Mathias | 2015-05-25 | 1 | -0/+1 |
| | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge pull request #2140 from mc-server/Plugins-duping | Alexander Harkness | 2015-05-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | Only add default plugins if there are not any plugins | ||||
| | * | | | | | | | | | | | | Only add default plugins if there are not any plugins | worktycho | 2015-05-25 | 1 | -1/+1 |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2082 | ||||
| * | | | | | | | | | | | | Merge pull request #2135 from linnemannr/master | Alexander Harkness | 2015-05-25 | 5 | -2/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | Support building on FreeBSD | ||||
| | * | | | | | | | | | | | Support building on FreeBSD | linnemannr | 2015-05-25 | 5 | -2/+16 |
| | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SetFlags.cmake Add -lexecinfo to linker flags for FreeBSD to resolve backtrace() lib/sqlite/CMakeLists.txt Define _XOPEN_SOURCE to 600 instead of __POSIX_VISIBLE to 200112 for POSIX 1-2001 support. For POSIX standards, the _XOPEN_SOURCE define controls the eventual value of __POSIX_VISIBLE. _XOPEN_SOURCE is defined to 500 in sqlite.c if not already defined, which sets up _POSIX_C_SOURCE and __POSIX_VISIBLE to the 199506 for POSIX.1c lib/tolua++/CMakeLists.txt src/CMakeLists.txt Add /usr/local/lib to the library search path for FreeBSD builds src/OSSupport/Errors.cpp Correct the strerror_r() implementation determination to check whether _GNU_SOURCE is defined, not what it evaluates to | ||||
| * | | | | | | | | | | | Merge pull request #2114 from cengizIO/master | Alexander Harkness | 2015-05-24 | 1 | -18/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix #2105 - Add gcc to Travis CI compilers list | ||||
| | * | | | | | | | | | | | Fix #2105 - Add gcc to CI compilers | Cengiz Can | 2015-05-24 | 1 | -18/+6 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #2091 from Rakete1111/master | worktycho | 2015-05-24 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Placing buckets up to 25 blocks away #2059 | ||||
| | * | | | | | | | | | | | Fixes #2059 | Blitz Rakete | 2015-05-21 | 1 | -0/+14 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #2130 from SafwatHalaby/easyInstall | worktycho | 2015-05-24 | 2 | -1/+204 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Easy compile script | ||||
| | * | | | | | | | | | | | | Easy compile script | SafwatHalaby | 2015-05-24 | 2 | -1/+204 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #2122 from SafwatHalaby/bounding | worktycho | 2015-05-24 | 3 | -26/+114 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pathfinder - Bounding boxes and some tweaks | ||||
| | * | | | | | | | | | | | | | Pathfinder - Bounding boxes and some tweaks | SafwatHalaby | 2015-05-23 | 3 | -26/+114 |
| | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Update CONTRIBUTORS | Alexander Harkness | 2015-05-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #2129 from Seadragon91/master | Alexander Harkness | 2015-05-24 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed item name | ||||
| | * | | | | | | | | | | | | | Add Seadragon91 to contributors | Lukas Pioch | 2015-05-24 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixed item name | Lukas Pioch | 2015-05-24 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge pull request #2118 from mc-server/login-gamemode | Safwat Halaby | 2015-05-24 | 2 | -148/+154 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gamemode not changing properly. | ||||
| | * | | | | | | | | | | | | | Fix gamemode not changing properly. | Alexander Harkness | 2015-05-23 | 2 | -148/+154 |
| | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should fix #604 | ||||
| * | | | | | | | | | | | | | Merge pull request #2128 from mc-server/wolf-fix | Safwat Halaby | 2015-05-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | Wolves don't spawn in rivers. | ||||
| | * | | | | | | | | | | | | Wolves don't spawn in rivers. | Alexander Harkness | 2015-05-24 | 1 | -1/+1 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #2107 from mc-server/cow-waterspawn | Safwat Halaby | 2015-05-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | Cows no longer spawn over water. | ||||
| | * | | | | | | | | | | | Cows and rabbits no longer spawn over water. | Alexander Harkness | 2015-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2080 | ||||
| * | | | | | | | | | | | | Merge pull request #2117 from Seadragon91/clang_errors | worktycho | 2015-05-23 | 19 | -42/+46 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. | ||||
| | * | | | | | | | | | | | Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. | Lukas Pioch | 2015-05-23 | 19 | -42/+46 |
| | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #2116 from mc-server/CMakeCacheOptions | Alexander Harkness | 2015-05-23 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add build_tools and Self_test as cache options, so that CLion can det… | ||||
| | * | | | | | | | | | | | Add build_tools and Self_test as cache options, so that CLion can detect them | tycho | 2015-05-23 | 1 | -0/+3 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #2065 from mc-server/OldArgs | Mattes D | 2015-05-23 | 1 | -29/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Move some of the old arguments over to TCLAP | ||||
| | * | | | | | | | | | | | Moved no buffering command line argument to tclap | tycho | 2015-05-20 | 1 | -5/+8 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Move commlog arguments over to TCLAP | tycho | 2015-05-20 | 1 | -25/+18 |
| | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #2103 from beeduck/Issue1980 | Alexander Harkness | 2015-05-23 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed players head visible when in spectator mode | ||||
| | * | | | | | | | | | | | Fixed players head visible when in spectator mode | b33duck | 2015-05-22 | 1 | -0/+9 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #2110 from mc-server/coverity-fix | Alexander Harkness | 2015-05-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | Fixed wrong copy/paste | ||||
| | * | | | | | | | | | | | Fixed wrong copy/paste | worktycho | 2015-05-23 | 1 | -1/+1 |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 110962 | ||||
| * | | | | | | | | | | | Merge pull request #2108 from mc-server/tgh-boolean | Alexander Harkness | 2015-05-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | TryGetHeight returns a bool | ||||
| | * | | | | | | | | | | TryGetHeight returns a bool | Alexander Harkness | 2015-05-23 | 1 | -1/+1 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | should fix #2099 | ||||
| * | | | | | | | | | | Merge pull request #2101 from mc-server/EquifaxCerts | Alexander Harkness | 2015-05-23 | 2 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Close Ssl Socket on destroy | ||||
| | * | | | | | | | | | | Close Ssl Socket on destroy | Tiger Wang | 2015-05-23 | 2 | -1/+5 |
| | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #2072 | ||||
| * | | | | | | | | | | Merge pull request #2104 from beeduck/Issue2053 | Alexander Harkness | 2015-05-23 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix for players falling through world when loading in as spectator | ||||
| | * | | | | | | | | | | Added a fix for players falling through the world when connecting in spectator mode | b33duck | 2015-05-23 | 1 | -0/+7 |
| | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #2100 from SafwatHalaby/creeper | Alexander Harkness | 2015-05-23 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | Fixed creeper not exploding when 1-block higher than player | ||||
| | * | | | | | | | | | Fixed creeper not exploding when 1 block higher than player | SafwatHalaby | 2015-05-23 | 1 | -2/+4 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #2086 from Seadragon91/master | Mattes D | 2015-05-21 | 9 | -19/+20 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Renamed hook HOOK_ENTITY_CHANGE_WORLD | ||||
| | * | | | | | | | | | Renamed hook HOOK_ENTITY_CHANGE_WORLD | Lukas Pioch | 2015-05-21 | 9 | -19/+20 |
| | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #2085 from mc-server/EquifaxCerts | Julian Laubstein | 2015-05-21 | 3 | -7/+40 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added Equifax root CA. | ||||
| | * | | | | | | | | | Added Equifax root CA. | Mattes D | 2015-05-21 | 3 | -7/+40 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2076. Closes #2081. Ref.: #2072. | ||||
| * | | | | | | | | | Merge pull request #2030 from beeduck/master | worktycho | 2015-05-21 | 3 | -3/+19 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | Issue #1868 and Issue #1984 | ||||
| | * | | | | | | | | Added beeduck to contributors | b33duck | 2015-05-21 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added open/close and sound effects for all door types | b33duck | 2015-05-21 | 1 | -3/+17 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added thunder sound effect to CastThunderbolt() | b33duck | 2015-05-21 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #2084 from mc-server/patch-2050 | Alexander Harkness | 2015-05-21 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added missing fencetypes to torchhandler | ||||
| | * | | | | | | | | | Added missing fencetypes to torchhandler | Julian Laubstein | 2015-05-20 | 1 | -0/+5 |
| | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #2073 from SafwatHalaby/rand | worktycho | 2015-05-20 | 3 | -10/+17 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Path recalculation improvements | ||||
| | * | | | | | | | | Path recalculation improvements | SafwatHalaby | 2015-05-20 | 3 | -10/+17 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #2074 from SafwatHalaby/rmUnique | worktycho | 2015-05-20 | 2 | -19/+26 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Removed UniquePTR from PathFinder | ||||
| | * | | | | | | | newlines | SafwatHalaby | 2015-05-19 | 1 | -0/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | Removed UniquePTR from PathFinder | SafwatHalaby | 2015-05-19 | 2 | -19/+17 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #2076 from mc-server/Cert-disable | Alexander Harkness | 2015-05-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Don't verify certificate | ||||
| | * | | | | | | | Don't verify certificate | worktycho | 2015-05-19 | 1 | -1/+1 |
| |/ / / / / / / | | | | | | | | | | | | | | | Temporary Hot-fix for #2072 | ||||
| * | | | | | | | Merge branch 'master' of github.com:mc-server/MCServer | Alexander Harkness | 2015-05-19 | 191 | -2946/+4028 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge pull request #2057 from Seadragon91/master | Alexander Harkness | 2015-05-19 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | Fix the health of animals | ||||
| | | * | | | | | | Fix the health of animals | Lukas Pioch | 2015-05-18 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #2019 from mc-server/OverrideArgs | Alexander Harkness | 2015-05-19 | 25 | -124/+1012 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Initial Implementation of command line arguments | ||||
| | | * | | | | | | | Add support for setting ports through command line | tycho | 2015-05-18 | 2 | -2/+24 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fix max slots logic to only override if acctually present. | tycho | 2015-05-18 | 1 | -4/+9 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Added deoxy comments | tycho | 2015-05-16 | 1 | -1/+16 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fix service Main | worktycho | 2015-05-16 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Move make_unique into a namespace to avoid ADL issues | tycho | 2015-05-16 | 4 | -11/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this prevents VS finding std::make_unique for constructors that take types from std | ||||
| | | * | | | | | | | Initial implementation of IniFile overloading | tycho | 2015-05-16 | 22 | -116/+955 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Added TCLAP | tycho | 2015-05-16 | 2 | -0/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Removed tip4commit, it's not used anymore. | Alexander Harkness | 2015-05-19 | 1 | -3/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge pull request #2060 from mc-server/more-leafimprove | Alexander Harkness | 2015-05-19 | 1 | -8/+20 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Improved leaves a bit more. | ||||
| | | * | | | | | | | | Improved leaves a bit more. | Alexander Harkness | 2015-05-18 | 1 | -8/+20 |
| | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Should fix #2058. | ||||
| | * | | | | | | | | Manual merge of #2066 | Alexander Harkness | 2015-05-19 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Improved contributor | Alexander Harkness | 2015-05-19 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge pull request #2064 from Seadragon91/hook_entity_change_world | Alexander Harkness | 2015-05-19 | 9 | -0/+172 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLD | ||||
| | | * | | | | | | | Added OnEntityChangeWorld.lua and OnEntityChangedWorld.lua hooks to APIDump | Lukas Pioch | 2015-05-19 | 2 | -0/+57 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLD | Lukas Pioch | 2015-05-18 | 7 | -0/+115 |
| | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | Fixes #1435. | ||||
| | * | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2015-05-18 | 15 | -174/+315 |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | | * | | | | | | Merge pull request #2049 from mc-server/sapling-probability | Safwat Halaby | 2015-05-18 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | Fix sapling probability. | ||||
| | | | * | | | | | Fix sapling probability. | Alexander Harkness | 2015-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Probability is 5% of leaves drop a sapling. This should really be different for jungle leaves (2.5%) and the Fortune enchantment should increase the probability. | ||||
| | | * | | | | | | APIDump: Removed an unneeded global variable. | Mattes D | 2015-05-17 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge pull request #2037 from SafwatHalaby/aprox | Safwat Halaby | 2015-05-17 | 5 | -55/+193 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Pathfinder - approximated paths when original destination unreachable | ||||
| | | | * | | | | | | Pathfinder - approximated paths when original destination unreachable | SafwatHalaby | 2015-05-17 | 5 | -55/+193 |
| | | | | | | | | | | |||||
| | | * | | | | | | | properly this time? | Alexander Harkness | 2015-05-17 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fixed typo. | Alexander Harkness | 2015-05-17 | 1 | -1/+1 |
| | | | |/ / / / / | | |/| | | | | | |||||
| | | * | | | | | | Merge pull request #2040 from mc-server/Random | Alexander Harkness | 2015-05-17 | 1 | -5/+21 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix FastRandom seeding | ||||
| | | | * | | | | | | Fix FastRandom seeding | worktycho | 2015-05-17 | 1 | -5/+21 |
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1815 Fixes #2021 | ||||
| | | * | | | | | | Should disable coveralls. | Alexander Harkness | 2015-05-17 | 1 | -7/+7 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge pull request #2038 from mc-server/InventoryFix | Alexander Harkness | 2015-05-17 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixed inventory handling. | ||||
| | | | * | | | | | | Fixed inventory handling. | Mattes D | 2015-05-16 | 1 | -2/+2 |
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2035. | ||||
| | | * | | | | | | Merge pull request #2033 from mc-server/BreakIntoDebugger | Safwat Halaby | 2015-05-16 | 2 | -0/+29 |
| | | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | Lua: Break into ZBS debugger on API errors. | ||||
| | | | * | | | | | Lua: Break into ZBS debugger on API errors. | Mattes D | 2015-05-16 | 2 | -0/+29 |
| | | | |/ / / / | |||||
| | | * | | | | | Merge pull request #2029 from mc-server/bedPatch | Mattes D | 2015-05-16 | 1 | -2/+2 |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | Bed uses bottom two bits for direction not three | ||||
| | | | * | | | | Bed uses bottom two bits for direction not three | worktycho | 2015-05-16 | 1 | -2/+2 |
| | | | | |/ / | | | |/| | | |||||
| | | * / | | | PathFinder uses UniquePtr for cell map. | SafwatHalaby | 2015-05-16 | 2 | -8/+3 |
| | | |/ / / | |||||
| | | * | | | Newsletter, content tweak. | Alexander Harkness | 2015-05-15 | 1 | -1/+3 |
| | | | | | | |||||
| | | * | | | Merge pull request #2024 from mc-server/revert-2023-smartPointers | worktycho | 2015-05-15 | 2 | -3/+8 |
| | | |\ \ \ | | | | | | | | | | | | | Revert "PathFinder - smart pointers" | ||||
| | | | * | | | Revert "PathFinder - smart pointers" | worktycho | 2015-05-15 | 2 | -3/+8 |
| | | |/ / / | |||||
| | | * | | | Merge pull request #2023 from SafwatHalaby/smartPointers | worktycho | 2015-05-15 | 2 | -8/+3 |
| | | |\ \ \ | | | | | | | | | | | | | PathFinder - smart pointers | ||||
| | | | * | | | uniquePTR | SafwatHalaby | 2015-05-15 | 2 | -8/+3 |
| | | | |/ / | |||||
| | | * | | | Unify shields. | Alexander Harkness | 2015-05-15 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Removed tip4commit. | Alexander Harkness | 2015-05-15 | 1 | -1/+1 |
| | | |/ / | |||||
| | | * | | Merge pull request #2022 from mc-server/ForEachCommandAPIFix | worktycho | 2015-05-14 | 1 | -93/+54 |
| | | |\ \ | | | | | | | | | | | Fixed cPluginManager:ForEachCommand() and ForEachConsoleCommand() | ||||
| | | | * | | Fixed cPluginManager:ForEachCommand() and ForEachConsoleCommand() | Mattes D | 2015-05-14 | 1 | -93/+54 |
| | | |/ / | | | | | | | | | | | | | | | | | The functions would leak one value on the Lua stack for each enumerated command. Fixes #2017. | ||||
| | * / / | Updated the defaults for the overworld world generator | STRWarrior | 2015-05-17 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge pull request #2018 from mc-server/ProbDif | Mattes D | 2015-05-14 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | Fixed possible crash in cProbabDistrib | ||||
| | | * | | Fixed possible crash in cProbabDistrib | STRWarrior | 2015-05-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | It could divide through 0 which causes a crash | ||||
| | * | | | Merge pull request #2010 from TwiddleStick/patch-2 | Mattes D | 2015-05-14 | 1 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | Update World.cpp | ||||
| | | * | | | Update World.cpp | Martin Fahy | 2015-05-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Fixed minor typos in comments, simply trying to understand the code base to fix issue regarding no sound when lighting is produced, no change to actual code. | ||||
| | * | | | | Merge pull request #2006 from mc-server/ManualBindingsWorld | Mattes D | 2015-05-14 | 7 | -1217/+1253 |
| | |\ \ \ \ | | |/ / / | |/| | | | Moved cWorld manual bindings out into a separate file. | ||||
| | | * | | | Moved cWorld manual bindings out into a separate file. | Mattes D | 2015-05-13 | 7 | -1217/+1253 |
| | | | | | | |||||
| | * | | | | Merge pull request #2007 from mc-server/AllCommandsThroughHook | Mattes D | 2015-05-13 | 3 | -5/+11 |
| | |\ \ \ \ | | | | | | | | | | | | | All in-game commands go through the OnExecuteCommand hook. | ||||
| | | * | | | | Fixed chat message manipulation by plugins. | Mattes D | 2015-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Plugins, in their OnChat hook, can change the chat message sent by a player. | ||||
| | | * | | | | All in-game commands go through the OnExecuteCommand hook. | Mattes D | 2015-05-13 | 2 | -4/+10 |
| | | |/ / / | | | | | | | | | | | | | | | | Everything that has a slash at the beginning, doesn't matter if it is a registered command or not. | ||||
| | * | | | | Merge pull request #2008 from mc-server/InfoDumpLinks | Mattes D | 2015-05-13 | 1 | -5/+16 |
| | |\ \ \ \ | | |/ / / | |/| | | | Info dump links | ||||
| | | * | | | InfoDump: Added DownloadLocation to forum post generator. | Mattes D | 2015-05-13 | 1 | -1/+4 |
| | | | | | | |||||
| | | * | | | InfoDump: Added support for links. | Mattes D | 2015-05-13 | 1 | -4/+12 |
| | |/ / / | | | | | | | | | | | | | Also fixed processing of lists and list items. | ||||
| | * | | | Merge pull request #2001 from mc-server/BindingsCleanup | Mattes D | 2015-05-12 | 13 | -972/+207 |
| | |\ \ \ | | | | | | | | | | | Bindings cleanup | ||||
| | | * | | | CIBuild: Added action labels | Mattes D | 2015-05-12 | 1 | -0/+4 |
| | | | | | | |||||
| | | * | | | ToLua now generates cLuaState::Push() and GetStackValue() | Mattes D | 2015-05-12 | 11 | -498/+195 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | For classes exported through ToLua it generates the cLuaState::Push() and cLuaState::GetStackValue() functions, as well as the supporting forward declarations and typedefs. Renamed virtual_method_hooks.lua to BindingsProcessor.lua since it no longer provides virtual method hooks and instead does additional processing when generating the bindings. | ||||
| | | * | | | ToLua: Fixed LuaJit compatibility. | Mattes D | 2015-05-11 | 1 | -0/+8 |
| | | | | | | |||||
| | | * | | | AllToLua: Removed unneeded virtual method hooks. | Mattes D | 2015-05-11 | 1 | -481/+7 |
| | | | | | | |||||
| | * | | | | Fixed creative click-outside | Tiger Wang | 2015-05-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | * Fixes #1995 | ||||
| | * | | | | Improved hoppers | Tiger Wang | 2015-05-11 | 2 | -27/+16 |
| | |/ / / | | | | | | | | | | | | | * Fixes #1994 | ||||
| | * | | | Merge pull request #2000 from mc-server/CommandHandling | Mattes D | 2015-05-11 | 16 | -73/+173 |
| | |\ \ \ | | | | | | | | | | | Command handling | ||||
| | | * | | | APIDump: Added linkification to hook return values. | Mattes D | 2015-05-10 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | OnExecuteCommand hook can override the command result (crXXX). | Mattes D | 2015-05-10 | 8 | -20/+40 |
| | | | | | | |||||
| | | * | | | Exported cPluginManager:ExecuteConsoleCommand() to Lua API. | Mattes D | 2015-05-10 | 5 | -16/+77 |
| | | | | | | | | | | | | | | | | | | | | | Fixes #1999. | ||||
| | | * | | | Call HOOK_EXECUTE_COMMAND even for unknown console commands. | Mattes D | 2015-05-10 | 3 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | This allows plugins such as Aliases to intercept even unknown commands. | ||||
| | | * | | | StringUtils: Fixed StringSplitWithQuotes(). | Mattes D | 2015-05-10 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | The function would crash when given a string that started with the delimiter. | ||||
| | | * | | | InfoReg: Fixed EntireCommand handling for MultiCommandHandler(). | Mattes D | 2015-05-10 | 1 | -34/+34 |
| | | | | | | | | | | | | | | | | | | | | | The EntireCommand wasn't propagated into the handlers. | ||||
| | | * | | | Added the EntireCommand parameter to HOOK_EXECUTE_COMMAND. | Mattes D | 2015-05-10 | 6 | -10/+11 |
| | |/ / / | | | | | | | | | | | | | Fixes #1996. | ||||
| | * | | | Merge pull request #1977 from mc-server/warnings | Tiger Wang | 2015-05-10 | 8 | -26/+41 |
| | |\ \ \ | | | | | | | | | | | Warnings and logic fixes | ||||
| | | * \ \ | Merge remote-tracking branch 'origin/master' into warnings | Tiger Wang | 2015-05-10 | 120 | -306/+361 |
| | | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.cpp src/Vector3.h | ||||
| | * | | | | Merge pull request #1985 from SafwatHalaby/lessPathCalcs | Mattes D | 2015-05-10 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | PathFinder - Less calculations per tick | ||||
| | | * | | | | PF - Less calcs per tick | wiseoldman95 | 2015-05-10 | 1 | -1/+1 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #1954 from mc-server/MoreStyleCheck | Mattes D | 2015-05-09 | 112 | -288/+324 |
| | |\ \ \ \ | | | | | | | | | | | | | More style checking. | ||||
| | | * | | | | Added check against "Type const &" and "Type const *". | Mattes D | 2015-05-09 | 1 | -0/+4 |
| | | | | | | | |||||
| | | * | | | | CheckBasicStyle: checks spaces around * and &. | Mattes D | 2015-05-09 | 42 | -104/+115 |
| | | | | | | | |||||
| | | * | | | | More style checking. | Mattes D | 2015-05-09 | 78 | -186/+207 |
| | |/ / / / | | | | | | | | | | | | | | | | Spaces around some operators are checked. | ||||
| | * | | | | Rabbit and cooked rabbit now stackable | jammet | 2015-05-09 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | And corrected the alphabetical ordering. | ||||
| | * | | | | Merge pull request #1956 from Tri125/master | Mattes D | 2015-05-09 | 5 | -6/+20 |
| | |\ \ \ \ | | | | | | | | | | | | | Fixed Magma cube sound and spawn size | ||||
| | | * | | | | GetSizeName of cSlime and cMagmaCube is now static | Tristan | 2015-05-09 | 4 | -4/+4 |
| | | | | | | | |||||
| | | * | | | | Big Magma Cube can now spawn | Tri125 | 2015-05-07 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Following the same method as the Slime, Magma Cube can now spawn with the size of 1, 2 or 4. | ||||
| | | * | | | | Fixed the sound issue with the MagmaCube | Tri125 | 2015-05-07 | 2 | -2/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Name of the sound is correctly capitalized -Get the appropriate sound depending on its size | ||||
| | * | | | | | Fixed remaing pragmas | worktycho | 2015-05-09 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | clang diagnostic not diagnostics | worktycho | 2015-05-09 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | fixed clang pragmas | ||||
| | * | | | | | Merge pull request #1968 from SafwatHalaby/patch-2 | Safwat Halaby | 2015-05-09 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Update Contributing.MD | ||||
| | | * | | | | | Update Contributing.MD | Safwat Halaby | 2015-05-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Double space is rendering as a single space so I changed the comment line a bit, the new version is clearer anyway. Added an exception to CamelCase (single letter vars) | ||||
| | * | | | | | | Merge pull request #1973 from Tri125/QuartzStack | Alexander Harkness | 2015-05-09 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed #1893 : Quartz can now stack | ||||
| | | * | | | | | | Fixed #1893 | Tri125 | 2015-05-07 | 1 | -0/+1 |
| | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | Quartz ore now stack properly | ||||
| | * | | | | | | Merge pull request #1972 from Woazboat/CodeCleanup_refactored | worktycho | 2015-05-09 | 1 | -4/+4 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed compiler warning overrides in Vector3.h | ||||
| | | * | | | | | | Fixed compiler warning overrides in Vector3.h | Woazboat | 2015-05-09 | 1 | -4/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #1971 from mc-server/worktycho-patch-1 | NiLSPACE | 2015-05-09 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Move chunk position accesses after the chunk validity checks | ||||
| | | * | | | | | | | Move chunk position accesses after the chunk validity checks | worktycho | 2015-05-09 | 1 | -2/+4 |
| | |/ / / / / / / | |||||
| | | | | | * | | | Fixed some warnings and logic errors in Monster.cpp | Tiger Wang | 2015-05-10 | 1 | -5/+7 |
| | | | | | | | | | |||||
| | | | | | * | | | Fixed some Visual Studio warnings | Tiger Wang | 2015-05-09 | 8 | -25/+38 |
| | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | | Merge pull request #1945 from Woazboat/CodeCleanup_refactored | Mattes D | 2015-05-08 | 4 | -43/+88 |
| | |\| | | | | | | |_|/ / / | |/| | | | | Small code cleanup - clean version | ||||
| | | * | | | | Added float comparison warning overrides to Vector3::hasNonZeroLength | Woazboat | 2015-05-08 | 1 | -7/+16 |
| | | | | | | | |||||
| | | * | | | | Ignoring Clang warnings for strict float comparison in Vector::Equals() | Woazboat | 2015-05-08 | 1 | -1/+11 |
| | | | | | | | |||||
| | | * | | | | Changed Vector3 Equals function to avoid using memcmp | Woazboat | 2015-05-08 | 1 | -5/+1 |
| | | | | | | | |||||
| | | * | | | | Tracer::signum function now returns int | Woazboat | 2015-05-08 | 3 | -25/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert c style casts to c++ static casts Changed fabs() to std::abs() | ||||
| | | * | | | | Check for zero length vector in Trace | Woazboat | 2015-05-08 | 2 | -4/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Added hasNonZeroLength member function to Vector3 | ||||
| | | * | | | | Changed Tracer::m_NormalTable to static array | Woazboat | 2015-05-08 | 2 | -8/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Was previously instantiated for every trace | ||||
| | * | | | | | Fix build URLs, now .tar.gz | Alexander Harkness | 2015-05-08 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #1957 from SafwatHalaby/patch-1 | Alexander Harkness | 2015-05-08 | 1 | -7/+36 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Added pre-commit hook to CONTRIBUTING.md5 | ||||
| | | * | | | | | Added pre-commit hook to CONTRIBUTING.md | Safwat Halaby | 2015-05-08 | 1 | -7/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added some other missing stuff. | ||||
| | * | | | | | | Merge pull request #1967 from jammet/patch-4 | Alexander Harkness | 2015-05-08 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Corrected hopper recipe | ||||
| | | * | | | | | | Corrected hopper recipe | jammet | 2015-05-08 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| | * | | | | | | Fixed syntax error | Alexander Harkness | 2015-05-08 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #1966 from SafwatHalaby/Spaces | Alexander Harkness | 2015-05-08 | 2 | -0/+2 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Spaces in cPath | ||||
| | | * | | | | | Spaces in cPath | wiseoldman95 | 2015-05-08 | 2 | -0/+2 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #1960 from mc-server/FixInterPluginCalls | Mattes D | 2015-05-08 | 4 | -27/+22 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Fix inter plugin calls | ||||
| | | * | | | | | Fixed inter-plugin calls. | Mattes D | 2015-05-07 | 3 | -27/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an inter-plugin call failed due to function not found, the server would maul the LuaState and "yield". Fixes #1959. | ||||
| | | * | | | | | Added Lua C API checks in Debug builds. | Mattes D | 2015-05-07 | 1 | -0/+3 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #1949 from SafwatHalaby/burn | worktycho | 2015-05-07 | 3 | -35/+93 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | AI - Better shade cover | ||||
| | | * | | | | | AI - Safer WouldBurnAt() | wiseoldman95 | 2015-05-06 | 1 | -3/+8 |
| | | | | | | | | |||||
| | | * | | | | | AI - Better shade cover | wiseoldman95 | 2015-05-06 | 1 | -1/+9 |
| | | | | | | | | |||||
| | | * | | | | | (duplicate) AI - Livestock escape fixed, water jumping fixed | wiseoldman95 | 2015-05-06 | 3 | -34/+79 |
| | | | |_|/ / | | |/| | | | |||||
| | * | | | | | Merge pull request #1951 from mc-server/BroadcastRefactor | Mattes D | 2015-05-07 | 22 | -19/+310 |
| | |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Added support for sending additional data in the ParticleEffect packet | ||||
| | | * | | | | Added support for additional data in the ParticleEffect Packet | tycho | 2015-05-07 | 22 | -19/+310 |
| | | |/ / / | | | | | | | | | | | | | | | | Also started refactoring how broadcasts are handled | ||||
| | * | | | | Merge pull request #1953 from mc-server/bearbin-fadwp | Mattes D | 2015-05-06 | 1 | -3/+3 |
| | |\ \ \ \ | | | | | | | | | | | | | Properly fix the docs for FindAndDoWithPlayer. | ||||
| | | * | | | | Properly fix the docs for FindAndDoWithPlayer. | Alexander Harkness | 2015-05-06 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed F accidentially added. Made the two FindAndDoWithPlayers documentation consistent. | ||||
| | * | | | | | Merge pull request #1952 from mc-server/coverity-fix | Alexander Harkness | 2015-05-06 | 1 | -1/+1 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | Actually empty the open list | ||||
| | | * | | | | Actually empty the open list | worktycho | 2015-05-06 | 1 | -1/+1 |
| | | |/ / / | |||||
| * | / / / | Updated Core. | Alexander Harkness | 2015-05-19 | 1 | -0/+0 |
| |/ / / / | |||||
| * / / / | Added info about case-sensitivity of FindAndDoWithPlayer | Alexander Harkness | 2015-05-06 | 1 | -4/+3 |
| |/ / / | |||||
| * | | | Merge pull request #1946 from SafwatHalaby/lean | Alexander Harkness | 2015-05-06 | 2 | -6/+13 |
| |\ \ \ | | | | | | | | | PathFinder - Couple of bugfixes | ||||
| | * | | | PF - Swimming bugfix | wiseoldman95 | 2015-05-06 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | PF - Fixed mobs not reaching leaning player | wiseoldman95 | 2015-05-06 | 2 | -3/+10 |
| | | | | | |||||
| * | | | | Merge pull request #1943 from mc-server/revert-1917-CodeCleanup | worktycho | 2015-05-05 | 4 | -62/+45 |
| |\ \ \ \ | | | | | | | | | | | Revert "Small code cleanup" | ||||
| | * | | | | Revert "Small code cleanup" | worktycho | 2015-05-05 | 4 | -62/+45 |
| |/ / / / | |||||
| * | | | | Merge pull request #1917 from Woazboat/CodeCleanup | worktycho | 2015-05-05 | 4 | -45/+62 |
| |\ \ \ \ | |/ / / |/| | | | Small code cleanup | ||||
| | * | | | Changed fabs() to std::abs() | Woazboat | 2015-04-29 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | braces in Tracer::mNormalTable initializer in separate lines | Woazboat | 2015-04-29 | 1 | -2/+4 |
| | | | | | |||||
| | * | | | Added extra braces to initialization of Tracer::m_NormalTable | Woazboat | 2015-04-29 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | And another cs fix I overlooked | Woazboat | 2015-04-29 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fixed comments according to cs | Woazboat | 2015-04-29 | 1 | -11/+11 |
| | | | | | |||||
| | * | | | Fix HasNonZeroLength name | Woazboat | 2015-04-29 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | now 100% more cs compliant | ||||
| | * | | | Changed Tracer::m_NormalTable to static array | Woazboat | 2015-04-29 | 2 | -7/+14 |
| | | | | | | | | | | | | | | | | | Was previously instantiated for every trace | ||||
| | * | | | Changed Vector3 Equals function to avoid using memcmp | Woazboat | 2015-04-28 | 1 | -5/+1 |
| | | | | | |||||
| | * | | | Tracer signum function now returns int | Woazboat | 2015-04-28 | 2 | -7/+10 |
| | | | | | |||||
| | * | | | Check for zero length vector in Trace | Woazboat | 2015-04-28 | 2 | -4/+15 |
| | | | | | | | | | | | | | | | | | Added hasNonZeroLength member function to Vector3 | ||||
| | * | | | convert c style casts to c++ static casts | Woazboat | 2015-04-28 | 2 | -15/+16 |
| | |/ / | |||||
| | * | | Removed redundant temp iterator. std::list.erase already returns | Woazboat | 2015-04-27 | 1 | -4/+1 |
| | | | | | | | | | | | | | iterator to next valid list element | ||||
| * | | | Merge pull request #1939 from SafwatHalaby/Polising | worktycho | 2015-05-05 | 2 | -26/+47 |
| |\ \ \ | | | | | | | | | AI - More conservative use of ResetPathFinding, some polishing | ||||
| | * | | | AI - More conservative use of ResetPathFinding, fixed minor swimming / jumping bug | wiseoldman95 | 2015-05-05 | 2 | -26/+47 |
| | | | | | |||||
| * | | | | Merge pull request #1941 from mc-server/bearbin-darkoak | Mattes D | 2015-05-05 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | Add furnacing recipies for dark oak and acacia. | ||||
| | * | | | | Add furnacing recipies for dark oak and acacia. | Alexander Harkness | 2015-05-05 | 1 | -0/+2 |
| |/ / / / | | | | | | | | | This should fix #1899, and also acacia logs too. | ||||
| * | | | | Merge pull request #1940 from SafwatHalaby/lua | Alexander Harkness | 2015-05-05 | 1 | -0/+0 |
| |\ \ \ \ | |/ / / |/| | | | Chmod +x CheckBasicStyle.lua | ||||
| | * | | | Chmod +x CheckBasicStyle.lua | wiseoldman95 | 2015-05-05 | 1 | -0/+0 |
| |/ / / | |||||
| * | | | Merge pull request #1938 from jan64/master | Mattes D | 2015-05-04 | 2 | -3/+3 |
| |\ \ \ | | | | | | | | | Change visual protocol name to include MCServer | ||||
| | * | | | Change visual protocol name to include MCServer | jan64 | 2015-05-04 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Merge pull request #1935 from mc-server/fixes | Alexander Harkness | 2015-05-04 | 8 | -265/+224 |
| |\ \ \ \ | |/ / / |/| | | | Entity improvements | ||||
| | * | | | Merge remote-tracking branch 'origin/master' into fixes | Tiger Wang | 2015-05-04 | 0 | -0/+0 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Path.cpp | ||||
| | * | | | | Entity improvements | Tiger Wang | 2015-05-04 | 8 | -265/+224 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | •Pathfinder improvements •Fixes #1217 •Fixes #1933 Merge remote-tracking branch 'SafwatHalaby/water2' into fixes | ||||
| * | | | | | Upgraded ubuntu version. | Alexander Harkness | 2015-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Should make builds start working again. | ||||
| * | | | | | Merge pull request #1937 from mc-server/BuildInfoCrash | Alexander Harkness | 2015-05-04 | 1 | -0/+9 |
| |\ \ \ \ \ | | | | | | | | | | | | | Print Build info as part of the crash information | ||||
| | * | | | | | Print Build info as part of the crash information | worktycho | 2015-05-04 | 1 | -0/+9 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1936 from Seadragon91/master | Mattes D | 2015-05-04 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Crafting - Allow to craft torches with charcoals | ||||
| | * | | | | Crafting - Allow to craft torches with charcoals | Lukas Pioch | 2015-05-03 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Merge pull request #1934 from SafwatHalaby/p_IsSolidChunks | Tiger Wang | 2015-05-03 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / |/| | | | PathFinder - Fixed nullptr chunk bug | ||||
| | * | | | PathFinder - Fixed nullptr chunk bug | wiseoldman95 | 2015-05-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1930 from SafwatHalaby/AI_Jump | Tiger Wang | 2015-05-03 | 2 | -5/+16 |
| |\ \ \ \ | | | | | | | | | | | AI - Improved Mob Jumping | ||||
| | * | | | | AI - Improved Mob Jumping | wiseoldman95 | 2015-05-03 | 2 | -5/+16 |
| | |/ / / | |||||
| * | | | | Merge pull request #1932 from SafwatHalaby/F_AssertFix | Mattes D | 2015-05-03 | 3 | -10/+8 |
| |\ \ \ \ | | | | | | | | | | | PathFinder - Fixed Howaner's bug | ||||
| | * | | | | PathFinder - Crash fix, chunks in parameters are now references | wiseoldman95 | 2015-05-03 | 3 | -10/+8 |
| | |/ / / | |||||
| * | | | | Fixed multiple mbedtls inclusion. | Mattes D | 2015-05-03 | 2 | -6/+7 |
| | | | | | | | | | | | | | | | | | Ref.: #1880. | ||||
| * | | | | Merge pull request #1880 from mc-server/submodules | Mattes D | 2015-05-03 | 8 | -4/+4 |
| |\ \ \ \ | | | | | | | | | | | Update submodules | ||||
| | * | | | | Update submodules | Tiger Wang | 2015-05-02 | 8 | -4/+4 |
| | | | | | | |||||
| * | | | | | Fixed error in webadmin home page | STRWarrior | 2015-05-02 | 1 | -1/+1 |
| | |/ / / |/| | | | |||||
| * | | | | Merge pull request #1925 from SafwatHalaby/PathFinder_Optimze | Tiger Wang | 2015-05-02 | 4 | -66/+38 |
| |\ \ \ \ | | | | | | | | | | | Pathfinder optimization | ||||
| | * | | | | PathFinding - Chunk querying optimization and improve cPath::IsSolid | wiseoldman95 | 2015-05-02 | 4 | -66/+38 |
| | | | | | | |||||
| * | | | | | Merge pull request #1928 from SafwatHalaby/contrib | Tiger Wang | 2015-05-02 | 1 | -0/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Added myself to CONTRIBUTORS | ||||
| | * | | | | | Added myself to CONTRIBUTORS. Note: I'm formerly wiseoldman95 | wiseoldman95 | 2015-05-02 | 1 | -0/+1 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge pull request #1927 from SafwatHalaby/AI_BetterDayLightHandling | Tiger Wang | 2015-05-02 | 6 | -63/+22 |
| |\ \ \ \ \ | | | | | | | | | | | | | AI - Much better burning/daylight behavior | ||||
| | * | | | | | AI - Better daylight handling | wiseoldman95 | 2015-05-02 | 6 | -63/+22 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge pull request #1919 from mathias-github/patch-1 | Tiger Wang | 2015-05-02 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Added Guardian and Rabbit to DefaultMonsters in Overworld | ||||
| | * | | | | Added Guardian and Rabbit to DefaultMonsters in Overworld | Mathias | 2015-04-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | CheckBasicStyle: Can check individual files or git commits. | Mattes D | 2015-05-02 | 1 | -2/+101 |
| | | | | | | |||||
| * | | | | | APIDump: Added an "apishow" command. | Mattes D | 2015-05-02 | 1 | -0/+10 |
| | |/ / / |/| | | | | | | | | | | | Launches the webbrowser to show the locally exported API docs. | ||||
| * | | | | Merge pull request #1920 from wiseoldman95/SquashedPathFinder | Mattes D | 2015-05-01 | 13 | -175/+736 |
| |\ \ \ \ | | | | | | | | | | | Implemented A* Pathfinding and updated monster.cpp to use it. | ||||
| | * | | | | A* Pathfinding and better monster AI | wiseoldman95 | 2015-05-01 | 13 | -175/+736 |
| |/ / / / | |||||
| * | | | | Merge pull request #1924 from mc-server/BlockAreaCountNonAir | Mattes D | 2015-05-01 | 3 | -1/+37 |
| |\ \ \ \ | | | | | | | | | | | Added cBlockArea:CountNonAirBlocks API function. | ||||
| | * | | | | Added cBlockArea:CountNonAirBlocks API function. | Mattes D | 2015-04-30 | 3 | -1/+37 |
| |/ / / / | |||||
| * | | | | Merge pull request #1923 from mc-server/ReadWholeFileFix | Mattes D | 2015-04-30 | 2 | -8/+44 |
| |\ \ \ \ | | | | | | | | | | | Fixed bindings for cFile:ReadWholeFile(). | ||||
| | * | | | | Fixed bindings for cFile:ReadWholeFile(). | Mattes D | 2015-04-30 | 2 | -8/+44 |
| |/ / / / | | | | | | | | | | | | | Fixes #1914 | ||||
| * | | | | Merge pull request #1922 from mc-server/BlockAreaExt | Mattes D | 2015-04-30 | 6 | -10/+242 |
| |\ \ \ \ | |/ / / |/| | | | cBlockArea extensions | ||||
| | * | | | APIDump: Added documentation for cBlockArea:GetNonAirCropRelCoords. | Mattes D | 2015-04-30 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Added cBlockArea::msSimpleCompare merge strategy. | Mattes D | 2015-04-29 | 3 | -9/+95 |
| | | | | | |||||
| | * | | | Added cBlockArea:GetNonAirCropRelCoords() API function. | Mattes D | 2015-04-29 | 5 | -1/+146 |
| | | | | | | | | | | | | | | | | | Fixes #1915. | ||||
| * | | | | Clay blocks are handled with the OreHandler | jammet | 2015-04-29 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1913 from wiseoldman95/fixCompatibleProtocols | Mattes D | 2015-04-28 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Updated MC versions in ProtocolRecognizer.h | ||||
| | * | | | | Updated MC versions in ProtocolRecognizer.h | wiseoldman95 | 2015-04-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Updated MC versions in readme.txt | Mattes D | 2015-04-28 | 1 | -2/+2 |
| |/ / / / | |||||
| * | | | | Merge pull request #1909 from Woazboat/CodeCleanup | worktycho | 2015-04-27 | 4 | -10/+12 |
| |\ \ \ \ | |/ / / |/| / / | |/ / | cSetChunkData constructor explicitly requires std::move() | ||||
| | * | | cSetChunkData constructor explicitly requires std::move() instead of | Woazboat | 2015-04-27 | 4 | -10/+12 |
| | | | | | | | | | | | | | unsafely stealing data | ||||
| * | | | Fix explosions trying to write to unread blockarea | Tiger Wang | 2015-04-26 | 1 | -3/+5 |
| | | | | |||||
| * | | | Update contributing.md with C++11 | worktycho | 2015-04-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Updated the Core. | Mattes D | 2015-04-25 | 1 | -0/+0 |
| | | | | |||||
| * | | | Merge pull request #1897 from mc-server/Restrictions | Mattes D | 2015-04-25 | 6 | -43/+772 |
| |\ \ \ | | | | | | | | | Restrictions | ||||
| | * | | | cPlayer now checks restrictions. | Mattes D | 2015-04-25 | 3 | -7/+68 |
| | | | | | | | | | | | | | | | | | Fixes #1331. | ||||
| | * | | | Added player restrictions to the DB and API. | Mattes D | 2015-04-25 | 3 | -36/+704 |
| | | | | | |||||
| * | | | | Merge pull request #1896 from mc-server/FindAndDoWithPlayerRace | Mattes D | 2015-04-25 | 1 | -4/+4 |
| |\ \ \ \ | |/ / / |/| | | | Eliminate race condition in cRoot::FindAndDoWithPlayer | ||||
| | * | | | Eliminate race condition in cRoot::FindAndDoWithPlayer | worktycho | 2015-04-24 | 1 | -4/+4 |
| | |/ / | | | | | | | Avoid a race condition where a player gets deleted during the FindAndDoWithPlayer callback by moving the callback into DoWithPlayer. | ||||
| * / / | Plugin removes its command registrations and webtabs when unloaded. | Mattes D | 2015-04-25 | 1 | -0/+5 |
| |/ / | | | | | | | Fixes #1890. | ||||
| * | | Merge pull request #1894 from mc-server/RefactorManualBindingsTemplates | Mattes D | 2015-04-23 | 5 | -392/+286 |
| |\ \ | | | | | | | Refactored ManualBindings' callbacks using templates. | ||||
| | * | | Refactored ManualBindings' callbacks using templates. | Mattes D | 2015-04-23 | 5 | -392/+286 |
| |/ / | | | | | | | | | This is a bit easier to read, has better error reporting and fixes a few subtle bugs. Fixes #1889. | ||||
| * | | Digging up a clay block spawns 4 clay items. | jammet | 2015-04-23 | 1 | -0/+5 |
| | | | | | | | | | | | Fixes #1884. Closes #1891. | ||||
| * | | Merge pull request #1892 from mc-server/DoWithPlugin | Mattes D | 2015-04-23 | 5 | -173/+332 |
| |\ \ | | | | | | | Implemented cPluginManager:DoWithPlugin(), fixed ForEachPlugin(). | ||||
| | * | | Implemented cPluginManager:DoWithPlugin(), fixed ForEachPlugin(). | Mattes D | 2015-04-23 | 5 | -173/+332 |
| | | | | | | | | | | | | | Both functions are exported as static. | ||||
| * | | | Nether Quartz is handled in the Ore handler. | jammet | 2015-04-23 | 1 | -0/+5 |
| | | | | | | | | | | | | | Fixes #1885, Closes #1888 | ||||
| * | | | Merge pull request #1851 from wraith11/DoorFix | Mattes D | 2015-04-23 | 2 | -6/+21 |
| |\ \ \ | | | | | | | | | Fix door placing in connection with slabs | ||||
| | * | | | Fix door placing in connection with slabs | wraith11 | 2015-04-21 | 2 | -6/+21 |
| | | | | | | | | | | | | | | | | | Except top-half slabs as transparent blocks for doors. | ||||
| * | | | | Merge pull request #1852 from wraith11/SlabPlacing | Mattes D | 2015-04-23 | 1 | -0/+23 |
| |\ \ \ \ | |_|/ / |/| | | | Fix slab placing | ||||
| | * | | | Fix slab placing | wraith11 | 2015-04-22 | 1 | -0/+23 |
| | |/ / | |||||
| * | | | Merge pull request #1883 from mc-server/NarrowWindowID | Mattes D | 2015-04-22 | 2 | -3/+7 |
| |\ \ \ | | | | | | | | | Narrowed WindowID to use only 7 bits. | ||||
| | * | | | Narrowed WindowID to use only 7 bits. | Mattes D | 2015-04-21 | 2 | -3/+7 |
| |/ / / | | | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1876 | ||||
| * | | | Hotfixed some chunk presence issues when generating. | Mattes D | 2015-04-21 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #1879 from mc-server/DynamicThreshold | Mattes D | 2015-04-21 | 2 | -7/+6 |
| |\ \ \ | | | | | | | | | Changed Nether composition to change the threshold from a cubic noise | ||||
| | * | | | Changed default MaxThreshold value | STRWarrior | 2015-04-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | There is now really a difference between open and dense parts | ||||
| | * | | | Calculate threshold for each column in a chunk instead for the whole chunk | STRWarrior | 2015-04-21 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | Changed Nether composition to change the threshold from a cubic noise | STRWarrior | 2015-04-20 | 2 | -7/+7 |
| | | | | | |||||
| * | | | | Network: fixed excessive debug logging. | Mattes D | 2015-04-21 | 2 | -7/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1881 from mc-server/UrlInHttpRequest | Mattes D | 2015-04-21 | 4 | -43/+62 |
| |\ \ \ \ | | | | | | | | | | | Added URL member to the HTTPRequest API class. | ||||
| | * | | | | Added URL member to the HTTPRequest API class. | Mattes D | 2015-04-21 | 4 | -43/+62 |
| |/ / / / | |||||
| * | | | | WebAdmin: Removed server name, shortened memory report. | Mattes D | 2015-04-20 | 1 | -5/+1 |
| | | | | | |||||
| * | | | | Fixed a bad recipe. | Mattes D | 2015-04-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | ItemHandler type fixes. | Mattes D | 2015-04-20 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #1878 from jammet/patch-2 | Mattes D | 2015-04-20 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Fixing dyeing | ||||
| | * | | | | Fixing dyeing | jammet | 2015-04-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Getting yellow dye and a lot of dye mixes were not working when it was just called "Flower". | ||||
| * | | | | | Protocol 1.8: Limit the amount of displayed data on NBT parse failure. | Mattes D | 2015-04-20 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | ItemHandler: Using automatic array bounds. | Mattes D | 2015-04-20 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Updated the Core plugin. | Mattes D | 2015-04-19 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | HangingEntity: Fixed a needless clang warning. | Mattes D | 2015-04-19 | 1 | -2/+5 |
| | | | | | |||||
| * | | | | Fixed typo in NetherForts initialization | STRWarrior | 2015-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | The S in NetherForts was missing | ||||
| * | | | | Merge pull request #1877 from mc-server/GlowStone | NiLSPACE | 2015-04-19 | 4 | -2/+140 |
| |\| | | | | | | | | | | | Added GlowStone finisher | ||||
| | * | | | GlowStone: Changed order of initialization of member variables | STRWarrior | 2015-04-19 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Fixed style | STRWarrior | 2015-04-19 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Added GlowStone finisher | STRWarrior | 2015-04-19 | 4 | -2/+140 |
| | |/ / | |||||
| * | | | Merge pull request #1875 from mc-server/PluginFolders | Mattes D | 2015-04-19 | 16 | -1161/+884 |
| |\ \ \ | | | | | | | | | Split the plugin names and plugin folders to avoid confusing them. | ||||
| | * | | | Refresh plugin list before trying to load. | Mattes D | 2015-04-19 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | APIDump: Documented cPluginManager:IsPluginLoaded(). | Mattes D | 2015-04-19 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Added cPluginManager:IsPluginLoaded() API, better load error msgs. | Mattes D | 2015-04-19 | 2 | -5/+42 |
| | | | | | |||||
| | * | | | Refactored cWebPlugin for C++11 style and proper WebTab clearing. | Mattes D | 2015-04-19 | 6 | -103/+149 |
| | | | | | |||||
| | * | | | Split the plugin names and plugin folders to avoid confusing them. | Mattes D | 2015-04-19 | 14 | -1059/+697 |
| | | | | | | | | | | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1877 | ||||
| * | | | | ClientHandle: Fixed re-sending refused right-clicks. | Mattes D | 2015-04-19 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | The coords weren't checked against Y boundary and -1 coords weren't sent. This fixes mc-server/Gallery#45. | ||||
| * | | | | HTTP: Error message is sent as the payload as well. | Mattes D | 2015-04-19 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | This shows the error message in the browsers. Before, the browsers would display just a blank page. | ||||
| * | | | | Merge pull request #1864 from mc-server/StrictRecipeMatching | Mattes D | 2015-04-19 | 2 | -55/+58 |
| |\ \ \ \ | | | | | | | | | | | Recipes match zero DamageValue strictly. | ||||
| | * | | | | Recipes match zero DamageValue strictly. | Mattes D | 2015-04-16 | 2 | -55/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | To match any DamageValue for the ingredient, an explicit "-1" as the DamageValue must be specified. Fixes #1859. | ||||
| * | | | | | Merge pull request #1876 from jammet/patch-1 | Mattes D | 2015-04-19 | 1 | -0/+19 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add StainedClay | ||||
| | * | | | | | Add StainedClay | jammet | 2015-04-19 | 1 | -0/+19 |
| |/ / / / / | | | | | | | | | | | For some reason StainedClay was entirely missing, so here it is. | ||||
| * | | | | | Merge pull request #1870 from mathias-gh/master | Mattes D | 2015-04-17 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Fixed IronGolem sounds | ||||
| | * | | | | Update IronGolem.cpp | mathias-gh | 2015-04-17 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #1869 from mathias-gh/master | NiLSPACE | 2015-04-17 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | Added MobTypeName for Giant | ||||
| | * | | | | Added MobTypeName for Giant | mathias-gh | 2015-04-17 | 1 | -0/+1 |
| |/ / / / | |||||
| * / / / | Fixed arm swing animation | Tiger Wang | 2015-04-17 | 1 | -1/+1 |
| |/ / / | | | | | | | * Fixes #1861 | ||||
| * | | | Fixed PolishedGranite et al crafting recipes. | Mattes D | 2015-04-16 | 4 | -6/+7 |
| | | | | | | | | | | | | | Fixes #1774. Ref.: #1859 | ||||
| * | | | Merge pull request #1858 from mc-server/BucketPluginCalls | Mattes D | 2015-04-15 | 24 | -501/+267 |
| |\ \ \ | | | | | | | | | Bucket plugin calls | ||||
| | * | | | Scooping up fluid calls the player placement hooks. | Mattes D | 2015-04-14 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | | Ref.: #1857. | ||||
| | * | | | Placing a fluid from bucket calls plugin hooks. | Mattes D | 2015-04-14 | 21 | -53/+204 |
| | | | | | | | | | | | | | | | | | Ref.: #1857. | ||||
| | * | | | Removed HOOK_MAX and HOOK_NUM_HOOKS from Lua API. | Mattes D | 2015-04-13 | 2 | -4/+3 |
| | | | | | |||||
| | * | | | HookNotify: Rewritten for generic hooks. | Mattes D | 2015-04-13 | 1 | -440/+48 |
| | | | | | |||||
| * | | | | Merge pull request #1844 from DevToaster/master | Mattes D | 2015-04-14 | 16 | -16/+61 |
| |\ \ \ \ | |/ / / |/| | | | Modified physics for more vanilla-like behavior | ||||
| | * | | | Changed air drag for pickups | DevToaster | 2015-03-31 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Changed air drag units to 'interpolated ticks' per second | DevToaster | 2015-03-31 | 11 | -14/+18 |
| | | | | | |||||
| | * | | | Adjusted projectile physics | DevToaster | 2015-03-31 | 1 | -4/+6 |
| | | | | | |||||
| | * | | | Modified physics for more vanilla-like behavior | DevToaster | 2015-03-31 | 15 | -12/+51 |
| | | | | | |||||
| * | | | | Debuggers: Renamed conflicting /cs command to /cstay. | Mattes D | 2015-04-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | /cs caused a conflict with WorldEdit. | ||||
| * | | | | Merge pull request #1854 from mc-server/FileOps | Mattes D | 2015-04-12 | 5 | -11/+389 |
| |\ \ \ \ | |_|/ / |/| | | | File ops | ||||
| | * | | | cFile:ChangeFileExt now accepts extensions with leading dot, too. | Mattes D | 2015-04-11 | 3 | -4/+25 |
| | | | | | |||||
| | * | | | Added more cFile API functions. | Mattes D | 2015-04-11 | 4 | -7/+89 |
| | | | | | | | | | | | | | | | | | GetLastModificationTime, GetPathSeparator() and GetExecutableExt() | ||||
| | * | | | Fixed plugin hook calls when unloading plugins. | Mattes D | 2015-04-10 | 1 | -1/+248 |
| | | | | | | | | | | | | | | | | | If a plugin installs any hooks in its Initialize method and then causes the Lua runtime to abort, the server asserted because the hooks were called while the plugin was being unloaded. | ||||
| | * | | | Added proper implementation of cFile::ChangeFileExt(). | Mattes D | 2015-04-10 | 2 | -2/+30 |
| | | | | | |||||
| * | | | | Added extra divide operator to Vector3. | STRWarrior | 2015-04-07 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | The multiply operator had one for both a different vector and a number, but the divide operator didn't. | ||||
| * | | | | Update GETTING-STARTED.md | Mattes D | 2015-04-07 | 1 | -7/+10 |
| |/ / / | |||||
| * | | | Fixed MSVC warnings, improved comments. | Mattes D | 2015-04-06 | 1 | -5/+5 |
| | | | | |||||
| * | | | Added cFile:ChangeFileExt() function. | Mattes D | 2015-04-06 | 3 | -0/+28 |
| | | | | |||||
| * | | | Fixed crash on exit introduced with Windows Service capability. | Mattes D | 2015-04-05 | 3 | -31/+29 |
| | | | | | | | | | | | | | Ref.: #1845 | ||||
| * | | | Merge pull request #1847 from mc-server/DumpInfoFix | Mattes D | 2015-04-04 | 2 | -6/+14 |
| |\ \ \ | | | | | | | | | Fixed DumpInfo plugin | ||||
| | * | | | Fixed DumpInfo plugin | STRWarrior | 2015-04-04 | 2 | -6/+14 |
| | | | | | |||||
| * | | | | Merge pull request #1846 from mc-server/WorldChanging | Mattes D | 2015-04-04 | 1 | -0/+6 |
| |\| | | | |_|/ |/| | | Fixed player switching world bug | ||||
| | * | | Fixed players not appearing/disappearing when traveling to a new world. | STRWarrior | 2015-04-03 | 1 | -0/+6 |
| | | | | |||||
| * | | | Fixed the nether and end getting snow if they were generated in the overworld. | STRWarrior | 2015-04-03 | 1 | -0/+7 |
| | | | | |||||
| * | | | Merge pull request #1799 from SnappingTurtles/BlockButton | Mattes D | 2015-04-03 | 1 | -1/+5 |
| |\ \ \ | | | | | | | | | Buttons can be placed on the top and on the bottom face of a block | ||||
| | * | | | Removed 0x6, 0x7 from BlockButton. | Alexandre Guertin | 2015-03-25 | 1 | -5/+3 |
| | | | | | |||||
| | * | | | Buttons can be placed on the top and on the bottom face of a block | Alexandre Guertin | 2015-03-09 | 1 | -1/+7 |
| | | | | | |||||
| * | | | | Merge pull request #1845 from birkett/master | Mattes D | 2015-04-03 | 6 | -35/+245 |
| |\ \ \ \ | |_|_|/ |/| | | | Enable MCServer to run as a service on Windows. | ||||
| | * | | | Working as a Windows service. Starts and stops correctly. | Anthony Birkett | 2015-04-01 | 6 | -35/+245 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Added "/service" switch, to prompt the binary to attempt starting as a service. Added service* methods, to control service startup. Split up main() into universalMain(), which contains the startup code for both service and normal start. Added cRoot::m_RunningAsService bool, Added cRoot::SetStopping(bool) to allow a stop request to be sent by the service controller. Added cBlockIDMap::init() to avoid loading items.ini before the working directory has been set. | ||||
| * | | | QtBiomeVisualiser: Fixed compilation and INI loading. | Mattes D | 2015-03-28 | 3 | -6/+13 |
| | | | | |||||
| * | | | Fixed placing bottom half-slabs by clicking a top half-slab. | Mattes D | 2015-03-28 | 1 | -2/+2 |
| | |/ |/| | | | | | Ref.: #1837 | ||||
| * | | Merge pull request #1826 from mc-server/UnifyPacketizer | Mattes D | 2015-03-24 | 48 | -2038/+2405 |
| |\ \ | | | | | | | Unify packetizer | ||||
| | * | | Added VarInt64, normalized cPacketizer datatype names. | Mattes D | 2015-03-22 | 8 | -694/+750 |
| | | | | |||||
| | * | | Unified cPacketizer across all protocols. | Mattes D | 2015-03-22 | 14 | -769/+873 |
| | | | | |||||
| | * | | ProtoProxy: Fixed connection and logging. | Mattes D | 2015-03-22 | 5 | -15/+23 |
| | | | | |||||
| | * | | Fixed signedness warnings in Protocol. | Mattes D | 2015-03-21 | 11 | -14/+14 |
| | | | | |||||
| | * | | Creeper: Fixed skeleton check. | Mattes D | 2015-03-21 | 1 | -11/+10 |
| | | | | |||||
| | * | | Fixed signedness issues in protocols. | Mattes D | 2015-03-21 | 6 | -62/+76 |
| | | | | |||||
| | * | | Changed cEntity::m_UniqueID to UInt32. | Mattes D | 2015-03-21 | 22 | -169/+224 |
| | | | | |||||
| | * | | Unified cByteBuffer types. | Mattes D | 2015-03-21 | 15 | -591/+722 |
| | | | | | | | | | | | | | cByteBuffer now reads and writes any of the [U]Int<N> types. | ||||
| * | | | Merge pull request #1775 from tommysanterre/terrainheightfix | Mattes D | 2015-03-23 | 18 | -22/+31 |
| |\ \ \ | | | | | | | | | Correct all world height validations. | ||||
| | * | | | Correct world height validations. | Tommy Santerre | 2015-03-20 | 18 | -22/+31 |
| | |/ / | | | | | | | | | | | | | 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 | ||||
| * | | | Merge pull request #1792 from mc-server/APIDocs | Mattes D | 2015-03-22 | 1 | -2/+37 |
| |\ \ \ | | | | | | | | | Api docs | ||||
| | * | | | APIDump: Linkified eShrapnelLevel. | Mattes D | 2015-03-21 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | APIDump: Used suggestions | STRWarrior | 2015-03-21 | 1 | -8/+8 |
| | | | | | |||||
| | * | | | APIDump: Improved documentation of cWorld:GetTNTShrapnelLevel | STRWarrior | 2015-03-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | Fixed APIDump loading | ||||
| | * | | | APIDump: Gave shrapnellevel it's own constantgroup | STRWarrior | 2015-03-21 | 1 | -0/+7 |
| | | | | | |||||
| | * | | | APIDump: Fixed typo in cWorld:BroadcastEntityAnimation documentation | STRWarrior | 2015-03-21 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | APIDump: Improved cWorld:GetMaxViewDistance documentation | STRWarrior | 2015-03-21 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | APIDump: Improved cBlockArea.msDifference documentation | STRWarrior | 2015-03-21 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | APIDump: Documented function in cChunkDesc | STRWarrior | 2015-03-21 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | APIDump: Documented functions & Variables in cBlockInfo | STRWarrior | 2015-03-21 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | APIDump: Documented missing constant in cBlockArea | STRWarrior | 2015-03-21 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | APIDump: Documented all undocumented functions in cWorld | STRWarrior | 2015-03-21 | 1 | -1/+23 |
| | | | | | |||||
| * | | | | Merge pull request #1786 from mc-server/pipelineSyntax | worktycho | 2015-03-21 | 3 | -22/+88 |
| |\ \ \ \ | |/ / / |/| | | | Added pipelining syntax for generators | ||||
| | * | | | Style fixes | worktycho | 2015-03-21 | 1 | -15/+15 |
| | | | | | |||||
| | * | | | Fixed alignment | worktycho | 2015-03-21 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Changed pipeline character from >> to | | tycho | 2015-03-11 | 2 | -15/+15 |
| | | | | | |||||
| | * | | | Fixed style and removed false positives | tycho | 2015-03-11 | 2 | -7/+12 |
| | | | | | | | | | | | | | | | | | Relaxed the rules for < followed by an && and removed rule for < following an && | ||||
| | * | | | Fixed Sequence Generator for IntGen | Tycho | 2015-03-10 | 2 | -12/+24 |
| | | | | | |||||
| | * | | | Fixed Style | Tycho | 2015-03-01 | 2 | -13/+15 |
| | | | | | | | | | | | | | | | | | Still fails CheckBasicStyle.lua dua to issue with rvalue references and templates | ||||
| | * | | | Added pipelining syntax for generators | Tycho | 2015-03-01 | 2 | -16/+63 |
| | | | | | |||||
| * | | | | Changed linked world name variables and setters / getters. | Mattes D | 2015-03-21 | 3 | -30/+31 |
| | | | | | | | | | | | | | | | | | | | | | Ref.: #1792 Ref.: https://github.com/mc-server/MCServer/pull/1792#discussion_r25946707 | ||||
| * | | | | Fixed trailing whitespace. | Mattes D | 2015-03-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Improved arrow in-flight and block-hit appearance | Tiger Wang | 2015-03-20 | 2 | -19/+3 |
| | | | | | | | | | | | | | | | | | * Fixes #1495 | ||||
| * | | | | cPluginLua:cResettable no longer shares CS with plugin. | Mattes D | 2015-03-20 | 2 | -10/+13 |
| | | | | | | | | | | | | | | | | | This fixes locking the resettable while the plugin is already gone. Hopefully no deadlocks. | ||||
| * | | | | Merge pull request #1822 from mc-server/ResettableLuaCallback | Mattes D | 2015-03-20 | 6 | -79/+150 |
| |\ \ \ \ | | | | | | | | | | | Added cPluginLua::cResettable interface, used for scheduled tasks. | ||||
| | * | | | | Added cPluginLua::cResettable interface, used for scheduled tasks. | Mattes D | 2015-03-20 | 6 | -79/+150 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows plugins to register objects that can "survive" the plugin unloading - they will simply bail out if the plugin is already unloaded, instead of referencing bad plugin data. Fixes #1556. | ||||
| * | | | | | Merge pull request #1821 from bibo38/bugfix1765 | Mattes D | 2015-03-20 | 2 | -0/+12 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Removed Metavalue from Piston drops. | ||||
| | * | | | | Removed Metavalue from Piston drops. Bugfix #1765 | bibo38 | 2015-03-20 | 2 | -0/+12 |
| | | | | | | |||||
| * | | | | | Updated Core. | Mattes D | 2015-03-20 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Merge pull request #1818 from mc-server/VerboseTests | Mattes D | 2015-03-20 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | Enabled output of individual tests. | ||||
| | * | | | | Enabled output of individual tests. | Mattes D | 2015-03-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | APIDump: Added inheritance checking. | Mattes D | 2015-03-19 | 1 | -3/+107 |
| | | | | | | |||||
| * | | | | | Removed unwanted base classes from Lua API. | Mattes D | 2015-03-19 | 4 | -2/+10 |
| | | | | | | |||||
| * | | | | | AllToLua: Fixed cMonster inheritance. | Mattes D | 2015-03-19 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Improved DoWithID bindings. | Mattes D | 2015-03-19 | 2 | -3/+8 |
| | | | | | | |||||
| * | | | | | Merge pull request #1819 from bibo38/bugfix1783 | Mattes D | 2015-03-19 | 1 | -1/+2 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Fixed creation of Fluid-Source-Blocks | ||||
| | * | | | | Removed wrong else clause, which caused that the following if-Statement got only executed in rare cases. This has blocked the creation of new Fluid-Sources. Bugfix #1783 | bibo38 | 2015-03-19 | 1 | -1/+2 |
| |/ / / / | |||||
| * | | | | APIDump: Removed the tolua.cast() example. | Mattes D | 2015-03-19 | 1 | -26/+3 |
| | | | | | | | | | | | | | | | | | | | | | The example was all wrong and the function is normally not needed at all (#1789). Fixes #1787 | ||||
| * | | | | Fixed a clang warning, improved comments. | Mattes D | 2015-03-19 | 1 | -7/+4 |
| | | | | | |||||
| * | | | | AllToLua: Removed an unneeded class declaration. | Mattes D | 2015-03-19 | 2 | -8/+2 |
| | | | | | | | | | | | | | | | | | It's perfectly possible to declare a class in ManualBindings without the need for declaration in AllToLua.pkg. | ||||
| * | | | | AllToLua: Fixed the parse order for bindings generation. | Mattes D | 2015-03-19 | 1 | -26/+45 |
| | | | | | | | | | | | | | | | | | Fixes #1789. | ||||
| * | | | | Added cNetwork initialization to program start. | Mattes D | 2015-03-18 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | Otherwise the server could crash because MSVC doesn't implement magic statics yet. | ||||
| * | | | | Debuggers: Added inheritance testing. | Mattes D | 2015-03-18 | 2 | -0/+81 |
| | | | | | | | | | | | | | | | | | This allows detailed testing of #1789 - bad Lua bindings for class inheritance. | ||||
| * | | | | World:DoWithEntityByID() checks the entities-to-add as well. | Mattes D | 2015-03-18 | 1 | -0/+14 |
| |/ / / | | | | | | | | | | This allows plugins to create entities and immediately act on them using that call. This will most likely need to be added to most of the DoWith<> and ForEach<> calls. | ||||
| * | | | Debuggers: Added a cBoundingBox test. | Mattes D | 2015-03-18 | 2 | -0/+61 |
| | | | | |||||
| * | | | Network: Close the UDP endpoint in destructor. | Mattes D | 2015-03-18 | 2 | -0/+11 |
| | | | | |||||
| * | | | Merge pull request #1817 from bibo38/bugfix1715 | worktycho | 2015-03-17 | 1 | -4/+4 |
| |\ \ \ | | | | | | | | | Changed Variable types of Endianness.h to uniform UInt* types | ||||
| | * | | | Changed Variable types of Endianness.h to uniform UInt* types from Globals.h | bibo38 | 2015-03-17 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Merge pull request #1816 from bibo38/bugfix1715 | worktycho | 2015-03-17 | 1 | -8/+8 |
| |\| | | | | | | | | | | | Bugfix 1715 | ||||
| | * | | | Fixed double underscore identifiers in the Endianess.h file, which are reserved for implementation use. Bug #1715 | bibo38 | 2015-03-17 | 1 | -8/+8 |
| |/ / / | |||||
| * | | | Merge pull request #1810 from mc-server/paintings | Mattes D | 2015-03-15 | 13 | -190/+157 |
| |\ \ \ | | | | | | | | | Paintings | ||||
| | * | | | Fixed style violations | Tiger Wang | 2015-03-14 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | cPainting saving implemented | Tiger Wang | 2015-03-14 | 13 | -72/+83 |
| | | | | | | | | | | | | | | | | | Additionally, it now inherits from cHangingEntity. | ||||
| | * | | | Fixed confusion over Item Frame directions | Tiger Wang | 2015-03-13 | 4 | -120/+76 |
| | | | | | |||||
| * | | | | Merge pull request #1811 from mc-server/grass | worktycho | 2015-03-15 | 5 | -43/+16 |
| |\ \ \ \ | | | | | | | | | | | Fixed grass spread, closes #1743 | ||||
| | * | | | | Use thread_local in cFastRandom | Tiger Wang | 2015-03-14 | 1 | -2/+8 |
| | | | | | | |||||
| | * | | | | Fixed grass spread, closes #1743 | Tiger Wang | 2015-03-14 | 5 | -41/+8 |
| | |/ / / | | | | | | | | | | | | | | | | | - Removed the salt parameter in cFastRandom functions, it wasn't doing what we thought it was following the move to C++11 | ||||
| * | | | | Merge pull request #1734 from mc-server/pistons | Mattes D | 2015-03-14 | 7 | -57/+46 |
| |\ \ \ \ | | | | | | | | | | | Handle client 'leave bed' request | ||||
| | * | | | | Reverted non-functional changes | Tiger Wang | 2015-03-05 | 5 | -53/+11 |
| | | | | | | |||||
| | * | | | | Handle client 'leave bed' request | Tiger Wang | 2015-02-08 | 9 | -61/+92 |
| | | | | | | | | | | | | | | | | | | | | | * Fixes #1728 | ||||
| * | | | | | Merge pull request #1808 from tumultenrx/master | Mattes D | 2015-03-14 | 6 | -11/+72 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Monsters will now attack. Additional checks have been added when generating spawn. | ||||
| | * | | | | Fixed a small bug | tumultenrx | 2015-03-14 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Monsters will now attack. Additional checks have been added when generating spawn. | tumultenrx | 2015-03-13 | 6 | -11/+72 |
| | | | | | | | | | | | | | | | | | | | | | Monsters will now attack. Additional checks have been added when generating spawn. | ||||
| * | | | | | Merge pull request #1809 from flx5/master | NiLSPACE | 2015-03-13 | 1 | -3/+3 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Performance improvements for #1807 | ||||
| | * | | | | Performance improvements for #1807 | flx5 | 2015-03-12 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #1761 from mc-server/NetworkIPEnum | Mattes D | 2015-03-12 | 7 | -5/+239 |
| |\ \ \ \ \ | | | | | | | | | | | | | cNetwork: Added EnumLocalIPAddresses() function. | ||||
| | * | | | | | Use std::memcpy to fix alignment | Tiger Wang | 2015-03-10 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by @madmaxoft | ||||
| | * | | | | | Potential Linux implementation | Tiger Wang | 2015-03-08 | 1 | -4/+54 |
| | | | | | | | |||||
| | * | | | | | Network: Replaced magic number with named constant. | Mattes D | 2015-02-22 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | cNetwork: Added EnumLocalIPAddresses() function. | Mattes D | 2015-02-22 | 7 | -5/+183 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1807 from flx5/master | Mattes D | 2015-03-11 | 10 | -24/+97 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | Fixes #493 and #490 | ||||
| | * | | | | | Fixed coding conventions for Pull Request #1807 | flx5 | 2015-03-11 | 5 | -24/+32 |
| | | | | | | | |||||
| | * | | | | | Fixed issue with quotes not appearing in pairs | flx5 | 2015-03-11 | 1 | -4/+5 |
| | | | | | | | |||||
| | * | | | | | Fixed some markup issues | flx5 | 2015-03-11 | 1 | -3/+4 |
| | | | | | | | |||||
| | * | | | | | Fixed some markup issues | flx5 | 2015-03-11 | 1 | -3/+5 |
| | | | | | | | |||||
| | * | | | | | Fixes #493 and #490 | flx5 | 2015-03-11 | 10 | -13/+74 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1804 from mc-server/streamlinetravis | Alexander Harkness | 2015-03-11 | 1 | -5/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Streamline Travis testing | ||||
| | * | | | | | | Reduced number of build jobs. | Alexander Harkness | 2015-03-11 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Reduce amount of testing, realises #1795 | Tiger Wang | 2015-03-10 | 2 | -7/+3 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #1665 from mc-server/Inventory | Mattes D | 2015-03-11 | 43 | -701/+1392 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Own classes for all windows and implemented vanilla-like shift click. | ||||
| | * | | | | | | Moved window code into cpp files | Howaner | 2015-03-10 | 23 | -519/+839 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into Inventory | Howaner | 2015-03-09 | 77 | -296/+6382 |
| | |\| | | | | | |||||
| | * | | | | | | Readded old comment | Howaner | 2015-02-06 | 1 | -0/+2 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into Inventory | Howaner | 2015-02-06 | 54 | -2096/+1384 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Readded old DistributeStackToAreas() comment. | Howaner | 2015-01-25 | 1 | -2/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into Inventory | Howaner | 2015-01-25 | 232 | -1534/+5177 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | C++11 and function rename. | Howaner | 2014-12-17 | 16 | -50/+71 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into Inventory | Howaner | 2014-12-17 | 38 | -2886/+2849 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Implemented vanilla-like shift click. | Howaner | 2014-12-13 | 17 | -105/+400 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes many visual bugs. | ||||
| | * | | | | | | | | | Own classes for all windows. | Howaner | 2014-12-13 | 28 | -597/+647 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1805 from mc-server/chunkDataFix | Mattes D | 2015-03-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | Fixed Bug in cChunkData. | ||||
| | * | | | | | | | | | Fixed Bug in cChunkData. | worktycho | 2015-03-10 | 1 | -1/+1 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | FIxed a bug where if the index was not aligned with the sections empty sections would not be set in the correct location. | ||||
| * | | | | | | | / | Fixed client kick/crash if many block changes happend | Howaner | 2015-03-09 | 1 | -3/+15 |
| | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #1794 from mc-server/MesaPlateauF | Mattes D | 2015-03-08 | 2 | -6/+24 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Mesa plateau F | ||||
| | * | | | | | | | | Added parenthesis around the comparisons | STRWarrior | 2015-03-08 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added proper trees to Mesa biomes | STRWarrior | 2015-03-08 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mesa only has small apple trees. | ||||
| | * | | | | | | | | Added grass/course dirt layer on MesaPlateauF(M) | STRWarrior | 2015-03-08 | 1 | -0/+14 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #1784 from mc-server/SteppyHeiGen | Tiger Wang | 2015-03-06 | 3 | -1/+409 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Added Steppy height generator. | ||||
| | * | | | | | | | | Steppy HeiGen: Fixed Linux compilation. | Mattes D | 2015-03-01 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added Steppy height generator. | Mattes D | 2015-03-01 | 3 | -1/+409 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Updated license year. | Alexander Harkness | 2015-03-05 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1791 from joshi07/master | Tiger Wang | 2015-03-05 | 2 | -2/+31 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added OnEntityTeleport.lua + description to APIDump | ||||
| | * | | | | | | | | | Added OnEntityTeleport.lua hook to APIDump | joshi07 | 2015-03-05 | 1 | -0/+29 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added description to APIDump for OnEntityTeleport | joshi07 | 2015-03-05 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Grass checks for sufficient light before spreading | Alexander Harkness | 2015-03-05 | 1 | -1/+13 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1790 from joshi07/master | Mattes D | 2015-03-05 | 8 | -12/+81 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added OnTeleportEntity hook for plugins. | ||||
| | * | | | | | | | | | Added OnTeleportEntity hook for plugins. | joshi07 | 2015-03-05 | 8 | -12/+81 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plugins may or may not allow teleport to the new position. Updated the HookNotify plugin with it. | ||||
| * | | | | | | | | | Lua API: Fixed md5 and sha1 hex formatting. | Mattes D | 2015-03-03 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | std::setw() is only valid for one output operation and needs to be set again in each loop repetition. | ||||
| * | | | | | | | | | Merge pull request #1781 from mc-server/Vines | Mattes D | 2015-03-01 | 3 | -0/+122 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | Vines in caves | ||||
| | * | | | | | | | | Removed trailing whitespace | STRWarrior | 2015-03-01 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Replaced IntNoiseXX with IntNoiseXXInt | STRWarrior | 2015-03-01 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Replaced cFinishGenPtr with std::make_shared | STRWarrior | 2015-03-01 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Made the minimum vine level configurable | STRWarrior | 2015-02-28 | 3 | -4/+7 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Implemented a vines finisher that creates vines in jungle biomes | STRWarrior | 2015-02-28 | 3 | -0/+119 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1780 from DevToaster/master | Mattes D | 2015-03-01 | 2 | -53/+53 |
| |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | Modified Player class to use int data type for experience | ||||
| | * | | | | | | | | Changed C-styled casts to static_cast and removed unneeded casts | DevToaster | 2015-02-28 | 1 | -34/+34 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Replaced short int with int for Player experience | DevToaster | 2015-02-28 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | modified: src/Entities/Player.cpp | DevToaster | 2015-02-28 | 2 | -27/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: src/Entities/Player.h | ||||
| * | | | | | | | | | Debuggers plugin: Disabled WECUI manipulation. | Mattes D | 2015-03-01 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed raspi easyinstall. | Alexander Harkness | 2015-03-01 | 1 | -1/+1 |
| | |/ / / / / / / |/| | | | | | | | | | | | | | | | Fixes #1782 | ||||
| * | | | | | | | | Merge pull request #1769 from mc-server/snowweather | NiLSPACE | 2015-02-28 | 4 | -114/+220 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Snow weather | ||||
| | * | | | | | | | | GetSnowStartHeight returns an int | STRWarrior | 2015-02-28 | 2 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | changed int to unsigned | STRWarrior | 2015-02-26 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And return 0 instead of -1 | ||||
| | * | | | | | | | | Ice finisher uses GetSnowStartHeight instead of specific biomes | STRWarrior | 2015-02-25 | 1 | -26/+19 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Snow finisher uses GetSnowStartHeight instead of specific biomes | STRWarrior | 2015-02-25 | 1 | -22/+14 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Weather: Snow starts forming when the top block is at the right height or higher | STRWarrior | 2015-02-25 | 1 | -66/+57 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added GetSnowStartHeight | STRWarrior | 2015-02-25 | 2 | -0/+130 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | returns the height of a biome where it starts snowing | ||||
| * | | | | | | | | | Merge pull request #1779 from mc-server/DoorHingesFix | Mattes D | 2015-02-28 | 1 | -4/+17 |
| |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | Fixed door placement. | ||||
| | * | | | | | | | | Fixed door placement. | Mattes D | 2015-02-28 | 1 | -4/+17 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Doors now have hinges on the correct side, based on what the surroundings are when placing them. | ||||
| * | | | | | | | | Merge pull request #1778 from mc-server/OreXP | Alexander Harkness | 2015-02-28 | 1 | -0/+59 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Added experience drops when mining ores | ||||
| | * | | | | | | | | Added experience drops when mining ores | STRWarrior | 2015-02-28 | 1 | -0/+59 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #1771 from Raekye/master | Mattes D | 2015-02-26 | 1 | -10/+4 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Use DoSetSpeed in AddSpeed* in Entity.cpp | ||||
| | * | | | | | | | use DoSetSpeed in AddSpeed* in Entity.cpp | Raekye | 2015-02-26 | 1 | -10/+4 |
| |/ / / / / / / | |||||
| * | | | | | | | Fixed flowing water turning into ice when snowing | STRWarrior | 2015-02-25 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1762 from mc-server/LuaStringCompress | Mattes D | 2015-02-25 | 2 | -0/+172 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Lua string compress | ||||
| | * | | | | | | | Added documentation for CompressStringZLIB | STRWarrior | 2015-02-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was no info about the factor. | ||||
| | * | | | | | | | Fixed operators | STRWarrior | 2015-02-23 | 1 | -6/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Added forgotten indent | STRWarrior | 2015-02-23 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Replaced lua_isXYZ with cLuaState::CheckParamXYZ | STRWarrior | 2015-02-23 | 1 | -12/+13 |
| | | | | | | | | | |||||
| | * | | | | | | | Documented cStringCompression | STRWarrior | 2015-02-23 | 1 | -2/+21 |
| | | | | | | | | | |||||
| | * | | | | | | | Exported all compression functions in a new class. | STRWarrior | 2015-02-23 | 1 | -16/+129 |
| | | | | | | | | | |||||
| | * | | | | | | | Documented CompressString and UncompressString | STRWarrior | 2015-02-22 | 1 | -0/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Exported CompressString and UncompressString to Lua | STRWarrior | 2015-02-22 | 1 | -0/+37 |
| | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | | 1.8 Protocol: Fixed a possible race condition. | Mattes D | 2015-02-24 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1759. | ||||
| * | | | | | | | Fixed race condition for TCP link deleting. | Mattes D | 2015-02-22 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could have caused crashes when a client disconnected from the server. | ||||
| * | | | | | | | Merge pull request #1760 from Samvbnm/patch-1 | Mattes D | 2015-02-22 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Update COMPILING.md | ||||
| | * | | | | | | Update COMPILING.md | Samvbnm | 2015-02-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | Changed to include specific version requirement | ||||
| | * | | | | | | Update COMPILING.md | Samvbnm | 2015-02-21 | 1 | -1/+2 |
| | | | | | | | | |||||
| | * | | | | | | Update COMPILING.md | Samvbnm | 2015-02-21 | 1 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | Tell the reader to make sure they have the latest buildtools installed. | ||||
| * | | | | | | Door handler: Removed needless check. | Mattes D | 2015-02-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The Y coord has already been checked above. | ||||
| * | | | | | | Fix door placement check | Freddie Wang | 2015-02-21 | 1 | -7/+3 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1758 from mc-server/CryptoHashAPI | Mattes D | 2015-02-21 | 4 | -19/+190 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Added cCryptoHash namespace to Lua API | ||||
| | * | | | | | | Added cCryptoHash namespace to Lua API. | Mattes D | 2015-02-21 | 4 | -19/+190 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1755 from mc-server/NetworkUDP | Mattes D | 2015-02-21 | 17 | -51/+1591 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | cNetwork: Added UDP API. | ||||
| | * | | | | | | APIDump: Added the UDP zero port policy. | Mattes D | 2015-02-20 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Network tests: Fixed clang warnings. | Mattes D | 2015-02-20 | 3 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | UDPEndpointImpl: Fixed clang warnings. | Mattes D | 2015-02-20 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | cNetwork: Added UDP API. | Mattes D | 2015-02-20 | 14 | -48/+1588 |
| | | | | | | | | |||||
| * | | | | | | | Fixed monster spawn randomness. | Mattes D | 2015-02-20 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1699. | ||||
| * | | | | | | | Fixed crash when logging nil values. | Matyas Dolak | 2015-02-20 | 1 | -0/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1798 | ||||
| * | | | | | | | Flower pots: In 1.8 items are saved with the name and not the id. | Howaner | 2015-02-18 | 1 | -5/+12 |
| |/ / / / / / | |||||
| * | | | | | | NetworkSingleton: LibEvent thread is joined properly on server exit. | Mattes D | 2015-02-18 | 2 | -7/+5 |
| | | | | | | | |||||
| * | | | | | | InfoReg: Fixed MultiCommand return values. | Mattes D | 2015-02-18 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Network: Fixed two-socket servers. | Mattes D | 2015-02-18 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1750 from tommysanterre/gitignore | Mattes D | 2015-02-18 | 1 | -0/+6 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Add files generated on build in gitignore | ||||
| | * | | | | | | Ignore files generated on build | Tommy Santerre | 2015-02-18 | 1 | -0/+6 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #1748 from Creaprog/patch-1 | Mattes D | 2015-02-16 | 1 | -2/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed guest.html | ||||
| | * | | | | | | Fixed guest.html | Creaprog | 2015-02-16 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fixed guest.html | Creaprog | 2015-02-16 | 1 | -2/+4 |
| |/ / / / / / | | | | | | | | | | | | | Fixed syntax. | ||||
| * | | | | | | Fixed guest page. | Alexander Harkness | 2015-02-16 | 1 | -2/+16 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1741 from Creaprog/patch-2 | Alexander Harkness | 2015-02-16 | 1 | -4/+4 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed Server.cpp | ||||
| | * | | | | | | Fixed Server.cpp | Creaprog | 2015-02-16 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fixed Server.cpp | Creaprog | 2015-02-15 | 1 | -4/+3 |
| | | | | | | | | |||||
| | * | | | | | | Fixed Server.cpp | Creaprog | 2015-02-15 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fixed Server.cpp | Creaprog | 2015-02-15 | 1 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | Fixed Server.cpp | Creaprog | 2015-02-15 | 1 | -4/+4 |
| |/ / / / / / | | | | | | | | | | | | | Performance improvement. | ||||
| * | | | | | | Merge pull request #1740 from Creaprog/patch-1 | Mattes D | 2015-02-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed login_template.html | ||||
| | * | | | | | | Fixed login_template.html | Creaprog | 2015-02-15 | 1 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | Remove "/". | ||||
| * | | | | | | Fixed TCP link shutdown. | Mattes D | 2015-02-14 | 3 | -11/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The shutdown is postponed until there's no more outgoing data in the LibEvent buffers. | ||||
| * | | | | | | SslContext: Turned debug messages off. | Mattes D | 2015-02-14 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fixed Linux compilation. | Mattes D | 2015-02-14 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Exported TLS server start on cTCPLink to Lua API. | Mattes D | 2015-02-13 | 5 | -10/+292 |
| | | | | | | | |||||
| * | | | | | | Exported cTCPLink:Close and :Shutdown() to Lua API. | Mattes D | 2015-02-13 | 2 | -13/+85 |
| | | | | | | | |||||
| * | | | | | | PolarSSL++: Fixed debugging output. | Mattes D | 2015-02-12 | 1 | -0/+3 |
| | | | | | | | |||||
| * | | | | | | Fixed Linux compilation. | Mattes D | 2015-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | std::make_unique is not available in C++11. | ||||
| * | | | | | | LuaAPI: Added client TLS support for TCP links. | Mattes D | 2015-02-12 | 12 | -8/+395 |
| | | | | | | | |||||
| * | | | | | | Update COMPILING.md | Mattes D | 2015-02-08 | 1 | -2/+2 |
| | |_|_|_|/ |/| | | | | | | | | | Fixed VS2013 download link | ||||
| * | | | | | Protocol 1.7: Fixed Coverity issues. | Mattes D | 2015-02-08 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | Fixes CID 66411, CID 103166 and CID 103167. | ||||
| * | | | | | ServerHandle: Fixed socket reuse. | Mattes D | 2015-02-08 | 1 | -10/+30 |
| | | | | | | | | | | | | | | | | | | | | | Fixes CID 104670, CID 104670 and CID 103724. | ||||
| * | | | | | WSSAnvil: Fixed chunk data padding. | Mattes D | 2015-02-08 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the chunk data fit perfectly into the old space, an extra 4 KiB of padding zeroes were written, overwriting the next chunk. Fixes #1730. | ||||
| * | | | | | Merge pull request #1729 from mc-server/ReuseFlag | Mattes D | 2015-02-08 | 1 | -1/+14 |
| |\ \ \ \ \ | | | | | | | | | | | | | Set reuse flag to sockets | ||||
| | * | | | | | Use evutil_make_listen_socket_reuseable | Howaner | 2015-02-07 | 1 | -16/+6 |
| | | | | | | | |||||
| | * | | | | | Set reuse flag to sockets | Howaner | 2015-02-07 | 1 | -1/+24 |
| | | |_|_|/ | |/| | | | | | | | | Should fix #1726 | ||||
| * | | | | | Merge pull request #1718 from mc-server/LuaNetworkAPI | Mattes D | 2015-02-07 | 20 | -3/+2453 |
| |\ \ \ \ \ | | | | | | | | | | | | | Lua Network API | ||||
| | * | | | | | APIDump: Added client and server examples. | Mattes D | 2015-02-07 | 1 | -0/+137 |
| | | | | | | | |||||
| | * | | | | | APIDump: Added cNetwork documentation. | Mattes D | 2015-02-06 | 2 | -1/+184 |
| | | | | | | | |||||
| | * | | | | | NetworkTest plugin: updated comments and splash loading. | Mattes D | 2015-02-04 | 1 | -7/+10 |
| | | | | | | | |||||
| | * | | | | | LuaServerHandle: Removed debugging output. | Mattes D | 2015-02-04 | 1 | -4/+0 |
| | | | | | | | |||||
| | * | | | | | Exported cServerHandle and cNetwork:Listen to Lua. | Mattes D | 2015-02-04 | 15 | -15/+1145 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Also added an example to the NetworkTest plugin. | ||||
| | * | | | | | cNetwork: Exported lookup functions to Lua API. | Mattes D | 2015-02-04 | 7 | -3/+282 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Also added an example in the NetworkTest plugin. | ||||
| | * | | | | | NetworkTest plugin: Added cNetwork:Connect test code. | Mattes D | 2015-02-04 | 2 | -0/+109 |
| | | | | | | | |||||
| | * | | | | | cTCPLink: Fixed missing addresses on link connection. | Mattes D | 2015-02-04 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | cNetwork: Exported the Connect() method and cTCPLink class to Lua. | Mattes D | 2015-02-04 | 8 | -1/+614 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #1727 from mc-server/Entities | Mattes D | 2015-02-07 | 4 | -8/+11 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Added IsOnGround() to cEntity | ||||
| | * | | | | Spacing | Howaner | 2015-02-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Updated IsOnGround() documentation | Howaner | 2015-02-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | cPlayer should override IsOnGround() | Howaner | 2015-02-07 | 2 | -3/+3 |
| | | | | | | |||||
| | * | | | | Added IsOnGround() to cEntity | Howaner | 2015-02-07 | 2 | -6/+9 |
| |/ / / / | |||||
| * | | | | Switched LuaState to use sizeof... | tycho | 2015-01-31 | 1 | -15/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1713 from mc-server/UseLibevent | Mattes D | 2015-01-30 | 48 | -2071/+1363 |
| |\ \ \ \ | | | | | | | | | | | Use libevent | ||||
| | * | | | | Fixed listening ports not closed on cServerHandle::Close. | Mattes D | 2015-01-27 | 1 | -0/+3 |
| | | | | | | |||||
| | * | | | | Fixed server failure to open any port not aborting the server. | Mattes D | 2015-01-27 | 1 | -29/+35 |
| | | | | | | |||||
| | * | | | | Fixed a deadlock in cClientHandle network sending. | Mattes D | 2015-01-27 | 2 | -5/+28 |
| | | | | | | |||||
| | * | | | | Added network termination called at app exit. | Mattes D | 2015-01-27 | 6 | -17/+90 |
| | | | | | | | | | | | | | | | | | | | | | This fixes a crash in MSVC runtime caused by joining a thread in a global var's destructor. | ||||
| | * | | | | cTCPLinkImpl: Added the BEV_OPT_THREADSAFE flag. | Mattes D | 2015-01-27 | 1 | -2/+8 |
| | | | | | | |||||
| | * | | | | ServerHandleImpl: Removed needless diagnostic output. | Mattes D | 2015-01-27 | 1 | -4/+0 |
| | | | | | | |||||
| | * | | | | Client: Only decode protocol when there's actual data incoming. | Mattes D | 2015-01-27 | 1 | -2/+8 |
| | | | | | | |||||
| | * | | | | Added LibEvent license to the binary distribution pack. | Mattes D | 2015-01-27 | 1 | -0/+99 |
| | | | | | | |||||
| | * | | | | Fix clang compile error | worktycho | 2015-01-27 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Removed cFile::ReplaceFileNameInvalidChars(). | Mattes D | 2015-01-27 | 3 | -27/+3 |
| | | | | | | | | | | | | | | | | | | | | | Its only usage in cProtocol18 has been changed to a simple string replace - only the IPv6's colons were causing problems. | ||||
| | * | | | | Fixed enchant packet handling. | Mattes D | 2015-01-27 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Turned off echo in Windows script. | Mattes D | 2015-01-27 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | RCONServer: Changed variables to UInt32. | Mattes D | 2015-01-27 | 2 | -32/+29 |
| | | | | | | |||||
| | * | | | | Replaced atoi() with StringToInteger(). | Mattes D | 2015-01-27 | 5 | -9/+11 |
| | | | | | | |||||
| | * | | | | Removed ListenThread and SocketThreads. | Mattes D | 2015-01-27 | 5 | -1225/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | They have been replaced by the cNetwork API. Socket.cpp is still used by RCONClient. | ||||
| | * | | | | BlockingSslClientSocket: Migrated to cNetwork API. | Mattes D | 2015-01-27 | 3 | -15/+198 |
| | | | | | | |||||
| | * | | | | Converted cServer to use the cNetwork API. | Mattes D | 2015-01-27 | 8 | -413/+330 |
| | | | | | | |||||
| | * | | | | cNetwork: Fixed IP address reading for incoming connections. | Mattes D | 2015-01-27 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Protocol18: Fixed failure with invalig logfile names. | Mattes D | 2015-01-27 | 1 | -8/+15 |
| | | | | | | |||||
| | * | | | | cFile: Added ReplaceFileNameInvalidChars(). | Mattes D | 2015-01-27 | 2 | -0/+26 |
| | | | | | | |||||
| | * | | | | StringUtils: Fixed bad predicate in MergeStringVectors(). | Mattes D | 2015-01-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Instead of preventing duplicates it was allowing only duplicates. | ||||
| | * | | | | RCON server: fixed compilation. | Mattes D | 2015-01-27 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fixed RCONClient compilation. | Mattes D | 2015-01-27 | 3 | -14/+55 |
| | | | | | | |||||
| | * | | | | Migrated RCON server to cNetwork API. | Mattes D | 2015-01-27 | 2 | -100/+116 |
| | | | | | | |||||
| | * | | | | Fixed a crash in RCON server. | Mattes D | 2015-01-27 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Fixed missing LibEvent reference in OSSupport. | Mattes D | 2015-01-27 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | WebAdmin uses the new cNetwork API. | Mattes D | 2015-01-27 | 8 | -203/+237 |
| | | | | | | |||||
| | * | | | | IniFile: Added common code to migrate ports. | Mattes D | 2015-01-27 | 2 | -4/+56 |
| | | | | | | | | | | | | | | | | | | | | | Old settings have IPv4 and IPv6 ports as separate values, new settings have a single value for the ports. | ||||
| | * | | | | StringUtils: Added string vector manipulation. | Mattes D | 2015-01-27 | 2 | -1/+54 |
| | | | | | | |||||
| * | | | | | Updated PolarSSL. | Matyas Dolak | 2015-01-29 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | CheckBasicStyle: Fixed a forgotten file close. | Mattes D | 2015-01-29 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Fixed missing LibEvent reference in OSSupport. | Mattes D | 2015-01-29 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Updated PolarSSL. | Mattes D | 2015-01-27 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Updated LibEvent. | Mattes D | 2015-01-27 | 1 | -0/+0 |
| |/ / / / | |||||
| * | | | | Debuggers: Logging the os.clock for console-scheduled tasks. | Matyas Dolak | 2015-01-27 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | This performs the test for #1717. | ||||
| * | | | | Merge pull request #1716 from Raekye/master | Mattes D | 2015-01-26 | 1 | -6/+12 |
| |\ \ \ \ | |_|_|/ |/| | | | filter out leaves meta changes from being sent to the client (resolves #1714) | ||||
| | * | | | fix logic bug in cChunk::FastSetBlock filtering out leaves meta changes | Raekye | 2015-01-26 | 1 | -7/+9 |
| | | | | | | | | | | | | | | | | | - send update if it's not a leaves block and (the original checks) | ||||
| | * | | | filter out leaves meta changes from being sent to the client | Raekye | 2015-01-26 | 1 | -0/+4 |
| |/ / / | |||||
| * | | | Gamosocm support | Alexander Harkness | 2015-01-24 | 1 | -2/+1 |
| | | | | |||||
| * | | | Merge pull request #1701 from mc-server/libevent | Mattes D | 2015-01-24 | 23 | -8/+2292 |
| |\ \ \ | | | | | | | | | LibEvent-based socket API | ||||
| | * | | | cNetwork: Added self pointers to keep objects alive for callbacks. | Mattes D | 2015-01-23 | 5 | -17/+39 |
| | | | | | | | | | | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1700&pid=17947#pid17947 | ||||
| | * | | | cNetwork: Renamed callback to OnConnected() | Mattes D | 2015-01-22 | 3 | -4/+7 |
| | | | | | |||||
| | * | | | cNetwork: Added link creation callback. | Mattes D | 2015-01-22 | 6 | -26/+90 |
| | | | | | | | | | | | | | | | | | This allows the callback classes to store the link inside them and use it internally later on, mainly for sending data. | ||||
| | * | | | cNetwork: Changed listening API. | Mattes D | 2015-01-22 | 5 | -51/+79 |
| | | | | | | | | | | | | | | | | | The link-callbacks for each new accepted link are now received from the OnIncomingConnection listen-callback. | ||||
| | * | | | cNetwork: Added error message to error callbacks. | Mattes D | 2015-01-22 | 8 | -21/+28 |
| | | | | | |||||
| | * | | | cTCPLinkImpl: Fixed type conversion warning. | Mattes D | 2015-01-22 | 3 | -5/+5 |
| | | | | | |||||
| | * | | | cNetwork: Fixed race conditions with lookups; proper shutdown. | Mattes D | 2015-01-22 | 7 | -82/+124 |
| | | | | | |||||
| | * | | | cNetwork: Split the main cpp file into several files. | Mattes D | 2015-01-22 | 14 | -1052/+1170 |
| | | | | | |||||
| | * | | | cNetwork: Fixed WinXP dualstack listening. | Mattes D | 2015-01-22 | 1 | -21/+42 |
| | | | | | |||||
| | * | | | cNetwork: Split cNetworkSingleton to a separate file. | Mattes D | 2015-01-22 | 5 | -326/+442 |
| | | | | | |||||
| | * | | | cNetwork: Fixed WSAStartup()-not-called error in Listen(). | Mattes D | 2015-01-22 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | cNetwork: Handle WSA initialization failures. | Mattes D | 2015-01-22 | 1 | -1/+7 |
| | | | | | |||||
| | * | | | cNetwork: Added an OnError callback for listening servers. | Mattes D | 2015-01-22 | 3 | -0/+13 |
| | | | | | | | | | | | | | | | | | The callback receives the error details. | ||||
| | * | | | cNetwork: Rewritten server listen into a factory method. | Mattes D | 2015-01-22 | 1 | -88/+102 |
| | | | | | |||||
| | * | | | cNetwork: Removed unneeded dependency. | Mattes D | 2015-01-22 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | cNetwork: Refactored cTCPLinkImpl::Connect into a factory. | Mattes D | 2015-01-22 | 1 | -41/+48 |
| | | | | | |||||
| | * | | | cNetwork: Cosmetics. | Mattes D | 2015-01-22 | 1 | -6/+10 |
| | | | | | |||||
| | * | | | cNetwork: Fixed compilation in out-of-source builds. | Mattes D | 2015-01-22 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | cNetwork: Fixed compilation. | Mattes D | 2015-01-22 | 1 | -9/+8 |
| | | | | | |||||
| | * | | | Wrap debug variable in ifdef | worktycho | 2015-01-22 | 1 | -0/+2 |
| | | | | | | | | | | | | | avoidss unused variable error in clang | ||||
| | * | | | cNetwork: Added error logging to server socket creation. | Mattes D | 2015-01-22 | 1 | -6/+24 |
| | | | | | | | | | | | | | | | | | This is mainly for WinXP and RasPi testing. | ||||
| | * | | | cNetwork: Added multithreading protection. | Mattes D | 2015-01-22 | 3 | -4/+35 |
| | | | | | |||||
| | * | | | cNetwork: Implemented connection shutdown and close. | Mattes D | 2015-01-22 | 3 | -18/+74 |
| | | | | | |||||
| | * | | | cNetwork: Fixed Linux compilation. | Mattes D | 2015-01-22 | 2 | -6/+24 |
| | | | | | |||||
| | * | | | cNetwork: Implemented link address getting. | Mattes D | 2015-01-22 | 2 | -61/+121 |
| | | | | | |||||
| | * | | | cNetwork: Implemented basic server functionality. | Mattes D | 2015-01-22 | 2 | -123/+282 |
| | | | | | |||||
| | * | | | cNetwork: Implemented IP-to-hostname lookup. | Mattes D | 2015-01-22 | 2 | -11/+130 |
| | | | | | |||||
| | * | | | cNetwork: Implemented HostnameToIP lookups. | Mattes D | 2015-01-22 | 6 | -9/+256 |
| | | | | | |||||
| | * | | | Excluded PolarSSL tests from MCS tests. | Mattes D | 2015-01-22 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Added newline to logged messages in the tests. | Mattes D | 2015-01-22 | 1 | -8/+12 |
| | | | | | |||||
| | * | | | Extracted Google connection test | Tycho | 2015-01-22 | 5 | -74/+113 |
| | | | | | |||||
| | * | | | cNetwork: Linux compilation fix. | Mattes D | 2015-01-22 | 2 | -4/+23 |
| | | | | | |||||
| | * | | | Implemented LibEvent-based client connections. | Mattes D | 2015-01-22 | 4 | -0/+1028 |
| | | | | | |||||
| | * | | | Added the libevent library. | Mattes D | 2015-01-22 | 4 | -1/+15 |
| | | | | | |||||
| * | | | | Merge pull request #1712 from UltraCoderRU/fix_coverity | Mattes D | 2015-01-23 | 6 | -3/+52 |
| |\ \ \ \ | | | | | | | | | | | Fixed Coverity defects. | ||||
| | * | | | | Fixed defect #43662 in Coverity list. | Kirill Kirilenko | 2015-01-23 | 1 | -1/+17 |
| | | | | | | |||||
| | * | | | | Fixed defect #43665 in Coverity list. | Kirill Kirilenko | 2015-01-23 | 1 | -0/+11 |
| | | | | | | |||||
| | * | | | | Fixed defect #73101 in Coverity list. | Kirill Kirilenko | 2015-01-23 | 1 | -1/+13 |
| | | | | | | |||||
| | * | | | | Fixed defect #43671 in Coverity list. | Kirill Kirilenko | 2015-01-23 | 1 | -0/+4 |
| | | | | | | |||||
| | * | | | | Fixed defect #43661 in Coverity list. | Kirill Kirilenko | 2015-01-23 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Fixed defect #71781 in Coverity list. | Kirill Kirilenko | 2015-01-23 | 1 | -0/+5 |
| |/ / / / | |||||
| * | | | | ProtoProxy: Added socket startup error reporting. | Matyas Dolak | 2015-01-23 | 1 | -3/+31 |
| | | | | | | | | | | | | | | | | | Fixes CID 66433, fixes CID 66443. | ||||
| * | | | | Fixed negative return values in SchematicFileSerializer. | Matyas Dolak | 2015-01-23 | 1 | -1/+3 |
| |/ / / | | | | | | | | | | Fixes CID 103165. | ||||
| * | | | Merge pull request #1708 from mc-server/WarningFixes | Mattes D | 2015-01-22 | 14 | -310/+384 |
| |\ \ \ | | | | | | | | | Warning fixes | ||||
| | * | | | Fixed warnings in StringUtils. | Mattes D | 2015-01-21 | 2 | -49/+59 |
| | | | | | |||||
| | * | | | ProtoProxy: Fixed warnings in Connection.cpp. | Matyas Dolak | 2015-01-21 | 1 | -87/+89 |
| | | | | | |||||
| | * | | | ByteBuffer: Added support for reading unsigned shorts and ints. | Matyas Dolak | 2015-01-21 | 2 | -1/+33 |
| | | | | | |||||
| | * | | | ProtoProxy: Fixed warnings in Connection.cpp. | Matyas Dolak | 2015-01-21 | 2 | -16/+24 |
| | | | | | |||||
| | * | | | Fixed warnings in FastNBT.cpp. | Mattes D | 2015-01-20 | 1 | -39/+40 |
| | | | | | |||||
| | * | | | Fixed warnings in 1.7 protocol. | Mattes D | 2015-01-18 | 3 | -110/+131 |
| | | | | | |||||
| | * | | | Fixed various warnings. | Mattes D | 2015-01-18 | 3 | -8/+8 |
| | | | | | |||||
| | * | | | cWorld: Fixed a type warning. | Mattes D | 2015-01-18 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Fixed type conversion warnings. | Mattes D | 2015-01-18 | 2 | -4/+4 |
| | | | | |||||
| * | | | Merge pull request #1702 from mc-server/chrono | Mattes D | 2015-01-18 | 117 | -260/+262 |
| |\ \ \ | | | | | | | | | Started to convert more of MCServer to std::chrono | ||||
| | * | | | Fixed type-conversion warnings. | Mattes D | 2015-01-18 | 4 | -8/+8 |
| | | | | | |||||
| | * | | | correct comment to say milliseconds | worktycho | 2015-01-17 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Converted Monster to std::chrono | Tycho | 2015-01-16 | 4 | -18/+18 |
| | | | | | |||||
| | * | | | Converted cPickupEntity to std::chrono | Tycho | 2015-01-16 | 2 | -12/+12 |
| | | | | | |||||
| | * | | | Converted MinecartEntity to std::chrono | Tycho | 2015-01-16 | 2 | -8/+8 |
| | | | | | |||||
| | * | | | Converted cExpOrbEntity to std::chrono | Tycho | 2015-01-16 | 2 | -7/+7 |
| | | | | | |||||
| | * | | | Converted ArrowEntityTiers to std::chrono | Tycho | 2015-01-16 | 2 | -7/+7 |
| | | | | | |||||
| | * | | | Fix trailing whitespace | Tycho | 2015-01-11 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Initial convertion of a_Dt to std::chrono | Tycho | 2015-01-11 | 117 | -221/+221 |
| | | | | | | | | | | | | | | | | | also refactored cWorld::m_WorldAge and cWorld::m_TimeOfDay | ||||
| | * | | | Created new type cTickTime and rewrote cWorld::TickThread to use it | Tycho | 2015-01-11 | 2 | -6/+8 |
| | | | | | |||||
| * | | | | Merge pull request #1707 from UltraCoderRU/master | Mattes D | 2015-01-17 | 8 | -11/+11 |
| |\ \ \ \ | |/ / / |/| | | | Fixed some problems found by CppCheck | ||||
| | * | | | Fixed CppCheck: (performance) Prefer prefix ++/-- operators for non-primitive types. | Kirill Kirilenko | 2015-01-17 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | Fixed CppCheck: (performance) Possible inefficient checking for emptiness. | Kirill Kirilenko | 2015-01-17 | 4 | -5/+5 |
| | | | | | |||||
| | * | | | Fixed CppCheck: (performance) Function parameter should be passed by reference. | Kirill Kirilenko | 2015-01-17 | 2 | -4/+4 |
| |/ / / | |||||
| * | | | CMake: Check libs in submodules before configuring. | Mattes D | 2015-01-09 | 1 | -0/+8 |
| | | | | | | | | | | | | | This provides an early error message when someone forgets to init / update submodules. | ||||
| * | | | Fixed Linux compilation. | Mattes D | 2015-01-03 | 2 | -2/+2 |
| | | | | |||||
| * | | | Protocols: Ignore garbage data at the end of PluginMessage packets. | Mattes D | 2015-01-03 | 2 | -0/+21 |
| | | | | | | | | | | | | | Fixes #1692. | ||||
| * | | | cByteBuffer: Improved SingleThreadAccessChecker performance. | Mattes D | 2015-01-03 | 1 | -1/+6 |
| | | | | | | | | | | | | | But it's still poor and unusable for regular testing. | ||||
| * | | | Merge pull request #1691 from tonibm19/patch-3 | Mattes D | 2014-12-30 | 1 | -0/+2 |
| |\ \ \ | | | | | | | | | Added player count to webadmin | ||||
| | * | | | Use cRoot:Get():GetServer():GetNumPlayers() instead of a custom function. | tonibm19 | 2014-12-30 | 1 | -9/+1 |
| | | | | | |||||
| | * | | | Added player count to webadmin | tonibm19 | 2014-12-29 | 1 | -0/+10 |
| |/ / / | | | | | | | Now it shows the number of online players near the memory use | ||||
| * | | | Add make as a required program for *nix | worktycho | 2014-12-26 | 1 | -2/+2 |
| | | | | |||||
| * | | | MobHead: Fixed wither spawning. | Mattes D | 2014-12-25 | 1 | -13/+40 |
| | | | | |||||
| * | | | ProtoProxy: Log block change packet details. | Mattes D | 2014-12-25 | 1 | -0/+3 |
| | | | | |||||
| * | | | MobHeads: fixed regular head placement. | Mattes D | 2014-12-25 | 1 | -2/+22 |
| | | | | |||||
| * | | | Merge pull request #1687 from mc-server/StyleCheckTravis | Mattes D | 2014-12-25 | 2 | -0/+6 |
| |\ \ \ | | | | | | | | | Style check travis | ||||
| | * | | | Travis style check in the right folder. | Mattes D | 2014-12-25 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Travis: Added lua installation before build. | Mattes D | 2014-12-25 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | Added basic style checking to Travis builds. | Mattes D | 2014-12-25 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Fixed tools compilation. | Mattes D | 2014-12-25 | 3 | -0/+5 |
| | | | | | | | | | | | | | Fixes errors introduced in 081e7ddd028d9382bd52c2b117dae6b6f84225e5. | ||||
| * | | | Fixed door placement. | Mattes D | 2014-12-25 | 2 | -3/+4 |
| | | | | |||||
| * | | | Fixed forgotten big flower handler. | Mattes D | 2014-12-25 | 1 | -1/+2 |
| | | | | |||||
| * | | | Fixed basic style. | Mattes D | 2014-12-25 | 4 | -23/+71 |
| | | | | |||||
| * | | | APIDump: Added details about client handle in OnServerPing hook. | Mattes D | 2014-12-25 | 1 | -1/+4 |
| | | | | |||||
| * | | | cIsThread: Fixed a race condition on thread start. | Mattes D | 2014-12-25 | 2 | -7/+30 |
| | | | | |||||
| * | | | Merge pull request #1686 from mc-server/PlaceBlockRefactor | Mattes D | 2014-12-25 | 48 | -786/+1489 |
| |\ \ \ | | | | | | | | | Place block refactor | ||||
| | * | | | APIDump: Updated the player block placement documentation. | Mattes D | 2014-12-24 | 4 | -11/+14 |
| | | | | | | | | | | | | | | | | | The hooks now have fewer parameters but are called on all player-placed blocks (#1618). | ||||
| | * | | | Fixed redstone dust placement on upside-down slabs. | Mattes D | 2014-12-24 | 1 | -1/+36 |
| | | | | | |||||
| | * | | | Replaced a std::hash specialization with explicit type. | Mattes D | 2014-12-24 | 2 | -8/+4 |
| | | | | | | | | | | | | | | | | | std::hash is problematic in gcc / clang, one has a class, the other a struct. | ||||
| | * | | | gcc compilation fix. | Mattes D | 2014-12-24 | 1 | -1/+6 |
| | | | | | |||||
| | * | | | Refactored all player block placing to go through hooks. | Mattes D | 2014-12-24 | 43 | -775/+1423 |
| | | | | | | | | | | | | | | | | | Fixes #1618. | ||||
| | * | | | Added Vector3::TurnCW() and Vector3::TurnCCW() | Mattes D | 2014-12-24 | 1 | -0/+16 |
| | | | | | |||||
| * | | | | ByteBuffer: SingleThreadAccessChecker is request-only. | Mattes D | 2014-12-24 | 1 | -1/+10 |
| |/ / / | | | | | | | | | | It slows the server down way too much, so it can't be turned on by default. | ||||
| * | | | Fixed too many slashes. | Alexander Harkness | 2014-12-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Better installation script. | Alexander Harkness | 2014-12-23 | 1 | -5/+3 |
| | | | | |||||
| * | | | Fixed armhf download URL. | Alexander Harkness | 2014-12-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Init Mojang API pointer | worktycho | 2014-12-23 | 1 | -0/+1 |
| | | | | | | | | | | Fixes CID 90583 | ||||
| * | | | Merge pull request #1684 from jonfabe/DepthStrider | Mattes D | 2014-12-22 | 3 | -1/+17 |
| |\ \ \ | | | | | | | | | Add Depth Strider enchantment | ||||
| | * | | | Fix compile error on OS X introduced by commit ecf778bbec2794562bf5e5b8645e2171f7cd081c | Jonathan Fabian | 2014-12-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | The following error occurs on OS X with the order reversed: `MCServer/src/World.cpp:282:2: error: field 'm_LastSave' will be initialized after field 'm_LastUnload' [-Werror,-Wreorder] m_LastSave(0),`. Reversing the order of initialization fixes this. | ||||
| | * | | | Added Depth Strider enchantment | Jonathan Fabian | 2014-12-22 | 2 | -0/+16 |
| |/ / / | |||||
| * | | | ProtoProxy: Added a sanity check to metadata string lengths. | Mattes D | 2014-12-21 | 1 | -2/+6 |
| | | | | | | | | | | | | | Fixes CID 66415. | ||||
| * | | | MCADefrag: Added a sanity check for chunk size. | Mattes D | 2014-12-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | Fixes CID 66448. | ||||
| * | | | WSSAnvil: Added clamping to entity coords. | Mattes D | 2014-12-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | Fixes CID 72854. | ||||
| * | | | FastNBT: Added a sanity check for number of list items. | Mattes D | 2014-12-21 | 1 | -1/+8 |
| | | | | | | | | | | | | | Fixes CID 55812. | ||||
| * | | | cChunk: Fixed missing initialization. | Mattes D | 2014-12-21 | 1 | -0/+2 |
| | | | | | | | | | | | | | Fixes CID 72670. | ||||
| * | | | cWorld: Moved initialization into constructor. | Mattes D | 2014-12-21 | 1 | -3/+2 |
| | | | | | | | | | | | | | Fixes CID 71781. | ||||
| * | | | cEndGen: Fixed unitialized member variables. | Mattes D | 2014-12-21 | 1 | -1/+3 |
| | | | | | | | | | | | | | Fixes CID 43671. | ||||
| * | | | cNoise3DComposable: Fixed unitialized member variables. | Mattes D | 2014-12-21 | 1 | -1/+3 |
| | | | | | | | | | | | | | Fixes CID 43665. | ||||
| * | | | Fixed coverity issues in protocols. | Mattes D | 2014-12-21 | 2 | -4/+11 |
| | | | | | | | | | | | | | Fixes CID 73099, CID 66411. | ||||
| * | | | Fixed a possible division by zero. | Mattes D | 2014-12-21 | 3 | -6/+16 |
| | | | | |||||
| * | | | Fixed crash on restart | Tiger Wang | 2014-12-21 | 2 | -5/+14 |
| | | | | |||||
| * | | | Merge pull request #1682 from Masy98/entities | Mattes D | 2014-12-21 | 15 | -92/+203 |
| |\ \ \ | | | | | | | | | Added Rabbits | ||||
| | * | | | Fixed damn empty line with no use | Masy98 | 2014-12-20 | 2 | -5/+1 |
| | | | | | |||||
| | * | | | Added Rabbit.h and Rabbit.cpp to the CMakeList | Masy98 | 2014-12-20 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | Fixed Rabbit size | Masy98 | 2014-12-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Added Rabbits | Masy98 | 2014-12-20 | 14 | -92/+205 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-12-21 | 17 | -1/+150 |
| |\| | | | |||||
| | * | | | Merge pull request #1680 from Masy98/entities | Mattes D | 2014-12-19 | 16 | -1/+149 |
| | |\ \ \ | | | | | | | | | | | Added Guardian | ||||
| | | * | | | Fixed Guardians size and health | Masy98 | 2014-12-19 | 3 | -1/+8 |
| | | | | | | |||||
| | | * | | | Guardian can now spawn if wanted!? | Masy98 | 2014-12-18 | 2 | -2/+2 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' into entities | Masy98 | 2014-12-18 | 37 | -2880/+2822 |
| | | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge pull request #1679 from SphinxC0re/master | Mattes D | 2014-12-18 | 1 | -0/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | Added itemblacklist to gitignore | ||||
| | | * | | | | Added itemblacklist to gitignore | Julian Laubstein | 2014-12-17 | 1 | -0/+1 |
| | |/ / / / | |||||
| | | * | | | Added Entity Guardian | Masy98 | 2014-12-18 | 17 | -2/+143 |
| | | | | | | |||||
| * | | | | | Fix repeater unpowering | Tiger Wang | 2014-12-18 | 1 | -2/+4 |
| |/ / / / | |||||
| * | | | | Merge pull request #1677 from mc-server/GlobalFixes | Mattes D | 2014-12-17 | 1 | -0/+1 |
| |\ \ \ \ | |_|_|/ |/| | | | Fixed eMonsterType lua bugs. | ||||
| | * | | | derp | Howaner | 2014-12-17 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Added comment. | Howaner | 2014-12-17 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fixed eMonsterType lua bugs. | Howaner | 2014-12-17 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Merge pull request #1674 from gushromp/master | Mattes D | 2014-12-17 | 1 | -8/+7 |
| |\ \ \ | | | | | | | | | Fix for water spreading on bottom of the world | ||||
| | * | | | Removed unneeded newlines | Ivan Đorđević | 2014-12-17 | 1 | -6/+0 |
| | | | | | |||||
| | * | | | Merge branch 'master' of https://github.com/gushromp/MCServer | gushromp | 2014-12-16 | 1 | -0/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Simulator/FloodyFluidSimulator.cpp | ||||
| | | * | | | Fixed water from spreading on bottom of world | gushromp | 2014-12-16 | 1 | -5/+8 |
| | | | | | | |||||
| | * | | | | Fixed water from spreading on bottom of world | gushromp | 2014-12-16 | 1 | -7/+11 |
| | |/ / / | |||||
| * | | | | Merge pull request #1581 from mc-server/redstone | Mattes D | 2014-12-17 | 25 | -2864/+2645 |
| |\ \ \ \ | |/ / / |/| | | | Resplit redstone .inc file and provided improvements | ||||
| | * | | | NULL -> nullptr | Tiger Wang | 2014-12-17 | 5 | -18/+22 |
| | | | | | |||||
| | * | | | Removed test | Tiger Wang | 2014-12-13 | 3 | -176/+0 |
| | | | | | |||||
| | * | | | Merge branch 'master' into redstone | Tiger Wang | 2014-12-13 | 232 | -5012/+11651 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | * | | | Fixed compilation? | Tiger Wang | 2014-11-01 | 1 | -3/+4 |
| | | | | | |||||
| | * | | | Improved redstone simulator | Tiger Wang | 2014-10-29 | 2 | -818/+808 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed style inconsistencies * Used more C++11 features * Improved speed perhaps | ||||
| | * | | | Cleaned up simulators | Tiger Wang | 2014-10-25 | 17 | -2681/+2644 |
| | | | | | |||||
| | * | | | Fixed some block checks | Tiger Wang | 2014-10-25 | 2 | -4/+3 |
| | | | | | | | | | | | | | | | | | * Fixes #1330 | ||||
| * | | | | Updated Core. | Mattes D | 2014-12-16 | 1 | -0/+0 |
| | | | | | |||||
| * | | | | Merge pull request #1673 from gushromp/master | Mattes D | 2014-12-15 | 1 | -0/+6 |
| |\ \ \ \ | | | | | | | | | | | Updated cPlayer::DoMoveToWorld to send target world's weather info to Player | ||||
| | * | | | | Added braces to 'if' according to the code guidelines | gushromp | 2014-12-15 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | Updated cPlayer::DoMoveToWorld to send target world's weather info to Player | blashyrk | 2014-12-15 | 1 | -0/+4 |
| |/ / / / | |||||
| * | | | | Fixed mob invisibility | Howaner | 2014-12-14 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge pull request #1635 from mc-server/Cocoa | Mattes D | 2014-12-14 | 6 | -4/+158 |
| |\ \ \ \ | | | | | | | | | | | Added cocoa pod. | ||||
| | * \ \ \ | Merge branch 'master' into Cocoa | Howaner | 2014-12-14 | 2 | -5/+26 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | | "& 0x0f" isn't needed | Howaner | 2014-12-14 | 2 | -3/+3 |
| | | | | | | |||||
| | * | | | | Fixes | Howaner | 2014-12-13 | 4 | -5/+22 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into Cocoa | Howaner | 2014-12-13 | 104 | -1751/+2182 |
| | |\ \ \ \ | |||||
| | * | | | | | Added cocoa pod. | Howaner | 2014-12-01 | 5 | -2/+139 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1670 from Masy98/crafting | Franz Reiter | 2014-12-14 | 2 | -3/+4 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Fixed fence/-gates and door recipes and added baked potato recipe | ||||
| | * | | | | | Fixed fence/-gates and door recipes and added baked potato recipe | Masy98 | 2014-12-14 | 2 | -3/+4 |
| |/ / / / / | |||||
| * | | | | | Clang needs the libstdc++ that comes with gcc-4.8 | Tycho | 2014-12-13 | 1 | -3/+5 |
| | | | | | | |||||
| * | | | | | final syntax errors | Tycho | 2014-12-13 | 1 | -5/+4 |
| | | | | | | |||||
| * | | | | | Double equals | Tycho | 2014-12-13 | 1 | -5/+5 |
| | | | | | | |||||
| * | | | | | Fix forgoten thens | Tycho | 2014-12-13 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | "Don't set compiler to gcc on clang builds" | Tycho | 2014-12-13 | 1 | -4/+5 |
| | | | | | | |||||
| * | | | | | Merge pull request #1664 from mc-server/SandstoneCaves | Mattes D | 2014-12-13 | 1 | -3/+22 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | WormNestCaves occasionally generates sandstone around the cave | ||||
| | * | | | | WormNestCaves occasionally generates sandstone around the cave | STRWarrior | 2014-12-13 | 1 | -3/+22 |
| | | |_|/ | |/| | | | | | | | | | | Only when the block around the cave is sand. | ||||
| * | | | | Merge pull request #1663 from mc-server/APIDumpSize | Alexander Harkness | 2014-12-13 | 1 | -1/+3 |
| |\ \ \ \ | |/ / / |/| | | | APIDump Width | ||||
| | * | | | Made comment in example code smaller | STRWarrior | 2014-12-13 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | It caused the whole page to extend beyond the max width | ||||
| | * | | | Reverted main_APIDump.lua changes | STRWarrior | 2014-12-13 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Fixed the width sometimes going over the div size | STRWarrior | 2014-12-13 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Merge pull request #1660 from Seadragon91/master | Mattes D | 2014-12-12 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Fixed print of milliseconds from chrono | ||||
| | * | | | | Fixed print of milliseconds from chrono | Lukas Pioch | 2014-12-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Updated the Core. | Mattes D | 2014-12-12 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | LightingThread: Fixed a memory leak. | Mattes D | 2014-12-12 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Exported cWorld:PrepareChunk to Lua API, test in Debuggers. | Mattes D | 2014-12-12 | 2 | -1/+73 |
| |/ / / / | |||||
| * | | | | Debuggers: Added loadchunk and preparechunk commands. | Mattes D | 2014-12-11 | 2 | -0/+87 |
| | | | | | | | | | | | | | | | | | preparechunk is not working yet because the required API is missing. | ||||
| * | | | | Debuggers: Changed to use Info.lua file. | Mattes D | 2014-12-11 | 2 | -33/+222 |
| | | | | | |||||
| * | | | | Merge pull request #1657 from mc-server/PrepareChunk | Mattes D | 2014-12-11 | 11 | -51/+293 |
| |\ \ \ \ | |/ / / |/| | | | Prepare chunk | ||||
| | * | | | Added a cWorld:PrepareChunk function. | Mattes D | 2014-12-10 | 9 | -51/+260 |
| | | | | | | | | | | | | | | | | | | | | | It prepares the chunk - loads or generates it and lights it. The spawn prepare process uses this function. | ||||
| | * | | | Lighting thread: skip chunks that are already lit. | Mattes D | 2014-12-10 | 1 | -0/+10 |
| | | | | | |||||
| | * | | | Added a RemoveIf() function to cQueue | Mattes D | 2014-12-09 | 1 | -0/+23 |
| | | | | | |||||
| * | | | | Cosmetic touchups. | Mattes D | 2014-12-11 | 5 | -10/+11 |
| | | | | | | | | | | | | | | | | | Removed trailing whitespace, added cast to remove warning, added file seeking in case of corrupt files. | ||||
| * | | | | Merge remote-tracking branch 'planetx/master' | Mattes D | 2014-12-11 | 2 | -5/+33 |
| |\ \ \ \ | |||||
| | * | | | | Check to see if header write out is required | planetx | 2014-12-08 | 1 | -17/+15 |
| | | | | | | |||||
| | * | | | | Added timestamp to merged files WSSAnvil | planetx | 2014-12-08 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Added timestamp to merged files WSSAnvil | planetx | 2014-12-08 | 1 | -62/+62 |
| | | | | | | |||||
| | * | | | | Added timestamp to new files WSSAnvil | planetx | 2014-12-08 | 2 | -79/+149 |
| | | | | | | |||||
| | * | | | | Added Timestamp info to chunks in WSSAnvil | planetx | 2014-12-07 | 2 | -87/+47 |
| | | | | | | |||||
| * | | | | | Fixed DungeonRooms edges not generating sometimes. | Mattes D | 2014-12-11 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #1655 from tonibm19/patch-2 | Mattes D | 2014-12-10 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | Added NetherOreNests to default nether generator. | ||||
| | * | | | | | Moved NetherOreNests | tonibm19 | 2014-12-10 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Added NetherOreNests to nether default generator. | tonibm19 | 2014-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | Now there's quartz in the nether | ||||
| * | | | | | | Merge pull request #1623 from p-mcgowan/issue_1253 | Mattes D | 2014-12-10 | 8 | -3/+94 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Prevent multiple logins with same username, unless allowed in settings | ||||
| | * | | | | | | Changed method call to DoesAllowMultiLogin() instead of IsAllowMultiLogin() | Vincent | 2014-12-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiles correctly. | ||||
| | * | | | | | | Fixed return value in CheckMultiLogin() | Vincent | 2014-12-09 | 1 | -1/+2 |
| | | | | | | | | |||||
| | * | | | | | | Fixed indent problems and added return definitions to CheckMultiLogin(). | Vincent | 2014-12-09 | 3 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed from IsAllowMultiLogin() to DoesAllowMultiLogin(). Fixed CheckMultiLogin() to not run to the end without returning a value. | ||||
| | * | | | | | | Changed DoWithPlayer to auto instead of using iterator. | Vincent | 2014-12-09 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Changed CheckMultiLogin() to not have main body wrapped in an if statement. | Vincent | 2014-12-08 | 4 | -21/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added in indent to cPlayerListCallBack in cCallback class inside CheckMultiLogin(). Added doxy-comment for DoWithPlayer(). Changed comments on IsPlayerInQueue() and IsAllowMultiLogin() to doxy-comments. | ||||
| | * | | | | | | created callback in Root and changed CheckMultiLogin() to use the DoWithPlayer function at Root instead of World. | Vincent | 2014-12-08 | 2 | -2/+9 |
| | | | | | | | | |||||
| | * | | | | | | Fixed compile errors | Vincent | 2014-12-08 | 6 | -18/+14 |
| | | | | | | | | |||||
| | * | | | | | | removed last space in handlehandshake | Vincent | 2014-12-08 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | Changed HandleHandshake to return the result of CheckMultiLogin instead of just true since it already returns true if it finds and kicks the current player. | Vincent | 2014-12-08 | 1 | -24/+23 |
| | | | | | | | | |||||
| | * | | | | | | Moved the check into a new function and just calls that function and a blank FindAndDoWithPlayer added. | Vincent | 2014-12-08 | 4 | -23/+52 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'issue_1253' of https://github.com/p-mcgowan/MCServer into issue_1253 | Vincent | 2014-12-07 | 1 | -5/+5 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Changed Kick message | vincentleung1 | 2014-11-30 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | | * | | | | | | removed extra space and fixed some formatting in cCallback | vincentleung1 | 2014-11-30 | 1 | -3/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | changed from using iterator to auto for server and clienthandle | Vincent | 2014-12-07 | 2 | -4/+4 |
| | |/ / / / / / | |||||
| | * | | | | | | removed GetUsernames() from World | Vincent | 2014-11-30 | 2 | -18/+0 |
| | | | | | | | | |||||
| | * | | | | | | Uses callback for players already in World. | Vincent | 2014-11-30 | 1 | -5/+12 |
| | | | | | | | | |||||
| | * | | | | | | fixed naming of strings and changed from i to I | Vincent | 2014-11-29 | 5 | -13/+18 |
| | | | | | | | | |||||
| | * | | | | | | issue 1253 - prevent multiple logins with same username | Vincent | 2014-11-29 | 5 | -0/+58 |
| | | | | | | | | |||||
| * | | | | | | | Fixed compiling. | Howaner | 2014-12-09 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Moved NaturalPatches in front of PreSimulator and Animals. | Mattes D | 2014-12-08 | 1 | -1/+1 |
| | |/ / / / / |/| | | | | | |||||
| * | | | | | | Merge pull request #1654 from tonibm19/patch-1 | Alexander Harkness | 2014-12-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Added NaturalPatches to the default finishers | ||||
| | * | | | | | Added NaturalPatches to finishers | tonibm19 | 2014-12-08 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1563 from mc-server/c++11Events | Mattes D | 2014-12-07 | 4 | -143/+72 |
| |\ \ \ \ \ | | | | | | | | | | | | | Reimplemented cEvent using C++11 primitives. | ||||
| | * | | | | | cMojangAPI: Fixed a possible problem with thread termination order. | Mattes D | 2014-12-07 | 1 | -5/+17 |
| | | | | | | | |||||
| | * | | | | | Fixed integer overflow problems. | Mattes D | 2014-12-07 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The event would overflow when requesting a 60 minute timeout. | ||||
| | * | | | | | Merge remote-tracking branch 'origin/master' into c++11Events | Mattes D | 2014-12-07 | 178 | -3914/+5859 |
| | |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | | Fixed format warning. | Mattes D | 2014-12-07 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Fixed crash on server stop. | Mattes D | 2014-12-07 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The entity destructors called through chunkmap destructor and chunk destructor were accessing the world which was in an already invalid state (half-destroyed). Fixed by destroying chunkmap explicitly and providing a nullptr check in the HasEntity() function. | ||||
| * | | | | | | Fixed c++11 branch issues. | Mattes D | 2014-12-07 | 8 | -45/+59 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1555 from mc-server/c++11 | Mattes D | 2014-12-07 | 49 | -1248/+353 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | C++11 | ||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-12-06 | 37 | -149/+695 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/OSSupport/Thread.cpp | ||||
| | * | | | | | | | Tools: Removed unused Timer.* file from CMakeLists.txt. | Mattes D | 2014-12-04 | 2 | -4/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | CheckBasicStyle: Doesn't report false positives ending in a keyword. | Mattes D | 2014-12-04 | 1 | -5/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed trailing whitespace. | Mattes D | 2014-12-04 | 2 | -6/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Merged branch 'origin/master' into c++11. | Mattes D | 2014-12-04 | 75 | -339/+1070 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fixed indent. | Mattes D | 2014-12-03 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Server: Fixed a MSVC warning. | Mattes D | 2014-12-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | ByteBuffer: Re-added Single-thread access checker. | Mattes D | 2014-12-03 | 2 | -0/+90 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'origin-master' into c++11 | Tiger Wang | 2014-11-26 | 32 | -1653/+1688 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Removed unnecessary #includes | Tiger Wang | 2014-11-23 | 2 | -2/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'origin/master' into c++11 | Tiger Wang | 2014-11-23 | 99 | -1589/+7139 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Noise/Noise.h src/World.h | ||||
| | * | | | | | | | | | Compilation fixes | Tiger Wang | 2014-11-23 | 5 | -15/+11 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Update GCC on Travis | Tiger Wang | 2014-11-23 | 2 | -24/+20 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merged branch 'master' into c++11. | Mattes D | 2014-10-24 | 47 | -193/+310 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | | Suggestions | Tiger Wang | 2014-10-24 | 7 | -10/+50 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added FastRandom.* back to CMakeLists.txt. | Mattes D | 2014-10-23 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merged branch 'master' into c++11. | Mattes D | 2014-10-23 | 51 | -526/+819 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Compile fix? | Tiger Wang | 2014-10-21 | 3 | -6/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Missing EOL. | Alexander Harkness | 2014-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Alignment. | Alexander Harkness | 2014-10-21 | 1 | -6/+6 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Missing space. | Alexander Harkness | 2014-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Missing space fix. | Alexander Harkness | 2014-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Compile fix? | Tiger Wang | 2014-10-21 | 2 | -4/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Windows close handlers handles more closes | Tiger Wang | 2014-10-21 | 1 | -5/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Replace &*[0] accesses with .data() | Tiger Wang | 2014-10-21 | 3 | -8/+8 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-20 | 211 | -1439/+1439 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Use std::recusive_mutex | Tiger Wang | 2014-10-20 | 3 | -52/+9 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-10-20 | 36 | -234/+281 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Migrated cSleep and cTimer to std::chrono | Tiger Wang | 2014-10-20 | 18 | -168/+45 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Migrated random generators to std::random | Tiger Wang | 2014-10-19 | 16 | -556/+102 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-10-19 | 39 | -496/+260 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Use std::thread | Tiger Wang | 2014-10-19 | 13 | -432/+59 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Reduced river height | STRWarrior | 2014-12-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rivers would exceed the water height quite often | ||||
| * | | | | | | | | | | | | | Fixed error message in cFinishGenPassiveMobs | STRWarrior | 2014-12-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It would send an error message when trying to spawn mobs in a desert | ||||
| * | | | | | | | | | | | | | Replaced most auto_ptr with unique_ptr. | Mattes D | 2014-12-06 | 2 | -62/+62 |
| | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1647 from mc-server/SocketThreadsFix | Mattes D | 2014-12-06 | 1 | -3/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | Fixes socket leak in HTTP server. | ||||
| | * | | | | | | | | | | | Fixes socket leak in HTTP server. | Mattes D | 2014-12-03 | 1 | -3/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1643. | ||||
| * | | | | | | | | | | | | FinishGenPassiveMobs: Cosmetic changes. | Mattes D | 2014-12-05 | 2 | -30/+33 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1642 from p-mcgowan/animalTerrainFinisher | Mattes D | 2014-12-05 | 5 | -3/+274 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Animal terrain finisher | ||||
| | * | | | | | | | | | | | | formatting and default spawn percentage | p-mcgowan | 2014-12-05 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisher | p-mcgowan | 2014-12-05 | 38 | -184/+496 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | update | ||||
| * | | | | | | | | | | | | | CheckBasicStyle: Check missing braces for control statements. | Mattes D | 2014-12-05 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only single-line control statements are checked. | ||||
| * | | | | | | | | | | | | | BasicStyle: Added missing braces to control statements. | Mattes D | 2014-12-05 | 17 | -54/+241 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | CheckBasicStyle: Added a check for parentheses around comparisons. | Mattes D | 2014-12-05 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check is only rudimentary and tends to fall towards missed positived rather than false positives. | ||||
| * | | | | | | | | | | | | | Fixed reported parentheses around comparisons. | Mattes D | 2014-12-05 | 14 | -83/+99 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1649 from jonfabe/InfoDumpFix | Mattes D | 2014-12-05 | 1 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicate commands added to README.md | ||||
| | * | | | | | | | | | | | | | Fix duplicate commands added to README.md | Jonathan Fabian | 2014-12-05 | 1 | -1/+12 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge pull request #1648 from mc-server/CraftingLuaFix | Mattes D | 2014-12-04 | 6 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the CRAFTING_NO_RECIPE hook call. | ||||
| | * | | | | | | | | | | | | | Fixed the CRAFTING_NO_RECIPE hook call. | Mattes D | 2014-12-04 | 6 | -6/+6 |
| | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used a pointer-to-pointer-to-cCraftingRecipe, which the Lua bindings didn't know how to handle, and emitted a warning message at runtime. Fixes #1641. | ||||
| * | | | | | | | | | | | | | Merge pull request #1638 from p-mcgowan/cactiNoLongerSpawnOnBeaches | Mattes D | 2014-12-04 | 2 | -1/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | cacti no longer spawn outside of desert variants | ||||
| | * | | | | | | | | | | | | conflict resolution | p-mcgowan | 2014-12-04 | 8 | -40/+79 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1645 from jonfabe/SpectatorModeFixes | Mattes D | 2014-12-04 | 2 | -7/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | Spectator mode fixes | ||||
| | * | | | | | | | | | | | | Updated whitespace in comment, changed conditional to logical equivalent due to popular demand | Jonathan Fabian | 2014-12-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fix Spaces to Tabs | Jonathan Fabian | 2014-12-03 | 1 | -5/+5 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Add missing IsSpectatorMode() checks in Player.cpp, make sure that player is flying when spawned otherwise it will fall through the world. | Jonathan Fabian | 2014-12-03 | 1 | -6/+11 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Allow Spectator Gamemode as a world default. | Jonathan Fabian | 2014-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1646 from p-mcgowan/luaCheckstyleWarnings | Mattes D | 2014-12-03 | 4 | -34/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clearing CheckBasicStyle.lua messages | ||||
| | * | | | | | | | | | | | | | clearing CheckBasicStyle.lua messages | p-mcgowan | 2014-12-03 | 4 | -34/+34 |
| | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge pull request #1640 from p-mcgowan/mooshroomMobSpawnerRule | Mattes D | 2014-12-03 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | added spawning rule to mooshroom | ||||
| | * | | | | | | | | | | | | updated mooshroom check for mycelium | p-mcgowan | 2014-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | extra formatting parentheses | p-mcgowan | 2014-12-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | added spawning rule to mooshroom | p-mcgowan | 2014-12-02 | 1 | -0/+13 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1634 from mc-server/DungeonSpawners | Mattes D | 2014-12-02 | 1 | -1/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | Dungeons spawners now spawn mobs | ||||
| | * | | | | | | | | | | | | Fixed forgotten semicolon | STRWarrior | 2014-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Using IntNoise3DInt instead of IntNoise3D | STRWarrior | 2014-12-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Suggestions by xoft | STRWarrior | 2014-12-02 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using IntNoise3D to prevent needless floating point math | ||||
| | * | | | | | | | | | | | | Using static cast for Dungeon spawners | STRWarrior | 2014-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Dungeons spawners now spawn mobs | STRWarrior | 2014-12-01 | 1 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25% for a spider, 25% for a skeleton and 50% for a zombie spawner. | ||||
| | | * | | | | | | | | | | | reformat for lua and CI | p-mcgowan | 2014-12-02 | 2 | -6/+9 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | formatting and commenting fixes | p-mcgowan | 2014-12-02 | 2 | -6/+6 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | cacti no longer spawn outside of desert variants | p-mcgowan | 2014-12-01 | 2 | -1/+16 |
| | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | reformat | p-mcgowan | 2014-12-05 | 1 | -9/+5 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | restructure, with logic this time | p-mcgowan | 2014-12-05 | 1 | -5/+13 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | restructured random animals, added check for desert (update as per wiki) | p-mcgowan | 2014-12-05 | 1 | -19/+17 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | handle non-vanilla dimensions | p-mcgowan | 2014-12-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | handle non-vanilla dimensions | p-mcgowan | 2014-12-05 | 1 | -2/+3 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | formatting fixes | p-mcgowan | 2014-12-05 | 1 | -4/+11 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | format blocks and randomizing | p-mcgowan | 2014-12-04 | 2 | -9/+9 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | last doxy fix | p-mcgowan | 2014-12-04 | 1 | -3/+3 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | added p-mcgowan to contributors | p-mcgowan | 2014-12-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | awful comment fixing, randomizer fix | p-mcgowan | 2014-12-04 | 2 | -19/+32 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | class description and doxy-commenting | p-mcgowan | 2014-12-03 | 2 | -5/+8 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | doxy-commenting | p-mcgowan | 2014-12-03 | 1 | -3/+3 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | forgot generation defaul init | p-mcgowan | 2014-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | forgot initializer | p-mcgowan | 2014-12-03 | 1 | -1/+5 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | typos and oversights for lua and CI | p-mcgowan | 2014-12-02 | 1 | -1/+5 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | fastRandom unused | p-mcgowan | 2014-12-02 | 1 | -1/+0 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | indentation, repeatable random, small corrections | p-mcgowan | 2014-12-02 | 1 | -98/+93 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | fix comments after replacing spaces with tabs | p-mcgowan | 2014-12-02 | 1 | -4/+4 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | animal terrain finisher | p-mcgowan | 2014-12-02 | 2 | -187/+187 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | animal terrain finisher | p-mcgowan | 2014-12-02 | 2 | -0/+241 |
| | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1636 from mc-server/MineshaftSpawners | Alexander Harkness | 2014-12-01 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Mineshaft spawners now spawn cave spiders | ||||
| | * | | | | | | | | | | Using static cast for MineShaft spawners | STRWarrior | 2014-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Mineshaft spawners now spawn cave spiders | STRWarrior | 2014-12-01 | 1 | -1/+4 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Simplefied SoulsandRims | STRWarrior | 2014-12-01 | 1 | -36/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced two for loops with a single if | ||||
| * | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2014-12-01 | 31 | -181/+637 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| | * | | | | | | | | | Updated core | Howaner | 2014-12-01 | 1 | -0/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Reverted bad .gitignore change | Howaner | 2014-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge pull request #1602 from mc-server/MobSpawner | Mattes D | 2014-12-01 | 31 | -182/+638 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Added mob spawner | ||||
| | | * | | | | | | | | | MobSpawner fixes. | Howaner | 2014-12-01 | 7 | -6/+14 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Merge branch 'master' into MobSpawner | Howaner | 2014-12-01 | 7 | -22/+46 |
| | | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| | | * | | | | | | | | | Merge branch 'master' into MobSpawner | Howaner | 2014-11-30 | 17 | -13/+134 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Removed old MobType category. | Howaner | 2014-11-29 | 1 | -8/+1 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Removed unused imports. | Howaner | 2014-11-29 | 2 | -2/+0 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes. | Howaner | 2014-11-29 | 13 | -122/+137 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge branch 'master' into MobSpawner | Howaner | 2014-11-29 | 83 | -2253/+3204 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | | Finished mob spawner implementation. | Howaner | 2014-11-18 | 18 | -124/+78 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge branch 'master' into MobSpawner | Howaner | 2014-11-18 | 415 | -12388/+11874 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/Core | ||||
| | | * | | | | | | | | | | | Fixed compile errors. | Howaner | 2014-09-27 | 2 | -42/+42 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Merge branch 'master' into MobSpawner | Howaner | 2014-09-26 | 186 | -4062/+10585 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/MobSpawner.h src/Mobs/Monster.h | ||||
| | | * | | | | | | | | | | | | Implemented mob spawner. | Howaner | 2014-09-19 | 11 | -67/+393 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Merge branch 'master' into MobSpawner | Howaner | 2014-09-19 | 25 | -103/+293 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Created MobSpawnerEntity class. | Howaner | 2014-09-17 | 4 | -1/+165 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Added better soulsand rims | STRWarrior | 2014-12-01 | 5 | -12/+107 |
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a finisher called SoulsandRims | ||||
| * | | | | | | | | | | | | | | Merge pull request #1624 from mc-server/LuaDeprecating | Mattes D | 2014-12-01 | 4 | -20/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() instead | ||||
| | * | | | | | | | | | | | | | | Removed old StringToMobType() function from Monster.cpp | Howaner | 2014-11-30 | 1 | -10/+0 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() instead | Howaner | 2014-11-29 | 3 | -10/+40 |
| | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | DistortedHeightmap: Added missing initialization. | Mattes D | 2014-12-01 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was probably the original cause for the "empty chunks". Fixes #1433. | ||||
| * | | | | | | | | | | | | | | Noise3D: Fixed missing initialization. | Mattes D | 2014-12-01 | 1 | -1/+3 |
| | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix terrain being at Y=0 or Y=255 for the spawn chunk. Fixes #1433. | ||||
| * | | | | | | | | | | | | | Hopefully fixed random build fails | STRWarrior | 2014-11-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed a crash in cSpawnPrepare. | Mattes D | 2014-11-30 | 1 | -0/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed nether ceiling | STRWarrior | 2014-11-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed compiling on linux. | Howaner | 2014-11-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Improved comments for cWorld::DoWithPlayer(). | Mattes D | 2014-11-30 | 2 | -2/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1626 from mc-server/StackTraceOnFailure | Mattes D | 2014-11-30 | 9 | -7/+105 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stack trace on failure | ||||
| | * | | | | | | | | | | | | | Fixed MCADefrag compilation. | Mattes D | 2014-11-29 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Removed unneeded include. | Mattes D | 2014-11-29 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixed QtBiomeVisualiser compilation. | Mattes D | 2014-11-29 | 2 | -3/+17 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixed missing files in ProtoProxy. | Mattes D | 2014-11-29 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Added a basic stacktracing for assert and signal failures. | Mattes D | 2014-11-29 | 5 | -4/+73 |
| | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge pull request #1622 from M10360/master | Mattes D | 2014-11-29 | 3 | -2/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing Fuels, Incorrect Smelting Recipe, Duplicate Code, Listing Myself | ||||
| | * | | | | | | | | | | | | | Added M10360. | M10360 | 2014-11-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Smelting Netherrack not TallGrass gives you NetherBrickItem. | M10360 | 2014-11-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Added missing fuels. | M10360 | 2014-11-29 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Removed duplicate. | M10360 | 2014-11-29 | 1 | -1/+0 |
| | |/ / / / / / / / / / / / | |||||
| * / / / / / / / / / / / / | Update core | Howaner | 2014-11-29 | 1 | -0/+0 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #1619 from mc-server/WarningFixes | Mattes D | 2014-11-28 | 26 | -63/+68 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning fixes | ||||
| | * | | | | | | | | | | | | Chunk: Fixed same-name iterators. | Mattes D | 2014-11-27 | 1 | -5/+5 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | OctavedNoise: Another unshadowed local variable. | Mattes D | 2014-11-27 | 1 | -9/+11 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Minecart.h: Fixed integral conversion warning. | Mattes D | 2014-11-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | RidgedNoise: Replaced fabs with std::abs(). | Mattes D | 2014-11-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | OctavedNoise: Unshadowed a local variable. | Mattes D | 2014-11-27 | 1 | -10/+12 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | BlockEntities: Removed the extra semicolon. | Mattes D | 2014-11-27 | 16 | -24/+25 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Replaced auto_ptr with unique_ptr. | Mattes D | 2014-11-27 | 2 | -6/+6 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | CompoGenBiomal: Fixed signed vs unsigned comparison. | Mattes D | 2014-11-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed BlockStringToType return value. | Mattes D | 2014-11-27 | 3 | -5/+5 |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -1 was not a valid BLOCKTYPE and would not be recognized by the callers, ever. | ||||
| * | | | | | | | | | | | | CMake: Fixed linux builds. | Mattes D | 2014-11-26 | 1 | -5/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | cRoot: Fixed a memory leak with cRankManager. | Mattes D | 2014-11-26 | 2 | -3/+5 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Windows: Fixed builds with LeakFinder enabled. | Mattes D | 2014-11-26 | 2 | -2/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | WSSAnvil: Fixed bad code in arrow loading. | Mattes D | 2014-11-26 | 1 | -2/+8 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1617 from mc-server/ReachDistance | Mattes D | 2014-11-25 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | ClientHandle: Fixed max block place distance check. | ||||
| | * | | | | | | | | | | | | ClientHandle: Fixed max block place distance check. | Mattes D | 2014-11-25 | 1 | -4/+10 |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1492 | ||||
| * | | | | | | | | | | | | Merge pull request #1604 from mc-server/GeneratorShapeRefactor | Mattes D | 2014-11-24 | 30 | -1532/+1578 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Generator shape refactor | ||||
| | * | | | | | | | | | | | | Added TwoHeights shape generator. | Mattes D | 2014-11-23 | 5 | -8/+162 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a faster shape generator that can generate overhangs and has biome awareness. | ||||
| | * | | | | | | | | | | | | Noise3D generator: Enlarged averaging to avoid steep beach slopes. | Mattes D | 2014-11-23 | 2 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor | Mattes D | 2014-11-23 | 7 | -2/+156 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | cWorld: Changed generator defaults. | Mattes D | 2014-11-20 | 1 | -13/+17 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | BiomalNoise3D generator: finished all biomes. | Mattes D | 2014-11-20 | 1 | -66/+74 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | CompoGenBiomal: Fixed sealevel offset. | Mattes D | 2014-11-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | CompoGenBiomal: Fixed sealevel not generating properly. | Mattes D | 2014-11-20 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Generators: Unified SeaLevel into a single variable. | Mattes D | 2014-11-20 | 3 | -70/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is shared between shape generators and composition generators and there's no sense in having two different values for those. | ||||
| | * | | | | | | | | | | | | Noise3D generators: Changed noise generator to InterpolNoise. | Mattes D | 2014-11-20 | 2 | -10/+10 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactor | Mattes D | 2014-11-20 | 38 | -593/+1483 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Mobs: Fixed crash with terrain too high. | Mattes D | 2014-11-15 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Generator: Fixed crash with trees too high. | Mattes D | 2014-11-15 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Snow generator: Fixed failure at top of the world. | Mattes D | 2014-11-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | ChunkDesc: Fixed comment about indexing. | Mattes D | 2014-11-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | DungeonRooms: Changed to work with the new shape generators. | Mattes D | 2014-11-15 | 1 | -10/+15 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Gen refactor: Implemented CompositedHeiGen. | Mattes D | 2014-11-13 | 9 | -217/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes crashes in the Village generator due to the missing generator. | ||||
| | * | | | | | | | | | | | | | Generator: Shape initial refactoring. | Mattes D | 2014-11-12 | 23 | -1346/+1356 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code compiles, but several structure generators are broken, crash on start. | ||||
| * | | | | | | | | | | | | | | Merge pull request #1611 from mc-server/SpawnPrepare | Mattes D | 2014-11-24 | 2 | -120/+113 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | cWorld: Rewritten spawn preparation. | ||||
| | * | | | | | | | | | | | | | Changed back capitalization. | Mattes D | 2014-11-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | cWorld: Rewritten spawn preparation. | Mattes D | 2014-11-22 | 2 | -120/+113 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It now supports pregeneration distance of any size and runs in two threads in parallel (generator / lighting). Fixes #1597. | ||||
| * | | | | | | | | | | | | | | Merge pull request #1612 from p-mcgowan/pigsIntoZombiePigmenOnLightning | Mattes D | 2014-11-23 | 2 | -0/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pigs turn into pigmen on lightning | ||||
| | * | | | | | | | | | | | | | | formatting - newline at EOF inserted: Pig.cpp | p-mcgowan | 2014-11-23 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | pigs turn into pigmen on lightning | p-mcgowan | 2014-11-23 | 2 | -0/+19 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge pull request #1610 from p-mcgowan/villagersIntoWitchOnLightning | Mattes D | 2014-11-22 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Villagers into witch on lightning | ||||
| | * | | | | | | | | | | | | | | formatter error | p-mcgowan | 2014-11-22 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | villagers turn into witches on lightning | p-mcgowan | 2014-11-22 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | villagers turn into witches when struck by lightning | p-mcgowan | 2014-11-22 | 1 | -0/+5 |
| | |/ / / / / / / / / / / / / | |||||
| * / / / / / / / / / / / / / | InfoReg: Added a diagnostic for bad Info.lua command info. | Mattes D | 2014-11-22 | 1 | -0/+1 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge pull request #1594 from mc-server/LargeOakTree | Mattes D | 2014-11-20 | 3 | -2/+125 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | Large Oak Tree | ||||
| | * | | | | | | | | | | | | Changed comment | STRWarrior | 2014-11-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggestion by xoft | ||||
| | * | | | | | | | | | | | | First implementation for the LargeOakTree | STRWarrior | 2014-11-13 | 3 | -2/+125 |
| | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #1603 from mc-server/ImprovedNoise | Mattes D | 2014-11-20 | 28 | -544/+1282 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | Improved noise | ||||
| | * | | | | | | | | | | | cInterpolNoise: Implemented optimized 2D generating. | Mattes D | 2014-11-19 | 3 | -32/+219 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | cOctavedNoise: Removed misleading comment, fixed assert texts. | Mattes D | 2014-11-19 | 1 | -3/+3 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | cOctavedNoise: Added a forgotten comment. | Mattes D | 2014-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Added a cInterpolNoise template for faster noise generator. | Mattes D | 2014-11-18 | 3 | -4/+439 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used an instance of it in the Noise3D generator. | ||||
| | * | | | | | | | | | | | Moved all Noise-related files into a separate folder. | Mattes D | 2014-11-18 | 26 | -80/+56 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Refactored cRidgedNoise into a separate template. | Mattes D | 2014-11-18 | 5 | -243/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to make the ridges out of any noise and to combine the cRidgedNoise with cOctavedNoise. | ||||
| | * | | | | | | | | | | | OctavedNoise: linux compilation fixes. | Mattes D | 2014-11-18 | 2 | -2/+3 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Added cOctavedNoise template. | Mattes D | 2014-11-17 | 3 | -258/+206 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to use any noise generator in the combination of octaves. | ||||
| | * | | | | | | | | | | | Fixed include path. | Mattes D | 2014-11-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Added cImprovedNoise implementation. | Mattes D | 2014-11-17 | 4 | -46/+376 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1598 from mc-server/SignEditor | Mattes D | 2014-11-18 | 7 | -21/+85 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | Fixed a security problem with signs. | ||||
| | * | | | | | | | | | | | Use cLuaState's stack trace. | Howaner | 2014-11-17 | 1 | -48/+27 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Added UpdateSign() method to DeprecatedBindings.cpp | Howaner | 2014-11-17 | 2 | -3/+88 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Use LastPlacedSign instead of LastPlacedBlock. | Howaner | 2014-11-15 | 3 | -9/+6 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Updated APIDump | Howaner | 2014-11-15 | 1 | -2/+3 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed a security problem with signs. | Howaner | 2014-11-15 | 5 | -16/+18 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed a wrong assert in cClientHandle::SetViewDistance(). | Mattes D | 2014-11-17 | 1 | -4/+8 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | BiomalNoise3D: Added more biomes. | Mattes D | 2014-11-16 | 1 | -13/+65 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1577 from mc-server/ViewDistance | Mattes D | 2014-11-16 | 6 | -16/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | Added a MaxViewDistance option. | ||||
| | * | | | | | | | | | | | Renamed m_UsedViewDistance to m_CurrentViewDistance | Howaner | 2014-11-15 | 2 | -11/+11 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Renamed m_SetViewDistance to m_RequestedViewDistance | Howaner | 2014-11-15 | 2 | -7/+7 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Renamed GetSettedViewDistance() to GetRequestedViewDistance() | Howaner | 2014-11-15 | 3 | -4/+4 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Updated APIDump | Howaner | 2014-11-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Use m_UsedViewDistance and m_SetViewDistance. | Howaner | 2014-11-14 | 3 | -15/+26 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into ViewDistance | Howaner | 2014-11-14 | 41 | -547/+4763 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | ... in this world | Howaner | 2014-10-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added a MaxViewDistance option. | Howaner | 2014-10-30 | 3 | -1/+16 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | APIDump: Fixed example cCompositeChat URL | Howaner | 2014-11-14 | 1 | -1/+1 |
| | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Noise3D: Added jungles. | Mattes D | 2014-11-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Noise3D: Added oceans. | Mattes D | 2014-11-13 | 1 | -0/+3 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed trailing whitespace. | Mattes D | 2014-11-12 | 3 | -3/+3 |
| | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | BiomalNoise3D: Added a few biomes. | Mattes D | 2014-11-10 | 1 | -5/+8 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | TallGrassGenerator: Fixed crash when too high | STRWarrior | 2014-11-10 | 1 | -0/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added BiomalNoise3D shape generator. | Mattes D | 2014-11-10 | 4 | -29/+369 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Noise3d Generator: Fixed unused function error. | Mattes D | 2014-11-09 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Noise3D generator: rewritten from scratch. | Mattes D | 2014-11-09 | 2 | -78/+145 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it uses three 3D and one 2D perlin noises to generate the terrain, and is highly parametrizable. | ||||
| * | | | | | | | | | | | Travis badge uses master branch. | Alexander Harkness | 2014-11-08 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added gratipay badge. | Alexander Harkness | 2014-11-08 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Noise3D CompoGen: Fixed missing initialization. | Mattes D | 2014-11-06 | 1 | -0/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'DoWithPlayerByUUID' | Mattes D | 2014-11-06 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Fixed an extra space. | Mattes D | 2014-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Lukas Pioch | 2014-11-05 | 17 | -368/+1024 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/mc-server/MCServer | Mattes D | 2014-11-06 | 18 | -369/+1025 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge pull request #1587 from Ambushed91/WebAdmin | Alexander Harkness | 2014-11-05 | 4 | -45/+36 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Update V1.0.3 | ||||
| | | * | | | | | | | | | | | Update V1.0.9 | Ambushed91 | 2014-11-05 | 3 | -44/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed Time, Scroll-Able Header, Resized contention | ||||
| | | * | | | | | | | | | | | Update V1.0.3 | Ambushed91 | 2014-11-05 | 2 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebAdmin Fixes | ||||
| * | | | | | | | | | | | | | renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDump | Lukas Pioch | 2014-11-05 | 6 | -10/+13 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Simplified FindAndDoWithUUID, formatted line | Lukas Pioch | 2014-11-02 | 2 | -8/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added FindAndDoWithUUID | Lukas Pioch | 2014-11-02 | 5 | -0/+46 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | | | | | | * | cEvent: Changed chrono duration resolution. | Mattes D | 2014-11-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | | | | | | * | cEvent: Changed steady_clock to system_clock. | Mattes D | 2014-11-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | | | | | | * | Merge branch 'master' into c++11Events | Mattes D | 2014-11-04 | 57 | -923/+4978 |
| | | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | WebAdmin: Fixed login template destination address. | Mattes D | 2014-11-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge remote-tracking branch 'ambushed/WebAdmin' | Mattes D | 2014-11-04 | 16 | -293/+703 |
| | |\| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update template.lua | Arian | 2014-11-04 | 1 | -70/+81 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update template.lua | Arian | 2014-10-28 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more to come | ||||
| | | * | | | | | | | | | | | Update login_template.html | Arian | 2014-10-28 | 1 | -110/+62 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update style.css | Arian | 2014-10-28 | 1 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update login.css | Arian | 2014-10-28 | 1 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update login.css | Arian | 2014-10-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update guest.html | Arian | 2014-10-28 | 1 | -3/+2 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update template.lua | Arian | 2014-10-28 | 1 | -2/+21 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update login_template.html | Arian | 2014-10-27 | 1 | -58/+108 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update login.css | Arian | 2014-10-27 | 1 | -1/+218 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update style.css | Arian | 2014-10-27 | 1 | -1/+432 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update template.lua | Arian | 2014-10-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added licence | ||||
| | | * | | | | | | | | | | | Update login_template.html | Arian | 2014-10-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added licence | ||||
| | | * | | | | | | | | | | | Update style.css | Arian | 2014-10-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added licence | ||||
| | | * | | | | | | | | | | | Update login.css | Arian | 2014-10-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added licence | ||||
| | | * | | | | | | | | | | | Update template.lua | Ambushed91 | 2014-10-27 | 1 | -6/+10 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update template.lua | Ambushed91 | 2014-10-27 | 1 | -90/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed FusionCare link, change position for "Current time JS", Compression Ratio: 31% (HTML) | ||||
| | | * | | | | | | | | | | | Update template.html | Ambushed91 | 2014-10-27 | 1 | -125/+136 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed all changes, back to old one | ||||
| | | * | | | | | | | | | | | Update login_template.html | Ambushed91 | 2014-10-27 | 1 | -58/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed copyright, current time and removed google.fonts. Loadtime has been lowered by: Compression Ratio: 86% | ||||
| | | * | | | | | | | | | | | Update style.css | Ambushed91 | 2014-10-27 | 1 | -1024/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed 142 unused css code's, compressed with 27.72% | ||||
| | | * | | | | | | | | | | | Update login.css | Ambushed91 | 2014-10-27 | 1 | -378/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Css has been cleaned and compressed. Take 44 unused css code's and compressed 39.09% | ||||
| | | * | | | | | | | | | | | Update login.css | Ambushed91 | 2014-10-27 | 1 | -1/+378 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Buatified | ||||
| | | * | | | | | | | | | | | Update temp.html | Ambushed91 | 2014-10-27 | 1 | -99/+0 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update guest.html | Ambushed91 | 2014-10-27 | 1 | -5/+3 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update login.css | Ambushed91 | 2014-10-23 | 1 | -442/+1 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update template.lua | Ambushed91 | 2014-10-23 | 1 | -4/+1 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update style.css | Ambushed91 | 2014-10-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update login.css | Ambushed91 | 2014-10-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update login_template.html | Ambushed91 | 2014-10-23 | 1 | -4/+1 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update temp.html | Ambushed91 | 2014-10-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update login_template.html | Ambushed91 | 2014-10-23 | 1 | -3/+1 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update (original).html | Ambushed91 | 2014-10-23 | 1 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update style.css | Ambushed91 | 2014-10-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update guest.html | Ambushed91 | 2014-10-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update WebAdmin | Ambushed91 | 2014-10-23 | 18 | -401/+1699 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All files have been updated to the latest version off the new WebAdmin look. | ||||
| | * | | | | | | | | | | | | MinMax heigen: Reduced the number of octaves. | Mattes D | 2014-11-04 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They didn't affect the terrain that much anyway. | ||||
| | * | | | | | | | | | | | | Added MinMax height generator. | Mattes D | 2014-11-04 | 1 | -0/+207 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1578. | ||||
| | * | | | | | | | | | | | | Fixed a missing endline. | Mattes D | 2014-11-03 | 1 | -1/+5 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added a (disabled) perf test for biome generators. | Mattes D | 2014-11-03 | 1 | -0/+46 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | HeiGen: Moved construction to the end of file. | Mattes D | 2014-11-03 | 1 | -75/+75 |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to define generators in the cpp file instead of needing them in the header, thus speeding up compilation on changes. | ||||
| * | | | | | | | | | | | | Merge pull request #1569 from mc-server/GrownBiomes | Mattes D | 2014-11-02 | 9 | -78/+3140 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Grown biomes | ||||
| | * | | | | | | | | | | | | Grown biomes: fixed Linux build. | Mattes D | 2014-11-02 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Grown biomes: Unified with GrownProt biomes. | Mattes D | 2014-11-02 | 3 | -159/+595 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed a Zoom filter randomness. | ||||
| | * | | | | | | | | | | | | GrownProt: Added the rest of rare and M biomes. | Mattes D | 2014-11-01 | 2 | -14/+91 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | GrownProt biome gen: Added biome edges. | Mattes D | 2014-11-01 | 2 | -2/+162 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into GrownBiomes | Mattes D | 2014-10-31 | 4 | -3/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | GrownProt biomes: added alterations. | Mattes D | 2014-10-31 | 3 | -130/+192 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | QtBiomeVisualiser: Fixed default zoom selection. | Mattes D | 2014-10-31 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | QtBiomeVisualiser: Set start zoom to 25%, just like AMIDST. | Mattes D | 2014-10-30 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | QtBiomeVisualiser: Added a prototyping int generator flavor. | Mattes D | 2014-10-30 | 6 | -53/+1256 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This generator is easier to manipulate, since it doesn't require rewriting the sizes in the template parameters. On the other hand, it doesn't optimize so well, so it's a bit slower. | ||||
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into GrownBiomes | Mattes D | 2014-10-30 | 4 | -12/+97 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Grown biomes: made biomes smaller, made beaches smaller. | Mattes D | 2014-10-29 | 1 | -11/+8 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merged branch 'master' into GrownBiomes. | Mattes D | 2014-10-28 | 27 | -478/+693 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | cIntGen: Added a virtual destructor. | Mattes D | 2014-10-27 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Removed too advanced C++11 features. | Mattes D | 2014-10-27 | 2 | -32/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to keep gcc 4.6 compatibility; these features were not implemented in that version yet. | ||||
| | * | | | | | | | | | | | | | | IntGen: Attempt at fixing Linux compilation. | Mattes D | 2014-10-26 | 1 | -13/+13 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | BioGenGrown: Smaller biomes, add land to map center. | Mattes D | 2014-10-26 | 2 | -16/+13 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed a copypasta error in cIntGenAddToOcean. | Mattes D | 2014-10-26 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Added a missing header to CMakeLists. | Mattes D | 2014-10-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Added new biomegen: Grown | Mattes D | 2014-10-26 | 5 | -67/+1122 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Added IsBiomeVeryCold() and IsBiomeCold() functions. | Mattes D | 2014-10-26 | 2 | -0/+71 |
| | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed it yet again. | Alexander Harkness | 2014-11-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Files found. | Alexander Harkness | 2014-11-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Use screen instaead. | Alexander Harkness | 2014-11-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added nohup. | Alexander Harkness | 2014-11-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | CMake: Added a C++11 check for VS. | Mattes D | 2014-11-02 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS2010- cannot be used, VS2012 needs to have a 2012-CTP compiler installed, VS2013+ has all the features we need. | ||||
| * | | | | | | | | | | | | | | Fixed wrong url. | Alexander Harkness | 2014-11-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added DO easy-install | Alexander Harkness | 2014-11-01 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1580 from mc-server/doinstall | Alexander Harkness | 2014-11-01 | 1 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | Create app.yml | ||||
| | * | | | | | | | | | | | | | Create app.yml | Alexander Harkness | 2014-11-01 | 1 | -0/+10 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | cLuaState: Fixed errors on non-existent callbacks. | Mattes D | 2014-10-31 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mostly affected table-based callbacks, such as the cLineBlockTracer. If a callback didn't exist, the code would still push its arguments on the stack, breaking the next callback. | ||||
| * | | | | | | | | | | | | | Fixed missing CS lock in cChunkMap::WakeUpSimulatorsInArea(). | Mattes D | 2014-10-31 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-10-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed m_SentChunks list chunk removing. | Howaner | 2014-10-30 | 1 | -1/+1 |
| | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1576 from mc-server/QtBiomeVisualiserThreadedGen | Mattes D | 2014-10-30 | 2 | -9/+72 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | QtBiomeVisualiser: Generator uses all machine threads. | ||||
| | * | | | | | | | | | | | | QtBiomeVisualiser: Generator uses all machine threads. | Mattes D | 2014-10-29 | 2 | -9/+72 |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous limit of 1 thread was lifted, now the generator source runs on all CPU threads available. | ||||
| * | | | | | | | | | | | | Merge pull request #1575 from mc-server/1.8-Item | Mattes D | 2014-10-29 | 2 | -3/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | Fixed 1.8 world item format reading. | ||||
| | * | | | | | | | | | | | Fixed 1.8 world item format reading. | Howaner | 2014-10-29 | 2 | -3/+25 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | QtBiomeVisualiser: Added quick shutdown to region loaders. | Mattes D | 2014-10-28 | 3 | -1/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the app shuts down immediately even if regions are queued for loading. | ||||
| * | | | | | | | | | | | QtBiomeVisualiser: Fixed mouse zoom vs menu zoom. | Mattes D | 2014-10-28 | 1 | -1/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1574 from mc-server/QtBiomeVisualiserRegions | Mattes D | 2014-10-28 | 17 | -439/+568 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | QtBiomeVisualiser: Switched caching to entire regions. | ||||
| | * | | | | | | | | | | | QtBiomeVisualiser: Reduced memory usage. | Mattes D | 2014-10-28 | 4 | -182/+156 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | QtBiomeVisualiser: Fixed random regions not rendered. | Mattes D | 2014-10-28 | 2 | -0/+4 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merged remote-tracking branch 'origin/master'. | Mattes D | 2014-10-28 | 7 | -33/+65 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | QtBiomeVisualiser: Attempt at fixing Linux compilation. | Mattes D | 2014-10-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | QtBiomeVisualiser: Switched caching to entire regions. | Mattes D | 2014-10-27 | 15 | -249/+409 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This speeds up the rendering preparation for small zooms. | ||||
| * | | | | | | | | | | | | | Forgotten m_SendChunksMediumPriority.empty() check. | Howaner | 2014-10-28 | 1 | -1/+1 |
| | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | QtBiomeVisualiser: Fixed compilation on Linux. | Mattes D | 2014-10-28 | 4 | -5/+14 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1573 from mc-server/warningfixes | Mattes D | 2014-10-28 | 6 | -32/+64 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | Fixed some more warnings. | ||||
| | * | | | | | | | | | | | Fixed compile (typos). | Alexander Harkness | 2014-10-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Comment alignment. | Alexander Harkness | 2014-10-27 | 2 | -8/+8 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | CheckBasicStyle'd | Alexander Harkness | 2014-10-27 | 4 | -32/+32 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Another one.# | Alexander Harkness | 2014-10-27 | 1 | -0/+22 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed more warnings. | Alexander Harkness | 2014-10-27 | 1 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's ugly though. | ||||
| | * | | | | | | | | | | | Another switch. | Alexander Harkness | 2014-10-27 | 1 | -0/+5 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fix missing biomes in enum. | Alexander Harkness | 2014-10-27 | 1 | -0/+5 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed remaining warnings. | Alexander Harkness | 2014-10-27 | 1 | -5/+5 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Actually fixed the warning. | Alexander Harkness | 2014-10-27 | 1 | -20/+9 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Test warning fix. | Alexander Harkness | 2014-10-27 | 1 | -0/+11 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Fixed typo. | Alexander Harkness | 2014-10-27 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Pocess? | Alexander Harkness | 2014-10-27 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1568 from mc-server/TypedBlocktypes | Alexander Harkness | 2014-10-26 | 1 | -1/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Added type to block type enum. | ||||
| | * | | | | | | | | | | | Added type to block type enum. | Mattes D | 2014-10-26 | 1 | -1/+11 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | APIDump: Added basic projectile documentation. | Mattes D | 2014-10-25 | 1 | -6/+18 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | shorter easy-install command | Alexander Harkness | 2014-10-25 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
| | | | | | | | | | * | Moved the chrono include into Globals. | Mattes D | 2014-10-24 | 2 | -1/+2 |
| | | | | | | | | | | | |||||
| | | | | | | | | | * | Added a missing chrono include. | Mattes D | 2014-10-24 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | | | | | | | | | * | Merge branch 'master' into c++11Events | Mattes D | 2014-10-24 | 45 | -190/+305 |
| | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1565 from mc-server/MergedIniFile | Mattes D | 2014-10-24 | 35 | -71/+36 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Merged ini file | ||||
| | * | | | | | | | | | | IniFile: Removed the problematic printf-like Set function. | Mattes D | 2014-10-24 | 2 | -20/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It wasn't used in any client code anyway. | ||||
| | * | | | | | | | | | | Fixed formatstring | worktycho | 2014-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | IniFile: Removed an unused macro. | Mattes D | 2014-10-23 | 1 | -4/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | QtBiomeVisualiser: Moved the IniFile lib. | Mattes D | 2014-10-23 | 4 | -5/+5 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Removed iniFile library from linux dependencies. | Mattes D | 2014-10-23 | 2 | -2/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merged IniFile into main MCS sources. | Mattes D | 2014-10-23 | 29 | -40/+29 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | OSSupport/CMakeLists.txt: fixed indentation | archshift | 2014-10-24 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed potential linker errors with mingw, as it isn't MSVC and it isn't APPLE. | archshift | 2014-10-24 | 1 | -4/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix linking on OS X, which does not have librt. | archshift | 2014-10-23 | 1 | -2/+6 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Re-updated Core. | Mattes D | 2014-10-23 | 1 | -0/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1500 from mc-server/ChunkLoader | Mattes D | 2014-10-23 | 11 | -117/+264 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Optimized chunk loader | ||||
| | * | | | | | | | | | | | Use 3 priorities. | Howaner | 2014-10-23 | 4 | -7/+45 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-23 | 240 | -2086/+2400 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkSender.cpp src/ClientHandle.cpp src/World.h | ||||
| * | | | | | | | | | | | | Fixed a crash in redstone simulator. | Mattes D | 2014-10-23 | 1 | -1/+0 |
| | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 17 | -539/+474 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| | * | | | | | | | | | | | style. | Howaner | 2014-10-21 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Reverted plugin remove | Howaner | 2014-10-21 | 4 | -0/+0 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed submodule downgrades | Howaner | 2014-10-21 | 3 | -0/+0 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Use two lists and 2 chunk send prioritys. | Howaner | 2014-10-21 | 4 | -66/+40 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | New c++11 stuff. | Howaner | 2014-10-21 | 1 | -4/+4 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-21 | 130 | -2313/+1951 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| | * | | | | | | | | | | | | Added distance check. | Howaner | 2014-10-07 | 1 | -0/+12 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Stream 4 chunks per tick. Added priority. | Howaner | 2014-10-06 | 7 | -29/+58 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into ChunkLoader | Howaner | 2014-10-06 | 37 | -645/+1059 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Better StreamNextChunk() method | Howaner | 2014-10-06 | 2 | -15/+120 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Optimized chunk loader | Howaner | 2014-10-02 | 7 | -105/+93 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | | | | | | | * | Reimplemented cEvent using C++11 primitives. | Mattes D | 2014-10-23 | 2 | -136/+51 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1523. | ||||
| * | | | | | | | | | | | | | Removed the "conditional expression is constant" warning. | Mattes D | 2014-10-23 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC spits out many of these on its own std libraries. | ||||
| * | | | | | | | | | | | | | Merge pull request #1562 from mc-server/signplace | Mattes D | 2014-10-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | Signs can be placed on wallsigns. | ||||
| | * | | | | | | | | | | | | Signs can be placed on wallsigns. | Alexander Harkness | 2014-10-23 | 1 | -1/+1 |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1438 | ||||
| * | | | | | | | | | | | | Merge pull request #1559 from mc-server/nullptr | Mattes D | 2014-10-23 | 211 | -1746/+1768 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | En masse NULL -> nullptr replace | ||||
| | * | | | | | | | | | | | | En masse NULL -> nullptr replace | Tiger Wang | 2014-10-23 | 211 | -1746/+1768 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | ComposableGenerator: Removed nullptr initializers. | Mattes D | 2014-10-22 | 1 | -3/+3 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Upgraded core. | Alexander Harkness | 2014-10-22 | 1 | -0/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | LuaState: Projectiles are pushed using their full class. | Mattes D | 2014-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | APIDump: Added docs for a few projectiles. | Mattes D | 2014-10-22 | 1 | -5/+21 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Clearer version indication. | Alexander Harkness | 2014-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added inheritance information to Lua docs for projectiles. | Mattes D | 2014-10-21 | 1 | -6/+41 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | cItemFrame: Fixed a forgotten rename. | Mattes D | 2014-10-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1515 from mc-server/BlockFixes | Mattes D | 2014-10-21 | 5 | -36/+97 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Block fixes | ||||
| | * | | | | | | | | | | | | Reverted hook move. | Howaner | 2014-10-21 | 1 | -5/+5 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Moved tall grass pickups handle. | Howaner | 2014-10-21 | 2 | -9/+37 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into BlockFixes | Howaner | 2014-10-21 | 132 | -2270/+1819 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Leaves are harvest-able. | Howaner | 2014-10-07 | 1 | -2/+0 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Corrected drops from dead bush, tall grass and cobweb. | Howaner | 2014-10-07 | 5 | -39/+64 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Corrected IsBlockAttachable() in BlockVine.h | Howaner | 2014-10-07 | 1 | -5/+15 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Properly exported cItemFrame and cHangingEntity to Lua. | Mattes D | 2014-10-21 | 10 | -67/+100 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed trailing whitespace. | Mattes D | 2014-10-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Exported individual projectile classes to Lua API. | Mattes D | 2014-10-21 | 18 | -221/+367 |
| | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They used to be exported, but then they were moved to separate files and those werent' added to the ToLua processing list. | ||||
| * | | | | | | | | | | | | Merged branch 'master' of git://github.com/sriehl/MCServer | Mattes D | 2014-10-21 | 17 | -540/+475 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | 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 | 17 | -549/+486 |
| | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Updated ProtectionAreas | Tiger Wang | 2014-10-21 | 1 | -0/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | cLuaState: cEntity is pushed with specific type. | Mattes D | 2014-10-21 | 1 | -7/+48 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Updated the Core. | Mattes D | 2014-10-20 | 1 | -0/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | InfoDump: Do not crash if one plugin fails to load. | Mattes D | 2014-10-20 | 1 | -1/+5 |
| | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there's a syntax error in one plugin's Info.lua file, report the error and continue processing. | ||||
| * | | | | | | | | | | Merge pull request #1554 from SphinxC0re/master | Alexander Harkness | 2014-10-20 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixed #1550 | ||||
| | * | | | | | | | | | | Fixed #1550 | Julian Laubstein | 2014-10-20 | 1 | -6/+6 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Fixed a potential crash in cEntity bindings. | Mattes D | 2014-10-20 | 1 | -2/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1553 from SphinxC0re/work | Alexander Harkness | 2014-10-20 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix for fix #1552 | ||||
| | * | | | | | | | | | | Found it! | Julian Laubstein | 2014-10-20 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fix for fix #1552 | Julian Laubstein | 2014-10-20 | 1 | -2/+2 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #1552 from SphinxC0re/master | Alexander Harkness | 2014-10-20 | 2 | -1/+13 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Added error handling to load <plugin> command | ||||
| | * | | | | | | | | | | Added error message | Julian Laubstein | 2014-10-20 | 2 | -9/+11 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Added error handling to load <plugin> command | Julian Laubstein | 2014-10-20 | 1 | -1/+11 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #1549 from SphinxC0re/master | Mattes D | 2014-10-19 | 7 | -16/+86 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Added mechanics placeable on halfslabs | ||||
| | * | | | | | | | | | | Fixed error with non-const function | Julian Laubstein | 2014-10-19 | 2 | -2/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Added mechanics placeable on halfslabs | Julian Laubstein | 2014-10-19 | 5 | -14/+84 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Removed obsolete tr1::shared_ptr. | Mattes D | 2014-10-19 | 1 | -13/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed minor style issues. | Mattes D | 2014-10-19 | 3 | -3/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | TwoLevel BioGen: fixed swapped inside and outside biomes. | Mattes D | 2014-10-19 | 1 | -1/+1 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Mountain height gen: Added ditches. | Mattes D | 2014-10-19 | 2 | -8/+16 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Generator: Rewritten to use SharedPtrs. | Mattes D | 2014-10-19 | 21 | -185/+149 |
| | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | | cLuaState: cMonster descendants don't push their specific type. | Mattes D | 2014-10-19 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The individual mob types aren't exported to Lua, so pushing them would crash the server. | ||||
| * | | | | | | | | | cLuaState: cBlockEntity descendants are pushed with proper class type. | Mattes D | 2014-10-19 | 17 | -26/+63 |
| | | | | | | | | | | |||||
| * | | | | | | | | | LuaState: Pushing a cEntity pushes the correct class name. | Mattes D | 2014-10-19 | 2 | -6/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes Lua scripts easier, as they don't need to cast values from cEntity to the specific descendant. | ||||
| * | | | | | | | | | Bindings: Removed obsolete codegen files. | Mattes D | 2014-10-19 | 3 | -237/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LuaState_Call.inc is no longer needed, it was replaced with variadic templates. | ||||
| * | | | | | | | | | Merge pull request #1502 from mc-server/furnaces | Tiger Wang | 2014-10-18 | 19 | -227/+180 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | Improved furnaces | ||||
| | * | | | | | | | | Fixed failure for cRankManager to restart | Tiger Wang | 2014-10-18 | 4 | -43/+44 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Furnaces now update their block entity type | Tiger Wang | 2014-10-18 | 2 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 15 | -180/+131 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed progress bar on 1.8 * Fixed bugs * Improved code * Fixes #1068 * Fixes #1070 | ||||
| * | | | | | | | | | InfoDump: Fixed trailing whitespace. | Mattes D | 2014-10-18 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | InfoDump: Fixed GH permission export, moved output to plugins. | Mattes D | 2014-10-18 | 1 | -196/+225 |
| | | | | | | | | | | |||||
| * | | | | | | | | | cMojangAPI: Don't update data if server is in offline mode. | Mattes D | 2014-10-17 | 5 | -8/+12 |
| | | | | | | | | | | |||||
| * | | | | | | | | | LuaChunkStay: Fixed a crash on unused callback. | Mattes D | 2014-10-17 | 1 | -2/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merged branch 'fix_chunks'. | Mattes D | 2014-10-16 | 2 | -3/+35 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1541 from mc-server/VariadicTemplates | Mattes D | 2014-10-16 | 1 | -3/+75 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | cLuaState::Call() uses variadic templates | ||||
| | * | | | | | | | | | Use universal references | worktycho | 2014-10-16 | 1 | -4/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | cLuaState::Call() uses variadic templates. | Mattes D | 2014-10-15 | 1 | -3/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (doesn't compile) | ||||
| * | | | | | | | | | | Merge pull request #1539 from mc-server/DungeonLoot | Mattes D | 2014-10-16 | 2 | -6/+34 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Added loot to dungeons. | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into DungeonLoot | STRWarrior | 2014-10-16 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ItemGrid.cpp | ||||
| * | | | | | | | | | | | BioGen: Fixed a compiler warning. | Mattes D | 2014-10-16 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1537 from mc-server/GenerationCrash | Mattes D | 2014-10-16 | 1 | -1/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed possible crash | ||||
| | * | | | | | | | | | | | Fixed possible crash | STRWarrior | 2014-10-15 | 1 | -1/+8 |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It could crash if MinAmount - MaxAmount was 0 because it would execute (Number % 0) | ||||
| | * | | | | | | | | | | Changed i variable to j | STRWarrior | 2014-10-16 | 1 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The server wasn't going over all the items before. | ||||
| | * | | | | | | | | | | Reversed wrong fix for #1517. | STRWarrior | 2014-10-16 | 1 | -8/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Reversed the order of the loot | STRWarrior | 2014-10-15 | 1 | -7/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason the rare items weren't generating at all. Added forgotten Golden Apple | ||||
| | * | | | | | | | | | | Added loot to dungeons. | STRWarrior | 2014-10-15 | 1 | -1/+27 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #1536 from mc-server/MineshaftBooks | Mattes D | 2014-10-15 | 3 | -1/+46 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Mineshaft books | ||||
| | * | | | | | | | | | Using C++11 loops | STRWarrior | 2014-10-15 | 1 | -5/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | The code now prevents conflicting enchantments. | STRWarrior | 2014-10-15 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | IntNoise1DInt result gets devided by 7 first | STRWarrior | 2014-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | suggestion by xoft | ||||
| | * | | | | | | | | | Adding enchantments directly instead of first getting the name of it. | STRWarrior | 2014-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Renamed the counter to 'j' | STRWarrior | 2014-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Returned cFastRandom and cEnchantment:GetRandomEnchantmentFromVector to before | STRWarrior | 2014-10-15 | 5 | -16/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cEnchantment:GenerateEnchantmentFromVector that allows to get the same enchantments over and over. | ||||
| | * | | | | | | | | | Enchanted books generate in MineShafts chests | STRWarrior | 2014-10-15 | 5 | -6/+30 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Functions in cPluginManager get references instead of pointers. | Mattes D | 2014-10-15 | 29 | -181/+220 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Usernames are lowercased before generating offline UUID. | Mattes D | 2014-10-15 | 1 | -1/+4 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This breaks previous offline UUIDs, but it guarantees that future offline UUIDs will be the same even for usernames with wrong capitalization. | ||||
| * | | | | | | | | | cWorld: Fixed scheduler. | Mattes D | 2014-10-13 | 2 | -12/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1534. Added a test case into the Debuggers plugin. | ||||
| * | | | | | | | | | Fixed style. | Mattes D | 2014-10-13 | 3 | -4/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | CheckBasicStyle ignores the Bindings.h generated file. | Mattes D | 2014-10-13 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1529 from mc-server/unique_ptr | Mattes D | 2014-10-12 | 4 | -42/+45 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Moved a few objects to unique_ptr | ||||
| | * | | | | | | | | | Aligned simulators | worktycho | 2014-10-12 | 1 | -5/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fix style | worktycho | 2014-10-12 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fix spaces | worktycho | 2014-10-12 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Update World.cpp | worktycho | 2014-10-12 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fix lambda capture | worktycho | 2014-10-11 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Moved a few objects to unique_ptr | tycho | 2014-10-10 | 4 | -39/+41 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | We only use VS2013 now, thus VS2008 is banished! | archshift | 2014-10-12 | 1 | -3/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Added CLion project directory to .gitignore | archshift | 2014-10-12 | 1 | -0/+2 |
| | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | | Update README.md | Alexander Harkness | 2014-10-11 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | The longer URL has https, so we have to use that until the shortener has HTTPS. | Alexander Harkness | 2014-10-11 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServer | Alexander Harkness | 2014-10-11 | 2 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Webadmin: use images already in files/ instead of inline image data | archshift | 2014-10-11 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also probably means that the browser will be able to cache the images better, and not have to repeatedly download them al a part of the HTML. | ||||
| * | | | | | | | | | | Added a guide to the easy install method. | Alexander Harkness | 2014-10-11 | 1 | -3/+10 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Added easy installation method for Linux. | Alexander Harkness | 2014-10-11 | 1 | -0/+17 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1261 from mc-server/issue850 | Mattes D | 2014-10-11 | 2 | -55/+150 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Continuation of #966: Adding E_METAs | ||||
| | * | | | | | | | | | Fixed compilation. | Alexander Harkness | 2014-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into issue850 | Alexander Harkness | 2014-10-11 | 472 | -18746/+26885 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/BlockID.h | ||||
| | * | | | | | | | | | | Reverted submodule changes. | Alexander Harkness | 2014-10-11 | 2 | -0/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fixed typo and removed useless right side up slab meta. | Alexander Harkness | 2014-10-11 | 1 | -2/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Renamed NEWLEAVES and NEWLOG to LEAVES and LOG. | archshift | 2014-07-30 | 1 | -34/+34 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into issue850 | archshift | 2014-07-29 | 652 | -11439/+47867 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockLeaves.h src/Generating/Trees.cpp | ||||
| | * | | | | | | | | | | | Spacing fixes and a few more BLOCK_META constants. | narroo | 2014-07-02 | 1 | -131/+152 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed E_META_...Typos in BlockID.h | narroo | 2014-06-08 | 3 | -90/+80 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed some E_META_*** Names | narroo | 2014-05-20 | 1 | -71/+67 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed Formmating | narroo | 2014-04-28 | 1 | -69/+69 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Added some E_META_* values to BlockID.h | narroo | 2014-04-28 | 1 | -20/+120 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | More README changes. | Alexander Harkness | 2014-10-11 | 1 | -5/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixes. | Alexander Harkness | 2014-10-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed remaining indent and replaced tiger with webfreak. | Alexander Harkness | 2014-10-11 | 1 | -107/+107 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1531 from win32re/patch-1 | Alexander Harkness | 2014-10-11 | 1 | -129/+134 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | More template changes. | ||||
| | * | | | | | | | | | | | Update template.html | win32re | 2014-10-11 | 1 | -3/+8 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed indentation. | win32re | 2014-10-11 | 1 | -130/+131 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | More template changes. | win32re | 2014-10-11 | 1 | -131/+130 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #1528 from kjanku1/master | Alexander Harkness | 2014-10-11 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Android strings translated to polish | ||||
| | * | | | | | | | | | | | Update strings.xml | Kamil Janku | 2014-10-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Android strings transladed to polish | kjanku1 | 2014-10-11 | 1 | -0/+13 |
| | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1530 from win32re/patch-1 | Alexander Harkness | 2014-10-11 | 1 | -4/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Update template.html | ||||
| | * | | | | | | | | | | Update template.html | win32re | 2014-10-11 | 1 | -4/+10 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Fixed MSVC compilation. | Mattes D | 2014-10-10 | 2 | -1/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1376 from mc-server/static_cast | archshift | 2014-10-10 | 3 | -24/+41 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Use static casts instead of C casts, add floor-cast functions | ||||
| | * | | | | | | | | | | Float/Ciel: If it's going to use C++11, it might as well take advantage of it | archshift | 2014-10-09 | 3 | -26/+12 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Use static casts instead of C casts, add floor-cast functions | archshift | 2014-10-09 | 3 | -24/+55 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | DistortedHeightmap: Fixed crash on number rounding. | Mattes D | 2014-10-09 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1521. | ||||
| * | | | | | | | | | | Merge pull request #1520 from mc-server/c++11switch | Mattes D | 2014-10-09 | 1 | -4/+26 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Enabled C++11 in gcc | ||||
| | * | | | | | | | | | | Fix flag name in gcc 4.6 and earlier | worktycho | 2014-10-09 | 1 | -8/+32 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Enabled C++11 in gcc | worktycho | 2014-10-09 | 1 | -11/+9 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #1519 from mc-server/submodulize | Mattes D | 2014-10-08 | 13 | -864/+12 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Submodulize some more plugins. | ||||
| | * | | | | | | | | | | Reordered .gitmodules. Fixes #496 | Alexander Harkness | 2014-10-08 | 1 | -6/+6 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Added MagicCarpet | Alexander Harkness | 2014-10-08 | 2 | -0/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Removed MagicCarpet | Alexander Harkness | 2014-10-08 | 2 | -178/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Added Handy. | Alexander Harkness | 2014-10-08 | 4 | -244/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Added ChatLog | Alexander Harkness | 2014-10-08 | 2 | -3/+6 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Removed ChatLog. | Alexander Harkness | 2014-10-08 | 1 | -31/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Added chunkWorx. | Alexander Harkness | 2014-10-08 | 2 | -0/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Removed ChunkWorx | Alexander Harkness | 2014-10-08 | 3 | -411/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1518 from mc-server/AcaciaTrees | Mattes D | 2014-10-08 | 1 | -5/+75 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Added AcaciaTrees for the savanna biomes | ||||
| | * | | | | | | | | | | Added comments to the GetAcaciaTreeImage function | STRWarrior | 2014-10-08 | 1 | -0/+18 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Using array with possible directions. | STRWarrior | 2014-10-08 | 1 | -8/+9 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Added AcaciaTrees for the savanna biomes | STRWarrior | 2014-10-08 | 1 | -5/+56 |
| | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * / | | | | | | | | | Updated Buildserver URLs. | Alexander Harkness | 2014-10-08 | 1 | -2/+2 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Removed BlockHaybale.h from CMakeLists.txt | Howaner | 2014-10-07 | 1 | -1/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Removed unused cBlockHayBaleHandler. | Howaner | 2014-10-07 | 2 | -24/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1513 from mc-server/MojangAPIRefresh | Mattes D | 2014-10-07 | 2 | -19/+132 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | cMojangAPI: Added periodical refreshes. | ||||
| | * | | | | | | | | cMojangAPI: Added periodical refreshes. | Mattes D | 2014-10-06 | 2 | -19/+132 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed crash in ForEachEntityInBox API. | madmaxoft | 2014-10-06 | 3 | -6/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1511. | ||||
| * | | | | | | | | | Merge pull request #1509 from WebFreak001/master | Mattes D | 2014-10-06 | 4 | -266/+432 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Made WebAdmin more modern | ||||
| | * | | | | | | | | added font callback | WebFreak001 | 2014-10-05 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Removed my license, added me to CONTRIBUTORS | WebFreak001 | 2014-10-05 | 2 | -16/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added newline | WebFreak001 | 2014-10-05 | 1 | -2/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added license | WebFreak001 | 2014-10-05 | 1 | -0/+16 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Made WebAdmin design more modern | WebFreak001 | 2014-10-05 | 3 | -265/+431 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1510 from mc-server/TimedEvent | Mattes D | 2014-10-06 | 3 | -1/+52 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added a cEvent::Wait() with timeout. | ||||
| | * | | | | | | | | | Update CMakeLists.txt | worktycho | 2014-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added a cEvent::Wait() with timeout. | Mattes D | 2014-10-05 | 2 | -0/+51 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed a missed value. | madmaxoft | 2014-10-05 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Removed obsolete cMonster::eType. | madmaxoft | 2014-10-05 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Has been replaced with global eMonsterType. | ||||
| * | | | | | | | | | | Fixed eMonsterType Lua API mismatch. | madmaxoft | 2014-10-05 | 6 | -54/+25 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed typo. | Alexander Harkness | 2014-10-05 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | cClientHandle: Added protocol version knowledge. | Mattes D | 2014-10-05 | 5 | -3/+22 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Update README.md | Alexander Harkness | 2014-10-05 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
| * / / / / / / / / | Updated Core. | Mattes D | 2014-10-05 | 1 | -0/+0 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #1504 from win32re/master | STRWarrior | 2014-10-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixes #1503 - No gravel is being generated | ||||
| | * | | | | | | | | Fixes #1503 - No gravel is being generated | win32re | 2014-10-04 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #1489 from mc-server/fixes | Mattes D | 2014-10-04 | 2 | -71/+54 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Improved torch handler | ||||
| | * | | | | | | | | Comment suggestions | Tiger Wang | 2014-10-03 | 1 | -2/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Improved torch handler | Tiger Wang | 2014-09-30 | 2 | -70/+52 |
| | | | | | | | | | | |||||
| * | | | | | | | | | QtBiomeVisualiser: Added mouse hover info. | Mattes D | 2014-10-03 | 7 | -147/+228 |
| | | | | | | | | | | |||||
| * | | | | | | | | | QtBiomeVisualiser: Zoom is now limited and aligned to steps. | madmaxoft | 2014-10-03 | 4 | -59/+169 |
| | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | | Fix spelling of PRISMRAINE | Alexander Harkness | 2014-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1497 | ||||
| * | | | | | | | | Added parentheses for clarity. | Alexander Harkness | 2014-10-01 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | APIDump: Fixed cEntity documentation. | madmaxoft | 2014-10-01 | 1 | -5/+23 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed broken code. | Alexander Harkness | 2014-10-01 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1494 from Masy98/blocks | Mattes D | 2014-10-01 | 3 | -26/+32 |
| |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Fixed Red Sandstone and Prismarine drops | ||||
| | * | | | | | | | Fixed sorting | Masy98 | 2014-10-01 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into blocks | Masy98 | 2014-10-01 | 5 | -42/+71 |
| | |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #1493 from Masy98/blocks | Mattes D | 2014-10-01 | 3 | -16/+70 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Added missing 1.8 blocks, E_METAs and sounds | ||||
| * | | | | | | | | | APIDump: Added more of the missing documentation. | madmaxoft | 2014-10-01 | 1 | -5/+22 |
| | | | | | | | | | | |||||
| * | | | | | | | | | cRoot: Removed useless variable from Lua API. | madmaxoft | 2014-10-01 | 1 | -2/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | cPlayer: Removed useless functions from the Lua API. | madmaxoft | 2014-10-01 | 1 | -2/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Bindings: Fixed binding for cPlayer::PermissionMatches(). | madmaxoft | 2014-10-01 | 1 | -10/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Unified cRoot broadcast chat documentation. | madmaxoft | 2014-10-01 | 2 | -12/+19 |
| | | | | | | | | | | |||||
| * | | | | | | | | | APIDump: Documented missing cIniFile function. | madmaxoft | 2014-10-01 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | APIDump: Documented missing cCompositeChat functions. | madmaxoft | 2014-10-01 | 1 | -4/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | APIDump: Added missing cClientHandle documentation. | madmaxoft | 2014-10-01 | 1 | -0/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | cClientHandle: Alpha-sorted the sending functions. | madmaxoft | 2014-10-01 | 1 | -7/+7 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fixed Red Sandstone and Prismarine drops | Masy98 | 2014-10-01 | 3 | -24/+30 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Added Daylight Sensors to the "can't push" list | Masy98 | 2014-10-01 | 1 | -0/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed ":" | Masy98 | 2014-10-01 | 1 | -11/+11 |
| | | | | | | | | | |||||
| | * | | | | | | | Added missing 1.8 blocks, E_METAs and sounds | Masy98 | 2014-10-01 | 3 | -7/+59 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #1490 from mc-server/removecompact | Mattes D | 2014-10-01 | 28 | -1664/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Removed WSSCompact | ||||
| | * | | | | | | | Removed WSSCompact | Tiger Wang | 2014-09-30 | 28 | -1664/+0 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #1487 from mc-server/BlockFixes | Mattes D | 2014-09-30 | 8 | -6/+62 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Block fixes | ||||
| | * | | | | | | Code improvements | Howaner | 2014-09-30 | 3 | -3/+7 |
| | | | | | | | | |||||
| | * | | | | | | Fixed 1.8 dirt types | Howaner | 2014-09-30 | 3 | -3/+35 |
| | | | | | | | | |||||
| | * | | | | | | Fixed iron trapdoors | Howaner | 2014-09-30 | 4 | -2/+9 |
| | | | | | | | | |||||
| | * | | | | | | Fixed 1.8 doors. | Howaner | 2014-09-30 | 1 | -1/+14 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1485 from mc-server/PluginMessages | Mattes D | 2014-09-30 | 6 | -118/+242 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Rewritten plugin messages, vanilla's are being parsed directly. | ||||
| | * | | | | | | Fixed a missing semicolon. | madmaxoft | 2014-09-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Rewritten plugin messages, vanilla are being parsed directly. | madmaxoft | 2014-09-30 | 6 | -118/+242 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should finally fix the compatibility problems between 1.7 and 1.8 protocols with the changes in the vanilla plugin messages. | ||||
| * | | | | | | | Merge pull request #1427 from mc-server/chestcarts | Mattes D | 2014-09-30 | 15 | -72/+190 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Implemented Chest Minecarts | ||||
| | * | | | | | | | Compilation fix | Tiger Wang | 2014-09-28 | 2 | -4/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Suggestions | Tiger Wang | 2014-09-27 | 6 | -23/+69 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into chestcarts | Tiger Wang | 2014-09-27 | 235 | -6583/+12914 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Minecart.cpp | ||||
| | * | | | | | | | | e.t.c. -> etc. | Tiger Wang | 2014-09-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | etcetera, not egg tray conglomerate :P | ||||
| | * | | | | | | | | Added newlines | Tiger Wang | 2014-09-13 | 1 | -1/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Implemented Chest Minecarts | Tiger Wang | 2014-09-13 | 15 | -94/+161 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1484 from SphinxC0re/master | Mattes D | 2014-09-30 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | actual solving of the halfslab+torch problem | ||||
| | * | | | | | | | | Indentation | Julian Laubstein | 2014-09-30 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Set right indentation | Julian Laubstein | 2014-09-30 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | actual solving of the halfslap+torch problem | Julian Laubstein | 2014-09-30 | 1 | -1/+3 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Updated Core. | madmaxoft | 2014-09-29 | 1 | -0/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Updated Core. | madmaxoft | 2014-09-29 | 1 | -0/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | RankMgr: GetAllPlayers() returns players sorted by name. | madmaxoft | 2014-09-29 | 3 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Updated the Core. | madmaxoft | 2014-09-29 | 1 | -0/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Style fixes. | madmaxoft | 2014-09-29 | 3 | -10/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | World: Fixed chunk generation by plugins. | madmaxoft | 2014-09-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChunkWorx was broken, it was trying to generate chunks that were not properly marked as InQueue. | ||||
| * | | | | | | | | QtBiomeVisualiser: Seed is read properly. | madmaxoft | 2014-09-29 | 2 | -9/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed codestyle again. | Alexander Harkness | 2014-09-29 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1472 from mc-server/Ranks | Mattes D | 2014-09-29 | 5 | -1/+206 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Added more cRankManager functions | ||||
| | * | | | | | | | | Fixed a typo in the description. | madmaxoft | 2014-09-29 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Renamed GetAllPlayers() to GetAllPlayerUUIDs() | Howaner | 2014-09-29 | 3 | -7/+7 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into Ranks | Howaner | 2014-09-29 | 39 | -4770/+178 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fixed SetDefaultRank() return value. | Howaner | 2014-09-28 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | cRankManager: Added ClearPlayerRanks() | Howaner | 2014-09-28 | 4 | -0/+46 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Updated api documentation. | Howaner | 2014-09-28 | 2 | -1/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | cRankManager: Added GetAllPlayers() and GetPlayerName() | Howaner | 2014-09-28 | 4 | -0/+157 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1480 from w00tc0d3/work | Alexander Harkness | 2014-09-29 | 2 | -3/+14 |
| |\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | BlockStone: drop the right cobblestone on onBreak(). | ||||
| | * | | | | | | | | | BlockStone.h: fix the codestyle | w00tc0d3 | 2014-09-29 | 1 | -6/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Tabs -> spaces | w00tc0d3 | 2014-09-29 | 1 | -4/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | BlockStone: drop the right cobblestone on onBreak(). | netchip | 2014-09-29 | 2 | -3/+15 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: netchip <w00tc0d3@outlook.com> | ||||
| * | | | | | | | | | Merge pull request #1479 from SphinxC0re/master | Mattes D | 2014-09-29 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added torches placeable on upside-down-halfslabs | ||||
| | * | | | | | | | | | Update BlockTorch.h | Julian Laubstein | 2014-09-29 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added torches placeable on upside-down-halfslaps | Julian Laubstein | 2014-09-29 | 1 | -1/+3 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #1473 from mc-server/NewStoneGeneration | Mattes D | 2014-09-29 | 3 | -7/+46 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added Granite, Diorite and Andesite to the NaturalPatches generator. | ||||
| | * | | | | | | | | | Fixed compilation | STRWarrior | 2014-09-28 | 1 | -1/+10 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added Granite, Diorite and Andesite to the NaturalPatches generator. | STRWarrior | 2014-09-28 | 3 | -7/+37 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1478 from doublej472/master | Mattes D | 2014-09-29 | 2 | -0/+21 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Make endermen take damage in water | ||||
| | * | | | | | | | | | | Derp | Jonathan Frederick | 2014-09-29 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fix comments | Jonathan Frederick | 2014-09-29 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Make endermen take damage in water | Jonathan Frederick | 2014-09-28 | 2 | -0/+21 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Plugin messages: Vanilla prefixes its payloads with VarInt lengths. | madmaxoft | 2014-09-28 | 1 | -4/+13 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Revert "1.8: Fixed plugin messages." | madmaxoft | 2014-09-28 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 04ee8c43dd17eb98d1e3d66ff691898e9f269b95. | ||||
| * | | | | | | | | | | Protocol 1.8: Fixed possible crash on malformed packet. | madmaxoft | 2014-09-28 | 1 | -0/+5 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed trailing whitespace. | madmaxoft | 2014-09-28 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1471 from mc-server/redstoneData | Mattes D | 2014-09-28 | 4 | -1/+13 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Use factory method to construct redstone simulator data | ||||
| | * | | | | | | | | | | Update Chunk.cpp | worktycho | 2014-09-28 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Use factory method to construct redstone simulator data | Tycho | 2014-09-28 | 4 | -1/+13 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #1466 from mc-server/endofsupport | Mattes D | 2014-09-28 | 27 | -4757/+24 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Removed protocols 1.2 to 1.6 | ||||
| | * | | | | | | | | | Compilation fix | Tiger Wang | 2014-09-28 | 2 | -3/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Bug fix | Tiger Wang | 2014-09-27 | 5 | -32/+27 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge remote-tracking branch 'origin/master' into endofsupport | Tiger Wang | 2014-09-27 | 8 | -4/+54 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | | Dropped support for <1.7.x | Tiger Wang | 2014-09-27 | 22 | -4733/+6 |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1463 from mc-server/sp_docs1.6EoS | Alexander Harkness | 2014-09-28 | 2 | -1/+52 |
| |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | Add docs for HOOK_SERVER_PING | ||||
| | * | | | | | | | | Add Code example. | Alexander Harkness | 2014-09-28 | 1 | -0/+26 |
| | | | | | | | | | | |||||
| | * | | | | | | | | changed description to be more readable. | Alexander Harkness | 2014-09-27 | 1 | -3/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Copy edit. | Alexander Harkness | 2014-09-27 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed return value descriptions. | Alexander Harkness | 2014-09-27 | 1 | -1/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed typo again. | Alexander Harkness | 2014-09-27 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Typo fix. | Alexander Harkness | 2014-09-27 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed line left in. | Alexander Harkness | 2014-09-27 | 1 | -4/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Remaining part of fix. | Alexander Harkness | 2014-09-27 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Hopefully fix #1384 | Alexander Harkness | 2014-09-27 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can @madmaxoft comment? | ||||
| * | | | | | | | | | 1.8: Fixed plugin messages. | Howaner | 2014-09-27 | 1 | -3/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | QtBiomeVisualiser: fixed compilation. | madmaxoft | 2014-09-27 | 1 | -1/+10 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed another redstone crash. | madmaxoft | 2014-09-27 | 1 | -1/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1465 from Masy98/blocks | Mattes D | 2014-09-27 | 2 | -3/+12 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added barriers correctly | ||||
| | * | | | | | | | | | Combined conditions | Masy98 | 2014-09-27 | 1 | -8/+11 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added barriers correctly | Masy98 | 2014-09-27 | 2 | -0/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | BioGen: TwoLevel is now fully settable in INI. | madmaxoft | 2014-09-27 | 2 | -44/+31 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed minor style issues. | madmaxoft | 2014-09-27 | 3 | -3/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Wrapped clang-specific pragma into an #ifdef block. | madmaxoft | 2014-09-27 | 1 | -1/+6 |
| | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC was complaining about an unknown pragma. | ||||
| * | | | | | | | | | Merge pull request #1461 from mc-server/RedstoneFix | Tiger Wang | 2014-09-27 | 3 | -1/+8 |
| |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | Redstone fix | ||||
| | * | | | | | | | | Update creatable.cpp | worktycho | 2014-09-27 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Update IncrementalRedstoneSimulator.inc | worktycho | 2014-09-27 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Update IncrementalRedstoneSimulator.inc | worktycho | 2014-09-27 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Correct method name. | worktycho | 2014-09-27 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Set chunk data | worktycho | 2014-09-27 | 1 | -0/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add data accessor. | worktycho | 2014-09-27 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #1459 from Masy98/blocks | Alexander Harkness | 2014-09-27 | 3 | -2/+45 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Fixed drops for Doors and Fence Gates | ||||
| | * | | | | | | | Added default value to switch and spruce gate to fence gate handler | Masy98 | 2014-09-27 | 2 | -0/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed convertToPickups for fence gates | Masy98 | 2014-09-27 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Fixed convertToPickups for doors | Masy98 | 2014-09-27 | 1 | -1/+38 |
| | |/ / / / / / | |||||
| * / / / / / / | Removed polarSSL makefile. Fixes #591. | Alexander Harkness | 2014-09-27 | 2 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | Also normalises polarssl submodule URL. | ||||
| * | | | | | | Merge pull request #1456 from Howaner/Fixes | Mattes D | 2014-09-26 | 16 | -77/+41 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed player custom names in 1.8 and added type checking to map loading | ||||
| | * \ \ \ \ \ | Merge branch 'master' into Fixes | Howaner | 2014-09-26 | 113 | -3157/+3556 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fixed players custom name in 1.8 | Howaner | 2014-09-26 | 14 | -66/+30 |
| | | | | | | | | | |||||
| | * | | | | | | | Added type checking to map loading. | Howaner | 2014-09-26 | 2 | -11/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed UNUSED macro so that it doesn't require type knowledge. | madmaxoft | 2014-09-26 | 2 | -5/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced new UNUSED_VAR macro that is used when type knowledge is available (for local variables). | ||||
| * | | | | | | | | Updated Core | Tiger Wang | 2014-09-26 | 1 | -0/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1415 from Masy98/blocks | Mattes D | 2014-09-26 | 13 | -41/+287 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Added 1.8 Blocks and Items | ||||
| | * | | | | | | | Moved curly brace to seperate line | Masy98 | 2014-09-26 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Re-added 1.8 blocks to the redstone simulator | Masy98 | 2014-09-26 | 1 | -9/+46 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into blocks | Masy98 | 2014-09-26 | 184 | -6551/+12716 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHandler.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| | * | | | | | | | | Added slime block to slime balls recipe | Masy98 | 2014-09-12 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added Sea Lantern drops | Masy98 | 2014-09-12 | 2 | -0/+32 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed 1.8 Item stacking and block harvesting | Masy98 | 2014-09-12 | 2 | -26/+44 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added new doors in ItemDoor.h | Masy98 | 2014-09-11 | 1 | -1/+15 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed mutton name in Sheep.cpp | Masy98 | 2014-09-11 | 2 | -3/+11 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed mutton name in ItemHandler | Masy98 | 2014-09-11 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added barrier block | Masy98 | 2014-09-11 | 3 | -1/+7 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added 1.8 food to the food list | Masy98 | 2014-09-11 | 2 | -2/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added blocks to the fire simulator | Masy98 | 2014-09-11 | 1 | -0/+11 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed incorrect handlers | Masy98 | 2014-09-11 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added stone slab in BlockSlab.h | Masy98 | 2014-09-10 | 1 | -1/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed typo | Masy98 | 2014-09-10 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added new blocks to the BlockInfo | Masy98 | 2014-09-10 | 3 | -12/+76 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added new blocks to the BlockHandler | Masy98 | 2014-09-10 | 1 | -0/+12 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added iron trapdoor, fence gates and doors to the redstone simulator | Masy98 | 2014-09-10 | 1 | -0/+11 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added 1.8 Blocks and Items | Masy98 | 2014-09-10 | 1 | -0/+37 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1455 from mc-server/includes | Tiger Wang | 2014-09-26 | 10 | -22/+15 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Removed a few unnecessary includes | ||||
| | * | | | | | | | | | Update Plugin.h | worktycho | 2014-09-26 | 1 | -2/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Removed a few unnessicary includes | Tycho | 2014-09-26 | 10 | -21/+16 |
| | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tycho | 2014-09-26 | 3 | -3/+8 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | | Fixed issue with casting | tycho | 2014-09-26 | 3 | -3/+8 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Removed more unessicary includes | Tycho | 2014-09-26 | 49 | -59/+55 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #1419 from mc-server/redstoneTests | worktycho | 2014-09-26 | 62 | -3075/+3480 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Added test mocking to IncrementalRedstoneSimulator | ||||
| | * | | | | | | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 4 | -23/+42 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| | * | | | | | | | | Fixed style | Tycho | 2014-09-25 | 4 | -2/+108 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-25 | 83 | -948/+6850 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Mobs/Monster.h | ||||
| | * | | | | | | | | | Fix accedental c++11 | Tycho | 2014-09-17 | 1 | -6/+7 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into redstoneTests | Tycho | 2014-09-17 | 88 | -2583/+2318 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/ChunkInterface.h | ||||
| | * | | | | | | | | | | Added first test to show the object can be created | Tycho | 2014-09-17 | 46 | -456/+681 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | IncrementalRedstoneSimulator now has no dependencies on cChunk | Tycho | 2014-09-16 | 6 | -375/+384 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Don't include IncrementalRedsonteSimulator.inc when in SELF_TEST mode | Tycho | 2014-09-11 | 1 | -5/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the server | Tycho | 2014-09-11 | 22 | -2339/+2403 |
| | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | THis wil hopefully allow for unit testing | ||||
| * | | | | | | | | | | Improved searching for spawn. | madmaxoft | 2014-09-26 | 1 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Won't spawn on a small island inside ocean anymore. | ||||
| * | | | | | | | | | | cByteBuffer: Simplified ReadPosition(). | madmaxoft | 2014-09-25 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, by popular demand, added more comments to the code. | ||||
| * | | | | | | | | | | Protocol 1.8: Fixed plugin message packet. | madmaxoft | 2014-09-25 | 1 | -1/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | cByteBuffer: Fixed position reading. | madmaxoft | 2014-09-25 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | TwoLevel BioGen: reads params from INI file. | madmaxoft | 2014-09-25 | 1 | -9/+26 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Added cByteBuffer::WriteBEUShort(). | madmaxoft | 2014-09-25 | 3 | -1/+15 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1452 from Howaner/Fixes | Mattes D | 2014-09-25 | 7 | -18/+55 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixes | ||||
| | * | | | | | | | | | | Comment style | Howaner | 2014-09-25 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' into Fixes | Howaner | 2014-09-25 | 4 | -25/+41 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Fixed wrong Surrounding size | Howaner | 2014-09-25 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Anvil: Arrow Tile tags are a short in Vanilla | Howaner | 2014-09-25 | 2 | -7/+24 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Use the json writer to write sign texts. | Howaner | 2014-09-25 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change the client disconnects if the text contains " | ||||
| | * | | | | | | | | | | Fixed dispender direction bug | Howaner | 2014-09-25 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fixed hanging direction bugs. | Howaner | 2014-09-25 | 3 | -2/+17 |
| | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | | Protocol 1.8: Handling packet compression properly. | madmaxoft | 2014-09-25 | 2 | -14/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compression didn't work with CommLog turned on. | ||||
| * | | | | | | | | | | Protocol 1.8: Added checks for values presence. | madmaxoft | 2014-09-25 | 1 | -2/+8 |
| | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Reported by @worktycho / Coverity. | ||||
| * | | | | | | | | | Redstone: Fixed a crash with repeaters on a chunk border. | madmaxoft | 2014-09-25 | 1 | -13/+22 |
| | | | | | | | | | | |||||
| * | | | | | | | | | 1.8 Protocol: Fixed problems with no-payload packets. | madmaxoft | 2014-09-25 | 1 | -6/+7 |
| | | | | | | | | | | |||||
| * | | | | | | | | | 1.7 Protocol: fixed potential problems with no-payload packets. | madmaxoft | 2014-09-25 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | HangingEntity: Silenced a crash. | madmaxoft | 2014-09-25 | 1 | -2/+8 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Vanilla worlds sometimes contain data that this was asserting upon. Changed into a log. | ||||
| * | | | | | | | | Merge pull request #1449 from mc-server/WorldLoader | Mattes D | 2014-09-24 | 3 | -5/+59 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | MCServer world compatiblity with vanilla and mcedit. | ||||
| | * | | | | | | | | derp | Howaner | 2014-09-24 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Don't create two entity lists. | Howaner | 2014-09-24 | 2 | -7/+14 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into WorldLoader | Howaner | 2014-09-24 | 9 | -14/+33 |
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | | QtBiomeVisualiser: Fixed MSVC path-crossing. | madmaxoft | 2014-09-24 | 7 | -10/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC would occasionally compile the wrong CPP file - the same name, but wrong path. | ||||
| * | | | | | | | | | Anvil: Wolf collar color is a byte in Vanilla. | madmaxoft | 2014-09-23 | 2 | -4/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kept the old Int reading for compatibility reasons. Ref.: #1448 | ||||
| | * | | | | | | | | Merge branch 'master' into WorldLoader | Howaner | 2014-09-23 | 2 | -5/+5 |
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | | Fixed compiler warnings in 1.8 protocol. | madmaxoft | 2014-09-23 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed a crash in WSSAnvil. | madmaxoft | 2014-09-23 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported as #1448. | ||||
| | * | | | | | | | | MCServer world compatiblity with vanilla and mcedit. | Howaner | 2014-09-23 | 3 | -5/+52 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #1372 from mc-server/EntityCustomName | Franz Reiter | 2014-09-23 | 20 | -31/+267 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Added SetCustomName() to cMonster and cPlayer | ||||
| | * | | | | | | | | Fixed SQLiteCpp downgrade | Howaner | 2014-09-23 | 1 | -0/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-23 | 232 | -4784/+10892 |
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | | | | QtBiomeVisualiser: Fixed confusion about Globals.h. | madmaxoft | 2014-09-23 | 5 | -21/+21 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Made ExpBottleEntity break on entities. | archshift | 2014-09-23 | 2 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1369 | ||||
| * | | | | | | | | | Merge pull request #1447 from cedeel/patch-2 | worktycho | 2014-09-23 | 5 | -44/+47 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | A few compiler warning fixes | ||||
| | * | | | | | | | | | A few compiler warning fixes | Chris Darnell | 2014-09-23 | 5 | -44/+47 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Updated README.md | Howaner | 2014-09-22 | 2 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Hotfixed 1.8 item reading. | Howaner | 2014-09-22 | 2 | -6/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | QtBiomeVisualiser: Implemented live-update for the generator setup. | madmaxoft | 2014-09-22 | 5 | -17/+49 |
| | | | | | | | | | | |||||
| * | | | | | | | | | QtBiomeVisualiser: generator source is read from generator setup ini. | madmaxoft | 2014-09-22 | 3 | -16/+13 |
| | | | | | | | | | | |||||
| * | | | | | | | | | QtBiomeVisualiser: Moved the generator setup into a side-pane. | madmaxoft | 2014-09-22 | 5 | -39/+96 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1398 from mc-server/1.8-Protocol | Alexander Harkness | 2014-09-22 | 36 | -680/+4729 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 1.8 Protocol Update | ||||
| | * | | | | | | | | | Changed metadata reading again. | Howaner | 2014-09-22 | 2 | -173/+7 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed item nbt reading. | Howaner | 2014-09-22 | 2 | -3/+168 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Code improvements. | Howaner | 2014-09-19 | 4 | -38/+36 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Updated SPAWNING_ENTITY hook description. | Howaner | 2014-09-19 | 1 | -2/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-19 | 31 | -360/+648 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | | Derp | Howaner | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Exported player list states to extra functions. | Howaner | 2014-09-18 | 14 | -531/+837 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | 1.8: Simplified item metadata reading. | Howaner | 2014-09-18 | 3 | -27/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Use xofts ReadPosition() code. | Howaner | 2014-09-17 | 1 | -3/+6 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed SQLiteCpp downgrade | Howaner | 2014-09-14 | 1 | -0/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Simplified WriteUUID() | Howaner | 2014-09-14 | 1 | -9/+9 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed warnings. | Howaner | 2014-09-14 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-14 | 58 | -2270/+1737 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | 1.8: Updated scoreboard packets. | Howaner | 2014-09-13 | 1 | -3/+7 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Moved chat json creating to the CompositeChat class. | Howaner | 2014-09-13 | 6 | -346/+192 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | 1.8: Fixed maps. | Howaner | 2014-09-13 | 12 | -45/+43 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-13 | 24 | -104/+185 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemHoe.h | ||||
| | * | | | | | | | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-12 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-12 | 2 | -0/+17 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-12 | 65 | -326/+260 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Fixed many right click issues. | Howaner | 2014-09-12 | 2 | -7/+17 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixed wrong buffer length in the 1.8 protocol. | Howaner | 2014-09-12 | 1 | -10/+4 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | 1.8: Fixed ReadItem() | Howaner | 2014-09-12 | 2 | -20/+40 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | 1.8: Added difficulty sending | Howaner | 2014-09-12 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | 1.8: Fixed block entities. | Howaner | 2014-09-12 | 1 | -8/+2 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | 1.8: Fixed eating. | Howaner | 2014-09-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | 1.8: Fixed workbench, enchanting and anvil window. | Howaner | 2014-09-12 | 1 | -3/+19 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | 1.8: Enderman, byte -> short | Howaner | 2014-09-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | 1.8: Fixed enderman spawning. | Howaner | 2014-09-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | 1.8: Fixed inventory open packet. | Howaner | 2014-09-11 | 3 | -4/+32 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Removed GetProtocolVersion() from the protocols. | Howaner | 2014-09-11 | 7 | -19/+6 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | 1.8: Fixed sign placing. | Howaner | 2014-09-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | 1.8: Fixed hangings. | Howaner | 2014-09-11 | 4 | -32/+89 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | 1.8: Added ParticleEffect packet. | Howaner | 2014-09-11 | 19 | -38/+115 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | 1.8: Added MultiBlockChange packet. | Howaner | 2014-09-09 | 4 | -54/+86 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Downgrade SQLiteCpp again | Howaner | 2014-09-09 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Added the player list to the 1.8 protocol. | Howaner | 2014-09-09 | 16 | -31/+108 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into 1.8-Protocol | Howaner | 2014-09-09 | 62 | -850/+1589 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | PlayerSpawn packet: Send the correct uuid. | Howaner | 2014-09-09 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | 1.8: Added new uuid field. | Howaner | 2014-09-09 | 3 | -17/+44 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | More fixes. | Howaner | 2014-09-08 | 3 | -12/+7 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Recoded cProtocol180 class. | Howaner | 2014-09-08 | 4 | -589/+2690 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | 1.8: Fixed tab complete. | Howaner | 2014-09-08 | 3 | -2/+20 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed more 1.8 packets. | Howaner | 2014-09-08 | 7 | -47/+313 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Updated chunk sending to 1.8 | Howaner | 2014-09-08 | 4 | -26/+22 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Added GetProtocolVersion() to cProtocol. | Howaner | 2014-09-08 | 8 | -26/+29 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Implemented packet compression. | Howaner | 2014-09-08 | 7 | -35/+117 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChunkData packet needs this. | ||||
| | * | | | | | | | | | | | | | | Fixed client errors. | Howaner | 2014-09-04 | 5 | -52/+79 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Added more 1.8 protocol things. | Howaner | 2014-09-04 | 6 | -14/+632 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Started implementing of the 1.8 protocol. | Howaner | 2014-09-04 | 7 | -7/+502 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #1446 from cedeel/patch-1 | Alexander Harkness | 2014-09-22 | 6 | -11/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made it compile with clang | ||||
| | * | | | | | | | | | | | | | | | Made it compile with clang | Chris Darnell | 2014-09-22 | 6 | -11/+11 |
| |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | QtBiomeVisualiser: Added the base for INI editting. | madmaxoft | 2014-09-21 | 5 | -20/+266 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fix crash in cLineBlockTracer | Tiger Wang | 2014-09-21 | 1 | -8/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1418 | ||||
| * | | | | | | | | | | | | | | | QtBiomeVisualiser: Added list of vanilla worlds. | madmaxoft | 2014-09-20 | 2 | -7/+145 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed cParsedNBT::FindTagByPath(). | madmaxoft | 2014-09-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an off-by-one error in the name handling. | ||||
| * | | | | | | | | | | | | | | | QtBiomeVisualiser: Added support for loading Anvil worlds. | madmaxoft | 2014-09-20 | 4 | -5/+320 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed typos in items.ini. | madmaxoft | 2014-09-19 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #1442 from Masy98/Language | Mattes D | 2014-09-19 | 2 | -3/+611 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | Added german language support | ||||
| | * | | | | | | | | | | | | | | Added german language support, now really | Masy98 | 2014-09-18 | 1 | -0/+603 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Added german language support | Masy98 | 2014-09-18 | 1 | -3/+8 |
| | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | QtBiomeVisualiser: More gcc fixes. | madmaxoft | 2014-09-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | QtBiomeVisualiser: Fixed linux compilation. | madmaxoft | 2014-09-18 | 5 | -0/+6 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed minor style issues. | madmaxoft | 2014-09-17 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Voronoi biomegen: Added JitterSize and OddRowOffset. | madmaxoft | 2014-09-17 | 3 | -88/+164 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Updated SQLiteCpp. | madmaxoft | 2014-09-17 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our changes have made it into upstream, updating to sync with upstream master. | ||||
| * | | | | | | | | | | | | | | Merge pull request #1437 from nesco/master | Mattes D | 2014-09-17 | 4 | -5/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented spectator gamemode. | ||||
| | * | | | | | | | | | | | | | | Implementing Spectator Mode | nesco | 2014-09-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding some proprieties of the spectator game mode in player.cpp : - Players can't toss items - Players can't touch the ground | ||||
| | * | | | | | | | | | | | | | | Update World.h | nesco | 2014-09-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Preparing 1.8 update | nesco | 2014-09-17 | 1 | -5/+15 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Preparing 1.8 update | nesco | 2014-09-16 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially added Spectator gamemode | ||||
| | * | | | | | | | | | | | | | | Preparing 1.8 update | nesco | 2014-09-16 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Spectator gamemode | ||||
| | * | | | | | | | | | | | | | | Pre 1.8 release | nesco | 2014-09-16 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Spectator gamemode | ||||
| | * | | | | | | | | | | | | | | Preparing 1.8 changes | nesco | 2014-09-16 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Spectator Gamemode | ||||
| | * | | | | | | | | | | | | | | Pre 1.8 release | nesco | 2014-09-16 | 1 | -0/+2 |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Added Gamemode Spectator | ||||
| * | | | | | | | | | | | | | | Added an explicit setting for allowing BungeeCord handshake. | madmaxoft | 2014-09-17 | 3 | -1/+16 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed wrong url in the debuggers plugin | Howaner | 2014-09-17 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | BungeeCord compatibility: don't overwrite UUID / properties. | madmaxoft | 2014-09-17 | 1 | -2/+10 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Full BungeeCord compatibility. | madmaxoft | 2014-09-17 | 2 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1392. Fixes SpigotMC/BungeeCord#1211. | ||||
| * | | | | | | | | | | | | | Initial BungeeCord support. | madmaxoft | 2014-09-17 | 4 | -1/+43 |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1392 | ||||
| * | | | | | | | | | | | | VoronoiMap: Added Jitter and OddRowOffset params. | madmaxoft | 2014-09-15 | 2 | -11/+55 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | QtBiomeVisualiser: Fixed colors and read failures. | madmaxoft | 2014-09-15 | 1 | -6/+5 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | QtBiomeVisualiser: Added reloading. | Mattes D | 2014-09-15 | 6 | -4/+49 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | QtBiomeVisualiser: removed multithreading. | Mattes D | 2014-09-15 | 2 | -65/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was slowing things down, the granularity is too fine. | ||||
| * | | | | | | | | | | | | QtBiomeVisualiser: Added multithreading. | Mattes D | 2014-09-15 | 3 | -23/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason this makes the UI less responsive. | ||||
| * | | | | | | | | | | | | QtBiomeVisualiser: Extended zoom down below 100%. | Mattes D | 2014-09-14 | 2 | -16/+80 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | QtBiomeVisualiser: Added mouse and keyboard view control. | Mattes D | 2014-09-14 | 2 | -4/+137 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mouse dragging or WASD pans view, mouse wheel or QE zooms. | ||||
| * | | | | | | | | | | | | QtBiomeVisualiser: Removed build-specific variables. | Mattes D | 2014-09-14 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These should be set in the project configuration instead, passed directly to qmake. | ||||
| * | | | | | | | | | | | | Removed the unused nightbuild script. | madmaxoft | 2014-09-14 | 1 | -209/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1434 from Masy98/master | Alexander Harkness | 2014-09-14 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | Added me to the contributors list | ||||
| | * | | | | | | | | | | | Added me to the contributors list | Masy98 | 2014-09-14 | 1 | -0/+1 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Added new Qt-based biome visualiser. | Mattes D | 2014-09-14 | 37 | -2181/+1482 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile with Qt 5.1+ | ||||
| * | | | | | | | | | | | OSSupport: Fixed UNICODE Windows builds. | Mattes D | 2014-09-14 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files now compile even inside UNICODE applications. | ||||
| * | | | | | | | | | | | Improved cBlockHandler::DropBlock | Tiger Wang | 2014-09-13 | 5 | -46/+34 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Entities experience water resistance | Tiger Wang | 2014-09-13 | 2 | -16/+31 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1353 from mc-server/Effects | Mattes D | 2014-09-13 | 13 | -16/+179 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Added speed entity effect. | ||||
| | * | | | | | | | | | | | Added extra mushroom handler. | Howaner | 2014-09-12 | 4 | -10/+60 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into Effects | Howaner | 2014-09-12 | 133 | -1375/+2157 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Renamed SetWalkSpeed() to SetRelativeWalkSpeed() | Howaner | 2014-09-02 | 4 | -11/+11 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into Effects | Howaner | 2014-09-02 | 38 | -405/+954 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Removed SexyMotd link | Howaner | 2014-08-30 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added GetWalkSpeed() and SetWalkSpeed() documentation. | Howaner | 2014-08-30 | 2 | -0/+3 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed potion removing in creative mode. | Howaner | 2014-08-30 | 5 | -8/+16 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added slowness effect and added entity support. | Howaner | 2014-08-30 | 2 | -16/+65 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added SetWalkSpeed() to cMonster. | Howaner | 2014-08-30 | 2 | -0/+9 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into Effects | Howaner | 2014-08-30 | 12 | -223/+319 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Added speed entity effect. | Hownaer | 2014-08-28 | 3 | -1/+46 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Gittip is now Gratipay | Alexander Harkness | 2014-09-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, 7000th Commit! | ||||
| * | | | | | | | | | | | | | | Updated CI Links to new ones. | Alexander Harkness | 2014-09-13 | 1 | -2/+2 |
| | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed friction being applied whilst airborne | Tiger Wang | 2014-09-12 | 1 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported by tonibm9 in #1300. | ||||
| * | | | | | | | | | | | | | APIDump: Improved command binding documentation. | madmaxoft | 2014-09-12 | 1 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1424 from Howaner/Fixes | Mattes D | 2014-09-12 | 21 | -85/+169 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | Fixes | ||||
| | * | | | | | | | | | | | | Only drop flint or gravel, not both. | Howaner | 2014-09-12 | 1 | -2/+4 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed farmland issues. | Howaner | 2014-09-12 | 11 | -64/+75 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Only place farmland if no block is upper than dirt/grass. | Howaner | 2014-09-12 | 1 | -1/+6 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added hoe interact sound. | Howaner | 2014-09-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Play placesound from the middle of the block. | Howaner | 2014-09-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed block place sounds. | Howaner | 2014-09-12 | 2 | -15/+27 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Spawn exp if you break a mob spawner. | Howaner | 2014-09-12 | 6 | -4/+50 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Disabled mobspawner itemdrop. | Howaner | 2014-09-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Players in survival mode are not allowed to break a bedrock. | Howaner | 2014-09-12 | 1 | -0/+6 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | / / / / / | Fixed iron ore drop. | Howaner | 2014-09-12 | 1 | -1/+2 |
| | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Added flint drop and fence gate meta reset. | Howaner | 2014-09-12 | 2 | -0/+17 |
| | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | | Fixed a redstone sim failure with droppers. | Mattes D | 2014-09-11 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / / |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tycho | 2014-09-10 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge pull request #1414 from Masy98/Crafting | Mattes D | 2014-09-10 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixed sign recipe | ||||
| | | * | | | | | | | | | Fixed spacing | Masy98 | 2014-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed sign recipe | Masy98 | 2014-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Grammar fixes. | Alexander Harkness | 2014-09-10 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Cleaned up flags | Tycho | 2014-09-10 | 1 | -5/+4 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Added MCServer_ prfix to env vars for versions | Tycho | 2014-09-10 | 2 | -9/+9 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1413 from mc-server/versionInfo | Alexander Harkness | 2014-09-10 | 6 | -0/+48 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Added abilty to set build info | ||||
| | * | | | | | | | | | | Added example for how to use version info to travis | Tycho | 2014-09-10 | 1 | -0/+4 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Added abilty to set build info | Tycho | 2014-09-10 | 5 | -0/+44 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build info is displayed at startup Fixes #1410 | ||||
| * | | | | | | | | | | Merge pull request #1402 from Masy98/Sounds | Mattes D | 2014-09-10 | 50 | -299/+172 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Moved sound-configs into BlockID.h and fixed/ added loads of sounds | ||||
| | * | | | | | | | | | | Removed old sound-configuration for SignPosts | Masy98 | 2014-09-09 | 1 | -6/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Removed old sound-configuration for Repeaters | Masy98 | 2014-09-09 | 1 | -6/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Removed old sound-configuration for Trapdoors | Masy98 | 2014-09-09 | 1 | -5/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Removed old sound-configuration for doors | Masy98 | 2014-09-09 | 2 | -10/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Moved sound-configs into BlockID.h and fixed/ added loads of sounds | Masy98 | 2014-09-09 | 45 | -272/+172 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #1399 from mc-server/warnings | Mattes D | 2014-09-09 | 3 | -17/+29 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Warnings | ||||
| | * | | | | | | | | | | Actually set default | worktycho | 2014-09-09 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | use the correct ASSERT | worktycho | 2014-09-08 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | FIxed a couple more warnings | Tycho | 2014-09-08 | 1 | -2/+8 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | TimeOfDay does not need to be an Int64 | Tycho | 2014-09-08 | 3 | -6/+6 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fixed a few compile warnings | Tycho | 2014-09-08 | 1 | -9/+14 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Update Zip2008_PDBs.list | Alexander Harkness | 2014-09-09 | 1 | -1/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Update Zip2008.list | Alexander Harkness | 2014-09-09 | 1 | -0/+1 |
| | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | | capitalisation error | worktycho | 2014-09-08 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #1397 from mc-server/saveSetting | Mattes D | 2014-09-08 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | If server fails init, save any changed or generated settings. | ||||
| | * | | | | | | | | | derp | worktycho | 2014-09-08 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | If server fails init, save any changed or generated settings. | worktycho | 2014-09-08 | 1 | -0/+1 |
| |/ / / / / / / / / | |||||
| * / / / / / / / / | Exported cClientHandle:GetIPString() to Lua API. | Mattes D | 2014-09-07 | 2 | -1/+2 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Webadmin: Added default ports to auto-generated ini file. | Mattes D | 2014-09-07 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1382. | ||||
| * | | | | | | | | WebAdmin: Added HTTPS instructions when cert / key is missing. | Mattes D | 2014-09-07 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed submodules' downgrade from the previous PR merge. | Mattes D | 2014-09-07 | 2 | -0/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Re-ordered the items.ini and added a few new names | Masy98 | 2014-09-06 | 1 | -291/+290 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into blocks | Masy98 | 2014-09-06 | 73 | -990/+1672 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MCServer/crafting.txt | ||||
| | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Masy98 | 2014-09-06 | 38 | -575/+762 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge pull request #1385 from mc-server/clangWarnings | Mattes D | 2014-09-06 | 2 | -6/+27 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Should now compile in clang 3.0 | ||||
| | | | * | | | | | | | | Update SetFlags.cmake | worktycho | 2014-09-06 | 1 | -1/+0 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Added workaround for clang version | Tycho | 2014-09-06 | 2 | -5/+16 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | bumped cmake version min and fixed clang support | Tycho | 2014-09-06 | 2 | -3/+3 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Wrong cmake var | worktycho | 2014-09-06 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Improve error message | worktycho | 2014-09-06 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Should now compile in clang 3.0 | worktycho | 2014-09-06 | 1 | -5/+16 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Added missing newline. | Mattes D | 2014-09-06 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Removed chunk's unused Y coord. | Mattes D | 2014-09-06 | 2 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the second issue of #1313. | ||||
| | | * | | | | | | | | | Added Y-wise asserts to signs. | Mattes D | 2014-09-06 | 3 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help detect #1313's second case. | ||||
| | | * | | | | | | | | | Alpha-sorted protocol 1.7 senders. | Mattes D | 2014-09-06 | 1 | -7/+7 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed player spawning in unknown world. | Mattes D | 2014-09-06 | 1 | -0/+4 |
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may happen if the admin removes a world. | ||||
| | | * | | | | | | | | Win build: put third party licenses into a separate folder. | madmaxoft | 2014-09-06 | 6 | -5/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Anvil: Fixed an off-by-one error in the loader. | Mattes D | 2014-09-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1307. | ||||
| | | * | | | | | | | | Fixed scoreboard loader type checks. | Mattes D | 2014-09-06 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes scoreboard loading error reported on the Dropper map in #1307. | ||||
| | | * | | | | | | | | Removed outdated message sending methods. | Alexander Harkness | 2014-09-06 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1381 | ||||
| | | * | | | | | | | | Merge pull request #1361 from mc-server/WebAdmin | Mattes D | 2014-09-06 | 9 | -348/+501 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Webadmin improvements | ||||
| | | | * | | | | | | | | Xoft fixes. | Alexander Harkness | 2014-09-06 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | [WebAdmin] Code improvements. | Howaner | 2014-09-02 | 2 | -61/+99 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Merge branch 'master' into WebAdmin | Howaner | 2014-09-02 | 27 | -293/+770 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | | | |||||
| | | | * | | | | | | | | WebAdmin: Exported logo and background. | Howaner | 2014-08-31 | 3 | -3/+3 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | WebAdmin: Stop webadmin if template can't load. | Howaner | 2014-08-31 | 1 | -1/+3 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | WebAdmin: Added favicon to the login template. | Howaner | 2014-08-31 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | WebAdmin: Exported favicon. | Howaner | 2014-08-31 | 2 | -4/+4 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | WebAdmin: Exported stylesheet in a own file. | Howaner | 2014-08-31 | 2 | -333/+329 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | WebAdmin: Added login template | Howaner | 2014-08-31 | 2 | -0/+24 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | WebAdmin: Added "files" folder and load the login template from login_template.html | Howaner | 2014-08-31 | 2 | -10/+102 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | WorldStorage no longer queues chunks into generator. | Mattes D | 2014-09-05 | 4 | -51/+17 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed loading empty chunks. | Mattes D | 2014-09-05 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported on the Dropper map in #1307. | ||||
| | | * | | | | | | | | | Rewritten chunk status to specify whether the chunk is in queue. | Mattes D | 2014-09-05 | 9 | -107/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes #1370. | ||||
| | | * | | | | | | | | | BiomeMultiCache is not used for simple generators. | Mattes D | 2014-09-05 | 1 | -21/+22 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed style. | Mattes D | 2014-09-05 | 3 | -9/+13 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed security: Player cannot spawn in a disabled world. | Mattes D | 2014-09-05 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Anvil: Fixed loading block entities with invalid Y coord. | Mattes D | 2014-09-05 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Masy98 | 2014-09-05 | 48 | -444/+935 |
| | |\| | | | | | | | | | |||||
| | | * | | | | | | | | | Merge pull request #1375 from mc-server/EntitiesInBox | Mattes D | 2014-09-04 | 13 | -1/+264 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Implemented ForEachEntityInBox | ||||
| | | | * | | | | | | | | | Fixed compilation after chunk Y removal. | madmaxoft | 2014-09-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Merge remote-tracking branch 'origin/master' into EntitiesInBox | madmaxoft | 2014-09-04 | 32 | -262/+376 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | Debuggers: Reviewed and fixed the Pickups and Poof commands. | madmaxoft | 2014-09-03 | 1 | -10/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now they're confirmed working. | ||||
| | | | * | | | | | | | | | | LuaState: Fixed class value-getting off the stack. | madmaxoft | 2014-09-03 | 1 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | LuaState: Fixed referenced function pushing. | madmaxoft | 2014-09-03 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The references are no longer destroyed by the call. | ||||
| | | | * | | | | | | | | | | Debuggers: Added a test code for ForEachEntityInBox(). | madmaxoft | 2014-09-03 | 1 | -0/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently untested, may not run, may crash. | ||||
| | | | * | | | | | | | | | | Exported ForEachEntityInBox() to Lua API. | madmaxoft | 2014-09-03 | 2 | -0/+71 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | Added cWorld::ForEachEntityInBox() | madmaxoft | 2014-09-03 | 8 | -0/+117 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | cBoundingBox: Added accessors. | madmaxoft | 2014-09-03 | 1 | -0/+11 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Merge pull request #1371 from DayBr3ak/master | Mattes D | 2014-09-04 | 3 | -2/+92 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | issue381, multicache for cBioGen | ||||
| | | | * | | | | | | | | | | change to linear calculation | DayBr3ak | 2014-09-03 | 2 | -9/+7 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | adapting format | DayBr3ak | 2014-09-03 | 3 | -7/+14 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | forgot this one | DayBr3ak | 2014-09-02 | 2 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | opting for size_t | DayBr3ak | 2014-09-02 | 2 | -5/+5 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | fixing memory leak | DayBr3ak | 2014-09-02 | 1 | -4/+5 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | changing implem, using vectors | DayBr3ak | 2014-09-02 | 2 | -98/+23 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | adding config file entry #381 | DayBr3ak | 2014-09-02 | 1 | -1/+10 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | adding the multicache behavior | DayBr3ak | 2014-09-02 | 3 | -4/+119 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | added multicache class definition | DayBr3ak | 2014-09-01 | 1 | -0/+35 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Anvil: Cleanly refuse to store data that is too large. | madmaxoft | 2014-09-04 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each chunk in MCA needs to be less than 1 MiB compressed; chunks that are larger will be refused with a log message. | ||||
| | | * | | | | | | | | | | | Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc" | archshift | 2014-09-04 | 4 | -62/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 472efa8174626a00ffdf5b39e1a44ac419cd3698. Apparently we don't support some of these features quite yet (darn you C++98!) | ||||
| | | * | | | | | | | | | | | In 1.8, carrots and potatoes yield one less hunger point. | archshift | 2014-09-04 | 2 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc | archshift | 2014-09-04 | 4 | -29/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snow Golems must also be above 64Y to spawn snow (as of 1.8). | ||||
| | | * | | | | | | | | | | | ChunkGenerator: Log world seed when creating a new one. | madmaxoft | 2014-09-03 | 1 | -3/+14 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Added cIniFile::HasValue() function. | madmaxoft | 2014-09-03 | 2 | -0/+23 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Updated SQLiteCpp. | madmaxoft | 2014-09-03 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix #1374. | ||||
| | | * | | | | | | | | | | | Merge pull request #1351 from LO1ZB/remove-a_RelY | Mattes D | 2014-09-03 | 18 | -230/+237 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | remove y-coord from chunks | ||||
| | | | * | | | | | | | | | | commit | LO1ZB | 2014-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | re-add the missing "s" too cChunkCoordsWithBoolList | LO1ZB | 2014-09-03 | 3 | -6/+6 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | hopefully the last commit for removing y-coord from chunks. :) | LO1ZB | 2014-09-03 | 5 | -23/+41 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | fix possibility of a twice generated chunk | LO1ZB | 2014-09-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | remove orphaned comment. | LO1ZB | 2014-08-30 | 1 | -4/+0 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | me being stupid | LO1ZB | 2014-08-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | add comments | LO1ZB | 2014-08-29 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | fix chunk regenerating | LO1ZB | 2014-08-29 | 3 | -9/+9 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | remove y-coord from chunks | LO1ZB | 2014-08-28 | 18 | -217/+208 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Anvil: switched inflate to stream mode. | madmaxoft | 2014-09-03 | 3 | -18/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the fixed-size buffer which could have caused #1307 and #1366. | ||||
| | | * | | | | | | | | | | | Fixed style and alpha-sorting. | madmaxoft | 2014-09-03 | 6 | -20/+20 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Quick fix for a preprocessor error with clang on OS X | archshift | 2014-09-03 | 1 | -1/+3 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Added mutton, which sheep now drop when killed | archshift | 2014-09-03 | 4 | -0/+13 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | EntityEffect.cpp: Enable 1.8's leaping potion | archshift | 2014-09-03 | 1 | -1/+1 |
| | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | Clang wants volatile... | madmaxoft | 2014-09-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Added strict error reporting to chunk loading. | madmaxoft | 2014-09-02 | 1 | -1/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help with #1307. | ||||
| | | * | | | | | | | | | | Merge pull request #1350 from mc-server/Inventory | Mattes D | 2014-09-02 | 9 | -179/+175 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | Enchanting table improvements. | ||||
| | | | * | | | | | | | | | Changed the IsEnchantable() comment again. | Howaner | 2014-09-02 | 2 | -3/+3 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Merge branch 'master' into Inventory | Howaner | 2014-09-02 | 56 | -649/+1452 |
| | | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| | | | * | | | | | | | | | Changed the IsEnchantable() comment. | Howaner | 2014-08-30 | 2 | -2/+3 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | APIDump: Added missing cItem things. | Hownaer | 2014-08-28 | 2 | -4/+9 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Added comments. | Hownaer | 2014-08-28 | 1 | -1/+3 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Fixed bad values in the IsEnchantable() method. | Hownaer | 2014-08-28 | 2 | -5/+17 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Fixed crashes and use std::swap. | Hownaer | 2014-08-28 | 4 | -26/+43 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Enchanting table improvements. | Hownaer | 2014-08-28 | 5 | -154/+113 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Added new recipes! | Masy98 | 2014-09-02 | 1 | -4/+19 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Seperated "custom" names list from the normal list in items.ini! | Masy98 | 2014-09-02 | 2 | -197/+328 |
| | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | | Fixed typo! | Masy98 | 2014-09-02 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added missing recipes! | Masy98 | 2014-09-02 | 1 | -6/+21 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Seperated the "custom" names from the normal list! | Masy98 | 2014-09-02 | 1 | -193/+326 |
| | | | | | | | | | | | | |||||
| | | | | | | | | * | | | Merge branch 'master' into EntityCustomName | Howaner | 2014-09-02 | 7 | -74/+252 |
| | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Re-added alternate spellings of darkgraywool. | madmaxoft | 2014-09-02 | 1 | -0/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Re-updated the Core. | madmaxoft | 2014-09-02 | 1 | -0/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge remote-tracking branch 'masy/blocks' | madmaxoft | 2014-09-02 | 4 | -58/+212 |
| | |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Added missing leather recipe! | Masy98 | 2014-09-01 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into blocks | Masy98 | 2014-09-01 | 24 | -271/+589 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MCServer/furnace.txt MCServer/items.ini | ||||
| * | | | | | | | | | | | | Fixed spacing and light gray wool name! | Masy98 | 2014-09-01 | 2 | -38/+40 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added furnace recipes! | Masy98 | 2014-08-31 | 2 | -17/+30 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added missing mossy stonebrick recipe! | Masy98 | 2014-08-31 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added 1.8 recipes! | Masy98 | 2014-08-31 | 2 | -8/+80 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added 1.8 blocks and items! | Masy98 | 2014-08-31 | 1 | -1/+65 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Pickups combine only within one chunk. | madmaxoft | 2014-09-01 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This greatly improves performance of the tick thread. | ||||
| | | * | | | | | | | | | | CopyBlocks test: decreased the test size. | madmaxoft | 2014-09-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It just needlessly ate up test time; there's no need for such rigorous testing once the test started succeeding. | ||||
| | | * | | | | | | | | | | Fixed off-by-one errors in cChunkDef asserts. | madmaxoft | 2014-09-01 | 1 | -8/+8 |
| | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Merge pull request #1368 from mc-server/coverityFixes | Mattes D | 2014-09-01 | 1 | -6/+24 |
| | |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | Make sure packets are valid | ||||
| | | * | | | | | | | | | Make sure packets are valid | worktycho | 2014-09-01 | 1 | -6/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 66408, 66409 and 72045 | ||||
| | | | | | | | | * | | | Added CustomName saving. | Howaner | 2014-09-02 | 3 | -2/+23 |
| | | | | | | | | | | | | |||||
| | | | | | | | | * | | | Added the new functions to APIDump. | Howaner | 2014-09-02 | 3 | -3/+12 |
| | | | | | | | | | | | | |||||
| | | | | | | | | * | | | Added a custom name test to the debuggers plugin. | Howaner | 2014-09-02 | 1 | -0/+17 |
| | | | | | | | | | | | | |||||
| | | | | | | | | * | | | Added SetCustomName() to players. | Howaner | 2014-09-02 | 15 | -41/+124 |
| | | | | | | | | | | | | |||||
| | | | | | | | | * | | | Added name tag | Howaner | 2014-09-01 | 7 | -3/+31 |
| | | | | | | | | | | | | |||||
| | | | | | | | | * | | | Added CustomName to cMonster. | Howaner | 2014-09-01 | 4 | -4/+64 |
| | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| | * | | | | | | | | | Fixed Bindings regeneration under MSVC. | madmaxoft | 2014-09-01 | 1 | -1/+6 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed previous commit's wrong assumptions. | madmaxoft | 2014-09-01 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The equipment-getting functions return a copy already, so we can't take a pointer, really. | ||||
| | * | | | | | | | | | Fixed MSVC compilation, improved performance. | madmaxoft | 2014-09-01 | 1 | -30/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're not creating copies of the equipped items anymore, rather, we're using pointers to them. Also pow() is needlessly slow for a simple second power, and MSVC2008 was confused about the pow() overloads. | ||||
| | * | | | | | | | | | Fixed MSVC warning. | madmaxoft | 2014-09-01 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge remote-tracking branch 'Hircine/Enchantments' | madmaxoft | 2014-09-01 | 9 | -22/+323 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Fixed style | Jaume Aloy | 2014-08-31 | 3 | -8/+9 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Added a_Digger check | Jaume Aloy | 2014-08-30 | 2 | -30/+33 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | More Enchantments | Jaume Aloy | 2014-08-22 | 2 | -58/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added Thorns and Respiration enchantments | ||||
| | | * | | | | | | | | | Protection Enchantments, some fixes | Jaume Aloy | 2014-08-21 | 4 | -15/+122 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Protection echantments (fire, blast, feather falling, protection and projectile). It isn't finished, add secondary effects and optimize the code. - Removed some brackets. - Silk touch fixed. | ||||
| | | * | | | | | | | | | Changed if in BlockHandler | Jaume Aloy | 2014-08-19 | 2 | -6/+2 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixes | Jaume Aloy | 2014-08-19 | 6 | -50/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed m_TicksLeftBurning > 0 for IsOnFire() - Tried to do the changes in BlockHandler.cpp - Removed m_Creator in ArrowEntity - Added m_Enchantments in ProjectileEntity CreatorData - Added blank lines between functions | ||||
| | | * | | | | | | | | | Changed if for switch | Jaume Aloy | 2014-08-19 | 3 | -15/+25 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Added more enchantments and some fixes | Jaume Aloy | 2014-08-19 | 6 | -23/+101 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed Debug messages - Added Punch enchantment effect - Added Silk Touch enchantment - Added Unbreaking enchantment effect | ||||
| | | * | | | | | | | | | Added some Enchantments | Jaume Aloy | 2014-08-19 | 4 | -7/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Bow enchantments: Infinity, Flame and Power - Sword and tools enchantments: Fire Aspect, Bane of Arthropods, Smite, Sharpness | ||||
| | * | | | | | | | | | | Avoid false positive in style check. | madmaxoft | 2014-09-01 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge pull request #1365 from mc-server/coverityFixes | Mattes D | 2014-09-01 | 4 | -9/+9 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | Coverity fixes | ||||
| | | * | | | | | | | | | Fixed style. | madmaxoft | 2014-09-01 | 1 | -1/+2 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Removed isDone check | worktycho | 2014-08-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The same data is returned by executeStep so why execute a call when you have the data. | ||||
| | | * | | | | | | | | | 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. | ||||
| | | * | | | | | | | | | Delete the entity before removing from the list | worktycho | 2014-08-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old code was calling dereference on invalid iterator | ||||
| | | * | | | | | | | | | Init RankMgr pointer to NULL | worktycho | 2014-08-31 | 1 | -1/+2 |
| | |/ / / / / / / / / |/| | | | | | | | | | |||||
| | * | | | | | | | | | Merge pull request #1363 from mc-server/FurnaceRecipes | Mattes D | 2014-09-01 | 6 | -211/+175 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Rewritten furnace.txt loading | ||||
| | | * | | | | | | | | | Use std::auto_ptr | Howaner | 2014-08-31 | 1 | -6/+6 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed compile warnings. | Howaner | 2014-08-31 | 2 | -5/+5 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed wrong doxy-comment. | Howaner | 2014-08-31 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Rewrited furnace.txt | Howaner | 2014-08-31 | 2 | -49/+53 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Rewrited furnace.txt loading. | Howaner | 2014-08-31 | 4 | -159/+119 |
| | |/ / / / / / / / / |/| | | | | | | | | | |||||
| | * | | | | | | | | | Fixed ReplaceString() documentation. | Howaner | 2014-09-01 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #1357 from mc-server/leafFix | Mattes D | 2014-08-31 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | Check range of y in HasNearLog | ||||
| | * | | | | | | | | Check range of y in HasNearLog | worktycho | 2014-08-31 | 1 | -1/+1 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | Fixes #803 | ||||
| * | | | | | | | | Merge pull request #1355 from mc-server/fixes | STRWarrior | 2014-08-30 | 10 | -83/+93 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixes | ||||
| | * | | | | | | | | Fixed style. | madmaxoft | 2014-08-30 | 2 | -4/+6 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into fixes | madmaxoft | 2014-08-30 | 10 | -251/+406 |
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | | WSSAnvil: Removed leftover debugging code. | madmaxoft | 2014-08-30 | 1 | -4/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed MSVC2008 compilation. | madmaxoft | 2014-08-30 | 1 | -18/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was getting confused about which sqrt() overload to call. | ||||
| * | | | | | | | | | Merge pull request #1340 from Masy98/crafting | Mattes D | 2014-08-30 | 2 | -16/+82 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | Added missing recipes for stairs and slabs | ||||
| | * | | | | | | | | Fixed missing slab name in line 297 | Masy98 | 2014-08-30 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into crafting | Masy98 | 2014-08-30 | 88 | -1562/+4865 |
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | | cChunk: Fixed the Coords param. | Mattes D | 2014-08-29 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Rewritten block entity loading. | Mattes D | 2014-08-29 | 7 | -215/+308 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block entities are now loaded based on the blocktype at the coords they specify; before loading, their type ("id" NBT tag) is checked. The chunk now expects that all block entities given to it via cChunk::SetAllData() have their valid blocktype; asserts if they don't. Fixes #1354. | ||||
| | * | | | | | | | | Fixed slab name | Masy98 | 2014-08-21 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added missing recipes for stairs and slabs! | Masy98 | 2014-08-21 | 2 | -4/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added missing recipes for stairs and slabs! | Masy98 | 2014-08-21 | 1 | -12/+30 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Changed new logs from wood to log! | Masy98 | 2014-08-21 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added missing blocks in item.ini | Masy98 | 2014-08-21 | 1 | -2/+49 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Updated Core | Tiger Wang | 2014-08-29 | 1 | -0/+0 |
| | | | | | | | | | | |||||
| | | * | | | | | | | A better hotfix for CraftingRecipies | Tiger Wang | 2014-08-29 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-08-29 | 163 | -2366/+5937 |
| | | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Server.cpp | ||||
| * | | | | | | | | | VanillaFluidSimulator: Fixed an invalid Y-coord query. | Mattes D | 2014-08-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing a spam of console messages, along with possible server crash, when liquids passed below the world: http://forum.mc-server.org/showthread.php?tid=1508&pid=15632#pid15632 | ||||
| * | | | | | | | | | Fixed conversion warning. | Mattes D | 2014-08-29 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed spaces. | Mattes D | 2014-08-29 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Hotfixed recipe.txt loading. | Hownaer | 2014-08-29 | 3 | -5/+8 |
| | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | | Fire can be destroyed with the sword in creative-mode | Hownaer | 2014-08-28 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Hownaer | 2014-08-28 | 14 | -41/+197 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge pull request #1323 from mc-server/CraftingFixes | Mattes D | 2014-08-28 | 13 | -39/+105 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed a couple of issues in craftingRecipes.cpp | ||||
| | | * | | | | | | | | Final template keyword style fix. | Mattes D | 2014-08-28 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | More template keyword fixes. | Mattes D | 2014-08-28 | 5 | -16/+16 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge remote-tracking branch 'origin/master' into CraftingFixes | Mattes D | 2014-08-28 | 125 | -2173/+5248 |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | | CheckBasicStyle: Added checking for the "template" keyword. | Mattes D | 2014-08-28 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fixed spaces after "template" keyword. | Mattes D | 2014-08-28 | 5 | -14/+14 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fixed comments | Tycho | 2014-08-13 | 1 | -5/+5 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Added missing header | Tycho | 2014-08-13 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fixed Integer pasing warnings in CraftingRecipies.cpp | Tycho | 2014-08-13 | 2 | -4/+64 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fixed type issues in CraftingRecipe.cpp | Tycho | 2014-08-13 | 2 | -5/+5 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fixed forgotten error checking | Tycho | 2014-08-13 | 1 | -1/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed a typo. | Mattes D | 2014-08-28 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge pull request #1324 from ChriPiv/master | Mattes D | 2014-08-28 | 1 | -2/+92 |
| | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | Implement ability to push minecarts on curved rails | ||||
| | | * | | | | | | | | 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 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed anvil placing. | Hownaer | 2014-08-28 | 1 | -5/+6 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Fixed ItemCategory code example. | Hownaer | 2014-08-28 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed mob burning. | reiter | 2014-08-28 | 1 | -1/+1 |
| | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | Fixes #1298 | ||||
| * | | | | | | | | DungeonRooms: Fixed an off-by-one error. | Mattes D | 2014-08-27 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Debuggers: Added a testcase for OnProjectileHitBlock. | Mattes D | 2014-08-27 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a test for #1326. | ||||
| * | | | | | | | | More basic style fixes. | Mattes D | 2014-08-27 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed basic style violations. | Mattes D | 2014-08-27 | 2 | -13/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | CheckBasicStyle: Relaxed the "space after comma". | Mattes D | 2014-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An apostrophe directly following a comma is not a violation. | ||||
| * | | | | | | | | Merge pull request #1345 from mc-server/DungeonRoomsFinisher | Mattes D | 2014-08-27 | 7 | -7/+359 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Added dungeon rooms finisher. | ||||
| | * | | | | | | | | DungeonRooms: Added a height probability distribution function. | Mattes D | 2014-08-27 | 3 | -9/+19 |
| | | | | | | | | | | |||||
| | * | | | | | | | | DungeonRooms: Added the spawner in the center of the room. | Mattes D | 2014-08-27 | 1 | -0/+15 |
| | | | | | | | | | | |||||
| | * | | | | | | | | DungeonRooms: Chests are never placed next to each other. | Mattes D | 2014-08-26 | 1 | -22/+27 |
| | | | | | | | | | | |||||
| | * | | | | | | | | DungeonRooms: Random pattern for floors. | Mattes D | 2014-08-26 | 1 | -1/+32 |
| | | | | | | | | | | |||||
| | * | | | | | | | | DungeonRooms: Replaced explicit switch with CanBeTerraformed(). | Mattes D | 2014-08-26 | 1 | -11/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'origin/master' into DungeonRoomsFinisher | Mattes D | 2014-08-26 | 24 | -694/+3478 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Profiling: Added profiling script for x64 executable. | Mattes D | 2014-08-26 | 3 | -6/+12 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | VS Profiling: Shutdown the profiler on error. | Mattes D | 2014-08-26 | 1 | -2/+6 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added initial dungeon rooms finisher. | Mattes D | 2014-08-26 | 4 | -0/+289 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1346 from mc-server/AnvilStatsHeights | Mattes D | 2014-08-27 | 8 | -16/+187 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Anvil stats heights | ||||
| | * | | | | | | | | | | AnvilStats: Fixed thread start race condition. | Mattes D | 2014-08-27 | 2 | -10/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The whole program would sometimes fail to process anything because the threads were waited-for before they were started. | ||||
| | * | | | | | | | | | | AnvilStats: Added per-height spawner stats. | Mattes D | 2014-08-27 | 2 | -4/+47 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | AnvilStats: Ignoring output XLS files. | Mattes D | 2014-08-27 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | AnvilStats: Added cmake directive for larger executable stack. | Mattes D | 2014-08-27 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes runtime "stack overflow" errors caused by large stack-allocated arrays used for decompression. | ||||
| | * | | | | | | | | | | AnvilStats: Fixed Win64 compilation. | Mattes D | 2014-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | AnvilStats: initial per-height blocktype implementation (WIP). | madmaxoft | 2014-08-27 | 3 | -5/+96 |
| |/ / / / / / / / / / | |||||
| * | / / / / / / / / | AnvilStats: Rewritten to use CMake. | madmaxoft | 2014-08-27 | 4 | -523/+126 |
| | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1290 from mc-server/Ranks | Mattes D | 2014-08-26 | 24 | -694/+3478 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | Rewriting permission system to use UUIDs and Ranks | ||||
| | * | | | | | | | | RankMgr: Exported the default-rank functions. | Mattes D | 2014-08-24 | 2 | -6/+69 |
| | | | | | | | | | | |||||
| | * | | | | | | | | RankMgr: Default rank is applied to players without any rank. | Mattes D | 2014-08-24 | 3 | -60/+21 |
| | | | | | | | | | | |||||
| | * | | | | | | | | RankMgr: Unified function signature comments in the bindings. | Mattes D | 2014-08-23 | 2 | -28/+36 |
| | | | | | | | | | | |||||
| | * | | | | | | | | RankMgr: Implemented default rank, added defaults. | Mattes D | 2014-08-23 | 3 | -24/+198 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'origin/master' into Ranks | Mattes D | 2014-08-22 | 84 | -875/+1044 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | cMojangAPI updates cRankManager's playernames. | Mattes D | 2014-08-21 | 4 | -2/+87 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | RankMgr: Added cRankManager::RemovePlayerRank(). | Mattes D | 2014-08-21 | 4 | -0/+60 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Removed last remnant of cGroup. | Mattes D | 2014-08-21 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Removed Group.h from Bindings' dependencies. | Mattes D | 2014-08-21 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | APIDump: Removed the cGroup and cGroupManager classes. | Mattes D | 2014-08-21 | 1 | -25/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Removed cGroup and cGroupManager. | Mattes D | 2014-08-21 | 10 | -395/+8 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | cMojangAPI: Fixed MakeUUID___() bindings. | Mattes D | 2014-08-21 | 2 | -4/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ToLua would generate a shadow return value for the input strings. | ||||
| | * | | | | | | | | | Updated the Core. | Mattes D | 2014-08-20 | 1 | -0/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Exported cServer:ShouldAuthenticate to Lua API. | Mattes D | 2014-08-20 | 2 | -2/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | cPlayer: Exported the LoadRank function to Lua API. | Mattes D | 2014-08-20 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | APIDump: Added cRankManager documentation. | Mattes D | 2014-08-20 | 1 | -0/+56 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | RankMgr bindings: fixed GetRankVisuals return value. | Mattes D | 2014-08-20 | 1 | -18/+22 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | RankMgr: Fixed an ignored return value in the API. | Mattes D | 2014-08-20 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | cPlayer reads ranks from cRankManager. | Mattes D | 2014-08-19 | 3 | -263/+139 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | RankMgr: Removed unneeded testing code. | madmaxoft | 2014-08-14 | 1 | -208/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into Ranks | madmaxoft | 2014-08-14 | 18 | -77/+91 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | RankMgr: Fixed multithreading issues. | madmaxoft | 2014-08-13 | 2 | -49/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only one thread is allowed to interact with a SQLite::Database object at a time. Additionally, improved performance of the migration by wrapping the entire thing in a transaction. | ||||
| | * | | | | | | | | | | RankMgr: Initial migration code. | madmaxoft | 2014-08-13 | 3 | -1/+568 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into Ranks | madmaxoft | 2014-08-12 | 15 | -81/+181 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Fixed unchecked return values. | madmaxoft | 2014-08-11 | 1 | -3/+6 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into Ranks | madmaxoft | 2014-08-09 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Debuggers: Disabled UUID and RankMgr tests. | madmaxoft | 2014-08-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | WebAdmin: Manually exported string conversion functions. | madmaxoft | 2014-08-09 | 2 | -6/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ToLua generated an extra return value for GetHTMLEscapedString() and GetURLEncodedString(), making them difficult to use. | ||||
| | * | | | | | | | | | | | | WebAdmin: Added GetURLEncodedString(). | madmaxoft | 2014-08-09 | 2 | -1/+36 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | RankMgr: Added GetRankVisuals() function. | madmaxoft | 2014-08-09 | 3 | -5/+81 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into Ranks | madmaxoft | 2014-08-09 | 12 | -28/+127 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Debuggers: Simple cRankManager test case. | madmaxoft | 2014-08-08 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Exported cRankManager to LuaAPI. | madmaxoft | 2014-08-08 | 5 | -1/+894 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | cLuaState: Added GetStackValues() auto-generated templates. | madmaxoft | 2014-08-08 | 1 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These will read consecutive values off the stack, each value of a type independent of the other values. Auto-generated because we don't have variadic templates in C++03. | ||||
| | * | | | | | | | | | | | | | RankMgr: Finished API implementation. | madmaxoft | 2014-08-08 | 2 | -38/+401 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | RankMgr: Implemented GetXforY and GetAll APIs. | madmaxoft | 2014-08-08 | 2 | -18/+162 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | RankMgr: Implemented the basic API functions. | madmaxoft | 2014-08-08 | 2 | -60/+696 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | RankMgr: Renamed PermissionGroup to Group in API and PermGroup in DB. | madmaxoft | 2014-08-08 | 2 | -28/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Group" is SQL keyword and shouldn't be used as table name. | ||||
| | * | | | | | | | | | | | | | RankMgr: Added SQL integer datatypes. | madmaxoft | 2014-08-05 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | RankMgr: More interface. | madmaxoft | 2014-08-05 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | RankMgr: Initial interface declaration. | madmaxoft | 2014-08-05 | 3 | -0/+258 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Type warning fixes. | Mattes D | 2014-08-25 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed a type warning. | Mattes D | 2014-08-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Assume POWER is big-endian, so it compiles. | Alexander Harkness | 2014-08-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [reference](http://nadeausoftware.com/articles/2012/02/c_c_tip_how_detect_processor_type_using_compiler_predefined_macros#POWER) We may want to come back and figure out if the processor is running in little-endian mode, but for now assume they're big-endian. | ||||
| * | | | | | | | | | | | | | | Fixed item drop. | Howaner | 2014-08-22 | 1 | -14/+18 |
| | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1341 | ||||
| * | | | | | | | | | | | | | Fixed a warning in FastRandom. | Mattes D | 2014-08-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | World: Report chunk count for the spawn area. | Mattes D | 2014-08-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed cPlugin::OnPlayerMoving signature. | Mattes D | 2014-08-22 | 3 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | cLuaState: Fixed Vector3<> names pushed to Lua. | Mattes D | 2014-08-22 | 2 | -5/+44 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | ToLua++ lib: Assert when usertype is not known. | Mattes D | 2014-08-22 | 1 | -4/+7 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added initializers for class members. | Mattes D | 2014-08-21 | 14 | -9/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As reported by Coverity, these weren't initialized. | ||||
| * | | | | | | | | | | | | | cSetChunkData: Added missing initializers. | Mattes D | 2014-08-21 | 1 | -0/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added cWorld initializers. | Mattes D | 2014-08-21 | 1 | -0/+30 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed 1.7.2 login packet reading. | Mattes D | 2014-08-21 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1317. | ||||
| * | | | | | | | | | | | | | Sorted the generated param count. | Mattes D | 2014-08-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed a compile-time warning in MSVC. | Mattes D | 2014-08-21 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1314 from mc-server/Fire | Mattes D | 2014-08-21 | 2 | -33/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed cancelled fire interact from all directions. | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into Fire | Howaner | 2014-08-20 | 78 | -860/+857 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Revert "Removes the fire if the block under the fire was broken." | Howaner | 2014-08-11 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 01001d2a49a3366e9b1eccf938d5073ab9a2f06e. | ||||
| | * | | | | | | | | | | | | | Removes the fire if the block under the fire was broken. | Howaner | 2014-08-11 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Moved the clicked-through block check to the top of the function. | Howaner | 2014-08-11 | 2 | -41/+17 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixed cancelled fire interact from all directions. | Howaner | 2014-08-11 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1339 from mc-server/Hooks | STRWarrior | 2014-08-20 | 9 | -42/+131 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | Added HOOK_SERVER_PING | ||||
| | * | | | | | | | | | | | | | Renamed a_Motd to a_ServerDescription. | Howaner | 2014-08-20 | 7 | -14/+14 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Added a_ClientHandle to the HOOK_SERVER_PING hook. | Howaner | 2014-08-20 | 8 | -10/+14 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Added "HOOK_SERVER_PING" call to older protocols | Howaner | 2014-08-20 | 1 | -13/+12 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Cleaned up code. | Howaner | 2014-08-20 | 3 | -848/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Added HOOK_SERVER_PING | Howaner | 2014-08-20 | 8 | -36/+926 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | First implementation of HOOK_SERVER_PING. | Howaner | 2014-08-16 | 5 | -0/+43 |
| | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1335 from mc-server/CodeFixes | Mattes D | 2014-08-20 | 30 | -154/+83 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code formatting fixes. | ||||
| | * | | | | | | | | | | | | | Removed old classes from the CMakeLists.txt | Howaner | 2014-08-20 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Code formatting fixes. | Howaner | 2014-08-19 | 29 | -152/+83 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Player: Silenced a few type conversion warnings. | Mattes D | 2014-08-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Player saving creates the "players" folder, if needed. | Mattes D | 2014-08-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1268. | ||||
| * | | | | | | | | | | | | | SwamplandM: Fixed sometimes having no mountains. | STRWarrior | 2014-08-18 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1329 from mc-server/Move | Mattes D | 2014-08-16 | 7 | -10/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Better OnPlayerMoving hook. | ||||
| | * | | | | | | | | | | | | Updated HOOK_PLAYER_MOVING documentation. | Howaner | 2014-08-16 | 1 | -1/+3 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Better OnPlayerMoving hook. | Howaner | 2014-08-16 | 6 | -9/+17 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #1308 from mc-server/logger | Mattes D | 2014-08-15 | 24 | -612/+644 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | New Logging framework | ||||
| | * | | | | | | | | | | | Removed an unneeded cast. | madmaxoft | 2014-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | File logger prefixes are 4 chars wide. | madmaxoft | 2014-08-13 | 1 | -6/+6 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Logger: Fixed windows debug ODS logger, fixed-size file prefixes. | madmaxoft | 2014-08-13 | 1 | -8/+9 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Logger: Fixed missing timestamp in log messages. | madmaxoft | 2014-08-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed windows compilation and style issues. | madmaxoft | 2014-08-12 | 4 | -37/+177 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fix messing rename | Tycho | 2014-08-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Renamed Loggers | Tycho | 2014-08-12 | 17 | -439/+418 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed Tools to work with new logging framework | Tycho | 2014-08-10 | 8 | -216/+18 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Added forgoten files | Tycho | 2014-08-10 | 4 | -0/+457 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | First Implementatation of new Loggin framework | Tycho | 2014-08-10 | 15 | -398/+51 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | CheckBasicStyle checks the src folder as well. | madmaxoft | 2014-08-14 | 5 | -14/+20 |
| | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1319 from mc-server/webadminfixes | Mattes D | 2014-08-13 | 2 | -30/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | A couple of fixes for issues with the webadmin | ||||
| | * | | | | | | | | | | Fixed shadowing variable | Tycho | 2014-08-13 | 1 | -5/+5 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Removed unused method | Tycho | 2014-08-13 | 2 | -25/+0 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #1296 from mc-server/LuaAPI | Franz Reiter | 2014-08-12 | 13 | -33/+66 |
| |\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. | ||||
| | * | | | | | | | | | Exported daylight cycle flag to the protocol. | Howaner | 2014-08-11 | 12 | -28/+29 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added a comment and simplified code. | Howaner | 2014-08-10 | 2 | -11/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added IsDaylightCycleEnabled saving. | Howaner | 2014-08-10 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Renamed functions. | Howaner | 2014-08-10 | 2 | -7/+7 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into LuaAPI | Howaner | 2014-08-10 | 6 | -11/+102 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Renamed m_DoDaylightCycle to m_CycleDaylight. | Howaner | 2014-08-08 | 2 | -7/+7 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld. | Howaner | 2014-08-07 | 4 | -20/+56 |
| | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | I need this for a GameRule plugin. | ||||
| * | | | | | | | | | | Merge pull request #1316 from ChriPiv/master | Alexander Harkness | 2014-08-11 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add entry for bat in monsters.ini | ||||
| | * | | | | | | | | | | Add entry for bat in monsters.ini | Christophe Piveteau | 2014-08-11 | 1 | -0/+6 |
| |/ / / / / / / / / / | |||||
| * | | / / / / / / / | cProtocol172: Check return values. | madmaxoft | 2014-08-11 | 1 | -4/+9 |
| | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 43489, CID 43490, CID 43491, CID 43493, CID 66410, CID 66411, CID 66416, CID 66417, CID 66418, CID 66419, CID 66420, CID 66421, CID 66422, CID 66423, CID 66424, CID 66425, CID 66429, CID 66430, CID 66431 | ||||
| * | | | | | | | | | Merge pull request #1310 from mc-server/ChestFix | Mattes D | 2014-08-11 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed potential null dereference | ||||
| | * | | | | | | | | | Fixed potential null dereference | Tycho | 2014-08-10 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70466 | ||||
| * | | | | | | | | | | Merge pull request #1301 from mc-server/Ores | Mattes D | 2014-08-11 | 3 | -53/+120 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Ore Tweaks | ||||
| | * | | | | | | | | | | Bunch of tweaks: | STRWarrior | 2014-08-10 | 3 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed Quarts to Quartz Using const_iterator instead of iterator Used CheckBasicStyle script to find style errors | ||||
| | * | | | | | | | | | | Added NaturalPatches generator | STRWarrior | 2014-08-10 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It generates gravel and dirt. | ||||
| | * | | | | | | | | | | Added NetherOreNests. | STRWarrior | 2014-08-10 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It generates Nether Quarts. | ||||
| | * | | | | | | | | | | Changed cStructGenOreNests to take a list of ores + the block to replace. | STRWarrior | 2014-08-10 | 3 | -53/+83 |
| | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1312 from mc-server/unnamed-enum | Mattes D | 2014-08-11 | 6 | -12/+22 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Various unnamed enum fixes | ||||
| | * | | | | | | | | | | Fixed tolua error with static initialization | archshift | 2014-08-11 | 2 | -3/+12 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Gave names to unnamed enums | archshift | 2014-08-11 | 4 | -5/+5 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Player.cpp: change unnamed enum to constant integers | archshift | 2014-08-11 | 2 | -7/+8 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #1311 from mc-server/CMakeFix | Mattes D | 2014-08-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixed circular dependecy luaState_Call.inc | ||||
| | * | | | | | | | | | | Fixed circular dependecy luaState_Call.inc | Tycho | 2014-08-10 | 1 | -1/+1 |
| | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1309 from mc-server/coverity_fixes | Mattes D | 2014-08-10 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixed potential crash in Player.cpp | ||||
| | * | | | | | | | | | | Spaces | Tycho | 2014-08-10 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fixed potential crash in Player.cpp | Tycho | 2014-08-10 | 1 | -0/+4 |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 71780 If ShouldBroadcastDeathMessages is false the pointer would fall through to a check agaist it being a player | ||||
| * | | | | | | | | | | Merge pull request #1299 from mc-server/Slabs | Mattes D | 2014-08-10 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Send the old slab to the client when the interact cancelled. | ||||
| | * | | | | | | | | | Changed comment. | Howaner | 2014-08-10 | 1 | -3/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Added comment. | Howaner | 2014-08-08 | 1 | -0/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Send the old slab to the client when the interact cancelled. | Howaner | 2014-08-08 | 1 | -0/+11 |
| | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge pull request #1305 from mc-server/Food | Mattes D | 2014-08-10 | 1 | -4/+2 |
| |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | Fixed swing arm animation when you ate. | ||||
| | * | | | | | | | | Fixed swing arm animation when you ate. | Howaner | 2014-08-10 | 1 | -4/+2 |
| |/ / / / / / / / | |||||
| * | | | / / / / | Removed an old and outdated comment. | STRWarrior | 2014-08-10 | 1 | -2/+0 |
| | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | | WebAdmin: Manually exported string conversion functions. | madmaxoft | 2014-08-09 | 2 | -6/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ToLua generated an extra return value for GetHTMLEscapedString() and GetURLEncodedString(), making them difficult to use. | ||||
| * | | | | | | | WebAdmin: Added GetURLEncodedString(). | madmaxoft | 2014-08-09 | 2 | -1/+36 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #1295 from mc-server/crystal | Mattes D | 2014-08-07 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | On destroy ender crystal, create bedrock and fire. | ||||
| | * | | | | | | On destroy ender crystal, create bedrock and fire | archshift | 2014-08-06 | 1 | -3/+3 |
| | |/ / / / / | |||||
| * | | | | | | Fixed nether wart digging. | Howaner | 2014-08-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | Fixes #1265 | ||||
| * | | | | | | Removed debug message. | Howaner | 2014-08-07 | 1 | -1/+0 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1291 from mc-server/RedstoneCleanUp | Mattes D | 2014-08-06 | 6 | -21/+83 |
| |\ \ \ \ \ | | | | | | | | | | | | | Redstone clean up | ||||
| | * | | | | | Fixed style issues | Tycho | 2014-08-06 | 3 | -5/+8 |
| | | | | | | | |||||
| | * | | | | | 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 | 4 | -12/+20 |
| | | | | | | | |||||
| | * | | | | | Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity Directly | Tycho | 2014-08-05 | 5 | -9/+56 |
| | | | | | | | |||||
| * | | | | | | Resending fire to the client when the interact cancelled. | Howaner | 2014-08-06 | 1 | -0/+8 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1289 from mc-server/LuaAPI | Franz Reiter | 2014-08-05 | 2 | -2/+31 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Added Clamp() function to the lua api. | ||||
| | * | | | | | Made lua clamp() compatible with all number types. | Howaner | 2014-08-05 | 1 | -4/+4 |
| | | | | | | | |||||
| | * | | | | | Added api documentation for Clamp() | Howaner | 2014-08-05 | 2 | -4/+5 |
| | | | | | | | |||||
| | * | | | | | Added Clamp() function to the lua api. | Howaner | 2014-08-05 | 1 | -0/+28 |
| |/ / / / / | |||||
| * / / / / | Fixed unsigned long comparison to size_t | archshift | 2014-08-05 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | MojangAPI: Fixed PlayerNameToUUID(). | madmaxoft | 2014-08-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1287 from Howaner/Bow | Franz Reiter | 2014-08-04 | 1 | -0/+10 |
| |\ \ \ \ | | | | | | | | | | | Added arrow consuming on shooting | ||||
| | * | | | | Changed arrow comment. | Howaner | 2014-08-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Added arrow consuming on shooting | Howaner | 2014-08-04 | 1 | -0/+10 |
| | | | | | | |||||
| | | * | | | Added new console command with cleanup | Tiger Wang | 2014-08-29 | 2 | -28/+45 |
| | | | | | | |||||
| | | * | | | Improved explosion damage | Tiger Wang | 2014-08-29 | 2 | -48/+28 |
| | | | | | | |||||
| | | * | | | Removed unused code | Tiger Wang | 2014-08-29 | 3 | -3/+1 |
| | | | | | | |||||
| | | * | | | Improved command block security | Tiger Wang | 2014-08-29 | 1 | -6/+19 |
| | |/ / / |/| | | | |||||
| * | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-08-04 | 1 | -1/+1 |
| |\| | | | |||||
| | * | | | Fixed #1286 | Howaner | 2014-08-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed signs not staying on other signs | Tiger Wang | 2014-08-04 | 2 | -2/+4 |
| | | | | | |||||
| * | | | | Made AllToLua output consistent | Tiger Wang | 2014-08-04 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Updated submodules | Tiger Wang | 2014-08-04 | 2 | -0/+0 |
| | | | | |||||
| * | | | CheckBasicStyle: multi-level indent change. | madmaxoft | 2014-08-04 | 7 | -13/+33 |
| | | | | |||||
| * | | | BasicStyleCheck: Dividers are exactly 80 slashes. | madmaxoft | 2014-08-04 | 2 | -2/+18 |
| | | | | |||||
| * | | | Merge pull request #1284 from Howaner/Monster | Mattes D | 2014-08-04 | 2 | -18/+24 |
| |\ \ \ | | | | | | | | | Attempt to fix knockback and swimming. | ||||
| | * \ \ | Merge branch 'master' into Monster | Howaner | 2014-08-04 | 9 | -75/+69 |
| | |\ \ \ | |/ / / |/| | | | |||||
| * | | | | Merge pull request #1285 from mc-server/StrCaseRefactor | Mattes D | 2014-08-04 | 7 | -47/+54 |
| |\ \ \ \ | | | | | | | | | | | Refactored case-conversion functions. | ||||
| | * | | | | Refactored case-conversion functions. | madmaxoft | 2014-08-04 | 7 | -47/+54 |
| | | | | | | | | | | | | | | | | | | | | | StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place. | ||||
| * | | | | | Merge pull request #1283 from Howaner/GlobalFixes | Mattes D | 2014-08-04 | 1 | -6/+5 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Fixed skins in mc 1.7.9/1.7.10 | ||||
| | * | | | | Changed properties for-loop. | Howaner | 2014-08-04 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into GlobalFixes | Howaner | 2014-08-03 | 2 | -0/+18 |
| | |\ \ \ \ | |||||
| | * | | | | | Fixed skins in mc 1.7.9/1.7.10 | Howaner | 2014-08-03 | 1 | -6/+5 |
| | | | | | | | |||||
| * | | | | | | Anvil: Wolf owner not saved if not present. | madmaxoft | 2014-08-04 | 1 | -2/+8 |
| | | | | | | | |||||
| * | | | | | | Rewritten string case manipulation to use std::transform. | madmaxoft | 2014-08-04 | 1 | -22/+4 |
| | |/ / / / |/| | | | | |||||
| | | * | | | Changed /** to /* | Howaner | 2014-08-04 | 1 | -3/+5 |
| | | | | | | |||||
| | | * | | | Fixed warnings | Howaner | 2014-08-04 | 1 | -3/+3 |
| | | | | | | |||||
| | | * | | | Attempt to fix knockback and swimming. | Howaner | 2014-08-04 | 2 | -18/+22 |
| | |/ / / |/| | | | |||||
| * | | | | Attempting a compilation fix for gcc / clang. | madmaxoft | 2014-08-03 | 2 | -0/+18 |
| |/ / / | |||||
| * | | | Wolf uses UUID for owner. | madmaxoft | 2014-08-03 | 5 | -17/+82 |
| | | | | | | | | | | | | | Fixes #1277. | ||||
| * | | | Debuggers: Added a Name-from-UUID cMojangAPI test. | madmaxoft | 2014-08-03 | 1 | -0/+7 |
| | | | | |||||
| * | | | cMojangAPI: Added UUID-to-Name lookup. | madmaxoft | 2014-08-03 | 6 | -71/+530 |
| | | | | | | | | | | | | | Also fixed the bindings, now all functions are static-like. | ||||
| * | | | Trailing whitespace fix. | madmaxoft | 2014-08-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Added cMojangAPI:GetUUIDFromPlayerName(). | madmaxoft | 2014-08-03 | 3 | -0/+36 |
| | | | | | | | | | | | | | This is a simpler way to ask for a single name -> uuid conversion. | ||||
| * | | | ToLua driver: disabled output buffering. | madmaxoft | 2014-08-03 | 1 | -0/+3 |
| | | | | |||||
| * | | | Added cPlayer::GetUUID(). | madmaxoft | 2014-08-03 | 1 | -0/+3 |
| | | | | |||||
| * | | | Fixed a ToLua warning - operator = not supported. | madmaxoft | 2014-08-03 | 8 | -8/+16 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2014-08-03 | 3 | -101/+70 |
| |\ \ \ | |||||
| | * | | | Entity.cpp: Air timer comment fix | archshift | 2014-08-03 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Code reduction and clarity fixes | archshift | 2014-08-03 | 2 | -29/+16 |
| | | | | | |||||
| | * | | | Removed unused cPlayer::FoodPoison function | archshift | 2014-08-03 | 2 | -12/+0 |
| | | | | | |||||
| | * | | | Entity.cpp: On portal check, use if-else for current dimension | archshift | 2014-08-03 | 1 | -60/+54 |
| | | | | | | | | | | | | | | | | | If current dimension corresponds with the portal (nether portal in the nether) send to the overworld, else send to the portal dimension. No need to switch on the dimension and exclude potential others. | ||||
| * | | | | VillageGen: Fixed a typo in comment | STRWarrior | 2014-08-03 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Added proper trees and height for SwamplandM biome | STRWarrior | 2014-08-02 | 3 | -2/+4 |
| | | | | |||||
| * | | | Merge pull request #1275 from Howaner/BlockEntitys | Mattes D | 2014-08-02 | 2 | -1/+18 |
| |\ \ \ | | | | | | | | | Verify beacon effects sent by the client before setting them. | ||||
| | * | | | Fixed a bug who can used from hacked clients. | Howaner | 2014-08-02 | 2 | -1/+18 |
| |/ / / | |||||
| * | | | Fixed issues with autocomplete and time loading | Tiger Wang | 2014-08-01 | 1 | -7/+33 |
| | | | | | | | | | | | | | * Fixes #1274 | ||||
| * | | | Improved endermen code a little | Tiger Wang | 2014-08-01 | 4 | -21/+57 |
| | | | | |||||
| * | | | Merge pull request #1255 from mc-server/NameToUUID | Mattes D | 2014-08-01 | 22 | -158/+859 |
| |\ \ \ | | | | | | | | | Name to UUID | ||||
| | * \ \ | Merged branch 'master' into NameToUUID. | madmaxoft | 2014-07-31 | 71 | -442/+1568 |
| | |\ \ \ | |||||
| | * | | | | Removed trailing whitespace. | madmaxoft | 2014-07-31 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Fixed UUIDs handling in cPlayer. | madmaxoft | 2014-07-31 | 2 | -6/+9 |
| | | | | | | | | | | | | | | | | | | | | | The loading expected dashed UUIDs, MCS uses short UUIDs throughout. | ||||
| | * | | | | MojangAPI: Moved the settings to a separate ini section. | madmaxoft | 2014-07-31 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames(). | madmaxoft | 2014-07-31 | 5 | -11/+55 |
| | | | | | | |||||
| | * | | | | MojangAPI: Renamed cache file to MojangAPI.sqlite. | madmaxoft | 2014-07-30 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | APIDump: Added notes about cache to cMojangAPI. | madmaxoft | 2014-07-30 | 1 | -1/+7 |
| | | | | | | |||||
| | * | | | | MojangAPI: Clarified the UUID conversion code. | madmaxoft | 2014-07-30 | 2 | -4/+17 |
| | | | | | | |||||
| | * | | | | ManualBindings: Fixed alignment. | madmaxoft | 2014-07-30 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | APIDump: Fixed UUID-related documentation. | madmaxoft | 2014-07-30 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Debuggers: Updated for the new cMojangAPI changes. | madmaxoft | 2014-07-30 | 1 | -1/+10 |
| | | | | | | |||||
| | * | | | | MojangAPI: Implemented UUID shortening and dashing. | madmaxoft | 2014-07-30 | 5 | -22/+40 |
| | | | | | | |||||
| | * | | | | Exported cMojangAPI to Lua. | madmaxoft | 2014-07-30 | 5 | -6/+46 |
| | | | | | | |||||
| | * | | | | Added a cMojangAPI class for PlayerName -> UUID lookups, with cache. | madmaxoft | 2014-07-30 | 9 | -239/+564 |
| | | | | | | | | | | | | | | | | | | | | | The cache is persisted into a SQLite DB file on server shutdown. | ||||
| | * | | | | Fixed SQLiteCpp include paths for MSVC2010+. | Mattes D | 2014-07-28 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fixed include directories for SQLiteCpp. | madmaxoft | 2014-07-28 | 1 | -0/+6 |
| | | | | | | |||||
| | * | | | | Added SQLiteCpp library. | madmaxoft | 2014-07-28 | 5 | -0/+33 |
| | | | | | | | | | | | | | | | | | | | | | This provides C++ wrappers for SQLite, making it safer to use in the C++ environment. | ||||
| | * | | | | Debuggers: Added an example for cClientHandle:GetUUIDsFromPlayerNames(). | madmaxoft | 2014-07-28 | 1 | -0/+31 |
| | | | | | | |||||
| | * | | | | Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API. | madmaxoft | 2014-07-28 | 2 | -3/+63 |
| | | | | | | |||||
| | * | | | | cAuthenticator: Added GetUUIDsFromPlayerNames(). | madmaxoft | 2014-07-28 | 2 | -3/+116 |
| | | | | | | |||||
| * | | | | | Merge pull request #1273 from Howaner/GlobalFixes | Mattes D | 2014-08-01 | 1 | -6/+14 |
| |\ \ \ \ \ | | | | | | | | | | | | | Added missing HOOK_BLOCK_SPREAD call. | ||||
| | * | | | | | Added missing HOOK_BLOCK_SPREAD call. | Howaner | 2014-08-01 | 1 | -6/+14 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1272 from Howaner/Food | Mattes D | 2014-08-01 | 8 | -48/+177 |
| |\ \ \ \ \ | | | | | | | | | | | | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added... | ||||
| | * | | | | | Compile fix. | Howaner | 2014-08-01 | 1 | -2/+1 |
| | | | | | | | |||||
| | * | | | | | Import Statistics.h | Howaner | 2014-07-31 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects. | Howaner | 2014-07-31 | 8 | -48/+177 |
| | | |/ / / | |/| | | | |||||
| * | | | | | Merge pull request #1269 from Howaner/BlockEntitys | Mattes D | 2014-08-01 | 28 | -37/+891 |
| |\ \ \ \ \ | | | | | | | | | | | | | Added beacon. | ||||
| | * | | | | | Use "default:" in switch. | Howaner | 2014-07-31 | 1 | -3/+6 |
| | | | | | | | |||||
| | * | | | | | Updated documentation again. | Howaner | 2014-07-31 | 1 | -4/+4 |
| | | | | | | | |||||
| | * | | | | | Renamed "select..." methods to "set..." and better IsValidEffect() function. | Howaner | 2014-07-31 | 4 | -55/+19 |
| | | | | | | | |||||
| | * | | | | | Updated documentation. | Howaner | 2014-07-31 | 2 | -8/+8 |
| | | | | | | | |||||
| | * | | | | | Renamed functions and added beacon json saving. | Howaner | 2014-07-31 | 8 | -66/+84 |
| | | | | | | | |||||
| | * | | | | | Added window update. | Howaner | 2014-07-30 | 1 | -0/+23 |
| | | | | | | | |||||
| | * | | | | | Added beacon load/save. | Howaner | 2014-07-30 | 5 | -1/+74 |
| | | | | | | | |||||
| | * | | | | | Added beacon documentation. | Howaner | 2014-07-30 | 2 | -0/+27 |
| | | | | | | | |||||
| | * | | | | | Changed return type from GetPrimaryPotion() and GetSecondaryPotion() | Howaner | 2014-07-30 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Exported the beacon. | Howaner | 2014-07-30 | 11 | -17/+107 |
| | | | | | | | |||||
| | * | | | | | Added beacon. | Howaner | 2014-07-30 | 13 | -33/+689 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1270 from Howaner/Options | Mattes D | 2014-07-31 | 1 | -5/+5 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator | ||||
| | * | | | | | | Capitalised "incremental" | Howaner | 2014-07-31 | 1 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator. | Howaner | 2014-07-31 | 1 | -2/+2 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Merge pull request #1271 from Howaner/GlobalFixes | Mattes D | 2014-07-31 | 2 | -2/+13 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed water from ice and removed packed ice drop. | ||||
| | * | | | | | | Changed IsSolid to FullyOccupiesVoxel | Howaner | 2014-07-31 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fixed water from ice and removed packed ice drop. | Howaner | 2014-07-31 | 2 | -2/+13 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #1047 from mc-server/Enderman | Tiger Wang | 2014-07-31 | 2 | -0/+121 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Enderman attacks a player if he's looking at him | ||||
| | * | | | | | Comment suggestions | Tiger Wang | 2014-07-31 | 1 | -9/+8 |
| | | | | | | | |||||
| | * | | | | | Added lighting code and added comments | STRWarrior | 2014-07-30 | 1 | -0/+17 |
| | | | | | | | |||||
| | * | | | | | Removed lighting code in cEnderman::CheckEventSeePlayer | STRWarrior | 2014-07-30 | 1 | -9/+1 |
| | | | | | | | |||||
| | * | | | | | Changed comment | worktycho | 2014-06-30 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Replaced strange algebra with dot product. | worktycho | 2014-06-18 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 10 degrees is a completely arbitary constant I pulled from nowhere. Feel free to adjust this value. | ||||
| | * | | | | | Improved Enderman code | Tiger Wang | 2014-06-18 | 2 | -14/+34 |
| | | | | | | | |||||
| | * | | | | | Swapped m_Player and m_EndermanPos | STRWarrior | 2014-06-18 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Enderman attacks a player if he's looking at him. | STRWarrior | 2014-06-18 | 2 | -0/+91 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1267 from mc-server/RoofedForest | Tiger Wang | 2014-07-31 | 1 | -3/+61 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Added RoofedForest trees. | ||||
| | * | | | | | | Suggestions | STRWarrior | 2014-07-30 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Moved GetRoofedForestTreeImage content to GetDarkoakTreeImage | STRWarrior | 2014-07-30 | 2 | -66/+55 |
| | | | | | | | | |||||
| | * | | | | | | Fixed doxy comment | STRWarrior | 2014-07-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fixed comment at the end of a for-loop | STRWarrior | 2014-07-30 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fixed compiling using Clang | STRWarrior | 2014-07-30 | 1 | -4/+2 |
| | | | | | | | | |||||
| | * | | | | | | Added RoofedForest trees. | STRWarrior | 2014-07-30 | 2 | -2/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Could still be improved allot. | ||||
| * | | | | | | | Merge pull request #1266 from mc-server/PreSimulatorConfig | Mattes D | 2014-07-30 | 3 | -6/+30 |
| |\| | | | | | | |_|/ / / / |/| | | | | | PreSimulator: Added configurations. | ||||
| | * | | | | | PreSimulator: Added configurations. | STRWarrior | 2014-07-30 | 3 | -6/+30 |
| |/ / / / / | | | | | | | | | | | | | | | | You can now choose if it should pregenerate something or not | ||||
| * | | | | | Merged branch 'howaner/Options'. | madmaxoft | 2014-07-30 | 8 | -42/+57 |
| |\ \ \ \ \ | |||||
| | * | | | | | Change Group->SetColor() again. | Howaner | 2014-07-27 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Use AString(1, Color[0]) | Howaner | 2014-07-27 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Use Color[0]. | Howaner | 2014-07-27 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Fixed group color's. | Howaner | 2014-07-27 | 2 | -16/+5 |
| | | | | | | | |||||
| | * | | | | | Add "Broadcasting" settings to world.ini | Howaner | 2014-07-27 | 5 | -11/+22 |
| | | | | | | | |||||
| | * | | | | | Fixed plugin count and fixed plugin loading, when settings.ini was regenerated. | Howaner | 2014-07-27 | 1 | -16/+30 |
| | | | | | | | |||||
| * | | | | | | Fixed "Dependency" typos | archshift | 2014-07-30 | 3 | -7/+7 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #1262 from mc-server/CanBeTerraformed | Mattes D | 2014-07-30 | 4 | -44/+32 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Added cBlockInfo::CanBeTerraformed and made finishers use it | ||||
| | * | | | | | | Added soulsand to the terraformed list. | STRWarrior | 2014-07-29 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Added cBlockInfo::CanBeTerraformed and made finishers use it | STRWarrior | 2014-07-29 | 4 | -44/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I might have forgotten some of them though | ||||
| * | | | | | | | Fixed FinishGen.h types. | madmaxoft | 2014-07-30 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Entity.h: Moved constants out of some unnamed enum | archshift | 2014-07-30 | 1 | -14/+14 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #1263 from Howaner/GlobalFixes | archshift | 2014-07-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Fixed compile error with clang. | ||||
| | * | | | | | | Changed size_t to 'unsigned long' | Howaner | 2014-07-30 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Fixed compile error with clang. | Howaner | 2014-07-30 | 1 | -2/+2 |
| |/ / / / / / | |||||
| * / / / / / | Slight cleanup after portals | Tiger Wang | 2014-07-29 | 8 | -20/+14 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #1061 from mc-server/portals | Mattes D | 2014-07-29 | 42 | -236/+673 |
| |\ \ \ \ \ | | | | | | | | | | | | | Portals and others | ||||
| | * | | | | | Detrailed whitespace | Tiger Wang | 2014-07-29 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 123 | -696/+1749 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| | * | | | | | | Suggestions | Tiger Wang | 2014-07-23 | 6 | -24/+28 |
| | | | | | | | | |||||
| | * | | | | | | Speed improvements, crash fixes, & self-suggestions | Tiger Wang | 2014-07-22 | 8 | -61/+55 |
| | | | | | | | | |||||
| | * | | | | | | Suggestion and failed merge fix | Tiger Wang | 2014-07-22 | 2 | -1/+6 |
| | | | | | | | | |||||
| | * | | | | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-07-22 | 180 | -1499/+2560 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| | * | | | | | | | Suggestions | Tiger Wang | 2014-07-21 | 10 | -127/+161 |
| | | | | | | | | | |||||
| | * | | | | | | | Bug and crash fixes | Tiger Wang | 2014-07-20 | 12 | -65/+107 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes end portals' solidity * Fixed crashes to do with multithreading and removing an entity from the wrong world * Fixed crashes due to bad merge * Fixed crashes due to an object being deleted twice * Simplified cWorld::Start() and added comments to configuration files | ||||
| | * | | | | | | | Fix failed merge and other issues | Tiger Wang | 2014-07-18 | 14 | -77/+28 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into portals | Tiger Wang | 2014-07-18 | 382 | -4731/+7710 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/mc-server/MCServer into portals | Tiger Wang | 2014-06-24 | 20 | -102/+297 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Conforms to standards | Tiger Wang | 2014-06-22 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 103 | -3457/+5628 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h | ||||
| | * | | | | | | | | | | Fixed invalid iterators | Tiger Wang | 2014-06-21 | 7 | -39/+26 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | More suggestions | Tiger Wang | 2014-06-21 | 4 | -5/+7 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Implemented PR suggestions | archshift | 2014-06-16 | 5 | -8/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Furnace.txt: newline BlockID: removed extraneous dimension mapping cEntity: fixed typo cPlayer: WorldPtr typedef | ||||
| | * | | | | | | | | | | Reverted portal creation code | Tiger Wang | 2014-06-14 | 2 | -103/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It wasn't really working and needs more development | ||||
| | * | | | | | | | | | | Cauldrons check the heightmap | Tiger Wang | 2014-06-14 | 3 | -8/+12 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-14 | 20 | -492/+791 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| | * | | | | | | | | | | | Fixed order of initalisation | Tycho | 2014-06-12 | 2 | -5/+6 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Removed unnessicary indirection from Entity iterator list | Tycho | 2014-06-12 | 2 | -6/+6 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed compile | worktycho | 2014-06-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Portals animate and delay correctly | Tiger Wang | 2014-06-12 | 20 | -118/+175 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 72 | -293/+2868 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp | ||||
| | * | | | | | | | | | | | | Portal improvements and suggestions | Tiger Wang | 2014-06-10 | 10 | -54/+179 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Capitalising | worktycho | 2014-06-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fix reading 64 bit values | worktycho | 2014-06-07 | 1 | -2/+5 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed Time of day | worktycho | 2014-06-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-06-05 | 7 | -14/+36 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed decision failure | Tiger Wang | 2014-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed compilation | Tiger Wang | 2014-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-06-04 | 2 | -2/+5 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Time and weather is saved, part of #1058 | Tiger Wang | 2014-06-04 | 2 | -3/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed unreliability in Health and LootPickup loading. | ||||
| | * | | | | | | | | | | | | Health of monsters is now saved | Tiger Wang | 2014-06-04 | 2 | -0/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed a NetherFinisher bug | Tiger Wang | 2014-06-04 | 3 | -24/+9 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Configurable portals | Tiger Wang | 2014-06-04 | 4 | -14/+83 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-06-04 | 3 | -6/+10 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Removed use of auto | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added checks for no downfall biomes | Tiger Wang | 2014-06-04 | 3 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into portals | Tiger Wang | 2014-06-04 | 130 | -1089/+22541 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Implemented bed homes | Tiger Wang | 2014-06-01 | 4 | -16/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented bed home positions * Fixed some inventory and health server/client mismatches after world change | ||||
| | * | | | | | | | | | | | | | Implemented end and nether portals | Tiger Wang | 2014-05-31 | 23 | -92/+254 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Very minor code changes | Tiger Wang | 2014-05-29 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Cauldrons fill | Tiger Wang | 2014-05-29 | 4 | -3/+19 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1254 from mc-server/SingleTopBlockFinisher | Mattes D | 2014-07-29 | 3 | -22/+92 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock | ||||
| | * | | | | | | | | | | | | | | Some finishing touches | STRWarrior | 2014-07-29 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed whitespace fixed dead bush comment | ||||
| | * | | | | | | | | | | | | | | Fixed comment above cFinishGenSingleTopBlock | STRWarrior | 2014-07-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | SingleTopBlock: All blocktypes and biometypes get initialized properly | STRWarrior | 2014-07-29 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Using suggestions | STRWarrior | 2014-07-28 | 1 | -25/+20 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Forgot Mesa Plateau biome. | STRWarrior | 2014-07-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock | STRWarrior | 2014-07-28 | 3 | -20/+82 |
| | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now accepts a vector of biomes and a vector of allowed blocks. | ||||
| * | | | | | | | | | | | | | | Merge pull request #1252 from mc-server/RoughRavinesGen | Mattes D | 2014-07-29 | 5 | -3/+451 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Rough ravines gen | ||||
| | * | | | | | | | | | | | | | Added a missing include for abs(float). | madmaxoft | 2014-07-27 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | RoughRavines: Made floor and ceiling settings-adjustable. | madmaxoft | 2014-07-27 | 4 | -20/+99 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The world.ini has settings for the minimum and maximum height for each at the ravines' center and edges. | ||||
| | * | | | | | | | | | | | | | RoughRavines: Added per-height radius modifier. Ledges! | madmaxoft | 2014-07-27 | 1 | -32/+73 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | RoughRavines: More settings - size, width, roughness | madmaxoft | 2014-07-27 | 3 | -23/+84 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | RoughRavines: Initial generator implementation. | madmaxoft | 2014-07-27 | 4 | -3/+264 |
| | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides the basic shape of the ravines, with the basic settings based on GridStructGen, and good default values. | ||||
| * | | | | | | | | | | | | | DistortedHeightmap: Now generates gravel in deep ocean. | STRWarrior | 2014-07-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Hotfixed compilation problems. | madmaxoft | 2014-07-27 | 2 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1236 from Howaner/Inventory2 | Mattes D | 2014-07-27 | 17 | -72/+164 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix item durability. | ||||
| | * | | | | | | | | | | | | | Derp. | Howaner | 2014-07-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Rename function. | Howaner | 2014-07-26 | 4 | -6/+6 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into Inventory2 | Howaner | 2014-07-26 | 108 | -663/+952 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/BlockInfo.cpp | ||||
| | * | | | | | | | | | | | | | | Fix item durability. | Howaner | 2014-07-23 | 16 | -69/+149 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1181 | ||||
| * | | | | | | | | | | | | | | | NetherClumpGenerator: Fixed generating stuff on halfslabs and fences | STRWarrior | 2014-07-27 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Updated NetherForts' weights. | madmaxoft | 2014-07-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1250 from mc-server/NetherCeiling | Mattes D | 2014-07-27 | 1 | -1/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a ceiling to disguise the bedrock above it. | ||||
| | * | | | | | | | | | | | | | | Removed forgotten comment | STRWarrior | 2014-07-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Made nether ceiling smooth. | STRWarrior | 2014-07-27 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Added a ceiling to disguise the bedrock above it. | STRWarrior | 2014-07-27 | 1 | -1/+9 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | NetherClumpFoliage: Fixed assert | STRWarrior | 2014-07-27 | 1 | -8/+39 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Updated NetherFort prefabs to latest Gallery content. | madmaxoft | 2014-07-27 | 1 | -37/+752 |
| | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1232 from mc-server/splash-entity | Mattes D | 2014-07-26 | 7 | -139/+162 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved potion static functions to EntityEffect to create splash potions through the world | ||||
| | * | | | | | | | | | | | | | SplashPotionEntity: Use `const cItem &` instead of a cItem | archshift | 2014-07-26 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixed indentations, removed redundant init code in SplashPotionEntity.cpp | archshift | 2014-07-26 | 4 | -9/+7 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Moved potion static functions to EntityEffect to create splash potions through world | archshift | 2014-07-26 | 7 | -139/+164 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1207 from Howaner/Inventory | Mattes D | 2014-07-26 | 4 | -10/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | Inventory fixes | ||||
| | * | | | | | | | | | | | | | Change comment. | Howaner | 2014-07-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into Inventory | Howaner | 2014-07-26 | 257 | -2009/+3248 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Git: Ignore AllFiles.lst (generated by cmake) | archshift | 2014-07-26 | 1 | -0/+1 |
| | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Endianness.h: undefined ntohll before redefining | archshift | 2014-07-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Removed the new old-style-cast warning from error treatment | archshift | 2014-07-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a new warning included in clang that ships with OS X 10.10 Yosemite. | ||||
| * | | | | | | | | | | | | | Tweaks to NetherClumpFoliage | STRWarrior | 2014-07-25 | 1 | -34/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplefied the way NetherClupFoliage creates the X and Z coordinate. | ||||
| * | | | | | | | | | | | | | Speed up the NetherClumpFoliage finisher. | STRWarrior | 2014-07-25 | 1 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using IntNoiseXX instead of CubicNoiseXX. | ||||
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' | Tiger Wang | 2014-07-24 | 84 | -229/+470 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1235 from mc-server/redundant-semis | Mattes D | 2014-07-24 | 75 | -111/+111 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed redundant semicolons and re-added the warning | ||||
| | | * | | | | | | | | | | | | | Made redundant semi not an error, fixed one more. | archshift | 2014-07-24 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 74 | -110/+110 |
| | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | Added a queue for setting chunk data. | madmaxoft | 2014-07-24 | 11 | -118/+349 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1196. | ||||
| | * | | | | | | | | | | | | | Made the cWorld::SpawnMobFinalize function more readable. | STRWarrior | 2014-07-24 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed block drops | Tiger Wang | 2014-07-24 | 5 | -17/+59 |
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1242 (the issue addressed within) | ||||
| * | | | | | | | | | | | | | Merge pull request #1237 from tonibm19/master | Mattes D | 2014-07-23 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moar view distance! | ||||
| | * | | | | | | | | | | | | | Moar view distance! | tonibm19 | 2014-07-23 | 1 | -2/+2 |
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's blow up our computers! :D | ||||
| * | | | | | | | | | | | | | TallGrass: Less grass on mountains. | STRWarrior | 2014-07-23 | 1 | -0/+11 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed possible crash in the NetherClumpFoliage finisher. | STRWarrior | 2014-07-23 | 1 | -0/+5 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | BlockLeaves: Fixed comment style. | madmaxoft | 2014-07-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed MSVC bindings regeneration. | madmaxoft | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still one typo had been left in the cmake file. | ||||
| * | | | | | | | | | | | | | Fixed Bindings generation in MSVC. | madmaxoft | 2014-07-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bindings weren't regenerated because of the typo in the dependencies cmake variable. | ||||
| * | | | | | | | | | | | | | Merge pull request #1234 from mc-server/GeneratorTweaks | archshift | 2014-07-22 | 1 | -13/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExtremeHillsPlus and ExtremeHills spawn with grass only | ||||
| | * | | | | | | | | | | | | | Extreme Hills M variant only spawn with grass and stone | STRWarrior | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed gravel. | ||||
| | * | | | | | | | | | | | | | ExtremeHillsPlus and ExtremeHills spawn with grass only | STRWarrior | 2014-07-21 | 1 | -12/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out only the M variants have stone and gravel in them. | ||||
| * | | | | | | | | | | | | | | Export SendEntityAnimation to ToLua | archshift | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fix misguided comment on bits... | Tiger Wang | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...obviously written by someone very confused, also known as me | ||||
| * | | | | | | | | | | | | | | Export BroadcastEntityAnimation with ToLua | archshift | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #752 | ||||
| * | | | | | | | | | | | | | | Merge pull request #1216 from mc-server/saplingsandleaves | Tiger Wang | 2014-07-22 | 10 | -141/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | Fixed issues relating to saplings and leaves | ||||
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into saplingsandleaves | Tiger Wang | 2014-07-22 | 111 | -937/+1094 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Defines.h | ||||
| * | | | | | | | | | | | | | | Updated prefabs to current Gallery content. | madmaxoft | 2014-07-22 | 3 | -226/+243 |
| | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merged branch 'origin/Foliage'. | madmaxoft | 2014-07-21 | 3 | -0/+100 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Fixed a missing enter. | STRWarrior | 2014-07-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Removed y for-loop. | STRWarrior | 2014-07-21 | 1 | -27/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the top block now gets long grass. | ||||
| | * | | | | | | | | | | | | | Fixed indentation | STRWarrior | 2014-07-21 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Changed CubicNoiseXX to IntNoiseXX | STRWarrior | 2014-07-20 | 2 | -40/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some comments | ||||
| | * | | | | | | | | | | | | | Renamed cFinishGenFoliage to cFinishGenTallGrass | STRWarrior | 2014-07-20 | 3 | -17/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better grass density Added double tall grass. | ||||
| | * | | | | | | | | | | | | | Fixed warnings | STRWarrior | 2014-07-20 | 2 | -5/+4 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | First attempt for a new foliage finisher | STRWarrior | 2014-07-20 | 3 | -0/+74 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Defines.h: Fixed a warning. | madmaxoft | 2014-07-21 | 1 | -1/+1 |
| | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | CheckBasicStyle: Added a lua shebang. | madmaxoft | 2014-07-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | CheckBasicStyle: Doesn't require LuaFileSystem. | madmaxoft | 2014-07-21 | 1 | -34/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead it uses the list of files generated by CMake. | ||||
| * | | | | | | | | | | | | | CMake: generates a list of all source files. | madmaxoft | 2014-07-21 | 2 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used for the style-checking script. | ||||
| * | | | | | | | | | | | | | Normalized spaces after "catch". | madmaxoft | 2014-07-21 | 2 | -3/+4 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | CheckBasicStyle: Checks spaces after keywords, no space before ")". | madmaxoft | 2014-07-21 | 1 | -1/+16 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Style: Normalized to no spaces before closing parenthesis. | madmaxoft | 2014-07-21 | 94 | -535/+541 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Style: Normalized spaces after if, for and while. | madmaxoft | 2014-07-21 | 28 | -135/+137 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Cuboid: added explicit copy assignment operator | archshift | 2014-07-21 | 2 | -0/+13 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1213 from mc-server/chat-color | Mattes D | 2014-07-20 | 6 | -57/+59 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored cChatColor | ||||
| | * | | | | | | | | | | | | | ChatColor.h: The @deprecated tag slipped. Oops. | archshift | 2014-07-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixed attempts to call c_str on ChatColors | archshift | 2014-07-19 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Removed references to deprecated cChatColor::Color | archshift | 2014-07-19 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Refactored cChatColor | archshift | 2014-07-19 | 2 | -49/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed std::string fields to const char-pointers in order to wipe out potential issues with static initialization and global destructors - Deprecated cChatColor::Color() because the name does not match the value | ||||
| * | | | | | | | | | | | | | | Revert "Only one instance of server can be started" | Tiger Wang | 2014-07-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6484e9814a3a540518606f552398e0b82f91ab4d. * Fixes #1200 | ||||
| * | | | | | | | | | | | | | | Line tracer invalid chunk fix | Tiger Wang | 2014-07-20 | 2 | -26/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1230 * Additionally improved speed in some scenarios | ||||
| | | | * | | | | | | | | | | | Merge branch 'master' into saplingsandleaves | Tiger Wang | 2014-07-20 | 345 | -2335/+3502 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Bindings/DeprecatedBindings.cpp src/Blocks/BlockSapling.h | ||||
| * | | | | | | | | | | | | | | NBTChunkSerializer.cpp: Added break after serializing the splash potion | archshift | 2014-07-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1231 from mc-server/ticks-alive | Tiger Wang | 2014-07-20 | 3 | -3/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added m_TicksAlive to entities and allows projectiles to hit their creators | ||||
| | * | | | | | | | | | | | | | | Added m_TicksAlive to entities, allows projectiles to hit their creators | archshift | 2014-07-20 | 3 | -3/+14 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Added destroy-timer system to splash potion entities | archshift | 2014-07-20 | 2 | -3/+24 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1227 from mc-server/fixes | Mattes D | 2014-07-20 | 5 | -23/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a couple warnings | ||||
| | * | | | | | | | | | | | | | | main.cpp: field style fixes | archshift | 2014-07-20 | 3 | -12/+12 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Socket: removed unused Socket destructor | archshift | 2014-07-19 | 2 | -10/+0 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | main.cpp: Fixed warnings with g_TERMINATE_EVENT_RAISED and g_SERVER_TERMINATED | archshift | 2014-07-19 | 3 | -6/+6 |
| |/ / / / / / / / / / / / / / | |||||
| * / / / / / / / / / / / / / | Monsters: Made IsUndead overridable by the respective mob classes | archshift | 2014-07-19 | 6 | -13/+11 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | CheckBasicStyle: Checks for braces not on separate lines. | madmaxoft | 2014-07-19 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the opening braces at the end of a line are checked, others (such as inline getters and setters or initializers) are valid. | ||||
| * | | | | | | | | | | | | | Code style: Fixed braces on separate lines. | madmaxoft | 2014-07-19 | 14 | -20/+38 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | CheckBasicStyle: Check spaces around commas. | madmaxoft | 2014-07-19 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want no space in front of and at least one space after a comma. | ||||
| * | | | | | | | | | | | | | Fixed spaces after commas in protocol data. | madmaxoft | 2014-07-19 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JSON data is well-formatted with spaces, too; we can afford to waste the few bytes. | ||||
| * | | | | | | | | | | | | | Fixed style: spaces after commas. | madmaxoft | 2014-07-19 | 42 | -101/+100 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1214 from mc-server/anti-glob | Mattes D | 2014-07-19 | 16 | -214/+847 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake - Explicitly lists all source files | ||||
| | * | | | | | | | | | | | | | Fixed MSVC bindings generation. | madmaxoft | 2014-07-19 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Moved Windows custom command to src/CMakeLists.txt | archshift | 2014-07-19 | 2 | -15/+20 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | CMakeLists: Moved Bindings-specific code to subdir | archshift | 2014-07-19 | 3 | -120/+125 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Blocks/CMakeLists.txt: Fixed header list after merge of master | archshift | 2014-07-19 | 2 | -10/+6 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | CMake: Add Bindings library from subdirectory | archshift | 2014-07-19 | 2 | -23/+12 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | src/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 2 | -20/+180 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On MSVC, CMake will traverse all the CMakeLists and add their source and header files to one conglomerate SOURCE list. | ||||
| | * | | | | | | | | | | | | | Subdirs: Only add_library if not using MSVC | archshift | 2014-07-19 | 13 | -19/+45 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | src/CMakeLists: Small changes for increased readability | archshift | 2014-07-19 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | OSSupport/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+32 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | HTTPServer/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+20 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Generating/Prefabs/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+22 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Simulator/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+28 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | WorldStorage/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+26 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Generating/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+54 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | BlockEntities/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+35 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | UI/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Protocol/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+23 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Blocks/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+92 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Items/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+47 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Entities/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+56 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Mobs/CMakeLists.txt: Replaced glob with list of files | archshift | 2014-07-19 | 1 | -5/+69 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1223 from mc-server/fixes | Mattes D | 2014-07-19 | 10 | -61/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed small issues throughout the codebase | ||||
| | * | | | | | | | | | | | | | | World.cpp: fixed not all enum fields being used in m_Dimension switch | archshift | 2014-07-19 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Minecart: slimmed down SpawnOn by keeping subtype in the payload enum | archshift | 2014-07-19 | 2 | -20/+7 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Trees.cpp: removed unused "debug" fields | archshift | 2014-07-19 | 1 | -7/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed clamping issues | archshift | 2014-07-19 | 6 | -33/+6 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #1224 from mc-server/fixes-potions | Mattes D | 2014-07-19 | 5 | -14/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Fix for potion color after tossing | ||||
| | * | | | | | | | | | | | | | | Splash potions: Renamed PotionParticleType to PotionColor for clarity | archshift | 2014-07-19 | 5 | -15/+15 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed splash potion color on toss | archshift | 2014-07-19 | 2 | -0/+16 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Renamed AllToLua_lua script. | madmaxoft | 2014-07-19 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1222. | ||||
| * | | | | | | | | | | | | | | Authenticator.cpp: Killed a global destructor warning | archshift | 2014-07-19 | 1 | -53/+56 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge branch 'Inventory2' | madmaxoft | 2014-07-18 | 6 | -4/+101 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Debuggers: Optimized and commented the /rmitem handler. | madmaxoft | 2014-07-18 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | APIDump: Documented RemoveItem(). | madmaxoft | 2014-07-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Clarified RemoveItem()'s comments. | madmaxoft | 2014-07-18 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Added RemoveItem() function to the player inventory. | Howaner | 2014-07-18 | 5 | -4/+93 |
| | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'Entities' | madmaxoft | 2014-07-18 | 4 | -11/+87 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Fixed slime-related comments. | madmaxoft | 2014-07-18 | 3 | -5/+10 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Slime sizes are 1, 2 or 4 and not 1, 2 or 3. | Howaner | 2014-07-18 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Split into more lines. | Howaner | 2014-07-17 | 2 | -6/+10 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixed many slime bugs. | Howaner | 2014-07-17 | 3 | -7/+74 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed slime hurt/death sound - Added slime spawning on death. - Fixed the max health. - Fixed the attack damage. - Little slimes should not attack players. | ||||
| * | | | | | | | | | | | | | | Merge branch 'Sign' | madmaxoft | 2014-07-18 | 4 | -34/+122 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Normalized code style for both sign handlers. | madmaxoft | 2014-07-18 | 2 | -16/+20 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Removed cBlockSignPostHandler descend. | Howaner | 2014-07-18 | 1 | -2/+28 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Added a extra wall sign handler. | Howaner | 2014-07-18 | 4 | -27/+85 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1119 | ||||
| * | | | | | | | | | | | | | | Monster fixes | Tiger Wang | 2014-07-18 | 8 | -35/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1203 * Fixes #627 | ||||
| * | | | | | | | | | | | | | | MCServer supports Minecraft v1.7.10 | archshift | 2014-07-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed creative players not being able to drink | archshift | 2014-07-18 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1215 | ||||
| * | | | | | | | | | | | | | | CheckBasicStyle: Proper spaces with commas. | madmaxoft | 2014-07-18 | 1 | -21/+48 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed spaces before commas. | madmaxoft | 2014-07-18 | 7 | -14/+14 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Removed duplicate IPvX labels. | madmaxoft | 2014-07-18 | 3 | -6/+6 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1208 from Howaner/MobInventory | Mattes D | 2014-07-18 | 2 | -0/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spawns skeletons with a bow in their hands | ||||
| | * | | | | | | | | | | | | | | Skeletons should spawn with a bow in the hand. | Howaner | 2014-07-18 | 2 | -0/+17 |
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1184 | ||||
| * | | | | | | | | | | | | | | Moved ChatColor.h out of defines where it was not needed | archshift | 2014-07-18 | 2 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1210 from Howaner/API | Mattes D | 2014-07-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed special character in APIDump | ||||
| | * | | | | | | | | | | | | | | Removed special character in APIDump | Howaner | 2014-07-18 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge pull request #1212 from mc-server/never-read | Mattes D | 2014-07-18 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ProtocolRecognizer.cpp: removed unused NumBytesRead | ||||
| | * | | | | | | | | | | | | | | ProtocolRecognizer.cpp: removed unused NumBytesRead | archshift | 2014-07-18 | 1 | -2/+0 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Generator: removed rnd definitions that are never read | archshift | 2014-07-18 | 2 | -2/+0 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1209 from Howaner/GlobalFixes | archshift | 2014-07-18 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Added Howaner to the CONTRIBUTORS list. | ||||
| | * | | | | | | | | | | | | | Added me to the CONTRIBUTORS list. I hope it is ok. | Howaner | 2014-07-18 | 1 | -0/+1 |
| |/ / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | Proper comment for DropBlock() | Tiger Wang | 2014-07-20 | 1 | -2/+5 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | Fixed issues relating to saplings and leaves | Tiger Wang | 2014-07-17 | 10 | -139/+32 |
| | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed cBlockInfo::RequiresSpecialTool * Fixes #1195 * Fixes #1201 | ||||
| | | | * | | | | | | | | | Add armor items directly to the armor slots. | Howaner | 2014-07-20 | 3 | -3/+16 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Moved comment. | Howaner | 2014-07-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Fixed the armor slot in creative mode. Also removed that armor get directly to the armor slot. It is extremely buggy and unnecessary. | Howaner | 2014-07-18 | 2 | -9/+13 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Items should first added to the first slot, not the latest. | Howaner | 2014-07-18 | 1 | -3/+3 |
| | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed NULL being passed instead of a double to AddEntityEffect | archshift | 2014-07-17 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed code style in Trees.cpp. | madmaxoft | 2014-07-17 | 1 | -24/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The src folder now has zero BasicStyle violations. | ||||
| * | | | | | | | | | | | Fixed tabs used for alignment. | madmaxoft | 2014-07-17 | 29 | -99/+115 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | More trailing whitespace fixes. | madmaxoft | 2014-07-17 | 13 | -25/+25 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Player.cpp: Fixed compile error | archshift | 2014-07-17 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Player.cpp: Added Wither death message | archshift | 2014-07-17 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Basic style fixes. | madmaxoft | 2014-07-17 | 130 | -286/+290 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | madmaxoft | 2014-07-17 | 3 | -25/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge pull request #1204 from Howaner/Blocks | Alexander Harkness | 2014-07-17 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | Fix sapling drop. | ||||
| | | * | | | | | | | | | | Fix sapling drop. | Howaner | 2014-07-17 | 1 | -1/+1 |
| | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Fixed mob knockback | Tiger Wang | 2014-07-17 | 1 | -23/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #901 | ||||
| | * | | | | | | | | | | Fixed crash with entities in unloaded chunks | Tiger Wang | 2014-07-17 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1190 | ||||
| * | | | | | | | | | | | Initial version of a script to check basic style. | madmaxoft | 2014-07-17 | 1 | -0/+188 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This script reports basic violations of the style, such as indentation using spaces, alignment using tabs, trailing whitespace etc. Passing this script does NOT mean that the style is clean, it's only for fast-checking purposes. | ||||
| * | | | | | | | | | | | Normalized comments. | madmaxoft | 2014-07-17 | 173 | -867/+893 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 spaces around single-line comments. | madmaxoft | 2014-07-17 | 34 | -139/+141 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There should be at least two spaces in front and one space after //-style comments. | ||||
| * | | | | | | | | | | | Fixed basic whitespace problems. | madmaxoft | 2014-07-17 | 52 | -298/+306 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines. | ||||
| * | | | | | | | | | | Merge pull request #1183 from Howaner/Sounds | Tiger Wang | 2014-07-17 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Reset meta to zero when the blocks explode | ||||
| | * | | | | | | | | | | Derp. | Howaner | 2014-07-15 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Reset meta to zero when the block explode. | Howaner | 2014-07-14 | 1 | -4/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #1079 from mc-server/potions | Mattes D | 2014-07-17 | 40 | -119/+1596 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Added potions and entity effect accessors | ||||
| | * | | | | | | | | | | | Fixed 3 MSVC warnings in SplashPotionEntity. | madmaxoft | 2014-07-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Updated cPawn::KilledBy signature for custom death messages. | madmaxoft | 2014-07-17 | 2 | -3/+3 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into potions | madmaxoft | 2014-07-17 | 21 | -41/+62 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1193 from mc-server/deathmessages | Mattes D | 2014-07-17 | 21 | -41/+62 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Death messages | ||||
| | * | | | | | | | | | | | | Resolved backwards compatibility issues | Tiger Wang | 2014-07-16 | 7 | -9/+9 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Tailored death messages | Tiger Wang | 2014-07-04 | 20 | -40/+61 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Reformatted cItemPotionHandler. | madmaxoft | 2014-07-17 | 2 | -48/+79 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Fixed formatting for cWitherSkullEntity | madmaxoft | 2014-07-17 | 2 | -3/+13 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into potions | madmaxoft | 2014-07-17 | 16 | -124/+261 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Another fix for excessive food drain | Tiger Wang | 2014-07-16 | 2 | -1/+10 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed a bug with buckets | Tiger Wang | 2014-07-16 | 2 | -9/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Additionally fixed cLineBlockTracer's EntryFace parameter when a block was hit on the first iteration along the projected line | ||||
| * | | | | | | | | | | | | | Fixed another redstone simulator crash | Tiger Wang | 2014-07-16 | 1 | -0/+7 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1192 from mc-server/skinuuid | Mattes D | 2014-07-16 | 11 | -113/+233 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skins | ||||
| | * | | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-07-16 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Function rename | Tiger Wang | 2014-07-16 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Unified functions | Tiger Wang | 2014-07-16 | 2 | -34/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks @Howaner! | ||||
| | * | | | | | | | | | | | | | Store properties as Json::Value | Tiger Wang | 2014-07-16 | 9 | -21/+44 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Player properties are now retrieved | Tiger Wang | 2014-07-14 | 11 | -116/+216 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed a DropSpenser AddFace bug | Tiger Wang | 2014-07-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into potions | madmaxoft | 2014-07-15 | 7 | -80/+246 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1191 from Masy98/Blocks | Tiger Wang | 2014-07-15 | 1 | -13/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed stairs and carpet from IsSolid | ||||
| | * | | | | | | | | | | | | | | Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them. | Masy98 | 2014-07-15 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them. | Masy98 | 2014-07-15 | 1 | -12/+0 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #1189 from Masy98/Blocks | Mattes D | 2014-07-15 | 2 | -63/+214 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added various missing blocks in the lists in BlockInfo.cpp | ||||
| | * | | | | | | | | | | | | | | Added Brick fence to m_Transparent | Masy98 | 2014-07-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Added various missing blocks in the lists in BlockInfo.cpp | Masy98 | 2014-07-15 | 2 | -64/+214 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed code formatting. | madmaxoft | 2014-07-15 | 2 | -6/+9 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/ClearMetaMixin' | madmaxoft | 2014-07-15 | 4 | -12/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Added super typedef | Tycho | 2014-07-15 | 3 | -3/+6 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | COnverted Lilypad back to mixin | Tycho | 2014-07-15 | 1 | -8/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Revert "Converted some blockhandlers to use cClearMetaOnDrop" | Tycho | 2014-07-15 | 9 | -21/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 333f4f982cbd24ffcb376594eddef439b3f05e9e. | ||||
| | * | | | | | | | | | | | | | | | Added documentation | Tycho | 2014-07-14 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Converted some blockhandlers to use cClearMetaOnDrop | Tycho | 2014-07-14 | 9 | -67/+21 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Simplified ClearMetaOnDrop | Tycho | 2014-07-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added cClearOnDrop Mixin to cPumpkin | Tycho | 2014-07-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added first implementation of cClearMetaOnDrop | Tycho | 2014-07-14 | 2 | -2/+21 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #1188 from mc-server/FindClosestPlayerFix | Mattes D | 2014-07-15 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | Fixed FindClosestPlayer | ||||
| | * | | | | | | | | | | | | | | | Fixed FindClosestPlayer | Tycho | 2014-07-15 | 1 | -3/+6 |
| |/ / / / / / / / / / / / / / / | |||||
| | | | | | * | | | | | | | | | | Restructured cSplashPotionEntity code. | madmaxoft | 2014-07-15 | 5 | -72/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The callback doesn't need declaration in the header. Renamed PotionName to PotionParticleType. | ||||
| | | | | | * | | | | | | | | | | Only the cEntityEffect::effXXX constants are Lua-exported. | madmaxoft | 2014-07-15 | 2 | -72/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rest of the classes don't need exporting, there's no interface using them anyway. | ||||
| | | | | | * | | | | | | | | | | Reformatted EntityEffect code. | madmaxoft | 2014-07-15 | 1 | -25/+29 |
| | | | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | | | Fixed a MSVC warning in cEntityEffect::CreateEntityEffect(). | madmaxoft | 2014-07-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | | | Merge branch 'master' into potions | madmaxoft | 2014-07-15 | 72 | -443/+699 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Pass cItem by reference. | madmaxoft | 2014-07-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 66445. | ||||
| * | | | | | | | | | | | | | | | Added missing member initialization to cGridStructGen. | madmaxoft | 2014-07-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68228. | ||||
| * | | | | | | | | | | | | | | | Fixed redstone simulator crash | Tiger Wang | 2014-07-15 | 2 | -8/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1176 * Fixed #1186 | ||||
| * | | | | | | | | | | | | | | | Fixed some meta resetting bugs | Tiger Wang | 2014-07-14 | 6 | -27/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1174 * Fixes #1171 | ||||
| * | | | | | | | | | | | | | | | Maybe improved arrow sinking | Tiger Wang | 2014-07-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed placing liquids over liquids | Tiger Wang | 2014-07-14 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1182 | ||||
| * | | | | | | | | | | | | | | Merge pull request #1177 from mc-server/ChestFix | Mattes D | 2014-07-14 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Issue with Comparing agast the wrong chest, potentially causing crashes | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into ChestFix | Tycho | 2014-07-13 | 6 | -8/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Fixed Issue with Comparing agast the wrong chest, potentially causing crashes. | worktycho | 2014-07-13 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #1172 from mc-server/coverity_fixes | Mattes D | 2014-07-13 | 3 | -4/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coverity fixes | ||||
| | * | | | | | | | | | | | | | | | | Added parenthasies | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | CopyPaste Error | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70460. | ||||
| | * | | | | | | | | | | | | | | | | Another COpyPaste Error | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70461 | ||||
| | * | | | | | | | | | | | | | | | | Fix CopyPaste error that ment a_MaxRelX wasdn't checked | worktycho | 2014-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70464 | ||||
| | * | | | | | | | | | | | | | | | | Check GridSize for 0 | worktycho | 2014-06-26 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68226 and CID 66437 | ||||
| | * | | | | | | | | | | | | | | | | Add Null check to SendBlockTo | worktycho | 2014-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 43611 | ||||
| * | | | | | | | | | | | | | | | | | Tolua driver: Fixed wrong indentation. | madmaxoft | 2014-07-13 | 1 | -15/+15 |
| | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #1178 from mc-server/projectilefix | Mattes D | 2014-07-13 | 6 | -8/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Made projectile a_Item into a pointer | ||||
| | * | | | | | | | | | | | | | | | Adjusted calls to CreateProjectile that passed Items | Tycho | 2014-07-13 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Made CreateProjectile a pointer | worktycho | 2014-07-13 | 4 | -6/+7 |
| |/ / / / / / / / / / / / / / / | |||||
| * | | | | | / / / / / / / / / | Fixed MSVC warnings in SoundEffect functions. | madmaxoft | 2014-07-13 | 3 | -15/+7 |
| | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Update. | Howaner | 2014-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into Sounds | Howaner | 2014-07-13 | 8 | -19/+86 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge pull request #1167 from Howaner/Plugins | Mattes D | 2014-07-13 | 1 | -3/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed diamond mover plugin | ||||
| | | * | | | | | | | | | | | | | Fixed diamond mover plugin | Howaner | 2014-07-13 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge pull request #1133 from Howaner/Sheep | Mattes D | 2014-07-13 | 4 | -10/+75 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sheep fixes | ||||
| | | * | | | | | | | | | | | | | | Changed comments. | Howaner | 2014-07-13 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Merge branch 'master' into Sheep | Howaner | 2014-07-13 | 117 | -2034/+2670 |
| | | |\| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Add doxy-comments. | Howaner | 2014-07-01 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Moved the random code to a function (cSheep::GenerateNaturalRandomColor()) | Howaner | 2014-06-30 | 2 | -36/+47 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Code fixes. | Howaner | 2014-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Save IsSheared from Sheep. | Howaner | 2014-06-28 | 2 | -4/+14 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Fix sheep color's, add shear sound. | Howaner | 2014-06-28 | 3 | -3/+42 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge pull request #1166 from Howaner/GlobalFixes | Mattes D | 2014-07-13 | 3 | -6/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE) | ||||
| | | * | | | | | | | | | | | | | | Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE) | Howaner | 2014-07-13 | 3 | -6/+6 |
| | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| * | / | | | | | | | | | | | | | Changed BroadcastSoundEffect function to take floating pos. | Howaner | 2014-07-13 | 36 | -83/+77 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Only one instance of server can be started | Tiger Wang | 2014-07-13 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This disallows the UDP multicasting that the original code enabled. xoft deterrent, in PR #1151 you implied that this was unwanted behaviour (but comments gone now as I force pushed - check emails?). Revert at will if unsatisfactory :P | ||||
| * | | | | | | | | | | | | | | Revert failed fix for #31 | Tiger Wang | 2014-07-13 | 2 | -31/+4 |
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 69dc9b4c9aea58ebd95e2dbd0205701dfc4ce54e. | ||||
| * | | | | | | | | | | | | | Merge pull request #1154 from mc-server/trappedchests | Tiger Wang | 2014-07-13 | 26 | -218/+387 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented trapped chests & others | ||||
| | * | | | | | | | | | | | | | cNBTChunkSerializer: Fixed alignment. | madmaxoft | 2014-07-12 | 1 | -14/+14 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | 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 | 7 | -30/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 3 | -2/+6 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-07-11 | 4 | -14/+18 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Improved LinkedPowering speed | Tiger Wang | 2014-07-11 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Additionally fixed wires powering other wires through blocks | ||||
| | * | | | | | | | | | | | | | Made things consistent | Tiger Wang | 2014-07-08 | 2 | -6/+9 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixed compilation and pressure plates | Tiger Wang | 2014-07-07 | 1 | -8/+4 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Implemented trapped chests & others | Tiger Wang | 2014-07-07 | 26 | -179/+340 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes | ||||
| * | | | | | | | | | | | | | | Comment grammar correction | Tiger Wang | 2014-07-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Simplified buckets code slightly | Tiger Wang | 2014-07-12 | 1 | -32/+15 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1162 from daniel0916/Fixes | Tiger Wang | 2014-07-12 | 1 | -23/+67 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bucket placing | ||||
| | * | | | | | | | | | | | | | | Changes | daniel0916 | 2014-07-12 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Changes | daniel0916 | 2014-07-11 | 1 | -24/+16 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Changes | daniel0916 | 2014-07-10 | 1 | -20/+22 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Maybe fixed whitespaces | daniel0916 | 2014-07-10 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Maybe fixed whitespaces | daniel0916 | 2014-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed Bucket Placing | daniel0916 | 2014-07-10 | 1 | -6/+57 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed Bucket placing | daniel0916 | 2014-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | | | | ItemHandler.cpp: removed redundant food and drink checks | archshift | 2014-07-14 | 1 | -33/+0 |
| | | | | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | | | | Readability and clarity changes | archshift | 2014-07-14 | 4 | -59/+68 |
| | | | | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | | | | OnEntityAddEffect.lua: Removed Originator param | archshift | 2014-07-14 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | | | | EntityEffect: Inlined functions, added explicit copy constructor and operator. | archshift | 2014-07-14 | 2 | -20/+29 |
| | | | | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | | | | Changed separating comment style from asterisks to slashes. | archshift | 2014-07-14 | 2 | -93/+93 |
| | | | | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | | | | Added splash potions to NBT serialization and retrieval | archshift | 2014-07-12 | 6 | -1/+50 |
| | | | | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | | | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-12 | 14 | -161/+400 |
| | | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Simplified the player data loading. | madmaxoft | 2014-07-11 | 1 | -9/+8 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Player data filenames are based on UUID. | madmaxoft | 2014-07-11 | 4 | -67/+155 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed a missing return value. | madmaxoft | 2014-07-11 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Preparation for player UUID-based storage: LoadFromFile() | madmaxoft | 2014-07-11 | 2 | -21/+42 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed style consistency. | madmaxoft | 2014-07-10 | 2 | -61/+64 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | APIDump: Documented cWorld:SetChunkAlwaysTicked. | madmaxoft | 2014-07-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1160 | ||||
| * | | | | | | | | | | | | | | | Debuggers: Added forced chunk ticking test. | madmaxoft | 2014-07-10 | 1 | -0/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1160 | ||||
| * | | | | | | | | | | | | | | | Implemented support for forced chunk ticking. | madmaxoft | 2014-07-10 | 6 | -8/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1160. | ||||
| * | | | | | | | | | | | | | | | Merge pull request #1159 from mc-server/VectorFloorFix | Mattes D | 2014-07-10 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vector floor fix | ||||
| | * | | | | | | | | | | | | | | | Fixed a missing "inline" keyword. | madmaxoft | 2014-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed Vector3.h compilation in MSVC2008. | madmaxoft | 2014-07-10 | 1 | -0/+9 |
| |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Removed lilypad from plains village prefabs. | madmaxoft | 2014-07-10 | 1 | -7/+8 |
| | | | | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | | | | For now, removed creator member from Entity Effect for pointer safety | archshift | 2014-07-12 | 12 | -104/+94 |
| | | | | | | | | | | | | | | | | |||||
| | | | | | | * | | | | | | | | | Merge remote-tracking branch 'origin/master' into potions | archshift | 2014-07-10 | 156 | -5178/+7390 |
| | | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp | ||||
| * | | | | | | | | | | | | | | | Merge pull request #1157 from Howaner/Window | Mattes D | 2014-07-09 | 3 | -41/+237 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more inventory actions. | ||||
| | * | | | | | | | | | | | | | | | Removed unused include line. | Howaner | 2014-07-09 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added inventory number click. | Howaner | 2014-07-09 | 2 | -1/+43 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added drop window action. | Howaner | 2014-07-06 | 3 | -25/+113 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Add middle click. | Howaner | 2014-07-05 | 2 | -21/+88 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fixed bow charge | Tiger Wang | 2014-07-09 | 1 | -11/+2 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fixed arrow collection animation | Tiger Wang | 2014-07-09 | 5 | -33/+4 |
| | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed piston extension non-solidness | ||||
| * | | | | | | | | | | | | | | | Merge pull request #1135 from mc-server/fixes | Tiger Wang | 2014-07-09 | 19 | -110/+272 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes to projectiles and the undead | ||||
| | * | | | | | | | | | | | | | | | Added extra space before comments | Tiger Wang | 2014-07-07 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Changed everything to callbacks | Tiger Wang | 2014-07-05 | 4 | -82/+53 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Crash and compile fix | Tiger Wang | 2014-07-04 | 3 | -5/+10 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Compile fix | Tiger Wang | 2014-07-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-07-04 | 7 | -11/+20 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Various fixed | Tiger Wang | 2014-07-04 | 4 | -17/+111 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed potential invalid pointer dereferencing, fixes #1117 * Fixed ender pearls not being loaded properly | ||||
| | * | | | | | | | | | | | | | | | Eps comparison | Tiger Wang | 2014-07-04 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-07-02 | 4 | -19/+31 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Vector clamping fixes | Tiger Wang | 2014-07-01 | 2 | -21/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thank you, @madmaxoft. | ||||
| | * | | | | | | | | | | | | | | | Implemented Vector3<>::Floor() | Tiger Wang | 2014-06-30 | 2 | -10/+19 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-06-29 | 3 | -3/+20 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | An unification of code style | Tiger Wang | 2014-06-28 | 1 | -1/+1 |
| | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Bettered zombie and skeleton AI | Tiger Wang | 2014-06-22 | 2 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed potential issues with skylight detection | ||||
| | * | | | | | | | | | | | | | | Some Entity.cpp style improvements | Tiger Wang | 2014-06-22 | 2 | -13/+8 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed multiple issues with projectiles | Tiger Wang | 2014-06-22 | 8 | -63/+112 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed arrows not being collectable/not truly hitting a block/not lodging into blocks/not going in far enough * Fixed projectiles not playing their block hit animation owning to being destroyed too quickly | ||||
| * | | | | | | | | | | | | | | | Updated generator prefabs to current Gallery contents. | madmaxoft | 2014-07-08 | 3 | -7/+8 |
| | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed OpenSSL programs and tests being generated when testing disabled. | tycho | 2014-07-06 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1144 from mc-server/LuaCodeGen | Mattes D | 2014-07-06 | 5 | -624/+227 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lua code gen | ||||
| | * | | | | | | | | | | | | | | Tolua generates LuaState_Call.inc file. | madmaxoft | 2014-07-01 | 4 | -624/+31 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Initial codegen for LuaState_Call.inc. | madmaxoft | 2014-07-01 | 1 | -0/+196 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed crafting grid updating. | Mattes D | 2014-07-06 | 2 | -2/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1152. | ||||
| * | | | | | | | | | | | | | | | Fixed slime handling in cMonster::StringToMobType(). | madmaxoft | 2014-07-06 | 1 | -1/+1 |
| | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1151 from mc-server/immediatesocketrebind | Mattes D | 2014-07-04 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MCS sockets can be rebound immediately | ||||
| | * | | | | | | | | | | | | | | MCS WebAdmin sockets rebinds instantly | Tiger Wang | 2014-07-04 | 1 | -0/+2 |
| | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #272 * Fixes #1150 | ||||
| * | | | | | | | | | | | | | | cPluginManager: Reformatted the switch statement. | madmaxoft | 2014-07-04 | 1 | -7/+34 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/HandleCommand' | madmaxoft | 2014-07-04 | 3 | -32/+53 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Removed useless sentence in cPluginManager:ExecuteCommand description. | STRWarrior | 2014-07-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Moved sending error messages to cPluginManager:CallHookChat | STRWarrior | 2014-07-04 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed ExecuteCommand description. | STRWarrior | 2014-07-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed doxycomments | STRWarrior | 2014-06-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | (Force)ExecuteCommand returns the CommandResult enums | STRWarrior | 2014-06-18 | 3 | -10/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exported and documented the CommandResult enums | ||||
| | * | | | | | | | | | | | | | | Added crBlocked and crNoPermission | STRWarrior | 2014-06-17 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | HandleCommand now returns an CommandResult enum. | STRWarrior | 2014-06-17 | 2 | -23/+19 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed possible confusion. | STRWarrior | 2014-06-17 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a command handler gets an error then the player will receive an unknown command error. This can be confusing for players. | ||||
| * | | | | | | | | | | | | | | | Fixed c1deda5d8f01811efa5094e9375166acb69d50ed | Tiger Wang | 2014-07-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I keep on breaking stuff :P | ||||
| * | | | | | | | | | | | | | | | Removed world-saving log messages. | madmaxoft | 2014-07-04 | 3 | -35/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1518 | ||||
| * | | | | | | | | | | | | | | | APIDump: Updated OnWeatherChanging docs after latest code changes. | madmaxoft | 2014-07-03 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Changed OnWeatherChanging hook to always read the returned weather. | madmaxoft | 2014-07-03 | 3 | -4/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1512 | ||||
| * | | | | | | | | | | | | | | | CMake: Changed slash format to support MSYS. | madmaxoft | 2014-07-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1044 | ||||
| * | | | | | | | | | | | | | | | SetFlags.cmake: don't use ${} expansion on if STREQUAL | archshift | 2014-07-03 | 1 | -1/+2 |
| | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://stackoverflow.com/questions/19982340/cmake-compare-to-empty-string-with-strequal-failed | ||||
| * | | | | | | | | | | | | | | Merge pull request #1138 from mc-server/enderchest | Mattes D | 2014-07-02 | 7 | -113/+78 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly implemented enderchests | ||||
| | * | | | | | | | | | | | | | | Suggestion | Tiger Wang | 2014-07-02 | 1 | -13/+13 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Removed unneeded code | Tiger Wang | 2014-06-30 | 4 | -38/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Removed bad comment | Tiger Wang | 2014-06-29 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Properly implemented enderchests | Tiger Wang | 2014-06-29 | 10 | -99/+102 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' | Tiger Wang | 2014-07-02 | 9 | -30/+96 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1139 from Howaner/Hooks | Mattes D | 2014-07-02 | 8 | -28/+94 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hook HOOK_PLAYER_FOOD_LEVEL_CHANGE | ||||
| | | * | | | | | | | | | | | | | | | Update documentation | Howaner | 2014-07-02 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | Removed foodlevel-change possibility. Plugins can cancel the event and use cPlayer:SetFoodLevel() | Howaner | 2014-07-02 | 5 | -6/+6 |
| | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | Change documentation | Howaner | 2014-07-01 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | Fixes. | Howaner | 2014-06-30 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | Add documentation. | Howaner | 2014-06-30 | 1 | -0/+22 |
| | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGE | Howaner | 2014-06-30 | 6 | -26/+67 |
| | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | Unnecessary return | Howaner | 2014-06-30 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | CMake: Use cmake for file-copying. | madmaxoft | 2014-07-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should enable MSYS builds. | ||||
| * | | | | | | | | | | | | | | | | | Fixed player teleport food drain | Tiger Wang | 2014-07-02 | 2 | -1/+14 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Redstone simulator is alerted to lever unpowering | Tiger Wang | 2014-07-02 | 4 | -1/+6 |
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed the "fix" that broke the fix for #535, thereby fixing said issue * Fixed #535 | ||||
| * | | | / / / / / / / / / / / / | Fixed printf formats for Win builds | madmaxoft | 2014-07-01 | 2 | -4/+4 |
| | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed a possibly unused variable. | madmaxoft | 2014-07-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #1122 from mc-server/LuaProxy | Mattes D | 2014-07-01 | 6 | -0/+324 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lua proxy DLL builds as part of MCS build. | ||||
| | * | | | | | | | | | | | | | | | LuaProxy compilation under MinGW. | Mattes D | 2014-07-01 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'master' into LuaProxy | Mattes D | 2014-07-01 | 59 | -1147/+1191 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | Added a missing endline. | madmaxoft | 2014-06-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Added the Lua Proxy DLL. | madmaxoft | 2014-06-24 | 6 | -0/+321 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This builds the lua5.1.dll file on Windows, making it 64-bit if so required. | ||||
| * | | | | | | | | | | | | | | | | | Merge pull request #1141 from Howaner/GlobalFixes | Mattes D | 2014-07-01 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Fix server-crash with non-existing items. | ||||
| | * | | | | | | | | | | | | | | | | Only fixes the server crash. | Howaner | 2014-07-01 | 2 | -7/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fix server-crash with non-existing items. | Howaner | 2014-07-01 | 2 | -2/+8 |
| |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #1140 from mc-server/FixMingw | Mattes D | 2014-07-01 | 6 | -13/+33 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mingw | ||||
| | * | | | | | | | | | | | | | | | | Proper sqlite dependency fix. | Mattes D | 2014-07-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Ignore Code:::Blocks project files. | Mattes D | 2014-07-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed linking order under MinGW. | Mattes D | 2014-07-01 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1044 | ||||
| | * | | | | | | | | | | | | | | | | typo | worktycho | 2014-06-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Added dependecy of tolualib on lua | worktycho | 2014-06-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed size_t printfing under MinGW. | Mattes D | 2014-06-30 | 1 | -3/+18 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed lua compilation under MinGW. | Mattes D | 2014-06-30 | 1 | -8/+4 |
| |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Fixed cFile compilation under MinGW. | madmaxoft | 2014-06-30 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fixed tolua linking order. | Mattes D | 2014-06-30 | 1 | -3/+1 |
| | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1044. | ||||
| * | | | | | | | | | | | | | | | Fixed respawning | Tiger Wang | 2014-06-29 | 12 | -19/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1103 | ||||
| * | | | | | | | | | | | | | | | Fixed offline UUID generator. | Mattes D | 2014-06-29 | 1 | -2/+4 |
| | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It generated invalid UUIDs, too many hex chars. | ||||
| * | | | | | | | | | | | | | | Merge pull request #1136 from Howaner/GlobalFixes | Mattes D | 2014-06-29 | 2 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send statistics to the player on login. | ||||
| | * | | | | | | | | | | | | | | Send statistics to the player, when he logged in. | Howaner | 2014-06-29 | 2 | -2/+4 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge pull request #1132 from mc-server/RemoveMD5 | Mattes D | 2014-06-29 | 7 | -499/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the md5 library, obsoleted by PolarSSL. | ||||
| | * | | | | | | | | | | | | | | Fixed a silly path error in #include. | Mattes D | 2014-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | CMake: Added polarssl include dir as non-system. | Mattes D | 2014-06-28 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Changed include folders to work for Bindings, too. | Mattes D | 2014-06-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Added PolarSSL dependency to Bindings. | Mattes D | 2014-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Removed the md5 library, obsoleted by PolarSSL. | Mattes D | 2014-06-27 | 7 | -494/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1130. | ||||
| * | | | | | | | | | | | | | | | Likely fixed too quick food depletion | Tiger Wang | 2014-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes FS427 properly, hopefully | ||||
| * | | | | | | | | | | | | | | | Fixed issue with breaking blocks at -1 coordinates | Tiger Wang | 2014-06-28 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Implemented tripwire(s) (hooks) | Tiger Wang | 2014-06-28 | 9 | -17/+324 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #944 | ||||
| * | | | | | | | | | | | | | | | Added more block exceptions to torches | Tiger Wang | 2014-06-28 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Minor change to buttons and levers | Tiger Wang | 2014-06-28 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + They now detect if the block they are on occupies its voxel, instead of just being solid | ||||
| * | | | | | | | | | | | | | | | Fixed bad water/redstone simulator communication | Tiger Wang | 2014-06-28 | 1 | -32/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #713 | ||||
| * | | | | | | | | | | | | | | | Fixed server forcing players afloat | Tiger Wang | 2014-06-28 | 1 | -1/+4 |
| | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1131 | ||||
| * | | | | | | | | | | | | | | Added generic entity-collecting. | Mattes D | 2014-06-27 | 17 | -25/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098. | ||||
| * | | | | | | | | | | | | | | Merge pull request #1129 from mc-server/CodeCoverageCondition | worktycho | 2014-06-27 | 1 | -2/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Moved CodeCoverage into a separate cmake condition. | ||||
| | * | | | | | | | | | | | | | Added MSVC guard | worktycho | 2014-06-27 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Update SetFlags.cmake | worktycho | 2014-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Update SetFlags.cmake | worktycho | 2014-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | CMake: Added log message for coverage. | madmaxoft | 2014-06-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Moved CodeCoverage into a separate cmake condition. | madmaxoft | 2014-06-27 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | CMake: pthread is used only on Unix. | madmaxoft | 2014-06-27 | 1 | -4/+8 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merged branch 'howaner/Bow'. | Mattes D | 2014-06-26 | 4 | -23/+61 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the pickup collection broadcast due to bad code. | ||||
| | * | | | | | | | | | | | | | Add comment. | Howaner | 2014-06-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | GameMode check | Howaner | 2014-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into Bow | Howaner | 2014-06-26 | 82 | -3427/+5264 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | derp | Howaner | 2014-06-17 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | The same: Float, not Double | Howaner | 2014-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Float, not Double | Howaner | 2014-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Split Broadcast Sound Effect function call in multiple lines. | Howaner | 2014-06-16 | 2 | -3/+24 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | This isn't needed | Howaner | 2014-06-16 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fix bow sound and creative arrow pickup. | Howaner | 2014-06-16 | 2 | -19/+30 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Add bow charging animation | Howaner | 2014-06-16 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merged branch 'howaner/Pickups'. | Mattes D | 2014-06-26 | 2 | -7/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Fixed a comment and changed CombineCount to short. | Howaner | 2014-06-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'master' into Pickups | Howaner | 2014-06-26 | 4 | -397/+382 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Optimize combining. | Howaner | 2014-06-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Better combining. | Howaner | 2014-06-24 | 1 | -3/+20 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fix pickup combining over the maximum stack size. | Howaner | 2014-06-24 | 2 | -5/+9 |
| | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | FurnaceRecipe parsing: Fixed whitespace removing. | Mattes D | 2014-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed misformed trimming. | Mattes D | 2014-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | FurnaceRecipe: Moved the parsing into separate functions for clarity. | Mattes D | 2014-06-26 | 2 | -60/+68 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | FurnaceRecipe parser: Made the parser more forgiving. | Mattes D | 2014-06-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Errors don't cause a stop in the parsing, but rather just skip the offending line. | ||||
| * | | | | | | | | | | | | | | | FurnaceRecipe parser: Added an else branch, changed to a switch. | Mattes D | 2014-06-26 | 1 | -45/+69 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/furnaceparsing' | Mattes D | 2014-06-26 | 2 | -92/+170 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Parenthesised comparison | Tiger Wang | 2014-06-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/furnaceparsing' into furnaceparsing | Tiger Wang | 2014-06-22 | 2 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/FurnaceRecipe.cpp | ||||
| | | * | | | | | | | | | | | | | | | Fixed compile errors | worktycho | 2014-06-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-06-22 | 1 | -6/+7 |
| | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-06-22 | 2 | -40/+30 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Removed debugging code | Tiger Wang | 2014-06-21 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Rewrote furnace recipe parser | Tiger Wang | 2014-06-21 | 2 | -93/+181 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #110 | ||||
| * | | | | | | | | | | | | | | | | Merged branch 'tonibm19/master'. | Mattes D | 2014-06-26 | 2 | -0/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added pig riding. | tonibm19 | 2014-06-20 | 2 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now you can ride a pig using a carrot on a stick. | ||||
| * | | | | | | | | | | | | | | | | Merge pull request #1126 from mc-server/BlockInfoInit | Mattes D | 2014-06-25 | 2 | -381/+374 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | BlockInfo is now a proper C++ singleton. | ||||
| | * | | | | | | | | | | | | | | | BlockInfo is now a proper C++ singleton. | madmaxoft | 2014-06-25 | 2 | -381/+374 |
| | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is properly initialized before it is ever used. | ||||
| * | | | | | | | | | | | | | | | Merge pull request #1125 from Howaner/Entities | worktycho | 2014-06-24 | 2 | -16/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Add entity health saving. | ||||
| | * | | | | | | | | | | | | | | Add entity health saving. | Howaner | 2014-06-24 | 2 | -16/+8 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Fixed BlockInfo initialization. | madmaxoft | 2014-06-24 | 1 | -15/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now cBlockInfo is initialized in the getter, instead of "at any time during startup", which included "after it was already needed". | ||||
| * | | | | | | | | | | | | | | Added asserts for cChunk::GetBlockEntity() coords. | Mattes D | 2014-06-24 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | | | | | | | | | Debuggers: Fixed the Blaze rod query tool. | madmaxoft | 2014-06-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | VoronoiMap: Added a missing initializer. | madmaxoft | 2014-06-23 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68410. | ||||
| * | | | | | | | | | | | | | | Added a (disabled) block meta mirror / rotate test code. | madmaxoft | 2014-06-23 | 1 | -2/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will perform basic sanity checks on block metadata mirroring and rotating. cMetaRotator must disable its asserts in order for this to work. | ||||
| * | | | | | | | | | | | | | | Fixed the slab vertical mirroring. | madmaxoft | 2014-06-23 | 1 | -9/+6 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed sign and lever rotations. | madmaxoft | 2014-06-23 | 2 | -8/+9 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Prefabs don't draw into chunk if they don't intersect. | madmaxoft | 2014-06-23 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1105 from Howaner/Blocks | Mattes D | 2014-06-22 | 3 | -4/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | Added door and fence gate sounds. | ||||
| | * | | | | | | | | | | | | | Changed 0xFFFFFFFB to ~0x04 | Howaner | 2014-06-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into Blocks | Howaner | 2014-06-17 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fix fence gate sound (Redstone simulator). | Howaner | 2014-06-17 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add fence gate sound. | Howaner | 2014-06-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add UNUSED() Tags | Howaner | 2014-06-17 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add door sound | Howaner | 2014-06-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-06-22 | 5 | -6/+47 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Fixed missing break | worktycho | 2014-06-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68409 | ||||
| | * | | | | | | | | | | | | | | Fixed invalid iterator | worktycho | 2014-06-22 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 60408 | ||||
| | * | | | | | | | | | | | | | | Added cClientHandle::IsUUIDOnline function. | madmaxoft | 2014-06-21 | 3 | -2/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #771 | ||||
| | * | | | | | | | | | | | | | | Restored style continuity. | Alexander Harkness | 2014-06-21 | 1 | -2/+2 |
| | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed another daylight sensor bug | Tiger Wang | 2014-06-22 | 1 | -20/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally fixed unpowering across chunks. | ||||
| * | | | | | | | | | | | | | | Chests don't open if obstructed | Tiger Wang | 2014-06-22 | 1 | -0/+13 |
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes FS383 | ||||
| * | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2014-06-21 | 6 | -2/+669 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Added a TestRails generator. | madmaxoft | 2014-06-21 | 5 | -0/+667 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for debugging purposes only. | ||||
| | * | | | | | | | | | | | | | Fixed a caching bug in GridStructGen. | madmaxoft | 2014-06-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The elements in cache were queried wrong, so sometimes they wouldn't be used even if they were the ones to use. | ||||
| * | | | | | | | | | | | | | | Updated CONTRIBUTORS file | STRWarrior | 2014-06-21 | 1 | -0/+2 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Updated prefabs to the latest Gallery content. | madmaxoft | 2014-06-21 | 4 | -2049/+2644 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Updated all prefabs to current Gallery content. | madmaxoft | 2014-06-20 | 2 | -650/+824 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | MCA saver marks chunks as populated. | madmaxoft | 2014-06-20 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #140. | ||||
| * | | | | | | | | | | | | | Fixed the BiomeVisualiser project. | madmaxoft | 2014-06-20 | 1 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiles under MSVC2008 again, was missing some shared files. | ||||
| * | | | | | | | | | | | | | Optimized Voronoi calculation. | madmaxoft | 2014-06-20 | 4 | -21/+81 |
| | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #818. | ||||
| * | | | | | | | | | | | | Merge pull request #1112 from mc-server/danglingptrs | Mattes D | 2014-06-19 | 35 | -18/+75 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | Nullify deleted pointers. | ||||
| | * | | | | | | | | | | | Nullify deleted pointers. | archshift | 2014-06-19 | 35 | -18/+75 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #1096 from mc-server/redstonerefactor | Alexander Harkness | 2014-06-18 | 3 | -140/+79 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Moved delayed repeaters to be handled in a seperate pass | ||||
| | * | | | | | | | | | | | FIxed second weird enum | Tycho | 2014-06-16 | 1 | -20/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Refactored reversing logic into seperate function | Tycho | 2014-06-16 | 2 | -16/+16 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed tigers weird enums | Tycho | 2014-06-16 | 1 | -14/+6 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into redstonerefactor | Tycho | 2014-06-16 | 35 | -469/+899 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| | * | | | | | | | | | | | | Moved repeater handling to seperate pass | Tycho | 2014-06-16 | 2 | -97/+64 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1045 from Howaner/GlobalFixes | Mattes D | 2014-06-18 | 12 | -61/+158 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Little fixes | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into GlobalFixes | Howaner | 2014-06-17 | 224 | -2010/+26942 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Check block type from cBlockEntity | Howaner | 2014-06-17 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add more documentation. | Howaner | 2014-06-17 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add comment. | Howaner | 2014-06-17 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Revert "Fix right click bugs." | Howaner | 2014-06-17 | 1 | -41/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 61b6fdde7553dac6e2d5c5a071b9a13fa0d71b2f. | ||||
| | * | | | | | | | | | | | | | The motion is already set in AddBasicEntity() | Howaner | 2014-06-17 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add DoWithBlockEntityAt() to WorldInterface.h | Howaner | 2014-06-17 | 4 | -40/+64 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Wrong arrow commit. | Howaner | 2014-05-30 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Code improvements | Howaner | 2014-05-28 | 3 | -12/+4 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fix hay place sound. | Howaner | 2014-05-28 | 2 | -1/+31 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fix fire break. | Howaner | 2014-05-28 | 2 | -18/+19 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add throw sound and fix arrow server crash. | Howaner | 2014-05-28 | 4 | -5/+16 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fix Y-Position from arrow entity. | Howaner | 2014-05-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fix right click bugs. | Howaner | 2014-05-28 | 1 | -40/+41 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fix skull bugs. | Howaner | 2014-05-28 | 2 | -2/+46 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1100 from Howaner/Slabs | archshift | 2014-06-18 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fix doubleslab meta. | Howaner | 2014-06-16 | 1 | -0/+1 |
| | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | EntityEffects.x -> EntityEffect.x, Object-Oriented effects | archshift | 2014-06-19 | 15 | -320/+748 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed effect map to take a pointer of the effect as a result. | ||||
| | | | | | | | * | | | | | | Entity effects: changed User to Creator, removed pawn pass-by-value | archshift | 2014-06-17 | 6 | -36/+20 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | APIDump: Added OnEntityAddEffect hook documentation. | madmaxoft | 2014-06-17 | 1 | -0/+34 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Added the OnEntityAddEffect hook. | madmaxoft | 2014-06-17 | 7 | -0/+57 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Entity Effects: Clarified user, added it to AddEntityEffect | archshift | 2014-06-17 | 7 | -15/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added second AddEntityEffect with a pass-by-value of the class. | ||||
| | | | | | | | * | | | | | | Changed the AddEntityEffect() params for easier calls. | madmaxoft | 2014-06-17 | 7 | -50/+52 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Entity Effect: Separates total duration and ticks of activity | archshift | 2014-06-17 | 3 | -22/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed HandleEntityEffect to use cEntityEffect's ticks instead of a static counter | ||||
| | | | | | | | * | | | | | | Fixed MSVC compilation. | madmaxoft | 2014-06-17 | 3 | -14/+17 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Pawn: renamed HandleEntityEffects to HandleEntityEffect | archshift | 2014-06-17 | 8 | -10/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua | ||||
| | | | | | | | * | | | | | | Cave spider now poisons its victim, added IsPawn function to Entity | archshift | 2014-06-17 | 5 | -5/+24 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Added wither damage type, wither entity effect. | archshift | 2014-06-17 | 4 | -1/+21 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Monster: added IsUndead(), undead-specific entity effects | archshift | 2014-06-17 | 3 | -6/+71 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Applies splash potion effects to mobs as well as players | archshift | 2014-06-17 | 2 | -8/+12 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Removed long function wrapping | archshift | 2014-06-17 | 2 | -12/+3 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | ItemHandler: changed IsDrinkable() to take a short argument | archshift | 2014-06-17 | 5 | -18/+14 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Splash potion: Adjusted speed, fixed spawn position | archshift | 2014-06-17 | 1 | -6/+3 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Entity effect type: use 'eff' as a prefix instead of 'ef' | archshift | 2014-06-17 | 5 | -74/+74 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Added splash potion functionality | archshift | 2014-06-17 | 6 | -15/+122 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Entity: only fire critical hit if damage type is physical | archshift | 2014-06-17 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Player: made healing instantaneous | archshift | 2014-06-17 | 2 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Implemented drinkable potions, noeffect entity effect, | archshift | 2014-06-17 | 8 | -6/+165 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clears entity effects on death | ||||
| | | | | | | | * | | | | | | Implemented milk, added documentation to Pawn.h | archshift | 2014-06-17 | 7 | -5/+86 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Pawn.cpp: fixed effect iterator BAD_ACCESS | archshift | 2014-06-17 | 2 | -9/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Erasure was occurring before the iterator increased, causing a bad access. Solved by storing map pairs in variables and manually updating iterator before erasure. Fixed mix-up in function arguments on food poisoning | ||||
| | | | | | | | * | | | | | | Pawn: Enabled entity effect broadcast, added typedef | archshift | 2014-06-17 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typedef'd std::map<cEntityEffect::eType, cEntityEffect> to tEffectMap | ||||
| | | | | | | | * | | | | | | EntityEffect: read-only getters, added user and distance modifier fields | archshift | 2014-06-17 | 3 | -11/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User: the pawn that uses or produces the entity effect (drinks/throws a potion) Distance modifier: the potency modifier from splash potion effectivity radius | ||||
| | | | | | | | * | | | | | | Player: Removed food-poisoning-specific code, set duration to 30 seconds | archshift | 2014-06-17 | 3 | -27/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://minecraft.gamepedia.com/Hunger#Behavior | ||||
| | | | | | | | * | | | | | | Entity effects: Added handlers for entity effects | archshift | 2014-06-17 | 4 | -13/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented hunger, instant health, damage, poison, regen Added "template" entity effect implementations | ||||
| | | | | | | | * | | | | | | Added iterator on tick to manage entity effect duration | archshift | 2014-06-17 | 1 | -1/+18 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | cPawn: Remove unused m_bBurnable | archshift | 2014-06-17 | 2 | -2/+0 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Moved Effects.h to EntityEffects.h, added initial impl | archshift | 2014-06-17 | 9 | -36/+115 |
| | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | Added classes for splash potions and wither skulls | archshift | 2014-06-17 | 5 | -0/+149 |
| | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1101 from Howaner/FenceGate | worktycho | 2014-06-17 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | Fix fence gate redstone simulator. | ||||
| | * | | | | | | | | | | | Fix fence gate redstone simulator. | Howaner | 2014-06-17 | 1 | -2/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1099 from Howaner/Blocks | Mattes D | 2014-06-17 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Glass-made blocks don't drop pickups. | ||||
| | * | | | | | | | | | | | | Glass shouldn't drop. | Howaner | 2014-06-16 | 1 | -0/+3 |
| | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1102 from Howaner/PressurePlate | Mattes D | 2014-06-17 | 3 | -0/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | Add pressure plate handler | ||||
| | * | | | | | | | | | | | Add parenthesis | Howaner | 2014-06-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add end lines to BlockPressurePlate.h | Howaner | 2014-06-17 | 1 | -1/+5 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add pressure plate handler | Howaner | 2014-06-17 | 3 | -0/+41 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Fixed GCC compilation. | madmaxoft | 2014-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed MSVC builds. | madmaxoft | 2014-06-16 | 1 | -9/+0 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #883 from mc-server/CutOffLighting | worktycho | 2014-06-16 | 3 | -16/+96 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Lighting reads blocktypes only for blocks under heightmap. | ||||
| | * | | | | | | | | | | Fixed link errors | Tycho | 2014-04-12 | 1 | -0/+9 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fixed member construction order. | madmaxoft | 2014-04-12 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Lighting reads blocktypes only for blocks under heightmap. | madmaxoft | 2014-04-12 | 2 | -16/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should theoretically speed it up, since less data is copied back and forth. Also implemented a possibly more cache-friendly blocklight starter algorithm (PrepareBlockLight2()), is disabled by default, needs perf testing. | ||||
| * | | | | | | | | | | | Fixed gcc compilation. | madmaxoft | 2014-06-16 | 1 | -1/+1 |
| | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge pull request #1024 from worktycho/AllocationPool | Mattes D | 2014-06-16 | 12 | -55/+281 |
| | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | First attempt at implementing an Allocation pool | ||||
| | | * | | | | | | | | | Added override | Tycho | 2014-06-16 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Changed names of callbacks | Tycho | 2014-06-14 | 2 | -10/+10 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Removed spaces | Tycho | 2014-06-14 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Documented starvation callbacks | Tycho | 2014-06-14 | 1 | -0/+7 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Documented cAllocationPool | Tycho | 2014-06-14 | 1 | -0/+5 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Reformated ChunkMap.h | Tycho | 2014-06-14 | 2 | -4/+10 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Moved m_Sections | Tycho | 2014-06-14 | 1 | -1/+2 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Added generic Allocation Pool Interface | Tycho | 2014-06-14 | 12 | -69/+110 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | reverted accedental android changes | Tycho | 2014-06-14 | 1 | -2/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | fixed spaces | Tycho | 2014-06-14 | 8 | -14/+16 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | fixed spaces | Tycho | 2014-06-14 | 8 | -16/+16 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | fixed compile | Tycho | 2014-06-14 | 2 | -2/+10 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | fixed const issue | Tycho | 2014-06-14 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fill with buffer on startup | Tycho | 2014-06-14 | 1 | -0/+10 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed comments | Tycho | 2014-06-14 | 2 | -6/+6 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Added logging | Tycho | 2014-06-14 | 1 | -3/+12 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | merge master | Tycho | 2014-06-14 | 194 | -2164/+25270 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Fixed bad merge | Tycho | 2014-05-25 | 3 | -10/+17 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Merge branch 'chunksparsing/structs' into AllocationPool | Tycho | 2014-05-25 | 89 | -1603/+2713 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkData.cpp src/ChunkData.h tests/ChunkData/Coordinates.cpp | ||||
| | | * | | | | | | | | | | | Fixed bug in freeing NULL pointers | Tycho | 2014-05-25 | 1 | -13/+15 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Implemented Allocation Pool use by cChunkData | Tycho | 2014-05-23 | 11 | -45/+125 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Use placement new to initalise objects | Tycho | 2014-05-23 | 1 | -2/+5 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Merge branch 'chunksparsing/structs' into AllocationPool | Tycho | 2014-05-23 | 16 | -144/+228 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | Added callback for stopping starvation mode | Tycho | 2014-05-21 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Implemented Allocation Pool | Tycho | 2014-05-21 | 1 | -0/+50 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixed a copypasta error in WormNestCaves generator settings. | madmaxoft | 2014-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Updated the SandFlatRoofVillage prefabs. | madmaxoft | 2014-06-16 | 1 | -288/+381 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Added random offsets to cGridStructGen. | madmaxoft | 2014-06-15 | 17 | -85/+127 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #740. | ||||
| | * | | | | | | | | | | | | | Merge pull request #1090 from mc-server/saveoncrash | Mattes D | 2014-06-15 | 2 | -2/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Data is saved on crash | ||||
| | | * | | | | | | | | | | | | | Players are saved regularly | Tiger Wang | 2014-06-15 | 2 | -2/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1076 | ||||
| | * | | | | | | | | | | | | | | Fixed bad comparison crash | Tiger Wang | 2014-06-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1095 | ||||
| | * | | | | | | | | | | | | | | Fixed daylight sensor unpowering | Tiger Wang | 2014-06-15 | 1 | -6/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1094 | ||||
| | * | | | | | | | | | | | | | | Merge pull request #1019 from mc-server/cPlayerSetSpeed | Mattes D | 2014-06-14 | 4 | -31/+59 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | cPlayer set speed | ||||
| | | * | | | | | | | | | | | | | Removed an unused tolua_end and tolua_begin pair. | madmaxoft | 2014-06-14 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Simplified speed clamping. | madmaxoft | 2014-06-14 | 1 | -8/+3 |
| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Refactored speed-setting to use a common function for all cases. | madmaxoft | 2014-06-14 | 4 | -93/+44 |
| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Merge branch 'master' into cPlayerSetSpeed | madmaxoft | 2014-06-14 | 216 | -1988/+26550 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | Player.h: Moved doxy-comments to Entity.h | archshift | 2014-06-11 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved doxy-comments to the defining function in Entity.h rather than the overloaded functions in Player.h Comment for each function (instead of assumed encapsulating comments) @deprecated tag for ForceSetSpeed() | ||||
| | | * | | | | | | | | | | | | | | Added doxy-comments | STRWarrior | 2014-05-22 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | cEntity::SetSpeed(a_Vector3d) isn't virtualized anymore | STRWarrior | 2014-05-22 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | cPlayer overrides the SetSpeedXX functions | STRWarrior | 2014-05-22 | 3 | -4/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compile error | ||||
| | | * | | | | | | | | | | | | | | Both SetSpeed functions are now overridden by cPlayer | STRWarrior | 2014-05-22 | 3 | -6/+32 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServer | Tycho | 2014-06-16 | 35 | -469/+900 |
| | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fix a few warnings | Tycho | 2014-06-16 | 1 | -3/+3 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge pull request #1093 from mc-server/BindingsFix | Mattes D | 2014-06-14 | 3 | -9/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed MSVC Bindings generation. | ||||
| | * | | | | | | | | | | | | | | Fixed bindings generation for Win64 builds. | Mattes D | 2014-06-14 | 3 | -9/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1092. | ||||
| | * | | | | | | | | | | | | | | Fixed MSVC Bindings generation. | Mattes D | 2014-06-14 | 1 | -0/+3 |
| |/ / / / / / / / / / / / / / | |||||
| * | / / / / / / / / / / / / | Remove windows bindings crutch | worktycho | 2014-06-14 | 1 | -10/+0 |
| | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed a repeater issue | Tiger Wang | 2014-06-14 | 2 | -17/+16 |
| | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Repeaters now properly continuously update their powering * Minor cosmetic improvements | ||||
| * | | | | | | | | | | | | Reduced cPluginManager code duplication | Tiger Wang | 2014-06-14 | 1 | -286/+178 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed ChunkWorx stop button giving an error | STRWarrior | 2014-06-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1089 from mc-server/tolua-auto | Mattes D | 2014-06-13 | 2 | -84/+85 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | automaticlly build tolua and generate bindings as part of build. | ||||
| | * | | | | | | | | | | | | automaticlly build tolua and generate bindings as part of build. | tycho | 2014-06-12 | 2 | -84/+85 |
| | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Removed an unused fwd declaration. | madmaxoft | 2014-06-13 | 1 | -1/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | APIDump: Added the Info.lua article. | madmaxoft | 2014-06-13 | 2 | -0/+247 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #504. | ||||
| * | | | | | | | | | | | | Typo Correction | Alexander Harkness | 2014-06-12 | 1 | -1/+1 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Fixed two redstone bugs | Tiger Wang | 2014-06-12 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed chunk border powering * Fixed quick place-replace powering | ||||
| * | | | | | | | | | | | Merge pull request #1082 from mc-server/cauldronfixes | Alexander Harkness | 2014-06-12 | 4 | -73/+112 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add biome-aware downfall functions. | ||||
| | * | | | | | | | | | | | Fixed constness | worktycho | 2014-06-11 | 3 | -72/+79 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Compile fix | Tiger Wang | 2014-06-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Reduced code duplication | Tiger Wang | 2014-06-11 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | call @maxmaxoft! calling... call connected (0:20) call ended | ||||
| | * | | | | | | | | | | | IsWeatherSunnyAt does something useful :D | Tiger Wang | 2014-06-11 | 1 | -9/+5 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Update APIDesc.lua | Alexander Harkness | 2014-06-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Update APIDesc.lua | Tiger Wang | 2014-06-11 | 1 | -3/+6 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | SMICOLOSL | Alexander Harkness | 2014-06-11 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Meant to be semicolons up there. | ||||
| | * | | | | | | | | | | | Updated unnecessary function :/ | Tiger Wang | 2014-06-11 | 1 | -1/+5 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add DoxyComments to he weather things. | Alexander Harkness | 2014-06-11 | 1 | -7/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changed the function names. | ||||
| | * | | | | | | | | | | | Add new IsWeatherWet hook for cauldrons. | Alexander Harkness | 2014-06-11 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @madmaxoft can you comment? | ||||
| * | | | | | | | | | | | | Merge pull request #1086 from qaisjp/patch-1 | Mattes D | 2014-06-12 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in handy_functions.lua | ||||
| | * | | | | | | | | | | | | Fix typo in handy_functions.lua | Qais Patankar | 2014-06-12 | 1 | -2/+2 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #1084 from mc-server/PlankRoads | STRWarrior | 2014-06-11 | 1 | -4/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Plank Roads | ||||
| | * | | | | | | | | | | | | Roads in villages are made out of wooden planks if they generate on water. | STRWarrior | 2014-06-11 | 1 | -4/+17 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | DispenserEntity code cleanup after PR merge. | madmaxoft | 2014-06-11 | 2 | -30/+30 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge remote-tracking branch 'joannis/master' | madmaxoft | 2014-06-11 | 2 | -19/+91 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | - 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 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Changed the teleport permissions to the new ones. | Alexander Harkness | 2014-06-11 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | APIDump: Documented cBlockArea:GetCoordRange(). | madmaxoft | 2014-06-11 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added cBlockArea:GetCoordRange to Lua API. | madmaxoft | 2014-06-11 | 1 | -0/+32 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Revert "Initial Mesa Bryce implementation." | madmaxoft | 2014-06-11 | 4 | -116/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1ff1a93866ab81e3868588a256f446a902a1a8c4. | ||||
| * | | | | | | | | | | | | | Added coverity badge | worktycho | 2014-06-11 | 1 | -1/+1 |
| | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Removed assert that is now informed by type system | worktycho | 2014-06-11 | 1 | -1/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Update GETTING-STARTED.md | worktycho | 2014-06-11 | 1 | -11/+11 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Update GETTING-STARTED.md | Alexander Harkness | 2014-06-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Test | Alexander Harkness | 2014-06-11 | 1 | -1/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Removed derpbadge. | Alexander Harkness | 2014-06-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Initial Mesa Bryce implementation. | madmaxoft | 2014-06-10 | 4 | -4/+116 |
| | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed clang warnings about abs() in Noise.cpp. | madmaxoft | 2014-06-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC provides a float overload of abs(), clang does not. Using the proper fabs(). | ||||
| * | | | | | | | | | | | Fixed a race condition when adding a player to a world. | madmaxoft | 2014-06-10 | 3 | -4/+29 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed gcc compilation. | madmaxoft | 2014-06-10 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added an experimental height generator, Mountains. | madmaxoft | 2014-06-09 | 2 | -0/+87 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added cRidgedMultiNoise, fixed cPerlinNoise. | madmaxoft | 2014-06-09 | 2 | -1/+233 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added Y coord checks and documentation to cBlockDoorHandler. | madmaxoft | 2014-06-09 | 1 | -19/+40 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge remote-tracking branch 'howaner/Redstone' | madmaxoft | 2014-06-09 | 3 | -35/+62 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Moved the IsDoor check before the meta get. | Howaner | 2014-05-31 | 1 | -2/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add doxy-comment | Howaner | 2014-05-31 | 1 | -3/+4 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Better SetOpen() and IsOpen() function from the doors. | Howaner | 2014-05-30 | 2 | -77/+27 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add SetOpen() and IsOpen() to BlockDoor.h and fix door redstone bug. | Howaner | 2014-05-29 | 2 | -13/+90 |
| | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | | docs/Generator: Fixed typo. | madmaxoft | 2014-06-09 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed debugging code in tolua++ driver script. | madmaxoft | 2014-06-09 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | ToLua can now be run in pure-lua mode. | madmaxoft | 2014-06-09 | 6 | -8/+127 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the src/Bindings/AllToLua_lua.bat for usage example. | ||||
| * | | | | | | | | | | | docs/Generator: Added SmallFoliage illlustrations. | madmaxoft | 2014-06-09 | 4 | -0/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed a crash when creating negative-size blockareas. | madmaxoft | 2014-06-09 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the server emits a warning instead and continues execution. | ||||
| * | | | | | | | | | | | Fixed deadlock when moving players to other worlds. | Mattes D | 2014-06-08 | 32 | -96/+204 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1039, fixes #851 | ||||
| * | | | | | | | | | | | Added queue for adding entities to cWorld. | Mattes D | 2014-06-08 | 6 | -7/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed. | ||||
| * | | | | | | | | | | | Small change for easier understanding. | Alexander Harkness | 2014-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Proper fix for long interaction. | madmaxoft | 2014-06-08 | 1 | -7/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1078 and #1038. | ||||
| * | | | | | | | | | | | Merge pull request #1077 from mc-server/fuelfixes | worktycho | 2014-06-07 | 1 | -15/+27 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Corrected the furnace fuels. Solves #1071 | ||||
| | * | | | | | | | | | | | Corrected the furnace fuels. Solves #1071 | Alexander Harkness | 2014-06-07 | 1 | -15/+27 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | docs/Generator: fixed grass confusion. | Mattes D | 2014-06-07 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | docs/Generator: Added the easy Finishers. | madmaxoft | 2014-06-07 | 2 | -3/+130 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added RainbowRoads finisher generator. | madmaxoft | 2014-06-07 | 5 | -3/+1594 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Further improvements on redstone speed | Tiger Wang | 2014-06-07 | 3 | -68/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on suggestions of @worktycho * Repeaters now walk their data structure only when needed * Fixed a bug with cChunkData returning an incorrect value for whether a meta had changed | ||||
| * | | | | | | | | | | | Fixed mob hitbox sizes, removed TODOs | archshift | 2014-06-07 | 3 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Measured bat and blaze in vanilla, updated values. Cavespiders are, in fact, passive in the day. | ||||
| * | | | | | | | | | | | Fixed a typo. | Mattes D | 2014-06-07 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Further reduced redstone idle CPU consumption | Tiger Wang | 2014-06-06 | 1 | -7/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Repeaters and wires are no longer unnecessarily ticked * Fixed #1063, likely addressed #1062 * Fixed bugs regarding duplicate values | ||||
| * | | | | | | | | | | | Grammar | worktycho | 2014-06-06 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Expanded GPU section | worktycho | 2014-06-06 | 1 | -1/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed numbers | worktycho | 2014-06-06 | 1 | -1/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | typo | worktycho | 2014-06-06 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | docs/Generator: Added basic terrain composition. | madmaxoft | 2014-06-05 | 4 | -1/+31 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Typographical error | Tiger Wang | 2014-06-05 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Start of GPU section. | worktycho | 2014-06-05 | 1 | -0/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | docs/Generator: Added the TerrainHeight section. | madmaxoft | 2014-06-05 | 4 | -0/+54 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Redstone fixes and improvements [SEE DESC] | Tiger Wang | 2014-06-05 | 3 | -61/+96 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Haha, see desc. * Improved redstone speed through a marking dirty system. Only a select few devices are still continuously simulated * Fixed redstone crashing with recent piston changes | ||||
| * | | | | | | | | | | | Merge pull request #1011 from SphinxC0re/SomeWarningFixes | Mattes D | 2014-06-04 | 4 | -3/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some warnings | ||||
| | * | | | | | | | | | | | Update IncrementalRedstoneSimulator.cpp | Julian Laubstein | 2014-06-04 | 1 | -8/+8 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Update Globals.h | Julian Laubstein | 2014-06-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Changed the m_slotarea position | Julian Laubstein | 2014-05-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed warnings in IncrementalRedstoneSimulator | Julian Laubstein | 2014-05-19 | 1 | -1/+7 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed some warnings in Server.cpp, and in UI/ | Julian Laubstein | 2014-05-19 | 3 | -3/+11 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Rolled some changes back | Julian Laubstein | 2014-05-19 | 1 | -12/+2 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed some warnings | Julian Laubstein | 2014-05-19 | 2 | -2/+13 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1060 from Howaner/Inventory | Mattes D | 2014-06-04 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | Fix itemframe break. | ||||
| | * | | | | | | | | | | | Fix itemframe break. | Howaner | 2014-06-04 | 1 | -1/+3 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #1059 from mc-server/coverity_fixes | worktycho | 2014-06-04 | 4 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Coverity fixes | ||||
| | * | | | | | | | | | | | derp | worktycho | 2014-06-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed bad coordinate | worktycho | 2014-06-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Make sure m_StackSizeToBeUsedInRepair Always has a valid value | worktycho | 2014-06-04 | 1 | -1/+3 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Removed unused field test | worktycho | 2014-06-04 | 1 | -1/+0 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Initialise m_Callbacks field to NULL in empty constructor. | worktycho | 2014-06-04 | 1 | -1/+2 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Fixed buffer overflow in JSON. | madmaxoft | 2014-06-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported on Coverity as CID 43614. | ||||
| * | | | | | | | | | | | Exploded creepers drop nothing, part of #1058 | Tiger Wang | 2014-06-04 | 1 | -2/+8 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed mob loading, part of #1058 | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed #1057 | Tiger Wang | 2014-06-04 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | docs/Generator: Re-fixed the wording. | madmaxoft | 2014-06-03 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Player permissions aren't logged to console anymore. | madmaxoft | 2014-06-03 | 1 | -7/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was only logspam on most servers and there are alternative ways to list players' permissions. | ||||
| * | | | | | | | | | | | Merge remote-tracking branch 'howaner/Inventory' | madmaxoft | 2014-06-03 | 2 | -2/+133 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Players can't set items in the result slot, when they shift a item. | Howaner | 2014-06-01 | 2 | -0/+39 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add HandleSmeltItem() call for achievements. | Howaner | 2014-06-01 | 1 | -7/+11 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Missing return; | Howaner | 2014-06-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Set DraggingItem to Slot directly. | Howaner | 2014-05-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fix DBL bug. | Howaner | 2014-05-31 | 1 | -5/+4 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Change "Slot.IsEmpty()" to "Slot.m_ItemCount <= 0" | Howaner | 2014-05-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fix the furnace result slot. | Howaner | 2014-05-30 | 1 | -2/+90 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed OnProjectileHitBlock bindings. | madmaxoft | 2014-06-03 | 3 | -82/+111 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also sorted the various cLuaState::Push() functions. | ||||
| * | | | | | | | | | | | | docs/Generator: Updated PerlinRivers with better images. | madmaxoft | 2014-06-03 | 5 | -1/+5 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #1028 from mc-server/pistonfixes | Mattes D | 2014-06-03 | 15 | -457/+401 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Piston fixes | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/pistonfixes' | Tiger Wang | 2014-06-02 | 15 | -457/+401 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp | ||||
| | | * | | | | | | | | | | | | Suggestions two | Tiger Wang | 2014-06-01 | 2 | -10/+12 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Suggestions | Tiger Wang | 2014-05-29 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | More comments! | Tiger Wang | 2014-05-29 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Revert "Fixed a food saturation issue" | Tiger Wang | 2014-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 67308e4337b422ebefb249049e662266072b0ba2. | ||||
| | | * | | | | | | | | | | | | Changed block send queue to use vectors | Tiger Wang | 2014-05-29 | 3 | -21/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by @worktycho. | ||||
| | | * | | | | | | | | | | | | Fixed piston power checking | Tiger Wang | 2014-05-29 | 1 | -11/+6 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Fixed a food saturation issue | Tiger Wang | 2014-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Hopefully fixed piston duplication issues | Tiger Wang | 2014-05-25 | 15 | -437/+372 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #879 * Fixes #714 | ||||
| * | | | | | | | | | | | | | | docs/Generator: Shrunk the hand-drawn images by 50 %. | madmaxoft | 2014-06-03 | 13 | -0/+0 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'GeneratorArticle' | madmaxoft | 2014-06-03 | 27 | -47/+374 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Generator article: Added TOC with links. | madmaxoft | 2014-06-03 | 1 | -7/+44 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Generator article: fixed bad wording. | madmaxoft | 2014-06-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Generator article: Finished the Biome-gen section and images. | madmaxoft | 2014-06-02 | 8 | -14/+25 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | AnvilStats: Added new biome colors. | Mattes D | 2014-06-01 | 2 | -34/+3 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Generator article now has all biome genertors and most their imgs. | Mattes D | 2014-06-01 | 15 | -8/+156 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Hot-fixed AnvilStats compilation for MSVC2013. | Mattes D | 2014-06-01 | 3 | -13/+56 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge branch 'master' into GeneratorArticle | Mattes D | 2014-06-01 | 138 | -910/+20904 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Initial commit of the Generator article. | Mattes D | 2014-05-30 | 1 | -0/+119 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #1052 from mc-server/UnderwaterBaseGen | Mattes D | 2014-06-02 | 5 | -0/+2489 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Underwater base gen | ||||
| | * | | | | | | | | | | | | | | | Update UnderwaterBase prefabs. | madmaxoft | 2014-06-01 | 1 | -12/+378 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the waterfall room and the decaying sphere room. Re-tweaked the pieces' weights. | ||||
| | * | | | | | | | | | | | | | | | Updated UnderwaterBase prefabs. | madmaxoft | 2014-06-01 | 1 | -103/+123 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added an initial version of the underwater base generator. | madmaxoft | 2014-05-31 | 5 | -0/+2103 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Small tweak for mobs | STRWarrior | 2014-06-02 | 1 | -4/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mobs move a bit smoother and aren't able to move allot when in air. | ||||
| * | | | | | | | | | | | | | | | | cBlockArea reading hotfix. | madmaxoft | 2014-06-02 | 1 | -63/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix the crashes introduced with chunksparsing. Not the most performant solution, but at least it should work. Ref.: #1056 | ||||
| * | | | | | | | | | | | | | | | | APIDump: Fixed crash | STRWarrior | 2014-06-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Added OnProjectileHitBlock example in Debuggers | STRWarrior | 2014-06-02 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Updated OnProjectileHitBlock documentation. | STRWarrior | 2014-06-02 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #844 from mc-server/ProjectileHitBlock | Mattes D | 2014-06-01 | 6 | -9/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnProjectileHitBlock tweak. | ||||
| | * | | | | | | | | | | | | | | | | Made a_BlockHitPos a reference | STRWarrior | 2014-06-01 | 5 | -6/+6 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Used recommendations | STRWarrior | 2014-05-31 | 6 | -9/+8 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Using recommendations (I think) | STRWarrior | 2014-03-30 | 6 | -6/+7 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Added a BlockHitPos parameter to OnProjectileHitBlock | STRWarrior | 2014-03-30 | 6 | -9/+9 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Added a blockface parameter to the OnProjectileHitBlock hook. | STRWarrior | 2014-03-30 | 6 | -8/+8 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | abort does not take a parameter. | worktycho | 2014-06-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Use abort in SIGSEGV and SIGABRT handlers | worktycho | 2014-06-01 | 1 | -2/+2 |
| | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should cause Mcserver to generate core dumps when it crashes. | ||||
| * | | | | | | | | | | | | | | | | Updated AlchemistVillage prefabs. | madmaxoft | 2014-06-01 | 1 | -103/+105 |
| | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #1018 from mc-server/VillageGen | Mattes D | 2014-05-31 | 25 | -23/+17115 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Village gen | ||||
| | * | | | | | | | | | | | | | | | Updated PlainsVillage prefabs. | madmaxoft | 2014-05-31 | 1 | -73/+85 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed a memory leak in VillagGen. | madmaxoft | 2014-05-31 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Updated PlainsVillage and AlchemistVillage. | madmaxoft | 2014-05-30 | 2 | -239/+1270 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed a memory leak in cPOCPieceGenerator | madmaxoft | 2014-05-29 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into VillageGen | madmaxoft | 2014-05-29 | 4 | -1/+44 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed a crash in message formatter. | madmaxoft | 2014-05-28 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code would fail if a message is sent to a player not yet added to a world. | ||||
| | * | | | | | | | | | | | | | | | Merge branch 'master' into VillageGen | madmaxoft | 2014-05-27 | 14 | -79/+157 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added AlchemistVillage prefabs (Thanks, KingsCraftAu). | madmaxoft | 2014-05-27 | 3 | -9/+3007 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed testing weights in PlainsVillages. | madmaxoft | 2014-05-27 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | cPieceGenerator chooses starting pieces based on weights. | madmaxoft | 2014-05-27 | 4 | -1/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1033. | ||||
| | * | | | | | | | | | | | | | | | Biome generators: biome lists can contain spaces. | madmaxoft | 2014-05-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed prefab test initialization. | madmaxoft | 2014-05-26 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added support for Miners' Village. | madmaxoft | 2014-05-25 | 10 | -2234/+4438 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The village contains both prefabs that snap to ground and prefabs that connect strictly via connectors. Fixes #1027. | ||||
| | * | | | | | | | | | | | | | | | Added Japanese village prefabs. | madmaxoft | 2014-05-24 | 5 | -4/+2442 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'master' into VillageGen | Mattes D | 2014-05-23 | 12 | -19/+177 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fixed profiling flags for MSVC. Fixed cWither::KilledBy Cleaned up cPlayer::UpdateMovementStats; Wither achievements Fixed MCADefrag compilation. Derp Should have fixed assumptions about entity width. Fixed clanging errors. Implemented cacti damage | ||||
| | * | | | | | | | | | | | | | | | | Updated plains village prefabs. | madmaxoft | 2014-05-22 | 1 | -186/+171 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expanded the hitboxes so that houses don't touch each other. Fixed minor visual defects. | ||||
| | * | | | | | | | | | | | | | | | | Villages have min and max density setting. | madmaxoft | 2014-05-22 | 5 | -17/+110 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also made roads use 3+9 scheme, instead of 3+5, for the house connectors. Fixes #1020. | ||||
| | * | | | | | | | | | | | | | | | | Updated plains village prefabs. | madmaxoft | 2014-05-22 | 1 | -44/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DoublePlantBed had sponges in wrong places, plus a few cosmetic fixes. | ||||
| | * | | | | | | | | | | | | | | | | Changed desert village roads to gravel. | madmaxoft | 2014-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Added second kind of desert village (FlatRoof). | madmaxoft | 2014-05-21 | 3 | -4/+1535 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Merged branch 'master' into VillageGen. | madmaxoft | 2014-05-18 | 60 | -328/+1589 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Updated SandVillage prefabs to latest Gallery content. | madmaxoft | 2014-05-18 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes sand village generation. | ||||
| | * | | | | | | | | | | | | | | | | | Village roads are drawn properly. | madmaxoft | 2014-05-17 | 2 | -8/+35 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Village houses are height-adjusted onto the terrain. | madmaxoft | 2014-05-17 | 5 | -7/+67 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Updated PlainsVillage prefabs to the latest Gallery contents. | madmaxoft | 2014-05-17 | 1 | -2265/+2892 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Fixed a NULL ptr failure in GridStructGen. | madmaxoft | 2014-05-15 | 2 | -9/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the descendant generator returned a NULL structure, the generator would crash. Now it uses a special cEmptyStructure class instead. | ||||
| | * | | | | | | | | | | | | | | | | | Changed village generator defaults to more reasonable values. | madmaxoft | 2014-05-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Changed village road generation to use multiple prefabs. | madmaxoft | 2014-05-15 | 3 | -39/+38 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | VillageGen rewritten using BFSPieceGenerator. | madmaxoft | 2014-05-15 | 5 | -412/+406 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Piece composition is not good yet, the buildings aren't height-adjusted and the road pieces will need special processing. This is mainly for adjusting the per-piece params. | ||||
| | * | | | | | | | | | | | | | | | | | cPrefab can be constructed in code. | madmaxoft | 2014-05-15 | 2 | -0/+51 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | VillageGen: Added well placement and the general algorithm description. | madmaxoft | 2014-05-12 | 3 | -6/+152 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Initial VillageGen implementation. | madmaxoft | 2014-05-11 | 6 | -0/+5807 |
| | | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WIP, doesn't generate anything yet. Ref.: 740. | ||||
| * | | | | | | | | | | | | | | | | | Merge pull request #951 from worktycho/chunksparsing/structs | Mattes D | 2014-05-31 | 40 | -484/+1844 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | Chunksparsing with segments | ||||
| | * | | | | | | | | | | | | | | | | Reduced the number of cChunkData::CopyBlockTypes() tests, added progress. | Mattes D | 2014-05-30 | 1 | -7/+16 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fix bugs in test | Tycho | 2014-05-30 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Added a cChunkData::CopyBlockTypes() unit test. | Mattes D | 2014-05-30 | 2 | -0/+68 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | removed NULL assignment to const value | Tycho | 2014-05-30 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | removed unneded addressof | Tycho | 2014-05-30 | 1 | -7/+11 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed cChunkData nibble copying. | madmaxoft | 2014-05-30 | 2 | -13/+13 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Test failures break into MSVC debugger. | madmaxoft | 2014-05-30 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Test failures are reported verbosely and into the debug console on Win. | madmaxoft | 2014-05-30 | 2 | -3/+19 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed sign comparison. | madmaxoft | 2014-05-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed test return values. | madmaxoft | 2014-05-30 | 2 | -38/+41 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed wrong copy sizes in cChunkData. | madmaxoft | 2014-05-30 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Attempt at fixing an unresolved symbol in gcc / clang. | madmaxoft | 2014-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fix bug when a_Idx is not a multiple of SectionBLockCount | worktycho | 2014-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Derp | worktycho | 2014-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | fix underflow | worktycho | 2014-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wish c++ could specify saturating unsigned underflow. | ||||
| | * | | | | | | | | | | | | | | | | Fixed wrong block sizes for copying / setting. | madmaxoft | 2014-05-29 | 3 | -58/+52 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed Wrong types in nibble sizeofs | worktycho | 2014-05-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed test compilation. | madmaxoft | 2014-05-29 | 2 | -16/+16 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed overflow bug | worktycho | 2014-05-29 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Added comments, reformatted code. | madmaxoft | 2014-05-29 | 6 | -280/+226 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Add comment | worktycho | 2014-05-29 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed forgotten changes. | madmaxoft | 2014-05-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | cChunkData: Normalized code style. | madmaxoft | 2014-05-28 | 2 | -89/+106 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed cChunkData formatting. | madmaxoft | 2014-05-28 | 2 | -39/+101 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fix cmake errors in msvc | worktycho | 2014-05-28 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed test globals to work with precompiled headers | Tycho | 2014-05-27 | 7 | -159/+40 |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | inject TestGlobals.h correctly | Tycho | 2014-05-24 | 3 | -5/+10 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Moved accessors to cpp file | Tycho | 2014-05-24 | 2 | -216/+241 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Implemented style changes | Tycho | 2014-05-24 | 9 | -268/+182 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-24 | 78 | -1170/+2341 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Ignore CTest files | Tycho | 2014-05-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed if spaces | Tycho | 2014-05-21 | 2 | -22/+23 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed reversed comparisons to null | Tycho | 2014-05-21 | 2 | -17/+17 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added space to ChunkData.cpp | Tycho | 2014-05-21 | 1 | -20/+100 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Changed cChunkData::SetMeta to return a bool indicating whether the value changed | Tycho | 2014-05-21 | 2 | -7/+9 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed stylistic issues | Tycho | 2014-05-21 | 4 | -25/+25 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Renamed cChunkBuffer to cChunkData | Tycho | 2014-05-21 | 15 | -87/+87 |
| | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed minor style issues | Tycho | 2014-05-21 | 4 | -7/+7 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed issue with types not being defined for an unused parameter | Tycho | 2014-05-18 | 8 | -107/+111 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | derp | Tycho | 2014-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | C++11 | Tycho | 2014-05-17 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | fixed assignment bugs and Skylight bug | Tycho | 2014-05-17 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fix assignment operators test | worktycho | 2014-05-17 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fix assignment ops 2 | worktycho | 2014-05-17 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Add test for zeros | worktycho | 2014-05-17 | 1 | -0/+35 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fix assignment operators | worktycho | 2014-05-17 | 1 | -10/+14 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Add tests for assignment operator | worktycho | 2014-05-17 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Rewrote array copies test | worktycho | 2014-05-17 | 1 | -36/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved each patten test into its own scope to test all unallocated section code paths. Moved 0's around so that they test the allocated sections code paths. | ||||
| | * | | | | | | | | | | | | | | excluding tests excludes everything | worktycho | 2014-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | test code does not need testing | worktycho | 2014-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Don't start mcserver up in coverage builds | worktycho | 2014-05-17 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting the server up is not a test. | ||||
| | * | | | | | | | | | | | | | | Added some more tests | Tycho | 2014-05-11 | 2 | -116/+242 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Added several more testsfor arrays and coordinates | Tycho | 2014-05-11 | 3 | -5/+21 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed bug that caused Array Setters to always create segments | Tycho | 2014-05-11 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | test 0 values | Tycho | 2014-05-11 | 1 | -0/+45 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | SkyLight defaults to 0xFF | Tycho | 2014-05-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Cerated array copy tests for block and skylight | Tycho | 2014-05-11 | 1 | -0/+36 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed a bug in writting zeros to a non-allocated section | Tycho | 2014-05-11 | 3 | -93/+134 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Coverage builds are called MCServer not MCServer_debug | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed stupid error | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 2 | -1/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Fail build on error | Tycho | 2014-05-10 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Don't run start test under gcov | Tycho | 2014-05-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | quite gcov take 4 | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed stupid buffer overflow in array setblocks | Tycho | 2014-05-10 | 3 | -13/+13 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Add arries copies tests | Tycho | 2014-05-10 | 1 | -0/+53 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added new test | Tycho | 2014-05-10 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added some more tests | Tycho | 2014-05-10 | 2 | -6/+100 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed bug in setting metas | Tycho | 2014-05-10 | 2 | -19/+7 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | quieted gcov 4 | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | quieted gcov 3 | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | quieted gcov 2 | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Relocate gcda files so gcov can find them 3 | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | rewrote exclustions | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | quieted gcov | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Relocate gcda files so gcov can find them take 2 | Tycho | 2014-05-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Relocate gcda files so gcov can find them | Tycho | 2014-05-10 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Add qutes to scripts | Tycho | 2014-05-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fix spaces in bash | Tycho | 2014-05-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Make scripts executable | Tycho | 2014-05-10 | 2 | -0/+0 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed missing Dollar signs | Tycho | 2014-05-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed paths | Tycho | 2014-05-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fix bash ifs | Tycho | 2014-05-10 | 3 | -3/+4 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 105 | -940/+2002 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.h | ||||
| | * | | | | | | | | | | | | | | | | Maybe coverage working? | Tycho | 2014-05-10 | 9 | -33/+409 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-03 | 36 | -92/+198 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp | ||||
| | * | | | | | | | | | | | | | | | | | cCHunkBuffer that compiles with TestGlobals.h | Tycho | 2014-05-03 | 7 | -2/+27 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Fixed polarssl programs included | Tycho | 2014-05-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Tests off by default take 2 | Tycho | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Disable polarssl tests by default | Tycho | 2014-05-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-01 | 129 | -2393/+4043 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | Added Testing capability | Tycho | 2014-04-27 | 5 | -2/+30 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Fixed bad comment | Tycho | 2014-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Fixed a couple of segfaults and made Free a seperate function | Tycho | 2014-04-27 | 2 | -6/+39 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Added other half of implementation | Tycho | 2014-04-27 | 1 | -14/+133 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Fixed issues with gcc | Tycho | 2014-04-27 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Fixed MobProximity Counter to remove chunk copys | Tycho | 2014-04-27 | 2 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Fixed bad merge | Tycho | 2014-04-27 | 1 | -13/+9 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-04-27 | 188 | -4917/+11174 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h | ||||
| | * | | | | | | | | | | | | | | | | | | | Implemented Chunk Sparsing with segments | Tycho | 2014-04-26 | 17 | -401/+610 |
| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | Fixed bindings for cCompositeChat:SetMessageType(). | madmaxoft | 2014-05-30 | 1 | -2/+2 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Cmake system name not System name | worktycho | 2014-05-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | derp | worktycho | 2014-05-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | FreeBSD requires __POSIX_VISIBLE macro to be defined | worktycho | 2014-05-28 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | for compiliers other than msvc we need to tell lua that its building as a dll | worktycho | 2014-05-28 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Fixed a memory leak in cPrefabPiecePool. | madmaxoft | 2014-05-28 | 2 | -1/+34 |
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pool pieces weren't freed upon pool destruction. | ||||
| * | | | | | | | | | | | | | | | | | | Stuff. | Alexander Harkness | 2014-05-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #1041 from mc-server/fixes | Mattes D | 2014-05-27 | 1 | -22/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ClientHandle.cpp: remove redundant code | ||||
| | * | | | | | | | | | | | | | | | | | | ClientHandle.cpp: Process look before pos | archshift | 2014-05-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | ClientHandle.cpp: remove redundant code | archshift | 2014-05-26 | 1 | -22/+2 |
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HandlePlayerMoveLook() calls HandlePlayerPos() and HandlePlayerLook() to reduce code redundancy. | ||||
| * | | | | | | | | | | | | | | | | | | Update main.css | Alexander Harkness | 2014-05-26 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Revert "Add more move checks" | madmaxoft | 2014-05-26 | 2 | -59/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 989312c4e7f517ae324e857cb255211e3fd8bb06. | ||||
| * | | | | | | | | | | | | | | | | | | Minor fixes. | Alexander Harkness | 2014-05-26 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #1003 from Howaner/GlobalFixes | Mattes D | 2014-05-26 | 2 | -17/+59 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more move checks | ||||
| | * | | | | | | | | | | | | | | | | | | Add more move checks | Howaner | 2014-05-16 | 2 | -17/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Invalid X/Y/Z/Stance check (std::isnan) - Illegal stance - Illegal position (32.000.000 is the world size) | ||||
| * | | | | | | | | | | | | | | | | | | | SEMICOLONS! | Alexander Harkness | 2014-05-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Update GroupManager.h | worktycho | 2014-05-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #1030 from mc-server/betterthan950 | worktycho | 2014-05-25 | 1 | -5/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A fix that is better than #950. | ||||
| | * | | | | | | | | | | | | | | | | | | | A fix that is better than #950. | Alexander Harkness | 2014-05-25 | 1 | -5/+15 |
| |/ / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Updated the installation instructions in the README. | Alexander Harkness | 2014-05-25 | 1 | -11/+8 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #1013 from mc-server/achievementtranslate | Mattes D | 2014-05-25 | 6 | -32/+109 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | Proper achievement informing | ||||
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' into achievementtranslate | Tiger Wang | 2014-05-25 | 13 | -22/+163 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp | ||||
| | * | | | | | | | | | | | | | | | | | | Update CompositeChat.h | Tiger Wang | 2014-05-20 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Update Player.cpp | Alexander Harkness | 2014-05-20 | 1 | -19/+19 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Fixed a cactus Y position issue | Tiger Wang | 2014-05-19 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Simplified cacti conditions | Tiger Wang | 2014-05-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | cCompositeChat message type is now formatted | Tiger Wang | 2014-05-19 | 4 | -5/+13 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Added client translation to achievements | Tiger Wang | 2014-05-19 | 4 | -4/+70 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Updated Core | Tiger Wang | 2014-05-25 | 1 | -0/+0 |
| | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Standardised a badge. | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Update README.md | Alexander Harkness | 2014-05-24 | 1 | -1/+3 |
| | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #1022 from mc-server/FixMineshafts | Mattes D | 2014-05-23 | 2 | -1/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mineshafts | ||||
| | * | | | | | | | | | | | | | | | | | Fixed Mineshaft system size. | Mattes D | 2014-05-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Auto-enlargement for cGridStructGen cache. | Mattes D | 2014-05-23 | 1 | -0/+9 |
| |/ / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | / / / / / / | Fixed datatype conversion warning. | Mattes D | 2014-05-23 | 1 | -2/+2 |
| | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fixed profiling flags for MSVC. | Mattes D | 2014-05-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The profiler output contained no useful symbols before, because there were no symbols in the PDBs. | ||||
| * | | | | | | | | | | | | | | | | Merge pull request #1015 from mc-server/Stats | xdot | 2014-05-21 | 7 | -15/+130 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | Statistics | ||||
| | * | | | | | | | | | | | | | | | Fixed cWither::KilledBy | andrew | 2014-05-21 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Cleaned up cPlayer::UpdateMovementStats; Wither achievements | andrew | 2014-05-20 | 7 | -15/+128 |
| | | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed MCADefrag compilation. | madmaxoft | 2014-05-20 | 1 | -0/+15 |
| | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #1010 from mc-server/cactidamage | Alexander Harkness | 2014-05-19 | 3 | -2/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Implemented cacti damage | ||||
| | * | | | | | | | | | | | | | Derp | Alexander Harkness | 2014-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Should have fixed assumptions about entity width. | Alexander Harkness | 2014-05-19 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @madmaxoft can you comment? | ||||
| | * | | | | | | | | | | | | | Fixed clanging errors. | Alexander Harkness | 2014-05-19 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please @tigerw make sure this is correct. | ||||
| | * | | | | | | | | | | | | | Implemented cacti damage | Tiger Wang | 2014-05-18 | 3 | -2/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented cacti damage * Fixed pickup tossing (PR #994 bug) | ||||
| * | | | | | | | | | | | | | | There's no "round" function in MSVC2008. | madmaxoft | 2014-05-18 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed datatype truncation in Diff() template. | madmaxoft | 2014-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #998 from mc-server/StatManager | Mattes D | 2014-05-18 | 24 | -61/+711 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Statistic Manager | ||||
| | * | | | | | | | | | | | | | Fixes | andrew | 2014-05-13 | 5 | -20/+23 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Movement Statistics | andrew | 2014-05-12 | 6 | -14/+101 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement() | andrew | 2014-05-12 | 8 | -10/+143 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixed compilation | andrew | 2014-05-11 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixed stat serialization | andrew | 2014-05-11 | 4 | -24/+44 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Statistic Manager | andrew | 2014-05-11 | 16 | -43/+448 |
| | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #1005 from SphinxC0re/LoadPluginfolder | worktycho | 2014-05-18 | 1 | -1/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | Load pluginfolder | ||||
| | * | | | | | | | | | | | | removed the <list> include | Julian Laubstein | 2014-05-18 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added unload <pluginname> command | Julian Laubstein | 2014-05-18 | 1 | -5/+9 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added load cmd | Julian Laubstein | 2014-05-17 | 1 | -5/+29 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added load command in the cServer class | Julian Laubstein | 2014-05-17 | 1 | -0/+6 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #1002 from tonibm19/patch-1 | Mattes D | 2014-05-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed anvil exp removing | ||||
| | * | | | | | | | | | | | | Fixed anvil exp removing | tonibm19 | 2014-05-16 | 1 | -1/+1 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #994 from Howaner/GlobalFixes | Mattes D | 2014-05-15 | 5 | -36/+125 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | Add place/break radius, add dig cancel packet and add item resend on break/place cancel. | ||||
| | * | | | | | | | | | | | Fix compile error. | Howaner | 2014-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Move radius check. | Howaner | 2014-05-15 | 1 | -25/+40 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Rename HandleBlockDigCancel to FinishDigAnimtion. | Howaner | 2014-05-11 | 2 | -5/+5 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add block place/break distance check. | Howaner | 2014-05-09 | 2 | -0/+31 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break. | Howaner | 2014-05-09 | 4 | -36/+79 |
| | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | | Added doxy-comment requirement | Mattes D | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #999 from mc-server/fixes | Mattes D | 2014-05-12 | 6 | -54/+80 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | A few warning fixes | ||||
| | * | | | | | | | | | | | More switch warnings. | archshift | 2014-05-12 | 2 | -7/+34 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed a few more switch warnings. | archshift | 2014-05-12 | 3 | -32/+35 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed a warning and a complaint about a never-read variable. | archshift | 2014-05-11 | 2 | -15/+11 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #972 from mc-server/SslWebAdmin | Mattes D | 2014-05-11 | 28 | -174/+637 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | Ssl web admin | ||||
| | * | | | | | | | | | | Merge branch 'master' into SslWebAdmin | Mattes D | 2014-05-10 | 131 | -1841/+2756 |
| | |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #993 from mc-server/GridStructGen | Mattes D | 2014-05-10 | 12 | -838/+581 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | Grid struct gen | ||||
| | * | | | | | | | | | | Merged branch 'master' into GridStructGen. | Mattes D | 2014-05-09 | 9 | -31/+38 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Removed unused constants from MineShafts and Ravines. | Mattes D | 2014-05-09 | 2 | -9/+0 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Removed an unused NetherFortGen variable. | Mattes D | 2014-05-09 | 1 | -6/+0 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Removed an unused macro. | Mattes D | 2014-05-09 | 1 | -7/+0 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Ravines rewritten using cGridStructGen. | Mattes D | 2014-05-09 | 2 | -182/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #987. | ||||
| | * | | | | | | | | | | | cWormNestCaves rewritten using cGridStructGen. | Mattes D | 2014-05-09 | 2 | -223/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #987. | ||||
| | * | | | | | | | | | | | Mineshafts generator rewritten to use GridStructGen. | Mattes D | 2014-05-09 | 2 | -156/+33 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed cGridStructGen. | Mattes D | 2014-05-08 | 1 | -18/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now cNetherFortGen works with the new architecture. | ||||
| | * | | | | | | | | | | | Merge branch 'master' into GridStructGen | Mattes D | 2014-05-08 | 86 | -347/+1151 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-08 | 47 | -159/+176 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | cNetherFortGen uses cGridStructGen. | madmaxoft | 2014-05-07 | 5 | -264/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WIP, this doesn't work properly yet. | ||||
| | * | | | | | | | | | | | | Initial cPrefabPiecePool refactoring. | madmaxoft | 2014-05-07 | 2 | -0/+196 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #986. | ||||
| | * | | | | | | | | | | | | Initial cGridStructGen refactoring. | madmaxoft | 2014-05-06 | 2 | -0/+262 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #987. | ||||
| * | | | | | | | | | | | | | Fixed the console saying no plugins are loaded. | STRWarrior | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #995 from mc-server/Portal_Pigman | Mattes D | 2014-05-10 | 1 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | Portal zombie pigman | ||||
| | * | | | | | | | | | | | | Fixed compile problem. | STRWarrior | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | A portal block now chooses a number between 2000 and 0 | STRWarrior | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Each time a portal block receives a tick it has a 1 in 500 chance of spawning a zombie pigman. | STRWarrior | 2014-05-10 | 1 | -0/+14 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #992 from mc-server/coverity_fixes | Mattes D | 2014-05-09 | 2 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | Coverity fixes | ||||
| | * | | | | | | | | | | | Range Check on schematic size | worktycho | 2014-05-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 55830 | ||||
| | * | | | | | | | | | | | Check the height and width values read. | worktycho | 2014-05-09 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 55831 | ||||
| * | | | | | | | | | | | | Fixed size_t in FireworksSerializer. | Mattes D | 2014-05-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed message formatting. | Mattes D | 2014-05-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Even more size_t fixes. | Mattes D | 2014-05-09 | 1 | -4/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | More size_t fixes. | Mattes D | 2014-05-09 | 2 | -6/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Build fixes after the last size_t batch. | Mattes D | 2014-05-09 | 6 | -15/+15 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | World pre-generation distance is settable in world.ini. | Mattes D | 2014-05-09 | 1 | -2/+6 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Lighting thread disabled its chunkstays before deleting them. | Mattes D | 2014-05-09 | 1 | -0/+2 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-09 | 47 | -159/+176 |
| |/ / / / / / / / / / / | |||||
| * | / / / / / / / / / | Initialise m_HasTeleported in both constructors | worktycho | 2014-05-09 | 1 | -0/+1 |
| | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #989 from Howaner/Anvil | Mattes D | 2014-05-07 | 9 | -55/+118 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ... | ||||
| | * | | | | | | | | | | Missing comma | Howaner | 2014-05-07 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Send item back to the client when the item get damage. | Howaner | 2014-05-07 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Change m_RepairCost to int. | Howaner | 2014-05-07 | 6 | -16/+10 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Where is the problem with clang? | Howaner | 2014-05-07 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs. | Howaner | 2014-05-07 | 8 | -57/+125 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #853 from Howaner/Slabs | Mattes D | 2014-05-07 | 11 | -4/+53 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Grass now grows under up-side-down slabs | ||||
| | * | | | | | | | | | | | Superfluous method override. | Howaner | 2014-05-07 | 1 | -6/+0 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add lava and water check to block handlers. | Howaner | 2014-05-07 | 2 | -2/+14 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Rename CanChangeDirtToGrass to CanDirtGrowGrass | Howaner | 2014-05-07 | 6 | -9/+9 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into Slabs | Howaner | 2014-05-07 | 274 | -7330/+16184 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Remove old import | Howaner | 2014-04-06 | 2 | -3/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into Slabs | Howaner | 2014-04-06 | 56 | -334/+540 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Add CanChangeDirtToGrass function to Block Handlers. | Howaner | 2014-04-06 | 9 | -4/+45 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into Slabs | Howaner | 2014-04-03 | 335 | -6807/+18153 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockDirt.h | ||||
| | * | | | | | | | | | | | | | | Remove old function | Howaner | 2014-04-03 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Grass now grows under up-side-down slabs | Howaner | 2014-04-03 | 1 | -3/+12 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #990 from Howaner/Entities | Tiger Wang | 2014-05-07 | 2 | -3/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | Fix MagmaCube save. | ||||
| | * | | | | | | | | | | | | | | Fix MagmaCube save. | Howaner | 2014-05-07 | 2 | -3/+9 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Fixed wires powering wires diagonally below them | Tiger Wang | 2014-05-07 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #985 from Howaner/Anvil | Mattes D | 2014-05-06 | 16 | -3/+671 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | Add anvil inventory. | ||||
| | * | | | | | | | | | | | | | Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count() | Howaner | 2014-05-06 | 9 | -34/+33 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Simplified the HandleAnvilItemName() code. | Howaner | 2014-05-06 | 1 | -7/+2 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Change int to size_t return. | Howaner | 2014-05-05 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fix SetRepairedItemName() in SlotArea.cpp | Howaner | 2014-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add comments to CanTakeResultItem() | Howaner | 2014-05-05 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add doxycomments to cSlotAreaAnvil functions. | Howaner | 2014-05-05 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Changed HandleAnvilItemName() length to size_t in ClientHandle.h | Howaner | 2014-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add anvil shift click. | Howaner | 2014-05-05 | 2 | -5/+86 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | This isn't a enchantment table :D | Howaner | 2014-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add clicks, exp subtraction, item check, ... | Howaner | 2014-05-05 | 7 | -18/+210 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add MC|ItemName plugin message. | Howaner | 2014-05-05 | 6 | -8/+51 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Add anvil window and slot area. | Howaner | 2014-05-05 | 13 | -0/+356 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #927 from mc-server/fixes | Mattes D | 2014-05-06 | 12 | -155/+160 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | Small fixes | ||||
| | * | | | | | | | | | | | | | Merge branch 'master' into fixes | Tiger Wang | 2014-05-06 | 21 | -510/+743 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Vector3.h | ||||
| | * | | | | | | | | | | | | | Suggestions'd #2 | Tiger Wang | 2014-05-06 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Suggestions'd | Tiger Wang | 2014-05-06 | 3 | -7/+11 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | A bit of reformatting. | madmaxoft | 2014-05-02 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into fixes. | madmaxoft | 2014-05-02 | 181 | -2524/+4641 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | A tiny speed improvement in ApplyFoodExhaustion() | Tiger Wang | 2014-04-27 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | More comments! | Tiger Wang | 2014-04-27 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also fixed a potential issue with position sending - if someone moved slowly enough, their position would never be updated. | ||||
| | * | | | | | | | | | | | | | | Implemented suggestions | Tiger Wang | 2014-04-24 | 1 | -7/+6 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge branch 'master' into fixes | Tiger Wang | 2014-04-24 | 78 | -565/+3146 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| | * | | | | | | | | | | | | | | | Some change to Entity.cpp | Tiger Wang | 2014-04-23 | 7 | -123/+105 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added comments to BroadcastMovementUpdate() and the collision tracer | ||||
| | * | | | | | | | | | | | | | | | Small changes | Tiger Wang | 2014-04-23 | 4 | -12/+15 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Changed cPieceGenerator to support pairings. | madmaxoft | 2014-05-05 | 3 | -57/+104 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #982. | ||||
| * | | | | | | | | | | | | | | | | Prefabs can specify that they don't want flooring. | madmaxoft | 2014-05-05 | 1 | -30/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the flag was ignored. | ||||
| * | | | | | | | | | | | | | | | | Fixed a flipped condition in cBlockArea::Merge(). | madmaxoft | 2014-05-05 | 1 | -2/+2 |
| | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #978 from mc-server/VectorAssignmentOperator | Mattes D | 2014-05-05 | 1 | -12/+32 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vector3 warning fixes | ||||
| | * | | | | | | | | | | | | | | | Removed convert-assign operator. | madmaxoft | 2014-05-04 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want all conversions to be explicit, not hidden. | ||||
| | * | | | | | | | | | | | | | | | Removed the controversial Vector3::operator <. | madmaxoft | 2014-05-03 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It hasn't been used in any C++ code and Lua doesn't need it. | ||||
| | * | | | | | | | | | | | | | | | Fixed float comparison warnings in Vector3. | madmaxoft | 2014-05-03 | 1 | -5/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a bitwise comparison (Equals), and there's Eps-based comparison (EqualsEps). | ||||
| | * | | | | | | | | | | | | | | | Implemented a true assignment operator for Vector3. | madmaxoft | 2014-05-03 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Attempted fix for CLang warnings in Vector3.h. | madmaxoft | 2014-05-02 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++11 seems to have deprecated classes that have custom copy-constructor but not a custom assignment operator. | ||||
| * | | | | | | | | | | | | | | | | Fixed crash on creating a world during plugin initialisation | worktycho | 2014-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fixed formatting | Tiger Wang | 2014-05-05 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #956 from mc-server/redstoneimprovements | Tiger Wang | 2014-05-04 | 9 | -458/+627 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redstone simulator performance and functionality improvements. | ||||
| | * | | | | | | | | | | | | | | | | Fixed 027efe09ea3d3222c3cbf169643e57773c1614ae | Tiger Wang | 2014-05-04 | 1 | -3/+49 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Merge branch 'master' into redstoneimprovements | Tiger Wang | 2014-05-04 | 145 | -2323/+4081 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| | * | | | | | | | | | | | | | | | | | Fixed lever and button powering direction | Tiger Wang | 2014-05-04 | 1 | -16/+8 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Redstone simulator now directly accesses cChunk | Tiger Wang | 2014-04-27 | 10 | -453/+586 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes | ||||
| * | | | | | | | | | | | | | | | | | | Fixed ProtoProxy compilation in MSVC2013. | madmaxoft | 2014-05-04 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #983. | ||||
| * | | | | | | | | | | | | | | | | | Fixed pressure plate oversights | Tiger Wang | 2014-05-04 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed stone pressure plates not checking for the correct distance for players * Fixed pressure plates in general not link powering the blocks beneath them | ||||
| * | | | | | | | | | | | | | | | | | Fixed portal Z direction loop coding failure | Tiger Wang | 2014-05-04 | 1 | -10/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed portals created in the ZP/ZM direction eating its frame * Changed return type of a function | ||||
| * | | | | | | | | | | | | | | | | | Hotfixed Chunked transfer encoding in Yggdrasil. | madmaxoft | 2014-05-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using HTTP/1.0, we're disabling the support for the Chunked encoding on the server. This is a hotfix for #979, a proper parser implementation is still needed. | ||||
| * | | | | | | | | | | | | | | | | | Fixed connection encryption. | madmaxoft | 2014-05-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #975. | ||||
| * | | | | | | | | | | | | | | | | | Fixed vanilla fluid simulator. | madmaxoft | 2014-05-03 | 1 | -4/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #919. | ||||
| * | | | | | | | | | | | | | | | | Seperate instructions for OSX and Linux | archshift | 2014-05-03 | 1 | -3/+38 |
| | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed vanilla fluid simulator. | madmaxoft | 2014-05-02 | 4 | -14/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #919. | ||||
| * | | | | | | | | | | | | | | | Fixed a buffer overflow in cChunk:SetLight(). | madmaxoft | 2014-05-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are only half as many bytes for light than there are blocktypes. | ||||
| * | | | | | | | | | | | | | | | Open files in shared mode on windows, so that other tools may read them. | madmaxoft | 2014-05-02 | 1 | -2/+2 |
| | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was the behavior before fopen_s() was used for implementation; unlike fopen(), fopen_s() opens the file in exclusive mode. | ||||
| * | | | | | | | | | | | | | | Fixed MagmaCube spawning. | madmaxoft | 2014-05-02 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #928. | ||||
| * | | | | | | | | | | | | | | Added a sanitizer for Spawn egg damage value. | madmaxoft | 2014-05-02 | 1 | -1/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This disallows spawning unknown mobs from unknown spawn eggs. Ref.: #928. | ||||
| * | | | | | | | | | | | | | | APIDump: Updated the OnDisconnect hook docs. | madmaxoft | 2014-05-02 | 1 | -7/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #655. | ||||
| * | | | | | | | | | | | | | | APIDump: Improved error handling in API file loader. | madmaxoft | 2014-05-02 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | HOOK_DISCONNECT has cClientHandle as its first parameter. | madmaxoft | 2014-05-02 | 6 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #655. | ||||
| * | | | | | | | | | | | | | | Fixed warnings in ManualBindings. | madmaxoft | 2014-05-01 | 1 | -20/+20 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed warnings in Lua helpers. | madmaxoft | 2014-05-01 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | | Client cert is not requested. | Mattes D | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | | Fixed cert filename in Linux script. | madmaxoft | 2014-05-07 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | | Fixed an extra space. | madmaxoft | 2014-05-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | | WebAdmin outputs a log message about HTTP / HTTPS status. | madmaxoft | 2014-05-02 | 1 | -18/+31 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | | Made the cert generation script executable on Linux | Mattes D | 2014-05-02 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | | Merged branch 'master' into SslWebAdmin. | madmaxoft | 2014-05-01 | 17 | -31/+34 |
| | | | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed a warning in Noise. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | More ClientHandle fixes. | madmaxoft | 2014-05-01 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed warnings in ClientHandle. | madmaxoft | 2014-05-01 | 8 | -9/+9 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed warnings in cByteBuffer. | madmaxoft | 2014-05-01 | 2 | -14/+14 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed warning in BlockID. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed warnings in cBlockArea. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed warnings in FastNBT. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed warning in cCallbackSslContext::cDataCallbacks. | madmaxoft | 2014-05-01 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed warning in cBlockArea. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | * | | | | | | | Merge branch 'master' into SslWebAdmin | madmaxoft | 2014-05-01 | 5 | -2/+13 |
| | | | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #973 from mc-server/ItemNoCopyConstructor | Mattes D | 2014-05-01 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | Removed the explicit copy constructor for cItem. | ||||
| | * | | | | | | | | | | | | | Removed the explicit copy constructor for cItem. | madmaxoft | 2014-05-01 | 1 | -0/+6 |
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler generates an implicit one with the same contents and warns about it. The function left in for ToLua to generate the binding for it. | ||||
| * | | | | | | | | | | | | | Fixed MSVC2013 compilation. | Mattes D | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #971 from worktycho/polarssl-local | worktycho | 2014-05-01 | 2 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep a cloned copy of polarssl | ||||
| | * | | | | | | | | | | | | | Merged change to enable testing to be disabled | Tycho | 2014-05-01 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is confirmed upstream but is unlikely to get into the repository for several weeks | ||||
| | * | | | | | | | | | | | | | Changed polarssl repo to point to cloned copy of polarssl | Tycho | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Anvil saver pads data to 4K boundaries. | madmaxoft | 2014-05-01 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #524. | ||||
| | | | | | | | | * | | | | | | Added a missing return statement. | madmaxoft | 2014-05-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | | | cSslContext has virtual destructor now. | madmaxoft | 2014-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | | | ProtoProxy: Renamed PublicKey to CryptoKey. | madmaxoft | 2014-05-01 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | | | Renamed PublicKey to CryptoKey in CMakeLists.txt | Mattes D | 2014-05-01 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | | | Renamed cPublicKey to cCryptoKey. | madmaxoft | 2014-05-01 | 9 | -41/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class can hold both the private key and the public key, bad naming on PolarSSL's part. Also somewhat fixed the cert and key loading in cHTTPServer. | ||||
| | | | | | | | | * | | | | | | Fixed crashes in the SSL HTTP connection. | madmaxoft | 2014-05-01 | 9 | -23/+36 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | | | Added a mention to run as admin. | madmaxoft | 2014-05-01 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | | | Added scripts for generating HTTPS cert and key. | madmaxoft | 2014-05-01 | 2 | -0/+19 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | | | Implemented SSL connection for WebAdmin. | madmaxoft | 2014-05-01 | 5 | -2/+195 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes FS-319. | ||||
| | | | | | | | | * | | | | | | Fixed HTTP message parsing, prepared for SSL. | madmaxoft | 2014-05-01 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | | | Added a (disabled) test of low-security ciphersuites. | madmaxoft | 2014-05-01 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabling this allows the connection to be sniffed and decoded using Wireshark, when given the SSL private key. | ||||
| | | | | | | | | * | | | | | | Fixed BufferedSslContext's buffer reading and writing. | madmaxoft | 2014-05-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | | | cSslContext supports setting own cert / privkey. | madmaxoft | 2014-05-01 | 5 | -7/+187 |
| | | | | | | | | | | | | | | | |||||
| | | | | | | | | * | | | | | | Added cBufferedSslContext implementation. | madmaxoft | 2014-05-01 | 2 | -20/+51 |
| | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | If webadmin.ini doesn't exist, example one is written immediately. | madmaxoft | 2014-04-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed a warning when an empty item is being created. | madmaxoft | 2014-04-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Ladders set as transparent. | madmaxoft | 2014-04-30 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Removed the unused cBlockingTCPLink class. | madmaxoft | 2014-04-30 | 3 | -171/+0 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #965 from mc-server/SslWrappers | Mattes D | 2014-04-30 | 44 | -874/+2129 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ssl wrappers | ||||
| | * | | | | | | | | | | | | | Removed unneeded #includes. | madmaxoft | 2014-04-29 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Moved the rest of the Crypto objects into their own respective files. | madmaxoft | 2014-04-29 | 17 | -436/+477 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Moved cPublicKey to its separate file in PolarSSL++. | madmaxoft | 2014-04-29 | 8 | -109/+127 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into SslWrappers | madmaxoft | 2014-04-29 | 3 | -12/+29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Added BiomeToString() API function. | madmaxoft | 2014-04-29 | 2 | -81/+106 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed ProtoProxy. | madmaxoft | 2014-04-29 | 4 | -3/+25 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Added missing initialization. | madmaxoft | 2014-04-29 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects. | madmaxoft | 2014-04-29 | 9 | -225/+244 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merged branch 'master' into SslWrappers. | madmaxoft | 2014-04-28 | 114 | -1350/+2209 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Added the G1 root cert. | madmaxoft | 2014-04-28 | 1 | -2/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the authenticator finally works. | ||||
| | * | | | | | | | | | | | | | | Added a debug cert printing function. | madmaxoft | 2014-04-28 | 2 | -0/+65 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Reordered constructors. | madmaxoft | 2014-04-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed a late-night typo. | madmaxoft | 2014-04-27 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes. | madmaxoft | 2014-04-27 | 1 | -91/+45 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | PolarSSL wrappers for the SSL context. | madmaxoft | 2014-04-27 | 10 | -5/+847 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | cSocket creates the socket in Connect if no socket is present yet. | madmaxoft | 2014-04-27 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed C++11 check for SharedPtr. | madmaxoft | 2014-04-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Added shared_ptr handling for C++03 mode. | madmaxoft | 2014-04-25 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Replaced MSVC-specific decorators with our universal ones. | madmaxoft | 2014-04-24 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | cByteBuffer uses void * instead of char * in data interface. | madmaxoft | 2014-04-24 | 2 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it compatible with any pointer type. | ||||
| | * | | | | | | | | | | | | | | Declared a SharedPtr that hopefully resolves on all platforms. | madmaxoft | 2014-04-24 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC2008 has it in std::tr1, all the others in std. | ||||
| | * | | | | | | | | | | | | | | Fixed filename case. | madmaxoft | 2014-04-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Attempted CMake inclusion for PolarSSL++. | madmaxoft | 2014-04-24 | 2 | -2/+19 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Authenticator uses some C++ SSL objects. | madmaxoft | 2014-04-24 | 1 | -19/+40 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Initial C++ SSL classes. | madmaxoft | 2014-04-24 | 7 | -2/+248 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Delayed sending the KeepAlive packet for 3 seconds after login. | madmaxoft | 2014-04-29 | 1 | -0/+5 |
| | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should alleviate #889. | ||||
| * | | | | | | | | | | | | | | Added BiomeToString() API function. | madmaxoft | 2014-04-29 | 2 | -81/+106 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Disabled MSVC warnings about constant bool expressions. | madmaxoft | 2014-04-28 | 1 | -2/+19 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Hopefully fixed repeated clang warnings. | madmaxoft | 2014-04-28 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed a MSVC warning. | madmaxoft | 2014-04-28 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #940 from Howaner/GlobalFixes | Mattes D | 2014-04-28 | 26 | -68/+132 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add entity invulnerable | ||||
| | * | | | | | | | | | | | | | Revert "Withers now use the new invulnerable." | Howaner | 2014-04-28 | 2 | -10/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 619592b5a0ab651e714d55932bc7909e4204cee9. | ||||
| | * | | | | | | | | | | | | | Revert "Changed the old invulnerable methods from the wither to the new." | Howaner | 2014-04-28 | 5 | -28/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34. | ||||
| | * | | | | | | | | | | | | | Changed the old invulnerable methods from the wither to the new. | Howaner | 2014-04-26 | 5 | -4/+28 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Withers now use the new invulnerable. | Howaner | 2014-04-26 | 2 | -26/+10 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixes | Howaner | 2014-04-26 | 8 | -23/+26 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Change m_InvulnerableTicks description again again :D | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Change m_InvulnerableTicks description again. | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Change m_InvulnerableTicks description | Howaner | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into GlobalFixes | Howaner | 2014-04-26 | 2 | -11/+36 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Add entity invulnerable | Howaner | 2014-04-26 | 22 | -50/+111 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed braces. | madmaxoft | 2014-04-28 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed missing return value warning in MSVC. | madmaxoft | 2014-04-28 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'worktycho/master' | madmaxoft | 2014-04-28 | 7 | -177/+225 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Removed static from combinators. | Tycho | 2014-04-28 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | THis allows us to use the functions in template params at the cost of polluting the global namespace. | ||||
| | * | | | | | | | | | | | | | | Fixed unbraced ifs | Tycho | 2014-04-28 | 1 | -10/+40 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Removed inlines from combinators | Tycho | 2014-04-28 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gcc requires external linkage for functions provided to template parameters | ||||
| | * | | | | | | | | | | | | | | Template Magic | Tycho | 2014-04-28 | 4 | -173/+183 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed need to allocate a fake meta block by using templates to provide a version of the code that does not use metas. Also changed the function to a template argument to make sure that the compilier is able to inline it. | ||||
| | * | | | | | | | | | | | | | | Worked around const pointer | Tycho | 2014-04-27 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixes to uninitallsed array access in Noise.cpp | Tycho | 2014-04-27 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CID 43634, 43634 | ||||
| | * | | | | | | | | | | | | | | Initalize counter in fastrandom | Tycho | 2014-04-27 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 43622 | ||||
| | * | | | | | | | | | | | | | | Initialised MetaArrays in BlockArea | Tycho | 2014-04-27 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 43621 | ||||
| | * | | | | | | | | | | | | | | Removed unneeded assert | Tycho | 2014-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed CID 43610 | ||||
| * | | | | | | | | | | | | | | | Merge pull request #954 from mc-server/projectiles-split | Mattes D | 2014-04-28 | 27 | -857/+932 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files. | ||||
| | * | | | | | | | | | | | | | | | Fixed projectile source filenames, indentations | archshift | 2014-04-28 | 26 | -80/+80 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed ToLua errors, added newlines | archshift | 2014-04-27 | 18 | -19/+19 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed ToLua issues | archshift | 2014-04-27 | 9 | -19/+24 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Moved cFireworkEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 5 | -115/+116 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Moved cGhastFireballEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 6 | -74/+85 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Moved cFireChargeEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 6 | -82/+90 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Moved cThrownSnowballEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 5 | -74/+84 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Moved cExpBottleEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 4 | -52/+61 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Moved cThrownEnderPearl out of ProjectileEntity.h | archshift | 2014-04-27 | 5 | -86/+95 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Moved cThrownEggEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 5 | -91/+100 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Moved cArrowEntity out of ProjectileEntity.h | archshift | 2014-04-27 | 10 | -284/+297 |
| | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed warnings. | madmaxoft | 2014-04-27 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed player spawning #953. | madmaxoft | 2014-04-27 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #958 from worktycho/bugfix | Mattes D | 2014-04-27 | 3 | -8/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix | ||||
| | * | | | | | | | | | | | | | | | Removed Old Asserts | Tycho | 2014-04-27 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed asserts about non-negative numbers on what are now unsigned types Fixes CID 43608 | ||||
| | * | | | | | | | | | | | | | | | Removed old unused code | Tycho | 2014-04-27 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed OnPluginMessage hook not exiting early. | Tycho | 2014-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnPluginMessage hook would call all plugins even after one returned true. Fixes CID 43512 | ||||
| * | | | | | | | | | | | | | | | | Merge pull request #959 from mc-server/fixes-2 | worktycho | 2014-04-27 | 4 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Coverity fixes | ||||
| | * | | | | | | | | | | | | | | | Revert "Creative players cannot throw ender pearls." | archshift | 2014-04-27 | 1 | -16/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 75bb36574b4bb78e8b5975bf905a97402fd8a4bb. | ||||
| | * | | | | | | | | | | | | | | | Creative players cannot throw ender pearls. | archshift | 2014-04-27 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added static const, initialized fields. | archshift | 2014-04-27 | 4 | -2/+7 |
| | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Update CoverityModel.cpp | worktycho | 2014-04-27 | 1 | -3/+15 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Create CoverityModel.cpp | worktycho | 2014-04-27 | 1 | -0/+5 |
| | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge pull request #864 from mc-server/Stat | Mattes D | 2014-04-27 | 2 | -0/+255 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Statistic/Achievement defs | ||||
| | * | | | | | | | | | | | | | | Added some comments | andrew | 2014-04-27 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Statistic/Achievement defs | andrew | 2014-04-07 | 2 | -0/+255 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Another attempt at #889. | madmaxoft | 2014-04-27 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The packet was being sent after the state was adjusted, so another thread *may* have sent another packet in the meantime. | ||||
| * | | | | | | | | | | | | | | | Merge pull request #948 from jfhumann/staticFixes | Mattes D | 2014-04-27 | 5 | -3/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Fixes motivated by Coverity #1 | ||||
| | * | | | | | | | | | | | | | | Fixed unitialized member in gZipFile (CID 43673) | jfhumann | 2014-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed a memory leak in tolua_cWorld_ChunkStay. (CID 43618) | jfhumann | 2014-04-26 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixes resource leaks in the yggdrasil authenticator. (CID 43617) | jfhumann | 2014-04-26 | 1 | -0/+33 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fix for minor resource leak (CID 43616) | jfhumann | 2014-04-26 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Should fix CIDs 43631, 43632 and 43633 | jfhumann | 2014-04-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge pull request #941 from archshift/master | Mattes D | 2014-04-26 | 19 | -174/+172 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | Fixed lots of warnings, and other small changes. | ||||
| | * | | | | | | | | | | | | | | More small fixes. | archshift | 2014-04-26 | 3 | -11/+11 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Moar alignment. | archshift | 2014-04-26 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Further refactored, Reverted Minecart change | archshift | 2014-04-26 | 11 | -90/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other small changes. | ||||
| | * | | | | | | | | | | | | | | Fixed mobs that don't naturally spawn. | archshift | 2014-04-26 | 3 | -7/+11 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Moved switch{} out of GetArmorCoverAgainst(). | archshift | 2014-04-26 | 2 | -5/+29 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Removed unused assignments. | archshift | 2014-04-26 | 3 | -6/+2 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed a couple more warnings. | archshift | 2014-04-26 | 2 | -21/+17 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Moved the weather picker out of TickWeather(), squashing a warning and improving readability. | archshift | 2014-04-26 | 2 | -25/+30 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Removed impossible default case. | archshift | 2014-04-26 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed a warning. | ||||
| | * | | | | | | | | | | | | | | Removed extraneous switch{} in Start() | archshift | 2014-04-26 | 2 | -17/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed a warning. | ||||
| | * | | | | | | | | | | | | | | Moved huge conditional out of InStateChasing(), improving readability | archshift | 2014-04-26 | 2 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed a warning. | ||||
| | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | archshift | 2014-04-25 | 18 | -17/+201 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Small changes; warning fixing. | archshift | 2014-04-25 | 6 | -14/+12 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Oops, fixed that. | archshift | 2014-04-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Giants! | archshift | 2014-04-25 | 2 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed mfMaxplusone to mfUnhandled for readability, and fixed a default case warning. | ||||
| | * | | | | | | | | | | | | | | | Refactored SendChat(), placing the message-type formatting into its own function. | archshift | 2014-04-25 | 2 | -84/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed default case warning in the process. | ||||
| * | | | | | | | | | | | | | | | | Merge pull request #863 from mc-server/chunkysparsing | Mattes D | 2014-04-26 | 3 | -67/+166 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chunky sparsing | ||||
| | * | | | | | | | | | | | | | | | | Implemented comments | Tiger Wang | 2014-04-25 | 3 | -33/+52 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Fixed indent | Tiger Wang | 2014-04-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Another small speed improvement? | Tiger Wang | 2014-04-24 | 1 | -12/+2 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Implemented suggestions | Tiger Wang | 2014-04-24 | 2 | -89/+16 |
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Replaced all the .data() calls so the code compiles in VS2008 | Tycho | 2014-04-10 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Maybe speed improvements? | Tiger Wang | 2014-04-07 | 2 | -48/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use a single index to determine from when to begin copying data * Use heightmap to determine first nonair block | ||||
| | * | | | | | | | | | | | | | | | Attempt to fix errors | Tiger Wang | 2014-04-07 | 2 | -12/+12 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Blocklight and skylight now compressed | Tiger Wang | 2014-04-07 | 3 | -32/+90 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Nibbletypes are compressed | Tiger Wang | 2014-04-05 | 3 | -18/+110 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added nibble compression * Fixed an off by one | ||||
| | * | | | | | | | | | | | | | | | Speed and memory improvements | Tiger Wang | 2014-04-04 | 2 | -62/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Changed array to be continuous, so no more layer splitting | ||||
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into chunkysparsing | Tiger Wang | 2014-04-03 | 154 | -1003/+6127 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | Fixed some bugs | Tiger Wang | 2014-04-03 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed undefined behaviour * Fixed compression failure | ||||
| | * | | | | | | | | | | | | | | | | Performance improvements and chunk flipping fixed | Tiger Wang | 2014-04-02 | 1 | -30/+32 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Sort of implementation of chunk sparsing | Tiger Wang | 2014-03-23 | 2 | -18/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues: * Chunks are flipped * Slow/inefficient/badly coded * Only blocktypes are 'compressed' | ||||
| * | | | | | | | | | | | | | | | | | Merge pull request #936 from archshift/patch-1 | Mattes D | 2014-04-26 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | Use libc++ on OSX | ||||
| | * | | | | | | | | | | | | | | | | Needs the -stdlib linker flag too. | archshift | 2014-04-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Move to line 47. | archshift | 2014-04-25 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Use libc++ on OSX | archshift | 2014-04-25 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issues with https://github.com/mc-server/MCServer/commit/f3dfc0349d7008efa50855c739d86918bdbf4a88 in XCode. Tested on Mac (Makefile and XCode) and Linux. | ||||
| * | | | | | | | | | | | | | | | | | Merge pull request #920 from axisd/master | Mattes D | 2014-04-25 | 1 | -7/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining | ||||
| | * | | | | | | | | | | | | | | | | | Fix formatting | r.ramazanov | 2014-04-25 | 1 | -9/+15 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Fix for clang | r.ramazanov | 2014-04-25 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining & Mob Knockback is far too much | r.ramazanov | 2014-04-25 | 1 | -8/+5 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | r.ramazanov | 2014-04-25 | 13 | -24/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/mc-server/MCServer | r.ramazanov | 2014-04-24 | 4 | -9/+32 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/mc-server/MCServer | r.ramazanov | 2014-04-23 | 58 | -531/+1259 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining #906 | r.ramazanov | 2014-04-23 | 1 | -9/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mob Knockback is far too much #776 | ||||
| | * | | | | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining #906 | r.ramazanov | 2014-04-21 | 1 | -5/+12 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Updated MSVC side of CMake files after recent changes. | madmaxoft | 2014-04-25 | 1 | -4/+2 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #935 from archshift/projectile-fixes | Mattes D | 2014-04-25 | 2 | -7/+69 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chicken eggs and ender pearls can hit entities. | ||||
| | * | | | | | | | | | | | | | | | | | | | | Creator not user. | archshift | 2014-04-25 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | Comments for TrySpawnChicken() and TeleportUser(). | archshift | 2014-04-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | Rename spawn chicken method, Initialize m_HasTeleported. | archshift | 2014-04-25 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | Chicken eggs and ender pearls can hit entities. | archshift | 2014-04-25 | 2 | -7/+66 |
| | | |_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed warning by adding dedicated m_HasTeleported for fired arrows. | ||||
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #938 from archshift/xcode-oops | Mattes D | 2014-04-25 | 7 | -3/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | Oops, forgot some CMakeLists in #937 | ||||
| | * | | | | | | | | | | | | | | | | | | | Missed these CMakeLists. | archshift | 2014-04-25 | 7 | -3/+17 |
| |/ / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #937 from archshift/xcode-headers | worktycho | 2014-04-25 | 12 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Cmake generated projects for IDEs include headers in project files. | ||||
| | * | | | | | | | | | | | | | | | | | | Cmake generated projects for IDEs include headers in project files. | archshift | 2014-04-25 | 12 | -0/+12 |
| |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #932 from Howaner/Inventory | Mattes D | 2014-04-25 | 6 | -17/+189 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | Fix armor in survival mode. | ||||
| | * | | | | | | | | | | | | | | | | | Add commit what the code is doing. | Howaner | 2014-04-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Add unkown armor warning and fix armor stacks. | Howaner | 2014-04-25 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Add armor to switch() in ItemHandler.cpp | Howaner | 2014-04-24 | 2 | -7/+26 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Fix armor in survival mode. | Howaner | 2014-04-24 | 6 | -17/+157 |
| | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #929 from archshift/master | Mattes D | 2014-04-24 | 11 | -22/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | / / / / / / / / | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | Renamed mob source files to better fit the CamelCase naming style. | ||||
| | * | | | | | | | | | | | | | | | Fixed class capitalization for the cave spider. | archshift | 2014-04-24 | 4 | -7/+7 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed references to renamed files. | archshift | 2014-04-24 | 6 | -9/+9 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Rename mob source files to fit CamelCase. | archshift | 2014-04-24 | 6 | -6/+0 |
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Cavespider.cpp to CaveSpider.cpp Rename Cavespider.h to CaveSpider.h Rename Magmacube.cpp to MagmaCube.cpp Rename Magmacube.h to MagmaCube.h Rename Zombiepigman.cpp to ZombiePigman.cpp Rename Zombiepigman.h to ZombiePigman.h | ||||
| * / / / / / / / / / / / / / / | Changed cByteBuffer constructor to take a size_t instead of int. | madmaxoft | 2014-04-24 | 2 | -2/+2 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Updated docs for StringToEnchantmentID. | madmaxoft | 2014-04-23 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: mc-server/Core#67 | ||||
| * | | | | | | | | | | | | | | Updated NetherFort prefabs to latest Gallery content. | madmaxoft | 2014-04-23 | 1 | -7/+29 |
| | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | The new leaves don't decay anymore. | STRWarrior | 2014-04-23 | 1 | -0/+1 |
| | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #792 | ||||
| * | | | | | | | | | | | | Merge pull request #925 from archshift/master | Mattes D | 2014-04-23 | 4 | -0/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Added monsters.ini rule for fireproof mobs. | ||||
| | * | | | | | | | | | | | | Renamed getter and setter for IsFireproof. | archshift | 2014-04-23 | 3 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Declaration that a mob is not fireproof is implicit. | archshift | 2014-04-23 | 1 | -21/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed explicitly declaring mobs as not fireproof. | ||||
| | * | | | | | | | | | | | | Added IsFireproof hook for monsters.ini | archshift | 2014-04-23 | 2 | -0/+29 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fireproof status getter and setter. | archshift | 2014-04-23 | 2 | -0/+16 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Updated NetherFort prefabs from the Gallery server. | madmaxoft | 2014-04-22 | 1 | -274/+785 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #923 from archshift/master | Mattes D | 2014-04-22 | 3 | -5/+17 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added flag for fireproof entities. | ||||
| | * | | | | | | | | | | | | Fixed indentation and changed m_Fireproof to m_IsFireproof. | archshift | 2014-04-22 | 2 | -14/+14 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed capitalization issues | archshift | 2014-04-22 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wasn't parsing correctly before, as some items were not capitalized correctly. | ||||
| | * | | | | | | | | | | | | Lay foundation for fireproof entities. | archshift | 2014-04-22 | 2 | -3/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent any entities with the m_Fireproof flag from taking fire or lava damage. | ||||
| * | | | | | | | | | | | | | Revert moving gcc to g++11 in 18c3b1 | worktycho | 2014-04-22 | 1 | -8/+0 |
| | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #909 from jfhumann/fixes | Mattes D | 2014-04-22 | 48 | -218/+263 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | | | 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 | 4 | -9/+10 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Declared one mutex as mutable in order to allow for const correct get accessors. | jfhumann | 2014-04-19 | 3 | -7/+7 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fixed clang compilation errors. Apparently gcc and MSVC do not care about the order of initializer lists, but clang does. | jfhumann | 2014-04-18 | 2 | -2/+2 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Small style changes | jfhumann | 2014-04-18 | 4 | -9/+9 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into fixes | jfhumann | 2014-04-18 | 46 | -811/+2166 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp | ||||
| | * | | | | | | | | | | | | Did some static analysis, fixed some bugs and optimized a lot of code | jfhumann | 2014-04-18 | 48 | -212/+257 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added prefab hitboxes. | madmaxoft | 2014-04-21 | 3 | -11/+138 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nether forts should quite limit their bridge-to-floor overlaps. Cannot eliminate, but at least severely diminish. | ||||
| * | | | | | | | | | | | | | Added enchantment combining into cEnchantments. | madmaxoft | 2014-04-21 | 2 | -16/+33 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Replaced X.size() with X.empty(), where applicable. | madmaxoft | 2014-04-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed a warning in CraftingRecipes. | Mattes D | 2014-04-21 | 1 | -1/+1 |
| | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Allow 1.6.4 Forge clients to log in. | Mattes D | 2014-04-21 | 2 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #913. | ||||
| * | | | | | | | | | | | | Fixed enchanting return values. | Mattes D | 2014-04-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Items are enchanted in those cases, so return true. Ref.: #914. | ||||
| * | | | | | | | | | | | | Updated the nightbuild script. | madmaxoft | 2014-04-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed MSVC compilation. | madmaxoft | 2014-04-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #890 from daniel0916/Enchanting | Mattes D | 2014-04-20 | 18 | -9/+1509 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Enchanting | ||||
| | * | | | | | | | | | | | | Fixed Code | daniel0916 | 2014-04-19 | 2 | -145/+148 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-19 | 10 | -29/+377 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | APIDump: Added a ChunkStay article. | madmaxoft | 2014-04-19 | 3 | -27/+195 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #772. | ||||
| * | | | | | | | | | | | | | Fixed formatting, made function static. | madmaxoft | 2014-04-19 | 2 | -13/+18 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/Beacons' | madmaxoft | 2014-04-19 | 4 | -0/+159 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | 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 | 4 | -0/+155 |
| | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no handling for the GUI. It can now check how big the pyramid is under the beacon. | ||||
| * | | | | | | | | | | | | Compilation fix | Tiger Wang | 2014-04-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-04-18 | 2 | -0/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed #906 | Tiger Wang | 2014-04-18 | 2 | -1/+12 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed #904 | Tiger Wang | 2014-04-18 | 2 | -1/+6 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Fixed Code (2) | daniel0916 | 2014-04-19 | 1 | -97/+93 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Fixed Code | daniel0916 | 2014-04-19 | 5 | -411/+418 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-18 | 29 | -426/+1507 |
| | | | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Added performance test of the nether fort generator. | madmaxoft | 2014-04-18 | 2 | -0/+35 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Removed unsupported C++11 features. | madmaxoft | 2014-04-18 | 1 | -13/+19 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #891 from mc-server/fixes | Mattes D | 2014-04-17 | 18 | -330/+457 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes to redstone & general | ||||
| | * | | | | | | | | | | | Compile fix? | Tiger Wang | 2014-04-17 | 2 | -2/+10 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Implemented weighted pressure plates | Tiger Wang | 2014-04-17 | 3 | -29/+175 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Rewrote redstone powering to use power levels | Tiger Wang | 2014-04-15 | 6 | -183/+157 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Entities handle chunks properly again | Tiger Wang | 2014-04-12 | 10 | -123/+123 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty | ||||
| | * | | | | | | | | | | | Simplified pickup speed randomisation | Tiger Wang | 2014-04-12 | 1 | -4/+3 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added area flooring. | madmaxoft | 2014-04-17 | 1 | -1/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #743. | ||||
| * | | | | | | | | | | | | Added new AI rules | Tiger Wang | 2014-04-17 | 7 | -55/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 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 | ||||
| * | | | | | | | | | | | | Added Prefab initializers to SELFTEST code. | madmaxoft | 2014-04-17 | 1 | -1/+13 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Prefabs can have per-piece per-placement weights. | madmaxoft | 2014-04-17 | 5 | -32/+752 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #753. Also upgraded NetherFortPrefabs to lates Gallery contents. | ||||
| * | | | | | | | | | | | | Merge pull request #896 from axisd/master | Mattes D | 2014-04-17 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Mobs rotation | ||||
| | * | | | | | | | | | | | | Mobs rotation | r.ramazanov | 2014-04-17 | 1 | -4/+6 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added asserts for proper game state. | madmaxoft | 2014-04-16 | 1 | -5/+131 |
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to help hunt #889. | ||||
| | | | * | | | | | | | | | Fixed Errors | daniel0916 | 2014-04-18 | 3 | -5/+23 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Removed old include | daniel0916 | 2014-04-18 | 2 | -2/+1 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Fixed some Errors (not all) | daniel0916 | 2014-04-17 | 4 | -20/+21 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Modified many things | daniel0916 | 2014-04-17 | 10 | -918/+1000 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Fixed conflicting enchantments checking | daniel0916 | 2014-04-16 | 2 | -24/+24 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Added deletions from merge conflict | daniel0916 | 2014-04-16 | 1 | -0/+875 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-16 | 24 | -382/+696 |
| | | | |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Attempted fix for the client crash with the new protocols. | madmaxoft | 2014-04-15 | 2 | -6/+16 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added support for per-piece per-placement weights in cPieceGenerator. | madmaxoft | 2014-04-15 | 2 | -28/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #753. | ||||
| * | | | | | | | | | | | | NetherFortPrefabs: Fixed a connector in MidStaircase. | madmaxoft | 2014-04-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #888 from mc-server/Proto176 | Mattes D | 2014-04-15 | 16 | -333/+571 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Protocol 1.7.6 | ||||
| | * | | | | | | | | | | | | Implemented the 1.7.6 protocol and authenticator. | madmaxoft | 2014-04-14 | 10 | -128/+198 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Server works both in online and offline modes with 1.7.9. | ||||
| | * | | | | | | | | | | | | A client UUID is generated when the server is in offline mode. | madmaxoft | 2014-04-14 | 3 | -5/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.7.9 client works with these changes in offline mode. | ||||
| | * | | | | | | | | | | | | Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176 | madmaxoft | 2014-04-14 | 10 | -296/+362 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | Fixed mistake | daniel0916 | 2014-04-13 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Fixed Error? | daniel0916 | 2014-04-13 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Code Update | daniel0916 | 2014-04-13 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Added Yggdrasil Authentication System | daniel0916 | 2014-04-13 | 9 | -295/+360 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code by Howaner. Fixes/Changes by me. | ||||
| | * | | | | | | | | | | | | | Initial 1.7.6 protocol support. | madmaxoft | 2014-04-14 | 4 | -2/+69 |
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doesn't work yet because of missing UUIDs. | ||||
| * | | | | / / / / / / / / | ProtoProxy: Fixed weird gcc compilation errors. | madmaxoft | 2014-04-14 | 1 | -16/+22 |
| | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | ProtoProxy: Added 1.7.9 compatibility. | madmaxoft | 2014-04-14 | 1 | -0/+29 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | ChunkStay must be disabled while being deleted.ProtoProxy_1.7.2_001 | madmaxoft | 2014-04-12 | 3 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #758. | ||||
| * | | | | | | | | | | | | Fixed chunkstays not being removed on auto-delete. | madmaxoft | 2014-04-12 | 2 | -10/+19 |
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #837. | ||||
| | | | * | | | | | | | | Fixed merge conflict | daniel0916 | 2014-04-16 | 1 | -877/+0 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Fixed double enchanting items | daniel0916 | 2014-04-16 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Code Optimization | daniel0916 | 2014-04-15 | 2 | -358/+183 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Added Book Enchanting | daniel0916 | 2014-04-15 | 2 | -2/+311 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Add more checks to cSlotAreaEnchanting | Howaner | 2014-04-15 | 3 | -99/+212 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Modified names | daniel0916 | 2014-04-15 | 2 | -49/+49 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Add linux compatibility | Howaner | 2014-04-15 | 1 | -61/+71 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Added ItemPlaceCount in SlotArea | daniel0916 | 2014-04-14 | 2 | -0/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Howaner for helping | ||||
| | | | * | | | | | | | | Removed Debug Message | daniel0916 | 2014-04-14 | 1 | -2/+0 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Added/Modified last things for Enchanting System | daniel0916 | 2014-04-14 | 1 | -15/+53 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Blocked enchanting a item twice | daniel0916 | 2014-04-14 | 2 | -8/+10 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Fixed Bookshelf Checking | daniel0916 | 2014-04-14 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code by LO1ZB | ||||
| | | | * | | | | | | | | Bug fixes | daniel0916 | 2014-04-14 | 4 | -26/+21 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Fixed invisibility enchantments | daniel0916 | 2014-04-13 | 4 | -1/+8 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Fixed mistake | daniel0916 | 2014-04-13 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Fixed Server Crash | daniel0916 | 2014-04-13 | 1 | -0/+6 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Some Fixes | daniel0916 | 2014-04-13 | 2 | -2/+9 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into Enchanting | daniel0916 | 2014-04-12 | 12 | -2057/+3454 |
| | | | |\ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Updated the NetherFort prefabs to current Gallery contents. | madmaxoft | 2014-04-12 | 3 | -1958/+3329 |
| | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code exported from the Gallery server by the GalExport plugin. | ||||
| * | | | | | | | | | | Fixed issues with 64-bit MSVC compilation. | madmaxoft | 2014-04-11 | 3 | -21/+35 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Fixed enchantment parsing. | madmaxoft | 2014-04-10 | 1 | -12/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #880. Enchantment parsing now reports in detail which value failed to parse | ||||
| * | | | | | | | | | InfoReg uses cCompositeChat for subcommand lists. | madmaxoft | 2014-04-10 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed an issue with console commands. | ||||
| * | | | | | | | | | Merge pull request #878 from mc-server/mobexp | Mattes D | 2014-04-10 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | @axisd Changes | ||||
| | * | | | | | | | | | Fixed GitHuB WebEdit fail. | Alexander Harkness | 2014-04-10 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Update Monster.cpp | Alexander Harkness | 2014-04-10 | 1 | -2/+4 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #871 from worktycho/worldstorage | Mattes D | 2014-04-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Removed check for enqueuing a chunk that is already enqueued to be loaded | ||||
| | * | | | | | | | | | Removed check for enqueuing a chunk that is already enqueued to be loaded | Tycho | 2014-04-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This remaval is safe as cWorldStorage checks for duplicate chunks when dequeuing and removes an expensive iteration whilst holding the queue lock | ||||
| * | | | | | | | | | | cRedstoneSimulator.cpp style improvements | Tiger Wang | 2014-04-08 | 1 | -40/+41 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #872 from worktycho/bugfix | Alexander Harkness | 2014-04-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixed missing - that caused all neighbour lookups to go to the chunkmap | ||||
| | * | | | | | | | | | | Fixed missing - that caused all neighbour lookups to go to the chunkmap | Tycho | 2014-04-08 | 1 | -1/+1 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge pull request #870 from wiseoldman95/patch-1 | Alexander Harkness | 2014-04-08 | 1 | -10/+11 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Comments: Inverted Z axis. | ||||
| | * | | | | | | | | | | Uppercased Z | wiseoldman95 | 2014-04-08 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor, no code changed. | ||||
| | * | | | | | | | | | | Comments: Inverted Z axis. | wiseoldman95 | 2014-04-08 | 1 | -9/+10 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Comments fix, No code has been changed. -Inverted the Z axis in the comments and changed all dependent comments accordingly. -Added NORTH/SOUTH/EAST/WEST in addition to LEFT/RIGHT/UP/DOWN. | ||||
| * | | | | | | | | | | Merge pull request #869 from wiseoldman95/patch-1 | Alexander Harkness | 2014-04-08 | 1 | -9/+31 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Added comments regarding latching and orientation | ||||
| | * | | | | | | | | | | Added comments regarding latching and orientation | wiseoldman95 | 2014-04-08 | 1 | -9/+31 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | No real code was changed. | ||||
| * | | | | | | | | | | Fixed the thing properly. | Alexander Harkness | 2014-04-08 | 1 | -8/+8 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #862 from mc-server/redstonefix | Alexander Harkness | 2014-04-08 | 1 | -23/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixed #859 | ||||
| | * | | | | | | | | | | Fixed #859 | Tiger Wang | 2014-04-07 | 1 | -23/+3 |
| | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #865 from wiseoldman95/patch-2 | Alexander Harkness | 2014-04-07 | 1 | -13/+13 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Redstone simulator - cleaning up repeater lock code | ||||
| | * | | | | | | | | | | Fixed IsOn | wiseoldman95 | 2014-04-07 | 1 | -3/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Removed stray IsLocked | wiseoldman95 | 2014-04-07 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Removed unneeded spacings | wiseoldman95 | 2014-04-07 | 1 | -6/+3 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Slight cleanup | wiseoldman95 | 2014-04-07 | 1 | -13/+17 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | It is more efficient and readable if we do nothing unless we're not locked. | ||||
| | | | * | | | | | | | Fixed Bookshelves Checking (not completly) | daniel0916 | 2014-04-12 | 1 | -7/+10 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Added complete Enchanting System | daniel0916 | 2014-04-12 | 8 | -147/+803 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://minecraft.gamepedia.com/Enchantment_mechanics | ||||
| | | | * | | | | | | | Modified comment | daniel0916 | 2014-04-07 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Fixed Errors | daniel0916 | 2014-04-07 | 2 | -3/+3 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Added deleted things for merging | daniel0916 | 2014-04-07 | 1 | -0/+3 |
| | | | | | | | | | | | |||||
| | | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into Enchanting | daniel0916 | 2014-04-07 | 711 | -62011/+38666 |
| | | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | | Fixed some more minor issues with the redstone simulator. | Alexander Harkness | 2014-04-07 | 1 | -34/+39 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Improved the speed a little more. | Alexander Harkness | 2014-04-07 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed the redstone simulator. | Alexander Harkness | 2014-04-07 | 1 | -49/+40 |
| | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | | Fix some of the comments in the PR tycho just did. | Alexander Harkness | 2014-04-07 | 1 | -8/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #861 from worktycho/simulator | Alexander Harkness | 2014-04-07 | 2 | -2/+65 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Added support for redstone latching | ||||
| | * | | | | | | | | | Added support for redstone latching | Tycho | 2014-04-06 | 2 | -2/+65 |
| | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | fixes #856 | ||||
| * | | | | | | | | | Fixed HTTP chunked encoding. | madmaxoft | 2014-04-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #858. | ||||
| * | | | | | | | | | Added the generated ZBS API file to ignore list. | madmaxoft | 2014-04-06 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed 1.6.4 client crash on composite chat messages. | madmaxoft | 2014-04-06 | 2 | -0/+14 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed crash in protocols sending 64-bit ints. | madmaxoft | 2014-04-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #855. | ||||
| * | | | | | | | | | Updated the tolua executable for Windows. | madmaxoft | 2014-04-06 | 1 | -0/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge remote-tracking branch 'worktycho/override' | madmaxoft | 2014-04-06 | 7 | -1325/+1648 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| | * | | | | | | | | Added forgoten lua file | Tycho | 2014-04-06 | 1 | -0/+1476 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into override | Tycho | 2014-04-05 | 200 | -1373/+6707 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/tolua++/CMakeLists.txt | ||||
| | * | | | | | | | | Fixed tolua++ override support | Tycho | 2014-04-02 | 5 | -1319/+164 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Added override specifier to functions declared in cWorld | Tycho | 2014-03-22 | 1 | -8/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | FIrst attempt at adding override support to tolua | Tycho | 2014-03-22 | 1 | -5/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Updated cWorld::CreateProjectile() documentation | Tiger Wang | 2014-04-06 | 1 | -1/+1 |
| | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | | Fixed Endiannes conversion routines for floats and doubles. | madmaxoft | 2014-04-05 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug has been introduced in 8825d30aabbee8cb2e452dc5a17deb6f9b6892a7. This change fixes #854. | ||||
| * | | | | | | | | Fixed double projectile spawning. | madmaxoft | 2014-04-05 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two spawn packets were sent per projectile. | ||||
| * | | | | | | | | Removed debugging log from entity physics handling. | madmaxoft | 2014-04-05 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Added more API documentation to cCompositeChat. | madmaxoft | 2014-04-05 | 1 | -1/+17 |
| | | | | | | | | | |||||
| * | | | | | | | | Added cPlayer:SendRotation() API function. | madmaxoft | 2014-04-05 | 2 | -0/+17 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #840 from Howaner/NewBlocks | Mattes D | 2014-04-04 | 3 | -5/+152 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add tall flower handler. | ||||
| | * | | | | | | | | Change CanBeAt() from big flower | Howaner | 2014-04-03 | 1 | -5/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add "a_RelY < cChunkDef::Height" to BlockBigFlower | Howaner | 2014-03-29 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add tallgrass drop to big flowers. | Howaner | 2014-03-28 | 2 | -8/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tallgrass drop, when a players break a tallgrass with the shear. | ||||
| | * | | | | | | | | door -> flower | Howaner | 2014-03-28 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add tall flower handler. | Howaner | 2014-03-28 | 2 | -0/+99 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into HTTPSizeT | madmaxoft | 2014-04-04 | 39 | -581/+359 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Explicit change record size. | madmaxoft | 2014-04-04 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Changed cNoise seed to signed. | madmaxoft | 2014-04-04 | 2 | -4/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed format string mismatch. | madmaxoft | 2014-04-04 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | More Clang warning fixes in the protocols. | madmaxoft | 2014-04-04 | 6 | -81/+82 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed CreateHexDump's format string. | madmaxoft | 2014-04-04 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed CreateHexDump's signedness. | madmaxoft | 2014-04-04 | 3 | -11/+11 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | More Clang warning fixes in the protocols. | madmaxoft | 2014-04-04 | 3 | -30/+39 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed silly Clang's warnings in FastNBT. | madmaxoft | 2014-04-04 | 1 | -28/+28 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed some Clang warnings in protocols. | madmaxoft | 2014-04-04 | 13 | -43/+51 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed Clang warnings in itemhandlers. | madmaxoft | 2014-04-04 | 6 | -20/+21 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | ProtoProxy: Fixed a few Clang and MSVC warnings. | madmaxoft | 2014-04-04 | 2 | -4/+8 |
| | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | | APIDump: Added angular specifics. | madmaxoft | 2014-04-03 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Documented the units and range for entity rotations. | madmaxoft | 2014-04-03 | 2 | -10/+10 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Removed unneeded asserts. | madmaxoft | 2014-04-03 | 1 | -2/+0 |
| | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | | Fixed a few MSVC type warnings. | Mattes D | 2014-04-03 | 3 | -2/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | Removed the bindings to set old g_BlockXXX arrays. | Mattes D | 2014-04-03 | 1 | -297/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those were supposed to be read-only; there's no point in writing to them anyway. Also fixed MSVC type warnings in the code. | ||||
| | * | | | | | | | Merge pull request #849 from mc-server/minorfixes | Mattes D | 2014-04-02 | 6 | -48/+34 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Minor fixes | ||||
| | | * | | | | | | | With eXtra line! | Tiger Wang | 2014-04-02 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Removed extra brackets | Tiger Wang | 2014-04-02 | 1 | -5/+2 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Final realisation of suggestions | Tiger Wang | 2014-03-31 | 1 | -5/+7 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Realised suggestions | Tiger Wang | 2014-03-31 | 2 | -6/+12 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Simplified and fixed slabs, fixes #835 | Tiger Wang | 2014-03-31 | 3 | -36/+13 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fixed a few Y too high/low asserts | Tiger Wang | 2014-03-31 | 3 | -12/+15 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into HTTPSizeT | Tycho | 2014-04-02 | 24 | -30/+45 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/HTTPServer/EnvelopeParser.h src/HTTPServer/HTTPFormParser.h src/HTTPServer/MultipartParser.h | ||||
| | * | | | | | | | | Fixed boat placement code. | madmaxoft | 2014-04-02 | 1 | -9/+17 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Fixed more virtual destructors for interfaces. | madmaxoft | 2014-04-02 | 4 | -0/+12 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'MacFixes' | Tycho | 2014-04-02 | 19 | -19/+21 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/DeadlockDetect.cpp src/World.cpp | ||||
| | | * | | | | | | | | 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. | Samuel Barney | 2014-03-25 | 16 | -15/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also had to undefine TOLUA_TEMPLATE_BIND a couple of times. | ||||
| | | * | | | | | | | | Added one more missing newline. | Samuel Barney | 2014-03-25 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Added newlines. Without them, the files would not compile. | Samuel Barney | 2014-03-25 | 4 | -4/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into HTTPSizeT | Tycho | 2014-04-02 | 14 | -18/+375 |
| |\| | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into globals | Tycho | 2014-04-02 | 178 | -4454/+11512 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge pull request #831 from mc-server/Wither | Mattes D | 2014-04-02 | 5 | -3/+153 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Wither | ||||
| | | | * | | | | | | | | | Fixed clang compilation | andrew | 2014-03-25 | 2 | -14/+17 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Fixed wither summoning | andrew | 2014-03-25 | 3 | -3/+37 |
| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | Protocol: Wither metadata | andrew | 2014-03-25 | 5 | -3/+116 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Debuggers: Added a Base64 API roundtrip test. | madmaxoft | 2014-04-02 | 1 | -4/+23 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Added schematic string serializer self-test. | madmaxoft | 2014-04-02 | 1 | -0/+33 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Fixed StringCompression's GZIP handling for larger strings. | madmaxoft | 2014-04-02 | 2 | -5/+7 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Exported the Base64 encoding and decoding functions to Lua API. | madmaxoft | 2014-04-01 | 2 | -2/+48 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Merged branch 'msDifference'. | madmaxoft | 2014-04-01 | 3 | -1/+52 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | APIDump: Gave msDifference it's own table. | STRWarrior | 2014-04-01 | 1 | -9/+21 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | Added extra table which should make it more clear what msDifference does. | STRWarrior | 2014-03-31 | 1 | -1/+3 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | Fixed typo | STRWarrior | 2014-03-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | Documented msDifference | STRWarrior | 2014-03-31 | 1 | -6/+8 |
| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | Added new merge strategy "msDifference" | STRWarrior | 2014-03-31 | 2 | -0/+35 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | cBlockArea: Added the msMask merge strategy. | madmaxoft | 2014-04-01 | 3 | -3/+59 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'master' into globals | Tycho | 2014-03-15 | 11 | -40/+146 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into globals | Tycho | 2014-03-14 | 4 | -11/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake | ||||
| | * | | | | | | | | | | | | | | Disable global constructors and exit-time destructors warnings | Tycho | 2014-03-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed All signedness warnings in HTTPServer.cpp | Tycho | 2014-04-02 | 10 | -14/+17 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed format string in HTTPConnection | Tycho | 2014-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed Comparison to -1 in HTTPMessage.h | Tycho | 2014-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Rewritten HTTPServer to use size_t for data lengths. | madmaxoft | 2014-04-01 | 16 | -90/+97 |
| | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Removed the exit-time-destructors flag from clang. | madmaxoft | 2014-04-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't care about exit-time destructors, at least for now. | ||||
| * | | | | | | | | | | | | | | More cFile warning fixes. | madmaxoft | 2014-04-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'RemoveClangFlags' | madmaxoft | 2014-04-01 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Attempt at disabling the useless clang warnings. | madmaxoft | 2014-04-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #846, #847 | ||||
| * | | | | | | | | | | | | | | | Fixed clang warnings in cGZipFile. | madmaxoft | 2014-04-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed clang warnings in BlockHandlers. | madmaxoft | 2014-04-01 | 4 | -5/+6 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed clang warnings in cFile. | madmaxoft | 2014-04-01 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only support 32-bit filesizes (files < 2 GiB). | ||||
| * | | | | | | | | | | | | | | | Simplified the anvil placement code. | madmaxoft | 2014-04-01 | 1 | -11/+9 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Removed an unneeded code branch. | madmaxoft | 2014-04-01 | 1 | -5/+0 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | LOG() API reads the LogLevel from the cCompositeChat's MessageType. | madmaxoft | 2014-04-01 | 6 | -24/+81 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | APIDump: Documented the cCompositeChat support in logging functions. | madmaxoft | 2014-03-31 | 1 | -5/+25 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Console logging supports cCompositeChat as its parameters. | madmaxoft | 2014-03-31 | 5 | -34/+78 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | APIDump: Added code completion support file to ZBS tutorial. | madmaxoft | 2014-03-31 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | APIDump: Renamed the ZBS API dump file to mcserver_api.lua. | madmaxoft | 2014-03-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to avoid confusion with ZBS, where two "mcserver.lua" files were present. | ||||
| * | | | | | | | | | | | | | | cCompositeChat has a MessageType param in the constructor. | madmaxoft | 2014-03-31 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make it easier to use. | ||||
| * | | | | | | | | | | | | | | Fixed a few Clang warnings in BlockHandlers. | madmaxoft | 2014-03-30 | 11 | -48/+54 |
| | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed a few clang warnings. | madmaxoft | 2014-03-30 | 4 | -7/+13 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'NetherFortGen'. | madmaxoft | 2014-03-30 | 12 | -26/+3248 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added all current NetherFort prefabs. | madmaxoft | 2014-03-30 | 1 | -3/+1547 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added asserts for critical data in cPrefab. | madmaxoft | 2014-03-30 | 1 | -0/+4 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Re-fixed nether fort piece count check. | madmaxoft | 2014-03-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed chest rotator. | madmaxoft | 2014-03-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | NetherForts have a minimum number of pieces. | madmaxoft | 2014-03-30 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fort will generate a different image if it has less than the minimum; the max depth affects the minimum number of pieces. | ||||
| | * | | | | | | | | | | | | Merge branch 'master' into NetherFortGen | madmaxoft | 2014-03-29 | 17 | -27/+285 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | NetherFortGen: Added several more prefabs. | madmaxoft | 2014-03-28 | 2 | -2/+783 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also extended the defauls MaxDepth value to 12. | ||||
| | * | | | | | | | | | | | | | Added Prefabs to *nix builds. | madmaxoft | 2014-03-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'master' into NetherFortGen | madmaxoft | 2014-03-28 | 11 | -37/+61 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Implemented the msSpongePrint merge strategy. | madmaxoft | 2014-03-28 | 4 | -13/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to msImprint, but allows prefabs to carve out air pockets, too. The sponge block is used as the NOP block. | ||||
| | * | | | | | | | | | | | | | | NetherFort: Added BalconyTee2 prefab. | madmaxoft | 2014-03-28 | 1 | -29/+158 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed a memory leak in NetherFortGen. | madmaxoft | 2014-03-28 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Sponged the netherfort balcony prefab. | madmaxoft | 2014-03-28 | 1 | -30/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a preparation for the msSpongePrint merge strategy, used for imprinting most prefabs. It will carve out even air, but will ignore sponge blocks. | ||||
| | * | | | | | | | | | | | | | | Merge branch 'master' into NetherFortGen | madmaxoft | 2014-03-28 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Initial NetherFortGen import. | madmaxoft | 2014-03-28 | 8 | -15/+713 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple fortresses of 2 different rooms will generate. | ||||
| * | | | | | | | | | | | | | | | APIDump: Added article: Setting up ZeroBrane Studio. | madmaxoft | 2014-03-30 | 4 | -0/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #824. | ||||
| * | | | | | | | | | | | | | | | Merge pull request #845 from mc-server/License | Alexander Harkness | 2014-03-30 | 1 | -1/+196 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | License | ||||
| | * | | | | | | | | | | | | | | | Apache license | andrew | 2014-03-30 | 1 | -1/+196 |
| |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge pull request #834 from narroo/issue503 | Mattes D | 2014-03-30 | 23 | -121/+372 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue503 pull Request | ||||
| | * | | | | | | | | | | | | | | | Added in MetaMirrorXY and MetaMirrorYZ to cBlockSignHandler. | narroo | 2014-03-29 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Altered the rotates for cBlockSignHandler. The functions as a whole is still unfinished though; no wall sign or mirroring support yet. | narroo | 2014-03-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed Minor typos. | narroo | 2014-03-26 | 3 | -9/+12 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added a comment about the behavior of doors under mirros. Simply put, the current implementation of MetaMirror causes glitchy behavior. The door class itself needs to be edited. (I've got an idea on that....) | narroo | 2014-03-25 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed spelling; Rotater to Rotator. | narroo | 2014-03-25 | 15 | -46/+46 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Changed Rotater to Rotator. Added partial sign post rotation support. | narroo | 2014-03-25 | 2 | -0/+12 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added MetaRotate/Mirror Support for a number of classes. | narroo | 2014-03-24 | 12 | -84/+295 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge pull request #838 from mc-server/lilypads | worktycho | 2014-03-30 | 10 | -13/+162 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | Lilypads | ||||
| | * | | | | | | | | | | | | | | | Another curly | Tiger Wang | 2014-03-30 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Compare for inequality in FACE_NONE checks | Tiger Wang | 2014-03-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Removed leftover clienthandle code | Tiger Wang | 2014-03-29 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Curly brackets | Tiger Wang | 2014-03-29 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed infinite minecart items | Tiger Wang | 2014-03-28 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed block interaction rate check | Tiger Wang | 2014-03-28 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed a potential crash | Tiger Wang | 2014-03-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Some fixes to lilypads | Tiger Wang | 2014-03-28 | 5 | -62/+116 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed placement on lava * Fixed placement on side of blocks * Fixed placement through blocks + Added washing-away of pads + Added ice as a block that fully occupies its voxel | ||||
| | * | | | | | | | | | | | | | | | Implemented lilypad placement | Tiger Wang | 2014-03-23 | 4 | -8/+98 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | cPrefab now uses a struct for block type definition in CharMap. | madmaxoft | 2014-03-29 | 2 | -10/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by worktycho in 7b585290fccd3dc074b1f9feef0af754ab3dd632, instead of packing the two values into a single int, they're packed into a struct. Also added a test code for the prefab parsing in SELF_TEST. | ||||
| * | | | | | | | | | | | | | | | | Merge pull request #842 from mc-server/ProjectileHooks | Mattes D | 2014-03-29 | 10 | -1/+167 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | Projectile hooks | ||||
| | * | | | | | | | | | | | | | | | Fixed the OnProjectileHitBlock hook not stopping projectiles. | STRWarrior | 2014-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Documented both hooks. | STRWarrior | 2014-03-29 | 2 | -0/+49 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added HOOK_PROJECTILE_HIT_BLOCK. | STRWarrior | 2014-03-29 | 6 | -0/+50 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed error when the hook gets called. | STRWarrior | 2014-03-29 | 3 | -1/+14 |
| | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Added HOOK_PROJECTILE_HIT_ENTITY | STRWarrior | 2014-03-29 | 6 | -0/+54 |
| | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Renamed lua dll for tolua++.exe. | madmaxoft | 2014-03-29 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #843. | ||||
| * | | | | | | | | | | | | | | | Updated the android files | STRWarrior | 2014-03-29 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed players not updating after world change | Tiger Wang | 2014-03-29 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addendum to 6dea7993f2a563a8b3a0746feeb2174922631526 | ||||
| * | | | | | | | | | | | | | | | Fixed #721 and FS439 | Tiger Wang | 2014-03-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Fixed a minor ini key duplication bug | Tiger Wang | 2014-03-29 | 1 | -0/+1 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | / / / / / / / / / / | Fixed non-virtual destructors warnings. | madmaxoft | 2014-03-28 | 11 | -37/+61 |
| | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed compilation after last PR merge. | madmaxoft | 2014-03-28 | 1 | -1/+1 |
| | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'howaner/GlobalFixes'. | madmaxoft | 2014-03-28 | 14 | -6/+132 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Add missing ChunkDesc import. | Howaner | 2014-03-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fix merge conflicts | Howaner | 2014-03-27 | 1 | -7/+0 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Change documentation text | Howaner | 2014-03-27 | 2 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Change SpreadSource documentation | Howaner | 2014-03-27 | 2 | -6/+6 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Change SpreadSource prefix to ss | Howaner | 2014-03-27 | 4 | -8/+8 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Wrong if in BlockLeaves | Howaner | 2014-03-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Add documentation for new Block spread | Howaner | 2014-03-27 | 2 | -0/+49 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Add SpreadSource | Howaner | 2014-03-27 | 11 | -10/+34 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Add HOOK_BLOCK_SPREAD | Howaner | 2014-03-27 | 6 | -3/+57 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Add new leaves to all classes. | Howaner | 2014-03-27 | 2 | -1/+8 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed Prefab's rotations. | madmaxoft | 2014-03-28 | 2 | -7/+39 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Debuggers: Deactivated the chunk generator callback. | madmaxoft | 2014-03-28 | 1 | -1/+3 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | cPrefab can draw itself into a cChunkDesc. | madmaxoft | 2014-03-27 | 2 | -6/+9 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed chunk neighbor-getting for long distances. | madmaxoft | 2014-03-27 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a server hang when teleporting to coords too far away. | ||||
| * | | | | | | | | | | | | Prefabs support connectors, rotations and merge strategy. | madmaxoft | 2014-03-26 | 2 | -3/+72 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Ignoring the default GalExports folder. | madmaxoft | 2014-03-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Removed unused constants. | madmaxoft | 2014-03-25 | 2 | -7/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now. | ||||
| * | | | | | | | | | | | | Added a basic cPrefab class. | madmaxoft | 2014-03-25 | 2 | -0/+222 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be defined in the source by GalExport's cpp output. | ||||
| * | | | | | | | | | | | | BlockArea: Create() can take the size as Vector3i, too. | madmaxoft | 2014-03-25 | 2 | -2/+17 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | BlockArea: Switched internal coords to Vector3i. | madmaxoft | 2014-03-25 | 4 | -200/+176 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added Vector3::Move(const Vector3 &). | madmaxoft | 2014-03-25 | 1 | -0/+7 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | InfoReg updated for multi-verb console commands. | madmaxoft | 2014-03-25 | 1 | -12/+39 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #833 from mc-server/EnderCrystal | Mattes D | 2014-03-25 | 7 | -11/+137 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | Ender crystals | ||||
| | * | | | | | | | | | | | Ender crystals | andrew | 2014-03-25 | 7 | -11/+137 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #828 from mc-server/Wither | Mattes D | 2014-03-25 | 9 | -15/+109 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | Wither invulnerability | ||||
| | * | | | | | | | | | | | Minor fixes | andrew | 2014-03-25 | 3 | -14/+13 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Wither invulnerability | andrew | 2014-03-24 | 8 | -5/+100 |
| | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #829 from Howaner/Cake | Mattes D | 2014-03-24 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | Add log pickups. | ||||
| | * | | | | | | | | | | Add log pickups. | Howaner | 2014-03-24 | 1 | -1/+7 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed bad cmake document interpretation | Tiger Wang | 2014-03-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs say: "If nothing is found, the result will be <VAR>-NOTFOUND" | ||||
| * | | | | | | | | | | | Updated the ToLua windows executable. | madmaxoft | 2014-03-23 | 1 | -0/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #826 from worktycho/xxd_check | Mattes D | 2014-03-23 | 1 | -6/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | Added better check for xxd existance | ||||
| | * | | | | | | | | | | Added Additonal check for xxd existance | Tycho | 2014-03-22 | 1 | -6/+9 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #810 from worktycho/size_t_lua | Mattes D | 2014-03-22 | 2 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | gave tolua awareness of size_t | ||||
| | * | | | | | | | | | | Merge branch 'master' into size_t_lua | Tycho | 2014-03-22 | 75 | -3909/+5072 |
| | |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/tolua++/src/bin/basic_lua.h | ||||
| * | | | | | | | | | | | Implemented faster upscaling using templates. | madmaxoft | 2014-03-21 | 6 | -36/+38 |
| | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #819. | ||||
| * | | | | | | | | | | Updated the tolua++ executable for Win builds. | madmaxoft | 2014-03-20 | 1 | -0/+0 |
| | | | | | | | | | | | |||||
 |
index : anonymous/cuberite | |
| A lightweight, fast and extensible game server for Minecraft | mirror |
| summaryrefslogtreecommitdiffstats |