Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | RankMgr: Initial migration code. | madmaxoft | 2014-08-13 | 3 | -1/+568 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into Ranks | madmaxoft | 2014-08-12 | 14 | -81/+175 |
|\ | |||||
| * | 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 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
| * | | | 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 |
| |/ | |||||
* | | Fixed unchecked return values. | madmaxoft | 2014-08-11 | 1 | -3/+6 |
| | | |||||
* | | 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 | 11 | -26/+124 |
|\| | |||||
| * | 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 |
| | | | |||||
| * | | Made lua clamp() compatible with all number types. | Howaner | 2014-08-05 | 1 | -4/+4 |
| | | | |||||
| * | | Added api documentation for Clamp() | Howaner | 2014-08-05 | 1 | -2/+2 |
| | | | |||||
| * | | 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 |
| | | |||||
* | | 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 |
|/ | |||||
* | 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 |
| | | |||||
* | | 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 |
|/ | |||||
* | 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 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. | ||||
* | cMojangAPI: Added UUID-to-Name lookup. | madmaxoft | 2014-08-03 | 5 | -62/+522 |
| | | | | 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 | 2 | -0/+35 |
| | | | | This is a simpler way to ask for a single name -> uuid conversion. | ||||
* | 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 |
| | |||||
* | 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 | 3 | -20/+56 |
| | |||||
* | Merge pull request #1255 from mc-server/NameToUUID | Mattes D | 2014-08-01 | 15 | -156/+716 |
|\ | | | | | Name to UUID | ||||
| * | Merged branch 'master' into NameToUUID. | madmaxoft | 2014-07-31 | 67 | -441/+1537 |
| |\ | |||||
| * | | 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 | 3 | -9/+23 |
| | | | |||||
| * | | MojangAPI: Renamed cache file to MojangAPI.sqlite. | madmaxoft | 2014-07-30 | 1 | -2/+2 |
| | | | |||||
| * | | MojangAPI: Clarified the UUID conversion code. | madmaxoft | 2014-07-30 | 2 | -4/+17 |
| | | | |||||
| * | | ManualBindings: Fixed alignment. | madmaxoft | 2014-07-30 | 1 | -3/+3 |
| | | | |||||
| * | | MojangAPI: Implemented UUID shortening and dashing. | madmaxoft | 2014-07-30 | 5 | -22/+40 |
| | | | |||||
| * | | Exported cMojangAPI to Lua. | madmaxoft | 2014-07-30 | 4 | -5/+20 |
| | | | |||||
| * | | 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. | ||||
| * | | Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API. | madmaxoft | 2014-07-28 | 1 | -3/+62 |
| | | | |||||
| * | | cAuthenticator: Added GetUUIDsFromPlayerNames(). | madmaxoft | 2014-07-28 | 2 | -3/+116 |
| | | | |||||
* | | | 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 | 26 | -37/+864 |
|\ \ \ | | | | | | | | | Added beacon. | ||||
| * | | | Use "default:" in switch. | Howaner | 2014-07-31 | 1 | -3/+6 |
| | | | | |||||
| * | | | Renamed "select..." methods to "set..." and better IsValidEffect() function. | Howaner | 2014-07-31 | 4 | -55/+19 |
| | | | | |||||
| * | | | Updated documentation. | Howaner | 2014-07-31 | 1 | -3/+3 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
* | | | | 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. | ||||
* | | | | 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 | 2 | -6/+6 |
| | | | | |||||
* | | | | 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 |
| | | | | | |||||
* | | | | | 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 | 39 | -236/+643 |
|\ \ \ \ | | | | | | | | | | | Portals and others | ||||
| * | | | | Detrailed whitespace | Tiger Wang | 2014-07-29 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Merge branch 'master' into portals | Tiger Wang | 2014-07-29 | 120 | -687/+1739 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 177 | -1495/+2517 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp | ||||
| * | | | | | | Suggestions | Tiger Wang | 2014-07-21 | 9 | -126/+160 |
| | | | | | | | |||||
| * | | | | | | 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 | 357 | -4210/+7212 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 17 | -98/+290 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Conforms to standards | Tiger Wang | 2014-06-22 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-21 | 96 | -3442/+5529 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -7/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 11 | -404/+445 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 19 | -117/+174 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into portals | Tiger Wang | 2014-06-10 | 54 | -269/+2529 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 9 | -54/+175 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed Time of day | worktycho | 2014-06-07 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Suggestions | Tiger Wang | 2014-06-05 | 5 | -14/+14 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 | 82 | -1005/+21372 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | 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 | 105 | -654/+942 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | 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 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Change comment. | Howaner | 2014-07-26 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'master' into Inventory | Howaner | 2014-07-26 | 248 | -1994/+3192 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Endianness.h: undefined ntohll before redefining | archshift | 2014-07-26 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 | 82 | -221/+462 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Removed redundant semicolons and re-added warning | archshift | 2014-07-24 | 73 | -103/+103 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | 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) | ||||
| * | | | | | | | | | | | 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 remote-tracking branch 'origin/master' into saplingsandleaves | Tiger Wang | 2014-07-22 | 110 | -937/+1093 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 339 | -2329/+3457 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | 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 | 4 | -0/+59 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Clarified RemoveItem()'s comments. | madmaxoft | 2014-07-18 | 2 | -2/+4 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Added RemoveItem() function to the player inventory. | Howaner | 2014-07-18 | 4 | -0/+57 |
| | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | 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 | 7 | -35/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1203 * Fixes #627 | ||||
| | * | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | 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 |
| | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 |
| | | | | | | | | | | |||||
* | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | 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 | 69 | -425/+679 |
|\| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | 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 | 5 | -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 | ||||
| * | | | | | | | | | | | | | | Adjusted calls to CreateProjectile that passed Items | Tycho | 2014-07-13 | 1 | -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 | 7 | -16/+81 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | 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 | 98 | -1538/+2247 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | 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 | 12 | -161/+371 |
|\| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Implemented support for forced chunk ticking. | madmaxoft | 2014-07-10 | 6 | -8/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1160. | ||||
| * | | | | | | | | | | | | | 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 | 135 | -4674/+6956 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | 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 | 2 | -30/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Moved sending error messages to cPluginManager:CallHookChat | STRWarrior | 2014-07-04 | 1 | -4/+6 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed doxycomments | STRWarrior | 2014-06-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | (Force)ExecuteCommand returns the CommandResult enums | STRWarrior | 2014-06-18 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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 | 139 | -1776/+24668 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | | | | | | | | | | 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 | 8 | -30/+69 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1139 from Howaner/Hooks | Mattes D | 2014-07-02 | 7 | -28/+67 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hook HOOK_PLAYER_FOOD_LEVEL_CHANGE | ||||
| | | * | | | | | | | | | | | | | | | | Removed foodlevel-change possibility. Plugins can cancel the event and use cPlayer:SetFoodLevel() | Howaner | 2014-07-02 | 5 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | Fixes. | Howaner | 2014-06-30 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fixed linking order under MinGW. | Mattes D | 2014-07-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1044 | ||||
| * | | | | | | | | | | | | | | | | Fixed size_t printfing under MinGW. | Mattes D | 2014-06-30 | 1 | -3/+18 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fixed cFile compilation under MinGW. | madmaxoft | 2014-06-30 | 1 | -0/+3 |
| |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | | | | | | | | | | 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 | 3 | -24/+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 | 3 | -19/+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. | ||||
| * | | | | | | | | | | | | | 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 | 78 | -3424/+5240 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | 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. | ||||
| * / | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | | | | | | | | | | 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 | 3 | -4/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | 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 | 2 | -2/+38 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #771 | ||||
| * | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | | | | | | | | | 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 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. | ||||
| * | | | | | | | | | | | | | | Optimized Voronoi calculation. | madmaxoft | 2014-06-20 | 4 | -21/+81 |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #818. | ||||
| * | | | | | | | | | | | | | 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 | 30 | -455/+819 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 149 | -1814/+25012 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | 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 | 7 | -10/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | 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 | 30 | -455/+820 |
| |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Fix a few warnings | Tycho | 2014-06-16 | 1 | -3/+3 |
| |_|/ / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | 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 |
| | | | | | | | | |||||
* | | | | | | | | 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 |
|/ / / / / / / | |||||
* | | | | | | | 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 | 1 | -3/+31 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add biome-aware downfall functions. | ||||
| * | | | | | | | Fixed constness | worktycho | 2014-06-11 | 1 | -5/+5 |
| | | | | | | | | |||||
| * | | | | | | | 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 |
| | | | | | | | | |||||
| * | | | | | | | 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 #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 |
| |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | 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. | ||||
* | | | | | | | | Removed assert that is now informed by type system | worktycho | 2014-06-11 | 1 | -1/+0 |
| | | | | | | | | |||||
* | | | | | | | | 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 |
| |/ / / / / / | |||||
* | | | | | | | ToLua can now be run in pure-lua mode. | madmaxoft | 2014-06-09 | 1 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | See the src/Bindings/AllToLua_lua.bat for usage example. | ||||
* | | | | | | | 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. | ||||
* | | | | | | | Proper fix for long interaction. | madmaxoft | 2014-06-08 | 1 | -7/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1078 and #1038. | ||||
* | | | | | | | docs/Generator: Added the easy Finishers. | madmaxoft | 2014-06-07 | 1 | -1/+13 |
| | | | | | | | |||||
* | | | | | | | 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. | ||||
* | | | | | | | 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 | ||||
* | | | | | | | 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 | 3 | -3/+16 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixed some warnings | ||||
| * | | | | | | | Update IncrementalRedstoneSimulator.cpp | Julian Laubstein | 2014-06-04 | 1 | -8/+8 |
| | | | | | | | | |||||
| * | | | | | | | 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 | 1 | -2/+12 |
| | | | | | | | | |||||
* | | | | | | | | Fix itemframe break. | Howaner | 2014-06-04 | 1 | -1/+3 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | 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 |
| | | | | | | | |||||
* | | | | | | | 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 |
| | | | | | | | |||||
* | | | | | | | 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. | ||||
* | | | | | | | | 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 | ||||
* | | | | | | | | | 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 | ||||
* | | | | | | | | | 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 | 2 | -1/+34 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | 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 | 11 | -64/+140 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| * | | | | | | | | | 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 | 10 | -17/+160 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 54 | -323/+1559 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | 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 | 24 | -449/+1072 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | Chunksparsing with segments | ||||
| * | | | | | | | | | | | 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 | 1 | -9/+9 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 | 1 | -2/+18 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed sign comparison. | madmaxoft | 2014-05-30 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 | 2 | -42/+36 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed Wrong types in nibble sizeofs | worktycho | 2014-05-29 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed test globals to work with precompiled headers | Tycho | 2014-05-27 | 2 | -16/+36 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | inject TestGlobals.h correctly | Tycho | 2014-05-24 | 1 | -3/+7 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Moved accessors to cpp file | Tycho | 2014-05-24 | 2 | -216/+241 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Implemented style changes | Tycho | 2014-05-24 | 6 | -92/+95 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-24 | 70 | -1163/+2294 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | 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 | 9 | -67/+67 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed minor style issues | Tycho | 2014-05-21 | 3 | -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 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | fixed assignment bugs and Skylight bug | Tycho | 2014-05-17 | 1 | -3/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix assignment ops 2 | worktycho | 2014-05-17 | 1 | -3/+8 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fix assignment operators | worktycho | 2014-05-17 | 1 | -10/+14 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added several more testsfor arrays and coordinates | Tycho | 2014-05-11 | 1 | -4/+16 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed bug that caused Array Setters to always create segments | Tycho | 2014-05-11 | 1 | -4/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | SkyLight defaults to 0xFF | Tycho | 2014-05-11 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed a bug in writting zeros to a non-allocated section | Tycho | 2014-05-11 | 2 | -0/+23 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed stupid error | Tycho | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 2 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fixed stupid buffer overflow in array setblocks | Tycho | 2014-05-10 | 2 | -5/+5 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed bug in setting metas | Tycho | 2014-05-10 | 2 | -19/+7 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-10 | 102 | -936/+1998 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.h | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-03 | 33 | -81/+138 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp | ||||
| * | | | | | | | | | | | | | | cCHunkBuffer that compiles with TestGlobals.h | Tycho | 2014-05-03 | 4 | -1/+13 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structs | Tycho | 2014-05-01 | 120 | -2375/+3985 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | 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 | 166 | -3545/+9240 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Fixed a memory leak in cPrefabPiecePool. | madmaxoft | 2014-05-28 | 2 | -1/+34 |
| |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pool pieces weren't freed upon pool destruction. | ||||
* | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | | | | | | | | | | Revert "Add more move checks" | madmaxoft | 2014-05-26 | 2 | -59/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 989312c4e7f517ae324e857cb255211e3fd8bb06. | ||||
* | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | A fix that is better than #950. | Alexander Harkness | 2014-05-25 | 1 | -5/+15 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'master' into achievementtranslate | Tiger Wang | 2014-05-25 | 10 | -18/+142 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp | ||||
| * | | | | | | | | | | | | | | | 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 |
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | 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 |
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | 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 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | 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 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | 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 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | 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 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | 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 branch 'master' into SslWebAdmin | Mattes D | 2014-05-10 | 125 | -1826/+2692 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | 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 | 84 | -344/+1148 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Fixed MSVC 64-bit build warnings. | Mattes D | 2014-05-08 | 46 | -156/+173 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | 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 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 | 46 | -156/+173 |
| |/ / / / / / / / / | |||||
| * | / / / / / / / | 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 | 10 | -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 | 242 | -5938/+14161 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Remove old import | Howaner | 2014-04-06 | 2 | -3/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' into Slabs | Howaner | 2014-04-06 | 53 | -328/+514 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Add CanChangeDirtToGrass function to Block Handlers. | Howaner | 2014-04-06 | 9 | -4/+45 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into Slabs | Howaner | 2014-04-03 | 292 | -3468/+12905 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | 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 | 19 | -506/+704 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 162 | -2490/+4545 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | 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 | 72 | -527/+2943 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed 027efe09ea3d3222c3cbf169643e57773c1614ae | Tiger Wang | 2014-05-04 | 1 | -3/+49 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'master' into redstoneimprovements | Tiger Wang | 2014-05-04 | 133 | -2294/+3963 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| | * | | | | | | | | | | | | | 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. | ||||
| | * | | | | | | | | | | | | 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. | ||||
| | * | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | 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 | ||||
* | | | | | | | | | | | | | Client cert is not requested. | Mattes D | 2014-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | 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 | 3 | -1/+12 |
|\| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Implemented SSL connection for WebAdmin. | madmaxoft | 2014-05-01 | 4 | -2/+191 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 38 | -857/+2089 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 13 | -422/+465 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Moved cPublicKey to its separate file in PolarSSL++. | madmaxoft | 2014-04-29 | 6 | -109/+124 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into SslWrappers | madmaxoft | 2014-04-29 | 3 | -12/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Added BiomeToString() API function. | madmaxoft | 2014-04-29 | 2 | -81/+106 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | 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 | 106 | -1343/+2177 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | 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 | 1 | -7/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | 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 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | 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 | 138 | -955/+5608 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | 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 #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 | 12 | -23/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/mc-server/MCServer | r.ramazanov | 2014-04-24 | 3 | -8/+31 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/mc-server/MCServer | r.ramazanov | 2014-04-23 | 56 | -521/+1252 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | | | | | | | | | | | | | | Missed these CMakeLists. | archshift | 2014-04-25 | 2 | -1/+7 |
| |_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | 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 | 10 | -21/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | / / / / / / / / | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | 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 | 5 | -8/+8 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Added monsters.ini rule for fireproof mobs. | ||||
| * | | | | | | | | | | | | Renamed getter and setter for IsFireproof. | archshift | 2014-04-23 | 3 | -4/+4 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added IsFireproof hook for monsters.ini | archshift | 2014-04-23 | 1 | -0/+3 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | 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 | 2 | -3/+15 |
|\| | | | | | | | | | | | | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | Added flag for fireproof entities. | ||||
| * | | | | | | | | | | | Fixed indentation and changed m_Fireproof to m_IsFireproof. | archshift | 2014-04-22 | 2 | -14/+14 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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. | ||||
* | | | | | | | | | | | | 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 | 43 | -793/+2133 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | | | | | | | Fixed MSVC compilation. | madmaxoft | 2014-04-20 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed Code | daniel0916 | 2014-04-19 | 2 | -145/+148 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'master' into Enchanting | daniel0916 | 2014-04-19 | 7 | -2/+182 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | 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 | 27 | -424/+1496 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 | 17 | -330/+449 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes to redstone & general | ||||
| | * | | | | | | | | | | Compile fix? | Tiger Wang | 2014-04-17 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | 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 | 6 | -53/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 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 | 23 | -382/+661 |
|\| | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | 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. | ||||
| * | | | | | | | | | | | 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 | 11 | -2051/+3448 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | 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 | ||||
| * | | | | | | | | 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 |
| | |/ / / / / / / | |||||
| * | | | | | | | | 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. | ||||
| * | | | | | | | | 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 |
| | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | 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 | 435 | -8455/+29130 |
|\| | | | | | | | | |||||
| * | | | | | | | | 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. | ||||
| * | | | | | | | 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 branch 'master' into override | Tycho | 2014-04-05 | 180 | -1316/+6155 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/tolua++/CMakeLists.txt | ||||
| | * | | | | | | 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 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 | 36 | -574/+348 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | 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 |
| | | | |/ / / / / | | | |/| | | | | | |||||
| | | * | | | | | | Documented the units and range for entity rotations. | madmaxoft | 2014-04-03 | 1 | -7/+7 |
| | | | | | | | | | |||||
| | | * | | | | | | 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 | 23 | -29/+44 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 18 | -18/+20 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 15 | -14/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 12 | -10/+315 |
| | |\| | | | | | | | |||||
| | | * | | | | | | | 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 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | 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 | 2 | -0/+35 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Added new merge strategy "msDifference" | STRWarrior | 2014-03-31 | 2 | -0/+35 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | cBlockArea: Added the msMask merge strategy. | madmaxoft | 2014-04-01 | 2 | -0/+39 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | 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 |
| | |/ / / / / / / / / | |||||
| | * | | | | | | | | | More cFile warning fixes. | madmaxoft | 2014-04-01 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | 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 | 5 | -22/+79 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Console logging supports cCompositeChat as its parameters. | madmaxoft | 2014-03-31 | 4 | -34/+69 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | 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 | 11 | -22/+3228 |
| | |\| | | | | | | | |||||
| | | * | | | | | | | 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 | 14 | -15/+224 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | 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 | 3 | -9/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | | | | | | | | 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 | 8 | -1/+118 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | Projectile hooks | ||||
| | | * | | | | | | | | | | Fixed the OnProjectileHitBlock hook not stopping projectiles. | STRWarrior | 2014-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | 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. | ||||
| | * | | | | | | | | | | 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 | 12 | -6/+83 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Add missing ChunkDesc import. | Howaner | 2014-03-28 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fix merge conflicts | Howaner | 2014-03-27 | 1 | -7/+0 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Change SpreadSource prefix to ss | Howaner | 2014-03-27 | 4 | -8/+8 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Wrong if in BlockLeaves | Howaner | 2014-03-27 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | 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 |
| | |/ / / / / / / | |||||
| | * | | | | | | | 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 |
| | | | | | | | | | |||||
| | * | | | | | | | 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 |
| | | | | | | | | | |||||
| | * | | | | | | | 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 |
| | | | | | | | | |||||
| | * | | | | | | Updated the ToLua windows executable. | madmaxoft | 2014-03-23 | 1 | -0/+0 |
| | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Implemented faster upscaling using templates. | madmaxoft | 2014-03-21 | 6 | -36/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #819. | ||||
| * | | | | | | Added override specifier to functions declared in cWorld | Tycho | 2014-03-22 | 1 | -8/+8 |
| |/ / / / / | |||||
| * | | | | | Updated the tolua++ executable for Win builds. | madmaxoft | 2014-03-20 | 1 | -0/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'unreachable' | madmaxoft | 2014-03-20 | 7 | -5/+12 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Merge branch 'master' into unreachable | Tycho | 2014-03-19 | 4 | -14/+14 |
| | |\ \ \ \ | |||||
| | * | | | | | Added unreachable lines backit prtected by preprocessor guards | Tycho | 2014-03-19 | 2 | -0/+10 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into unreachable | Tycho | 2014-03-17 | 37 | -215/+827 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Fixed unessicary return | Tycho | 2014-03-15 | 1 | -1/+0 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into unreachable | Tycho | 2014-03-15 | 6 | -3/+29 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake | ||||
| | * | | | | | | | Patched tolua to emit range checks for enums | Tycho | 2014-03-15 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into unreachable | Tycho | 2014-03-14 | 3 | -10/+2 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake | ||||
| | * | | | | | | | | Fixed a few unneeded breaks | Tycho | 2014-03-14 | 3 | -3/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Removed missiterperatable malfunctioning error handling code | Tycho | 2014-03-14 | 1 | -2/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Removed invalid block face handling code | Tycho | 2014-03-14 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code for handling invalid block faces is removed by gcc and clang as it is undefined behavior for a enum to contain a value that is not part of the enum. Since the only way that the line can be executed is through undefined behavior clang and gcc remove it so the function fits in the caches better. | ||||
| * | | | | | | | | | Plugins can set flying speed. | madmaxoft | 2014-03-20 | 3 | -77/+119 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Rewritten player speeds to be relative unit-less. | madmaxoft | 2014-03-20 | 4 | -12/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof. | ||||
| * | | | | | | | | | Fixed code style after recent merge. | madmaxoft | 2014-03-20 | 2 | -31/+33 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Made pushing plain pointer to Lua a valid operation, with a warning. | madmaxoft | 2014-03-20 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is used for exotic explosions, and the NORETURNDEBUG macro caused MSVC warnings across the entire cLuaState class (MSVC marked ALL Push() function overloads as non-returning) | ||||
| * | | | | | | | | | Merge pull request #790 from mc-server/awesometnt | Mattes D | 2014-03-20 | 9 | -217/+258 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | TNT Shrapnel | ||||
| | * | | | | | | | | | Added braces | Tiger Wang | 2014-03-20 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Minor Entity.cpp cleanup | Tiger Wang | 2014-03-20 | 1 | -12/+9 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | ENUMified shrapnel level | Tiger Wang | 2014-03-20 | 4 | -15/+17 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-18 | 120 | -1024/+3001 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkMap.cpp | ||||
| | * | | | | | | | | | | Added levels of shrapnel | Tiger Wang | 2014-03-18 | 3 | -8/+18 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into awesometnt | Tiger Wang | 2014-03-10 | 28 | -206/+743 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into awesometnt | Tiger Wang | 2014-03-10 | 80 | -595/+1990 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Shrapnel now configurable | Tiger Wang | 2014-03-10 | 3 | -3/+8 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Added extra awesomeness to TNT | Tiger Wang | 2014-03-05 | 7 | -209/+232 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + TNT now has a chance of flinging FallingBlock entities around * Improved TNT damage * Improved TNT spawning visuals * Possible fix for 'SetSwimState failure' messages in debug | ||||
| * | | | | | | | | | | | | | Errors in Lua don't include the error handler in the stack trace. | madmaxoft | 2014-03-19 | 2 | -7/+7 |
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #817. | ||||
| * | | | | | | | | | | | | LuaChunkStay: Removed a debugging output. | madmaxoft | 2014-03-19 | 1 | -3/+0 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed chunkmap tree block replacing. | madmaxoft | 2014-03-18 | 1 | -8/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed cGZipFile::ReadRestOfFile returning incorrect value. | madmaxoft | 2014-03-18 | 1 | -1/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed a crash in firework rockets. | madmaxoft | 2014-03-17 | 1 | -2/+8 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #816. | ||||
| * | | | | | | | | | | Fixed double to float conversions. | madmaxoft | 2014-03-16 | 4 | -52/+53 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Added override specifier where appropriate in cWorld. | madmaxoft | 2014-03-16 | 1 | -37/+38 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #782 from mc-server/beds | Mattes D | 2014-03-16 | 5 | -17/+94 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Beds now work properly, fixes #707 | ||||
| | * | | | | | | | | | | Fixed VERIFY | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Beds now work properly fixes #707 | Tiger Wang | 2014-03-09 | 5 | -17/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp | ||||
| * | | | | | | | | | | | Merge pull request #809 from Howaner/BlockEntitys | Mattes D | 2014-03-16 | 19 | -99/+512 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | More entity saving. | ||||
| | * | | | | | | | | | | | Fix anvil pickups. | Howaner | 2014-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add anvil direction. | Howaner | 2014-03-16 | 3 | -1/+74 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Remove old debug messages. | Howaner | 2014-03-15 | 1 | -3/+0 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-15 | 125 | -1229/+3223 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Add item frame saving. | Howaner | 2014-03-15 | 9 | -46/+251 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Add health and age load to pickup's. | Howaner | 2014-03-15 | 5 | -22/+43 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Add ExpOrb saving. | Howaner | 2014-03-15 | 7 | -38/+124 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Add fireball interact | Howaner | 2014-03-14 | 4 | -2/+33 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Wrong if in BlockLeaves | Howaner | 2014-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Add new leaves to all classes. | Howaner | 2014-03-16 | 9 | -5/+18 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Added common eMessageType aliases. | madmaxoft | 2014-03-16 | 1 | -10/+16 |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Change if-clause in BlockCake.h | Howaner | 2014-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add cake | Howaner | 2014-03-16 | 4 | -0/+101 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #800 from mc-server/EntireCommandError | Mattes D | 2014-03-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | The entire unknown command is echoed back to the user on error. | ||||
| | * | | | | | | | | | | | The entire unknown command is echoed back to the user on error. | madmaxoft | 2014-03-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Added cCuboid:Assign(OtherCuboid) API function. | madmaxoft | 2014-03-15 | 2 | -0/+15 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into noreturn | Tycho | 2014-03-14 | 3 | -10/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake | ||||
| | * | | | | | | | | | | Merge pull request #805 from worktycho/undef | Mattes D | 2014-03-14 | 3 | -10/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | Fixed a couple of missing defs | ||||
| | | * | | | | | | | | | Fixed a couple of missing defs | Tycho | 2014-03-14 | 3 | -10/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added Noreturn attribtes to a couple of functions and made a missing noreturn an error | Tycho | 2014-03-14 | 3 | -4/+11 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added NORETURN macro | Tycho | 2014-03-14 | 1 | -0/+4 |
| |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge branch 'master' into warnings | Tycho | 2014-03-14 | 2 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | cPlugin:BindConsoleCommand can be called statically. | madmaxoft | 2014-03-14 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been documented before it was written. | ||||
| | * | | | | | | | | | Fixed a warning. | madmaxoft | 2014-03-14 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed xofts issues | Tycho | 2014-03-14 | 10 | -23/+24 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into warnings | Tycho | 2014-03-14 | 2 | -11/+13 |
| |\| | | | | | | | | | |||||
| | * | | | | | | | | | Merge pull request #793 from xdot/master | Mattes D | 2014-03-14 | 1 | -9/+9 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Unified Vector classes | ||||
| | | * | | | | | | | | | Vector3: More casts | andrew | 2014-03-12 | 1 | -9/+9 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | cPluginManager:Bind[Console]Command returns true on success. | madmaxoft | 2014-03-14 | 1 | -2/+4 |
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #801. | ||||
| * | | | | | | | | | | Fixed comma | Tycho | 2014-03-12 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Added additional macros to support the MSVC size_t format and changed all formats to use the macros | Tycho | 2014-03-12 | 13 | -29/+33 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'Werror' into warnings | Tycho | 2014-03-12 | 43 | -648/+649 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Globals.h | ||||
| | * | | | | | | | | | | Fixed printf format compatabilty | Tycho | 2014-03-12 | 2 | -5/+9 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' into Werror | Tycho | 2014-03-12 | 43 | -642/+639 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp | ||||
| | | * | | | | | | | | | Fixed missing comment terminator. | madmaxoft | 2014-03-12 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Merge remote-tracking branch 'xdot/master' | madmaxoft | 2014-03-12 | 2 | -2/+2 |
| | | |\| | | | | | | | | |||||
| | | | * | | | | | | | | M_PI MSVC Fix | andrew | 2014-03-12 | 2 | -2/+2 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Merge remote-tracking branch 'xdot/master' | madmaxoft | 2014-03-12 | 35 | -632/+546 |
| | | |\| | | | | | | | | |||||
| | | | * | | | | | | | | Vector3: Length() should always return a float | andrew | 2014-03-12 | 1 | -9/+9 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Matrix4: Removed enum | andrew | 2014-03-11 | 2 | -22/+24 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Unified Matrix4 code | andrew | 2014-03-11 | 7 | -233/+230 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | LineCoeff Doc | andrew | 2014-03-11 | 1 | -4/+20 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Unified Vector classes | andrew | 2014-03-11 | 32 | -401/+300 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed Lua string return values. | madmaxoft | 2014-03-12 | 1 | -4/+0 |
| | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #773. | ||||
| | | * | | | | | | | | Moved Lua API registering into a separate function. | madmaxoft | 2014-03-12 | 4 | -2/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to use Lua as lite-config files as well, should we want to. | ||||
| | | * | | | | | | | | Merge remote-tracking branch 'origin/SnowBall' | madmaxoft | 2014-03-12 | 2 | -2/+25 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | TakeDamage now has the cThrownSnowballEntity instead of the creator's object. | STRWarrior | 2014-03-11 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | | * | | | | | | | | Snowballs now actualy hurt other entities. | STRWarrior | 2014-03-11 | 2 | -2/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3 damage for blazes and 1 for the ender dragon. Otherwise 0 | ||||
| | | * | | | | | | | | | Renamed cBlockArea Offset to WEOffset. | madmaxoft | 2014-03-12 | 3 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even in getters / setters. | ||||
| | | * | | | | | | | | | Merge branch 'master' into cBlockArea_Offset | madmaxoft | 2014-03-12 | 76 | -497/+2530 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | |||||
| | | * | | | | | | | | | Renamed m_Offset to m_WEOffset | STRWarrior | 2014-03-11 | 3 | -8/+9 |
| | | | |/ / / / / / / | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Using ```const Vector3i &``` | STRWarrior | 2014-03-11 | 2 | -3/+3 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | This allows a blockarea to have an Offset. | STRWarrior | 2014-03-10 | 3 | -0/+47 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed comments an assert | Tycho | 2014-03-12 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed more Format issues | Tycho | 2014-03-11 | 6 | -17/+17 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed a load of format string errors | Tycho | 2014-03-11 | 13 | -27/+29 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Move Format issues | Tycho | 2014-03-11 | 3 | -4/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed format errors in protocol | Tycho | 2014-03-11 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Added macros to follow format string checking through wrappers | Tycho | 2014-03-11 | 3 | -4/+8 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Fixed Chunkdef warnings | Tycho | 2014-03-11 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed Warnings in PieceGenerator | Tycho | 2014-03-11 | 2 | -9/+9 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into Werror | Tycho | 2014-03-11 | 11 | -36/+1364 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkDef.h | ||||
| | * | | | | | | | | Merge pull request #791 from mc-server/PieceGenerator | Mattes D | 2014-03-10 | 11 | -30/+1358 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Piece generator | ||||
| | | * | | | | | | | | Removed debugging output. | madmaxoft | 2014-03-10 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kept it commented-out for later revisions, if needed. | ||||
| | | * | | | | | | | | POCPieces: Added height. | madmaxoft | 2014-03-10 | 1 | -17/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the pieces connect in different heights, too, creating a true 3D maze. | ||||
| | | * | | | | | | | | A working POCPiece generator. | madmaxoft | 2014-03-09 | 5 | -6/+359 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Hardened cCuboid with asserts for its assumptions. | madmaxoft | 2014-03-09 | 2 | -3/+11 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | ChunkDef: Replaced enums with static const ints. | madmaxoft | 2014-03-09 | 1 | -10/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes them easier to use in std::min et al. | ||||
| | | * | | | | | | | | Added cCuboid::Engulf(). | madmaxoft | 2014-03-09 | 2 | -0/+37 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | cPieceGenerator: New connectors are added to the free pool. | madmaxoft | 2014-03-09 | 2 | -9/+30 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge branch 'master' into PieceGenerator | madmaxoft | 2014-03-09 | 1 | -0/+21 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'master' into PieceGenerator | madmaxoft | 2014-03-09 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | PieceGenerator can connect two connectors of the same type. | madmaxoft | 2014-03-09 | 2 | -60/+338 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added extensive debugging output and a test. | ||||
| | | * | | | | | | | | | | Added BlockFaceToString() translation function. | madmaxoft | 2014-03-09 | 1 | -0/+20 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Added Vector3i::Move(). | madmaxoft | 2014-03-09 | 2 | -17/+82 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Added the first skeleton code for PieceGenerator. | madmaxoft | 2014-03-09 | 2 | -0/+545 |
| | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a WIP and won't work / isn't used at all. | ||||
| * | | | | | | | | | | | Merge branch 'master' into Werror | Tycho | 2014-03-10 | 1 | -2/+0 |
| |\| | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge pull request #767 from worktycho/envmatrix | Mattes D | 2014-03-10 | 1 | -2/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support to control build type with env vars | ||||
| | | * | | | | | | | | | | Move env code part 1 | worktycho | 2014-03-07 | 1 | -10/+0 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Added support to overide CMake build type with env vars | Tycho | 2014-03-07 | 1 | -0/+8 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Revert "Fixed some warnings" | madmaxoft | 2014-03-10 | 1 | -10/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4cb0b82d1df560ad32c92eede91f466c75a87c87. | ||||
| * | | | | | | | | | | | | Fixed xofts issues | Tycho | 2014-03-10 | 4 | -20/+14 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed test asserts | Tycho | 2014-03-10 | 4 | -37/+37 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed assert | Tycho | 2014-03-10 | 1 | -14/+17 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' into Werror | Tycho | 2014-03-10 | 1 | -7/+19 |
| |\| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge pull request #779 from mc-server/tntburnexplode | Alexander Harkness | 2014-03-10 | 1 | -7/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | TNT explodes when consumed by fire | ||||
| | | * | | | | | | | | | | Fixed compile | Tiger Wang | 2014-03-10 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Removed uneeded meta obtain | Tiger Wang | 2014-03-09 | 1 | -3/+1 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | TNT explodes when consumed by fire | Tiger Wang | 2014-03-09 | 1 | -6/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed FS#406 | ||||
| | * | | | | | | | | | | | Merge pull request #788 from worktycho/warnings | Alexander Harkness | 2014-03-10 | 1 | -7/+10 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some warnings | ||||
| * | | | | | | | | | | | | | Fixed Alignment issue in ByteBuffer | Tycho | 2014-03-10 | 3 | -7/+4 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Removed Some unnessicary macros | Tycho | 2014-03-10 | 3 | -21/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Use string.reserve to avoid the need to do inplace byteswap | Tycho | 2014-03-10 | 1 | -10/+6 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Removed unused macro from WSSCompact | Tycho | 2014-03-10 | 1 | -1/+0 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed alignment issues in Fireworks Serializer | Tycho | 2014-03-10 | 1 | -7/+7 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Removed unused macro | Tycho | 2014-03-10 | 1 | -13/+0 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed cast to type with different alignment in BlockingTCPLink | Tycho | 2014-03-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed cast between types of different alignment in cSocket | Tycho | 2014-03-10 | 1 | -1/+2 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed MTRand warnings | Tycho | 2014-03-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'master' into Werror | Tycho | 2014-03-10 | 27 | -199/+733 |
| |\| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Fixed MSVC2008 compilation. | madmaxoft | 2014-03-10 | 1 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge pull request #768 from Howaner/BlockEntitys | Tiger Wang | 2014-03-09 | 11 | -28/+87 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | Add TNT load/save | ||||
| | | * | | | | | | | | | | | Merge branch 'master' into BlockEntitys | Howaner | 2014-03-08 | 22 | -65/+633 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | Change TNT Fuse to ticks | Howaner | 2014-03-08 | 9 | -21/+20 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Add TNT Save/Load and add Netbeans projects to .gitignore | Howaner | 2014-03-08 | 6 | -18/+78 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge pull request #731 from mc-server/ballisticmissiles | Tiger Wang | 2014-03-09 | 20 | -171/+646 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | Ballistic firework missiles | ||||
| | | * | | | | | | | | | | | | != FACE_NONE | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Merge branch 'master' into ballisticmissiles | Tiger Wang | 2014-03-09 | 121 | -1342/+3619 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp | ||||
| | | * | | | | | | | | | | | | Hexified colours | Tiger Wang | 2014-03-09 | 1 | -16/+16 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Fixed data length issues | Tiger Wang | 2014-03-09 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Demonstrated issues with GetDataLength() | Tiger Wang | 2014-03-09 | 2 | -5/+11 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Improved formatting of username tabcomplete | Tiger Wang | 2014-03-09 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Moved firework handler to separate function | Tiger Wang | 2014-03-09 | 2 | -48/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also simplified and improved readability of code | ||||
| | | * | | | | | | | | | | | | CheckBlockInteractionsRate() fixed & enabled | Tiger Wang | 2014-03-09 | 4 | -65/+23 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Fix Linux compile | Tiger Wang | 2014-03-09 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Removed unneeded includes in Player.cpp | Tiger Wang | 2014-02-27 | 1 | -7/+0 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Fixed compile | Tiger Wang | 2014-02-27 | 2 | -3/+2 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Fixed sheep ASSERTing sometimes | Tiger Wang | 2014-02-27 | 1 | -8/+18 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Implemented ballistic missiles (fireworks) | Tiger Wang | 2014-02-27 | 14 | -84/+591 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added fireworks | ||||
| * | | | | | | | | | | | | | | Be more parinoid about int sizes | Tycho | 2014-03-09 | 3 | -5/+18 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fixed Mesannine twister to use UInt32 | Tycho | 2014-03-09 | 4 | -4/+6 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into Werror | Tycho | 2014-03-09 | 20 | -184/+300 |
| |\| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Fixed #778 - stack overflow.com | Tiger Wang | 2014-03-09 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Silenced useless MSVC warnings in cMetaRotater. | madmaxoft | 2014-03-09 | 1 | -0/+21 |
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | Hotfix for MSVC compilation. | madmaxoft | 2014-03-09 | 1 | -0/+1 |
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Merge pull request #777 from jfhumann/issue317 | Mattes D | 2014-03-09 | 5 | -32/+62 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions | ||||
| | | * | | | | | | | | | | Adjusted style of switch/case | Jan-Fabian Humann | 2014-03-09 | 3 | -45/+15 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Changed if-else to switch-case | Jan-Fabian Humann | 2014-03-08 | 3 | -39/+33 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting. | Jan-Fabian Humann | 2014-03-08 | 5 | -32/+98 |
| | | | |_|_|/ / / / / / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Merge pull request #775 from worktycho/warnings | Mattes D | 2014-03-09 | 25 | -75/+120 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | Fixed a few warnings | ||||
| | * | | | | | | | | | | Slight plugin messaging changes | Tiger Wang | 2014-03-09 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Clients are not allowed to register duplicate channels - Clients are not allowed to use channels that were not registered | ||||
| | * | | | | | | | | | | Merge pull request #729 from worktycho/MetaRotate | Mattes D | 2014-03-08 | 13 | -151/+202 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | Alternitive solution to #503 | ||||
| | | * | | | | | | | | | Moved returns | worktycho | 2014-03-08 | 1 | -3/+3 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Reformatted | Tycho | 2014-03-02 | 10 | -20/+20 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Reformated MetaRotater | Tycho | 2014-03-02 | 1 | -19/+30 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Reverted BlockVine | worktycho | 2014-03-02 | 1 | -3/+27 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Fixed errors | Tycho | 2014-03-01 | 2 | -2/+2 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Revesed typedef | Tycho | 2014-03-01 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Implemented Rotations | Tycho | 2014-03-01 | 11 | -170/+28 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Merge branch 'master' into MetaRotate | Tycho | 2014-03-01 | 25 | -165/+459 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Final implementation of MetaRotater | Tycho | 2014-03-01 | 1 | -45/+51 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Added some Metadate rotaters using templated Mixin | Tycho | 2014-02-27 | 10 | -16/+168 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix IsThread destructor | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Globals.h is now warnings free again. | Tycho | 2014-03-09 | 2 | -10/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also turned off Wpadded as it is indicates potental performance issues rather than potential bugs | ||||
| * | | | | | | | | | | | | Its a const not a macro | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Take 5 | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Take 4 | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Unsigned types take 3 | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fix gcc error attempt 2 | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed gcc error | Tycho | 2014-03-09 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed some warnings | Tycho | 2014-03-09 | 1 | -7/+10 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | FIxed int in test | Tycho | 2014-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Added static | Tycho | 2014-03-08 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Added tons more asserts to bytebuffer | Tycho | 2014-03-08 | 1 | -7/+17 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Enabled self test of bytebuffer | Tycho | 2014-03-08 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed issues with int vs size_t and a few other warnings | Tycho | 2014-03-08 | 10 | -28/+26 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Actually Fixed ByteBuffer | Tycho | 2014-03-08 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into warnings | Tycho | 2014-03-08 | 9 | -24/+107 |
| |\| | | | | | | | | | |||||
| | * | | | | | | | | | cBlockInfo-related changes from #723 | andrew | 2014-03-08 | 3 | -11/+21 |
| | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge pull request #764 from xdot/master | Mattes D | 2014-03-07 | 3 | -4/+74 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fixed water/lava interaction | ||||
| | | * | | | | | | | | Added some comments | andrew | 2014-03-07 | 2 | -1/+6 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fixed water/lava interaction | andrew | 2014-03-07 | 3 | -4/+69 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed cBlockArea schematic string saving signature. | madmaxoft | 2014-03-07 | 3 | -9/+12 |
| | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Warnings | Tycho | 2014-03-07 | 2 | -1/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Warnings | Tycho | 2014-03-07 | 11 | -29/+42 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed warnings | Tycho | 2014-03-07 | 2 | -3/+21 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed warnings | Tycho | 2014-03-07 | 3 | -1/+5 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #763 from Howaner/BlockEntitys | Mattes D | 2014-03-07 | 20 | -101/+419 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | Add Flower Pots | ||||
| | * | | | | | | | Add Lua Bindings for FlowerPotEntity.h and add documentation. | Howaner | 2014-03-07 | 10 | -14/+18 |
| | | | | | | | | | |||||
| | * | | | | | | | Add Flower Pots | Howaner | 2014-03-07 | 17 | -87/+401 |
| | | | | | | | | | |||||
| * | | | | | | | | Fixed a typo. | madmaxoft | 2014-03-07 | 1 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #760 from Howaner/GlobalFixes | Mattes D | 2014-03-07 | 13 | -6/+116 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | Add data backsending, when the Client interacts a Block and the Interact... | ||||
| | * | | | | | | | Fix comment | Howaner | 2014-03-06 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Broadcast the Equipped Item, if the Slot is changed. | Howaner | 2014-03-06 | 1 | -0/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Add SendBlockTo to cWorldInterface | Howaner | 2014-03-05 | 9 | -10/+18 |
| | | | | | | | | | |||||
| | * | | | | | | | Set tnt step sound to step.grass | Howaner | 2014-03-05 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Add data backsending, when the Client interacts a Block and the Interact is cancelled. | Howaner | 2014-03-05 | 10 | -6/+102 |
| | |/ / / / / / | |||||
| * | | | | | | | Added cBlockArea serialization to string. | madmaxoft | 2014-03-07 | 3 | -38/+202 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #665. | ||||
| * | | | | | | | Merge remote-tracking branch 'xdot/master' | madmaxoft | 2014-03-06 | 6 | -17/+238 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Implemented vanilla-like fluid simulator | andrew | 2014-03-05 | 6 | -17/+238 |
| | | | | | | | | |||||
| * | | | | | | | Fixed some gcc warnings in Defines.h. | madmaxoft | 2014-03-04 | 1 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | Manually exported cCompositeChat modifiers. | madmaxoft | 2014-03-04 | 2 | -7/+268 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds chaining support to them. Fixes #755. | ||||
| * | | | | | | | cLuaState: Made public the GetStackValue() functions. | madmaxoft | 2014-03-04 | 2 | -54/+61 |
| | | | | | | | | |||||
| * | | | | | | | Fixed an assert in map-loading. | madmaxoft | 2014-03-04 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The maps were loaded too soon, the world wasn't initialized yet. | ||||
| * | | | | | | | Fixed previous weather changes. | madmaxoft | 2014-03-03 | 2 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather. | ||||
| * | | | | | | | Merge pull request #746 from Howaner/Slabs | Mattes D | 2014-03-03 | 4 | -19/+96 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | ||||
| | * | | | | | Add cancelling to WeatherChanging event. | Howaner | 2014-03-02 | 2 | -13/+43 |
| | | | | | | | |||||
| | * | | | | | More documentation (thanks to madmaxoft) and use GetBlockTypeMeta | Howaner | 2014-03-02 | 2 | -6/+10 |
| | | | | | | | |||||
| | * | | | | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs | Howaner | 2014-03-02 | 4 | -6/+49 |
| | | | | | | | |||||
| * | | | | | | Removed if condition | andrew | 2014-03-02 | 1 | -4/+1 |
| | | | | | | | |||||
| * | | | | | | cBlockInfo now manages the respective cBlockHandler | andrew | 2014-03-02 | 11 | -73/+70 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Fixed MSVC warnings in DeprecatedBindings. | madmaxoft | 2014-03-02 | 1 | -8/+76 |
| | | | | | | |||||
| * | | | | | Added blockface mirroring and rotating. | madmaxoft | 2014-03-02 | 1 | -0/+50 |
| | | | | | | |||||
| * | | | | | Merge pull request #738 from xdot/master | Mattes D | 2014-03-02 | 40 | -503/+1013 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Refactored global block property arrays | ||||
| | * | | | | | GetById => Get | andrew | 2014-03-02 | 3 | -22/+22 |
| | | | | | | | |||||
| | * | | | | | Removed g_BlockXXX arrays | andrew | 2014-03-02 | 4 | -440/+4 |
| | | | | | | | |||||
| | * | | | | | Manually exported g_Block tables | andrew | 2014-03-02 | 4 | -0/+445 |
| | | | | | | | |||||
| | * | | | | | Exported cBlockInfo | andrew | 2014-03-02 | 2 | -3/+9 |
| | | | | | | | |||||
| | * | | | | | g_BlockXXX => cBlockInfo::XXX | andrew | 2014-03-01 | 33 | -73/+91 |
| | | | | | | | |||||
| | * | | | | | Refactored global block property arrays | andrew | 2014-03-01 | 2 | -0/+477 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Creeper fixes | tonibm19 | 2014-03-02 | 2 | -10/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed explosion time (1.5s, according to minecraftwiki) - Creeper explodes if right clicked with flint and steel | ||||
| * | | | | | Merge pull request #733 from Howaner/Slabs | Mattes D | 2014-03-02 | 3 | -13/+35 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | Fix Double Slabs, fix Slab Meta and add more things to burnable | ||||
| | * | | | | Use switch in GetStepSound | Howaner | 2014-02-28 | 2 | -8/+6 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into Slabs | Howaner | 2014-02-28 | 12 | -41/+137 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix Double Slabs, fix Slab Meta and add more things to burnable | Howaner | 2014-02-28 | 3 | -13/+37 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Added more documentation for FastNBT parser. | madmaxoft | 2014-03-02 | 1 | -3/+45 |
| | | | | | | |||||
| * | | | | | ChunkDesc warns about StructureGen's deprecation. | madmaxoft | 2014-03-01 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Unified StructureGens and FinisherGens. | madmaxoft | 2014-03-01 | 10 | -163/+128 |
| | |_|/ / | |/| | | | | | | | | | | | | | Now they are all Finishers. Fixes #398. | ||||
| * | | | | Exported cScoreboard::ForEachTeam | andrew | 2014-03-01 | 3 | -1/+34 |
| | | | | | |||||
| * | | | | Shortened enums | andrew | 2014-03-01 | 4 | -58/+58 |
| | | | | | |||||
| * | | | | Exported cScoreboard::ForEachObjective | andrew | 2014-03-01 | 3 | -4/+43 |
| | | | | | |||||
| * | | | | Exported and documented cScoreboard | andrew | 2014-03-01 | 4 | -49/+70 |
| | | | | | |||||
| * | | | | Forgotten changes to cChunkInterface. | madmaxoft | 2014-03-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Removed cBlockHandler forward declaration from cChunkInterface. | madmaxoft | 2014-03-01 | 1 | -9/+22 |
| | | | | | | | | | | | | | | | | | | | | Wasn't needed. Also reformatted the code. | ||||
| * | | | | Improved comments in float size check. | madmaxoft | 2014-03-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fixed multiple gcc warnings about unused params. | madmaxoft | 2014-02-28 | 7 | -5/+78 |
| | | | | | |||||
| * | | | | Documented the changes in cJukeboxEntity. | madmaxoft | 2014-02-28 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Moved common cGroupManager code to a separate function. | madmaxoft | 2014-02-28 | 3 | -12/+30 |
| | |/ / | |/| | | | | | | | | | | This fixes my concerns in PR #709. | ||||
| * | | | Merge pull request #709 from Howaner/GlobalFixes | Mattes D | 2014-02-28 | 8 | -24/+112 |
| |\ \ \ | | | | | | | | | | | Add 'Group not found', when the Server load the users.ini and add auto g... | ||||
| | * | | | Better Jukebox API | Howaner | 2014-02-21 | 3 | -16/+52 |
| | | | | | |||||
| | * | | | Remove users.ini generation in Player.cpp and use the CheckUsers() Function | Howaner | 2014-02-21 | 1 | -6/+1 |
| | | | | | |||||
| | * | | | Remove old Output Finish | Howaner | 2014-02-21 | 1 | -2/+0 |
| | | | | | |||||
| | * | | | Unicode :-( | Howaner | 2014-02-21 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add 'Group not found', when the Server load the users.ini and add auto generate from users.ini | Howaner | 2014-02-21 | 5 | -2/+61 |
| | | | | | |||||
| * | | | | Better fix for the 32-bit float reading. | madmaxoft | 2014-02-28 | 1 | -4/+5 |
| | | | | | |||||
| * | | | | Merge pull request #730 from tonibm19/master | Alexander Harkness | 2014-02-27 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | | | added mooshroom to cow conversion | ||||
| | * | | | | added mooshroom to cow conversion | tonibm19 | 2014-02-27 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Added a "nooutbuf" cmdline param. | madmaxoft | 2014-02-27 | 2 | -13/+18 |
| | |_|/ / | |/| | | | | | | | | | | | | | This forces that the stdout stream uses no buffer, even when not a TTY. Used for running MCServer under ZeroBraneStudio. | ||||
| * | | | | Fixed crash and some warnings in map handling. | madmaxoft | 2014-02-27 | 2 | -3/+5 |
| | |_|/ | |/| | | | | | | | | | | Fixes #728. | ||||
| * | | | Fixed a gcc warning in FastNBT.h. | madmaxoft | 2014-02-26 | 1 | -2/+11 |
| | | | | |||||
| * | | | Attempted fix for several GCC warnings. | madmaxoft | 2014-02-26 | 3 | -3/+15 |
| |/ / | |||||
| * | | Added more utility functions to cCuboid. | madmaxoft | 2014-02-26 | 2 | -4/+105 |
| | | | | | | | | | | | | GetVolume(), Expand(), ClampX(), ClampY(), ClampZ() | ||||
| * | | Added useful parameter overloads to cBlockArea Lua API. | madmaxoft | 2014-02-24 | 2 | -0/+133 |
| | | | |||||
| * | | Fixed tolua export for Byte. | madmaxoft | 2014-02-24 | 1 | -0/+7 |
| | | | | | | | | | | | | No longer treated as an unknown class. | ||||
| * | | Fixed compilation in MSVC (forward class definitions). | madmaxoft | 2014-02-24 | 2 | -0/+2 |
| | | | |||||
| * | | BlockEntities is warnings free | Tycho | 2014-02-24 | 6 | -3/+11 |
| | | | |||||
| * | | Merge pull request #710 from TheJumper/master | Mattes D | 2014-02-24 | 28 | -39/+517 |
| |\ \ | | | | | | | | | Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops | ||||
| | * | | Fixed Formatting, added compiler warning suppressing methods, fixed comments | TheJumper | 2014-02-24 | 5 | -3/+6 |
| | | | | |||||
| | * | | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to Monsters | TheJumper | 2014-02-23 | 29 | -40/+515 |
| | | | | |||||
| | * | | BlockBed.cpp: Fixed Multiple people in one bed. | TheJumper | 2014-02-23 | 1 | -7/+18 |
| | | | | | | | | | | | | | | | | OnUse in BlockBed.cpp now checks whether bit flag 0x4 in the Data values of the bed is set before somebody can try to sleep in the bed. | ||||
| | * | | Fixed bindings for cBlockArea:Get(Rel)BlockTypeMeta(). | madmaxoft | 2014-02-23 | 2 | -29/+110 |
| | | | | | | | | | | | | | | | | They no longer require the ghost output params. | ||||
| | * | | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-23 | 23 | -256/+254 |
| | | | | |||||
| | * | | Add break to Protocol17x.cpp and use new comment delimiter | Howaner | 2014-02-23 | 2 | -7/+8 |
| | | | | |||||
| | * | | Add Heads completely | Howaner | 2014-02-23 | 14 | -7/+154 |
| | | | | |||||
| | * | | Add Skulls/Heads | Howaner | 2014-02-23 | 13 | -5/+354 |
| | | | | |||||
| * | | | Fixed MCServer not compiling with C++03 compilers | STRWarrior | 2014-02-24 | 3 | -12/+12 |
| | | | | |||||
| * | | | Small improvements to boats. | STRWarrior | 2014-02-24 | 1 | -3/+7 |
| | | | | |||||
| * | | | Merge pull request #669 from xdot/master | Tiger Wang | 2014-02-24 | 28 | -10/+1871 |
| |\ \ \ | | | | | | | | | | | Implementation of in-game maps :D | ||||
| | * | | | Maps: Improvements | andrew | 2014-02-23 | 7 | -13/+26 |
| | | | | | |||||
| | * | | | Manually exported DoWithMap | andrew | 2014-02-23 | 4 | -2/+11 |
| | | | | | |||||
| | * | | | Documented and exported cMapManager | andrew | 2014-02-23 | 2 | -3/+6 |
| | | | | | |||||
| | * | | | Documented and exported cMap | andrew | 2014-02-22 | 3 | -9/+53 |
| | | | | | |||||
| | * | | | Semi-working implementation of cMap::UpdatePixel | andrew | 2014-02-22 | 2 | -11/+95 |
| | | | | | |||||
| | * | | | Split cMap::UpdateClient | andrew | 2014-02-21 | 2 | -73/+114 |
| | | | | | |||||
| | * | | | Thread safe cMap manager | andrew | 2014-02-20 | 7 | -17/+275 |
| | | | | | |||||
| | * | | | Manual merge (Fixed conflicts) | andrew | 2014-02-20 | 79 | -389/+2685 |
| | |\ \ \ | |||||
| | * | | | | cMapDecorator: Implemented random rotations | andrew | 2014-02-19 | 2 | -13/+18 |
| | | | | | | |||||
| | * | | | | Documented cMap | andrew | 2014-02-19 | 3 | -7/+31 |
| | | | | | | |||||
| | * | | | | Map decorators; Map clients | andrew | 2014-02-18 | 12 | -45/+351 |
| | | | | | | |||||
| | * | | | | Map item handler; Fixed several bugs | andrew | 2014-02-17 | 13 | -29/+195 |
| | | | | | | |||||
| | * | | | | cMap::UpdateRadius | andrew | 2014-02-15 | 4 | -16/+121 |
| | | | | | | |||||
| | * | | | | EmptyMap item handler | andrew | 2014-02-14 | 3 | -4/+52 |
| | | | | | | |||||
| | * | | | | Send map when selected | andrew | 2014-02-14 | 7 | -27/+114 |
| | | | | | | |||||
| | * | | | | IDCount Serialization | andrew | 2014-02-13 | 7 | -3/+191 |
| | | | | | | |||||
| | * | | | | Implementation of in-game maps | andrew | 2014-02-13 | 13 | -0/+596 |
| | | | | | | |||||
| * | | | | | Removed an unused member variable from cChunk. | madmaxoft | 2014-02-24 | 2 | -8/+0 |
| | | | | | | |||||
| * | | | | | Fixed crash in cBlockArea rotation. | madmaxoft | 2014-02-24 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #720. | ||||
| * | | | | | Fixed a possible crash in cWorld::WakeUpSimulatorsInArea(). | madmaxoft | 2014-02-24 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | The Y coords weren't checked. | ||||
| * | | | | | Merge pull request #716 from Howaner/BreakFix | Mattes D | 2014-02-23 | 1 | -0/+10 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | No Sword Block Destroying in Creative Mode | ||||
| | * | | | | | Use the ItemCategorie::IsSword() Method. | Howaner | 2014-02-23 | 2 | -20/+1 |
| | | | | | | | |||||
| | * | | | | | No Sword Block Destroying in Creative Mode | Howaner | 2014-02-23 | 2 | -0/+29 |
| | | | | | | | |||||
| * | | | | | | fixed globals.h warnings | Tycho | 2014-02-23 | 3 | -2/+11 |
| |/ / / / / | |||||
| * | | | | | Added cBlockArea::GetVolume, exported to Lua API. | madmaxoft | 2014-02-23 | 1 | -27/+30 |
| | | | | | | |||||
| * | | | | | Added cBlockArea:GetSize() and :GetOrigin() to Lua API. | madmaxoft | 2014-02-23 | 1 | -0/+64 |
| | | | | | | | | | | | | | | | | | | | | | | | | These don't have a direct C++ equivalent, but are rather useful for the plugins. | ||||
| * | | | | | cClientHandle manages the client-registered plugin channels. | madmaxoft | 2014-02-20 | 2 | -36/+123 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #706. | ||||
| * | | | | | Removed problematic utf8. | madmaxoft | 2014-02-20 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #704 from Howaner/GlobalFixes | Mattes D | 2014-02-20 | 6 | -29/+81 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | Global fixes | ||||
| | * | | | | Bad UTF-8 o.O | Howaner | 2014-02-20 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Remove typeinfo import in IncrementalRedstoneSimulator | Howaner | 2014-02-20 | 1 | -2/+0 |
| | | | | | | |||||
| | * | | | | Fix Cauldron | Howaner | 2014-02-20 | 1 | -8/+11 |
| | | | | | | |||||
| | * | | | | Add Wolf Heal with Food | Howaner | 2014-02-20 | 1 | -10/+34 |
| | | | | | | |||||
| | * | | | | Add Pressure Plate Sound | Howaner | 2014-02-20 | 1 | -0/+9 |
| | | | | | | |||||
| | * | | | | Add Light weighted pressure plates | Howaner | 2014-02-20 | 3 | -10/+24 |
| | | | | | | |||||
| | * | | | | Add Hay Bale to Burnable | Howaner | 2014-02-20 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Add 'Meta < 3' to Cauldron | Howaner | 2014-02-20 | 1 | -5/+8 |
| | | | | | | |||||
| * | | | | | Merge pull request #702 from TheJumper/master | Mattes D | 2014-02-20 | 1 | -7/+18 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | BlockBed.cpp: Fixed Multiple people in one bed. | ||||
| | * | | | | | BlockBed.cpp: Fixed space at if statement | TheJumper | 2014-02-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Added a space after an if statement and before the first bracket to keep up code conventions. | ||||
| | * | | | | | BlockBed.cpp: Fixed Multiple people in one bed. | TheJumper | 2014-02-20 | 1 | -7/+18 |
| | | |_|/ / | | |/| | | | | | | | | | OnUse in BlockBed.cpp now checks whether bit flag 0x4 in the Data values of the bed is set before somebody can try to sleep in the bed. | ||||
| * | | | | | Disabled the leak finder. | madmaxoft | 2014-02-20 | 2 | -2/+6 |
| | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #700 from Howaner/GlobalFixes | Mattes D | 2014-02-20 | 7 | -8/+84 |
| |\ \ \ \ | | |/ / / | |/| | | | Add new Trees (without Generator) | ||||
| | * | | | Add BlockNewLeaves.h and rename Darkoac to Darkoak | Howaner | 2014-02-19 | 5 | -15/+57 |
| | | | | | |||||
| | * | | | Add new Trees (without Generator) | Howaner | 2014-02-19 | 6 | -0/+34 |
| | | |/ | | |/| | |||||
| * | | | Fixed bindings for cBlockArea:Get(Rel)BlockTypeMeta(). | madmaxoft | 2014-02-20 | 2 | -29/+110 |
| | | | | | | | | | | | | | | | | They no longer require the ghost output params. | ||||
| * | | | Merge pull request #697 from Howaner/Skull | Mattes D | 2014-02-19 | 21 | -6/+501 |
| |\ \ \ | | |/ / | |/| | | Add Skulls/Heads to MCServer | ||||
| | * | | Rename SkullEntity to MobHeadEntity | Howaner | 2014-02-19 | 23 | -256/+254 |
| | | | | |||||
| | * | | Add break to Protocol17x.cpp and use new comment delimiter | Howaner | 2014-02-19 | 2 | -7/+8 |
| | | | | |||||
| | * | | Add Heads completely | Howaner | 2014-02-18 | 14 | -7/+154 |
| | | | | |||||
| | * | | Add Skulls/Heads | Howaner | 2014-02-17 | 13 | -5/+354 |
| | | | | |||||
| * | | | Merge branch 'master' into itemframes | Tiger Wang | 2014-02-18 | 24 | -11/+433 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp | ||||
| | * \ \ | Merge pull request #696 from mc-server/paintings | Mattes D | 2014-02-18 | 17 | -3/+231 |
| | |\ \ \ | | | | | | | | | | | | | Implemented paintings, fixes #689 | ||||
| | | * | | | Properly exported and documented paintings | Tiger Wang | 2014-02-18 | 3 | -2/+4 |
| | | | | | | |||||
| | | * | | | Comments & new BLOCK_FACE constants | Tiger Wang | 2014-02-18 | 1 | -7/+10 |
| | | | | | | |||||
| | | * | | | Implemented paintings, fixes #689 | Tiger Wang | 2014-02-18 | 15 | -3/+226 |
| | | | | | | | | | | | | | | | | | | | | | | | | + Implemented paintings | ||||
| | * | | | | The cuboid for cWorld::SetAreaBiome() doesn't need sorting. | madmaxoft | 2014-02-18 | 2 | -2/+7 |
| | | | | | | |||||
| | * | | | | Added cWorld:SetAreaBiome() API function. | madmaxoft | 2014-02-18 | 6 | -3/+164 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #675. | ||||
| | * | | | | Added a bit more documentation to cForEachChunkProvider. | madmaxoft | 2014-02-18 | 2 | -5/+33 |
| | |/ / / | |||||
| * | | | | Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframes | Tiger Wang | 2014-02-18 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Fixed possible ASSERT failure | Tiger Wang | 2014-02-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | De-breaked stuff | Tiger Wang | 2014-02-18 | 1 | -2/+0 |
| |/ / / / | |||||
| * | | | | Changed BlockFace type to eBlockFace | Tiger Wang | 2014-02-18 | 3 | -26/+27 |
| | | | | | |||||
| * | | | | Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframes | Tiger Wang | 2014-02-18 | 1 | -7/+10 |
| |\ \ \ \ | |||||
| | * | | | | Added an explanatory comment | Tiger Wang | 2014-02-18 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | Used new BLOCK_FACE constants | Tiger Wang | 2014-02-18 | 1 | -7/+8 |
| | | | | | | | | | | | | | | | | | | Also added more comments | ||||
| * | | | | | Added a brace | Tiger Wang | 2014-02-18 | 1 | -0/+2 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ==== { } { __ } { | | } ==== REMOVE ALL THE BRACES!! | ||||
| * / / / | Implemented item frames, a part of #689 | Tiger Wang | 2014-02-18 | 7 | -2/+233 |
| |/ / / | | | | | | | | | | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!) | ||||
| * | | | Added cPluginManager:GetPluginsPath() to the Lua API. | madmaxoft | 2014-02-17 | 2 | -1/+5 |
| | | | | |||||
| * | | | Add Lua plugin path to package.path and .cpath. | madmaxoft | 2014-02-17 | 3 | -0/+37 |
| | | | | | | | | | | | | | | | | Fixes #693. | ||||
| * | | | Merge pull request #690 from tonibm19/master | Alexander Harkness | 2014-02-17 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |/| | | Now mobs can't escape from fences. | ||||
| | * | | Improved formatting | tonibm19 | 2014-02-17 | 1 | -2/+2 |
| | | | | |||||
| | * | | Now mobs can't escape from fences. | tonibm19 | 2014-02-16 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #692 from mc-server/wolfcleanup | Alexander Harkness | 2014-02-17 | 1 | -30/+15 |
| |\ \ \ | | | | | | | | | | | Wolf cleanup | ||||
| | * | | | Fixes to previous commit | Tiger Wang | 2014-02-16 | 1 | -9/+10 |
| | | | | | |||||
| | * | | | Slight cleanup of wolf code | Tiger Wang | 2014-02-16 | 1 | -23/+7 |
| | | | | | |||||
| * | | | | Fixed a memory leak in CompositeChat. | madmaxoft | 2014-02-17 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Links sent via chat messages are clickable. | madmaxoft | 2014-02-16 | 4 | -9/+34 |
| | | | | | | | | | | | | | | | | | | | | Fixes #658. | ||||
| * | | | | Implemented cCompositeChat::ParseText(), incl. self-test. | madmaxoft | 2014-02-16 | 2 | -1/+211 |
| | | | | | |||||
| * | | | | Fixed cBoundingBox self-test code-style. | madmaxoft | 2014-02-16 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | Also made the class name unique and the global variable static, to avoid linkage problems with other self-tests | ||||
| * | | | | Merge pull request #683 from mc-server/redstoneimprovements | Mattes D | 2014-02-16 | 5 | -94/+167 |
| |\ \ \ \ | | |_|/ / | |/| | | | Redstone speed improvements | ||||
| | * | | | Fixed a glaring bug with chunk cross-simulating | Tiger Wang | 2014-02-16 | 1 | -9/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * A chunk's redstone blocks list is no longer touched if AddBlock was being called with another chunk's coordinates * Fixed chunk boundary checks | ||||
| | * | | | Added a 'default:' for SimChunk()'s switch | Tiger Wang | 2014-02-15 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | A fix and an improvement | Tiger Wang | 2014-02-15 | 2 | -23/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed a special case with the wrong ChunkX/Z values being used to calculate a relative position * Simplified data structure adding and removing operations (no more pointers!) - Removed one character of whitespace :D | ||||
| | * | | | Fixed TNT fizzing everywhere | Tiger Wang | 2014-02-15 | 2 | -2/+2 |
| | | | | | |||||
| | * | | | Sizeable speed improvements to redstone | Tiger Wang | 2014-02-15 | 3 | -83/+127 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Moved all simulator data into individual chunks * Cleaned up parameters for functions and some code * Fixed repeaters powering off faster than they power on The main issue before was that, although the redstone simulator stored blocks to be simulated in individual cChunks, other data, such as powered lists, and etcetera, were global regardless of which chunk was being simulated. Therefore, with worlds with lots of redstone, each tick saw the ticking of chunks, which themselves iterated through the entire dataset needlessly, creating LOTS of lag. Should be better now :) | ||||
| * | | | | Merge pull request #686 from Howaner/GlobalFixes | Mattes D | 2014-02-16 | 5 | -3/+11 |
| |\ \ \ \ | | |_|/ / | |/| | | | Add Locale to ClientHandle | ||||
| | * | | | Add Locale to ClientHandle | Howaner | 2014-02-16 | 5 | -3/+11 |
| | | | | | |||||
| * | | | | Fixed minor formatting issues from #682 | Tiger Wang | 2014-02-16 | 3 | -16/+3 |
| |/ / / | | | | | | | | | | | | | | | | | - Removed unused PlaySoundEffect * Simplified and parenthesised code | ||||
| * | | | Replace random Float Generation and broadcast the Exp Pickup Sound | Howaner | 2014-02-16 | 2 | -9/+4 |
| | | | | |||||
| * | | | Add Exp Bottle Effects | Howaner | 2014-02-16 | 4 | -1/+23 |
| | | | | |||||
| * | | | Set max. Players in the Tablist to 60 | Howaner | 2014-02-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Disable Hunger Death | Howaner | 2014-02-16 | 1 | -1/+7 |
| | | | | |||||
| * | | | Removed the unnecessary LoopPlayersAndBroadcastChat() functions. | madmaxoft | 2014-02-15 | 4 | -23/+19 |
| | | | | |||||
| * | | | Implemented cCompositeChat. | madmaxoft | 2014-02-15 | 18 | -21/+671 |
| | | | | | | | | | | | | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678. | ||||
| * | | | Merge pull request #679 from mc-server/NotchDeath | Alexander Harkness | 2014-02-15 | 1 | -0/+6 |
| |\ \ \ | | |/ / | |/| | | NotchApple | ||||
| | * | | If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/Notch | STRWarrior | 2014-02-15 | 1 | -0/+6 |
| | | | | |||||
| * | | | Add more Sounds to Redstone Simulator | Howaner | 2014-02-15 | 1 | -1/+23 |
| | | | | |||||
| * | | | Add Fence Gate to Redstone Simulator | Howaner | 2014-02-15 | 2 | -0/+31 |
| | | | | |||||
| * | | | Merge pull request #664 from mc-server/generalfixes | Mattes D | 2014-02-15 | 19 | -46/+130 |
| |\ \ \ | | | | | | | | | | | General fixes | ||||
| | * | | | Fixed typographical error | Tiger Wang | 2014-02-15 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | Removed debug messages again | Tiger Wang | 2014-02-15 | 1 | -6/+0 |
| | | | | | |||||
| | * | | | Added proper debug messages | Tiger Wang | 2014-02-13 | 1 | -3/+8 |
| | | | | | |||||
| | * | | | Fancy stuff with constant references | Tiger Wang | 2014-02-13 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Added more missing GetClassStatic()s | Tiger Wang | 2014-02-12 | 2 | -0/+4 |
| | | | | | |||||
| | * | | | Removed some unneeded BroadcastWholeWindow()s | Tiger Wang | 2014-02-12 | 4 | -23/+2 |
| | | | | | |||||
| | * | | | Changed inheritance a bit | Tiger Wang | 2014-02-12 | 8 | -33/+54 |
| | | | | | | | | | | | | | | | | | | | | * cBlockEntityWithItems now inherits from cBlockEntityWindowOwner | ||||
| | * | | | Made player jump reset less ambiguous | Tiger Wang | 2014-02-12 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Simplified Attack() tracing | Tiger Wang | 2014-02-12 | 1 | -1/+6 |
| | | | | | |||||
| | * | | | Improved pressure plates | Tiger Wang | 2014-02-12 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | + Two (or more) pressure plates can be triggered at the same time * Fixed issues caused by pressure plates not being in the sources list | ||||
| | * | | | Fixed #190 | Tiger Wang | 2014-02-11 | 1 | -2/+67 |
| | | | | | | | | | | | | | | | | | | | | + Hoppers now collect pickups above them | ||||
| | * | | | Fixed #627 | Tiger Wang | 2014-02-11 | 5 | -21/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Attack() is now called from cAggressive instead of cMonster * Monsters can no longer attack through walls * Should fix last remnants of player damage after teleporting (that both STR and bearbin contributed fixes to :P) | ||||
| | * | | | Fixed #612 | Tiger Wang | 2014-02-11 | 2 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | * Chests send contents updates to client | ||||
| * | | | | Merge pull request #677 from mc-server/BroadcastParticleEffect | Alexander Harkness | 2014-02-15 | 1 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | Broadcast particle effect | ||||
| | * | | | Exported cWorld::BroadcastParticleEffect. | STRWarrior | 2014-02-15 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
| * | | | Merged branch 'narroo/master'. | madmaxoft | 2014-02-13 | 2 | -1/+36 |
| |\ \ \ | | |/ / | |/| | | | | | | This merges pull request #661. | ||||
| | * | | Fixed formatting. Moved UnloadUnusedChunks from public to private. | narroo | 2014-02-11 | 2 | -4/+10 |
| | | | | |||||
| | * | | Fixed formatting of previous commit. | narroo | 2014-02-11 | 2 | -2/+7 |
| | | | | |||||
| | * | | Fixed bug #385. UnloadUnusedChunks now has the same interface as | narroo | 2014-02-11 | 2 | -1/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking. | ||||
| * | | | Fixed #573 | STRWarrior | 2014-02-12 | 1 | -4/+4 |
| | | | | |||||
| * | | | cWorld:ChunkStay() accepts nils as callbacks. | madmaxoft | 2014-02-11 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | Also removed leftover debug logging. | ||||
| * | | | Added cLuaState::CheckParamFunctionOrNil(). | madmaxoft | 2014-02-11 | 2 | -2/+37 |
| | |/ | |/| | | | | | | | Also fixed error reporting for the two function-checking functions. | ||||
| * | | More gcc warnings fixed. | madmaxoft | 2014-02-11 | 2 | -4/+5 |
| | | | |||||
| * | | Made cChunkStay's destructor virtual. | madmaxoft | 2014-02-11 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed gcc warnings in Item.h. | madmaxoft | 2014-02-11 | 1 | -21/+21 |
| | | | |||||
| * | | Fixed nested plugin function calls. | madmaxoft | 2014-02-11 | 1 | -6/+9 |
| | | | |||||
| * | | Merge branch 'master' into ChunkStay | madmaxoft | 2014-02-11 | 1 | -2/+1 |
| |\ \ | |||||
| | * | | Added additional parenthasies | worktycho | 2014-02-10 | 1 | -2/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into boatsFix | Tycho | 2014-02-10 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemBoat.h | ||||
| | | * | | Maybe fixed boat placing | tonibm19 | 2014-02-10 | 1 | -1/+1 |
| | | |/ | |||||
| | * / | Fixed stupid mistax in conditional | worktycho | 2014-02-10 | 1 | -2/+1 |
| | |/ | | | | | | | boats can't be placed if the face is not block_face_none and not block_face_YM, not if it is only not one. | ||||
| * | | Added LuaChunkStay to Bindings sources. | madmaxoft | 2014-02-10 | 1 | -36/+47 |
| | | | | | | | | | | | | This should fix *nix compilation. Also alpha-sorted the lists. | ||||
| * | | Rewritten Lua ChunkStay API into a single function, cWorld:ChunkStay(). | madmaxoft | 2014-02-10 | 9 | -87/+213 |
| | | | | | | | | | | | | This fixes problems with indeterminate class object lifespan (Lua-GC) and forgetting to disable it or keep it until ready. | ||||
| * | | cLuaState: Stack traces don't include ghost 0-th element. | madmaxoft | 2014-02-10 | 1 | -1/+1 |
| | | | |||||
| * | | Added cPluginLua::cOperation. | madmaxoft | 2014-02-10 | 1 | -1/+27 |
| | | | | | | | | | | | | This class should be used to lock-and-access the plugin's LuaState. cPluginLua::GetLuaState() is unsafe and by this commit obsolete. | ||||
| * | | First working version of cLuaChunkStay. | madmaxoft | 2014-02-09 | 4 | -17/+92 |
| | | | | | | | | | | | | It works, but has random failures, probably due to threading issues. | ||||
| * | | Initial Lua cChunkStay export. | madmaxoft | 2014-02-09 | 4 | -1/+123 |
| | | | |||||
| * | | cLuaState::cRef can be unbound and re-bound. | madmaxoft | 2014-02-09 | 2 | -9/+60 |
| | | | | | | | | | | | | This will allow us to store Lua references as member variables in classes and initialize those later than in the constructor. | ||||
| * | | Added AllToLua.pkg to MSVC project files. | madmaxoft | 2014-02-09 | 1 | -0/+2 |
| | | | | | | | | | | | | MSVC ignores the file when compiling and it makes it easier to open it up for editing. | ||||
| * | | Merge remote-tracking branch 'origin/master' into ChunkStay | madmaxoft | 2014-02-09 | 30 | -127/+328 |
| |\| | |||||
| | * | Fixed compile and some warnings in MSVS | Tiger Wang | 2014-02-09 | 7 | -17/+6 |
| | | | |||||
| | * | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-09 | 33 | -1897/+2087 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp | ||||
| | | * | Merge pull request #656 from mc-server/ReloadGroups | Mattes D | 2014-02-09 | 1 | -0/+11 |
| | | |\ | | | | | | | | | | | The console reload command also reloads the groups. | ||||
| | | | * | "reload" is back. | STRWarrior | 2014-02-09 | 1 | -0/+7 |
| | | | | | |||||
| | | | * | Split "reload" in "reloadplugins" and "reloadgroups". | STRWarrior | 2014-02-09 | 1 | -2/+5 |
| | | | | | |||||
| | | | * | The console reload command also reloads the groups. | STRWarrior | 2014-02-09 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into playerimprovements | Tiger Wang | 2014-02-09 | 92 | -214/+347 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua | ||||
| | * | | | | Fixed a boat ASSERT | Tiger Wang | 2014-02-09 | 1 | -2/+8 |
| | | | | | | |||||
| | * | | | | Moved Gamemode setting into General root tag | Tiger Wang | 2014-02-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Added sender name to PM if prefixes disabled | Tiger Wang | 2014-02-07 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Also moved the PVP setting into Mechanics | ||||
| | * | | | | Improved chat messaging functions | Tiger Wang | 2014-02-07 | 9 | -111/+155 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API. | ||||
| | * | | | | Server internally uses new functions | Tiger Wang | 2014-02-06 | 4 | -17/+13 |
| | | | | | | |||||
| | * | | | | Added more chat functions | Tiger Wang | 2014-02-06 | 4 | -27/+46 |
| | | | | | | |||||
| | * | | | | Reduced max explosions per tick | Tiger Wang | 2014-02-05 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fixed explosions bug | Tiger Wang | 2014-02-05 | 3 | -32/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Fixed bug where explosions would sometimes never be sent | ||||
| | * | | | | Fixed annoying creative on fire bug | Tiger Wang | 2014-02-05 | 2 | -0/+20 |
| | | | | | | |||||
| | * | | | | Fixed a bunch of MSVS warnings | Tiger Wang | 2014-02-05 | 6 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely | ||||
| | * | | | | Added more SendMessageXXX() functions | Tiger Wang | 2014-02-04 | 3 | -47/+62 |
| | | | | | | |||||
| | * | | | | Pickup constructor no longer exported | Tiger Wang | 2014-02-03 | 3 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It didn't do anything without Initialize() exported, anyway, pickups are spawned with cWorld. | ||||
| | * | | | | Added SendMessageXXX() to cPlayer | Tiger Wang | 2014-02-03 | 2 | -1/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested by @bearbin, one no longer needs to download a file that links to Core. The server does it! Hopefully this encourages standards compliance. | ||||
| | * | | | | Partial fix for #130 | Tiger Wang | 2014-02-03 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Fixed #491 | Tiger Wang | 2014-02-03 | 1 | -2/+14 |
| | | | | | | |||||
| | * | | | | Fixed a crash bug | Tiger Wang | 2014-02-03 | 2 | -11/+5 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/master' into playerimprovements | Tiger Wang | 2014-02-03 | 11 | -80/+219 |
| | |\ \ \ \ | |||||
| | * | | | | | Fixed #626 | Tiger Wang | 2014-02-03 | 3 | -13/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed consumption of carrots and potatoes | ||||
| | * | | | | | Fixed issues with farmland | Tiger Wang | 2014-02-03 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed farmland reversion checks not taking into account carrots and potatoes * Fixed #623 | ||||
| | * | | | | | Server now handles join messages also | Tiger Wang | 2014-02-03 | 2 | -10/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revised as well hook documentation | ||||
| * | | | | | | Moved a forgotten comment back to its place. | madmaxoft | 2014-02-08 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Fixed lighting thread queueing. | madmaxoft | 2014-02-08 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | Fixed ChunkStay initialization. | madmaxoft | 2014-02-08 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fixed gcc compilation. | madmaxoft | 2014-02-08 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Initial ChunkStay code. | madmaxoft | 2014-02-08 | 11 | -406/+560 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge pull request #653 from mc-server/RedstoneSimulator | Mattes D | 2014-02-08 | 8 | -1772/+1881 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | Improvements for the redstone simulator. | ||||
| | * | | | | Fixed comment. | STRWarrior | 2014-02-08 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later). | STRWarrior | 2014-02-07 | 10 | -1826/+1822 |
| | | | | | | |||||
| | * | | | | Fixed some end of lines | STRWarrior | 2014-02-07 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Implemented an easy way of adding new redstone simulators. | STRWarrior | 2014-02-07 | 6 | -9/+122 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also added a "noop" redstone simulator that does the same as the fluid version. | ||||
| * | | | | | Fixed cWorld:TryGetHeight() API. | madmaxoft | 2014-02-08 | 1 | -1/+5 |
| |/ / / / | |||||
| * | | | | WebAdmin is stopped properly on server shutdown / restart. | madmaxoft | 2014-02-07 | 3 | -36/+55 |
| | | | | | | | | | | | | | | | | | | | | Fixes #272. | ||||
| * | | | | Fixed wiki link in auto-generated settings.ini. | madmaxoft | 2014-02-07 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge pull request #648 from worktycho/runMCServer | Mattes D | 2014-02-05 | 1 | -9/+27 |
| |\ \ \ \ | | | | | | | | | | | | | Added BoundingBox Test | ||||
| | * | | | | Change Output to stderr | worktycho | 2014-02-05 | 1 | -4/+3 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into runMCServer | Tycho | 2014-02-05 | 16 | -45/+96 |
| | |\ \ \ \ | |||||
| | * | | | | | Modified automatic test for boundingBox | Tycho | 2014-02-05 | 1 | -7/+26 |
| | | | | | | | |||||
| | * | | | | | Simplified shutdown | Tycho | 2014-02-05 | 1 | -4/+0 |
| | | | | | | | |||||
| | * | | | | | Added support to start up MCServer and then immediatly sut it down in travis | Tycho | 2014-02-05 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #649 from mc-server/GroupsPermissions | Mattes D | 2014-02-05 | 4 | -36/+1 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Removed deprecated HasCommand function | ||||
| | * | | | | | Removed deprecated HasCommand function | STRWarrior | 2014-02-05 | 4 | -36/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #645 from mc-server/GroupsPermissions | Mattes D | 2014-02-05 | 6 | -18/+69 |
| |\| | | | | | | | | | | | | | | | | | | | Improvements to the GroupManager | ||||
| | * | | | | | Forgot extra lines. | STRWarrior | 2014-02-05 | 1 | -0/+4 |
| | | | | | | | |||||
| | * | | | | | Improvements: | STRWarrior | 2014-02-05 | 6 | -22/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a function in cRoot that allows you to reload all the groups permissions. Note: Players don't automatically load their new permissions. You can use cPlayer::LoadPermissionsFromDisk for that. | ||||
| * | | | | | | Merge pull request #646 from worktycho/warningfixes | Alexander Harkness | 2014-02-05 | 10 | -27/+27 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Fixed most of the reordering warnings | ||||
| | * | | | | | Fixed most of the reordering warnings | Tycho | 2014-02-05 | 12 | -33/+33 |
| | | | | | | | |||||
| * | | | | | | Improved the signedness conversion. | madmaxoft | 2014-02-05 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Added cPluginManager:LogStackTrace() to the Lua API. | madmaxoft | 2014-02-05 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #637. | ||||
| * | | | | | | Crypto: Removed unused member, fixed gcc warning. | madmaxoft | 2014-02-04 | 2 | -6/+4 |
| | | | | | | | |||||
| * | | | | | | Added dtExplosion to damage<->string functions. | madmaxoft | 2014-02-04 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | Protocol 1.7: Fixed a signed / unsigned comparison warning. | madmaxoft | 2014-02-04 | 1 | -2/+2 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Fixed a gcc warning in ManualBindings. | madmaxoft | 2014-02-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Constructor member order... | ||||
| * | | | | | Removed a useless check in cLuaState. | madmaxoft | 2014-02-04 | 1 | -3/+1 |
| | | | | | | |||||
| * | | | | | Fixed a warning in cItem in gcc. | madmaxoft | 2014-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Constructor member order... | ||||
| * | | | | | Protocol 1.7 uses char for blockface. | madmaxoft | 2014-02-04 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | That should fix #644 on RasPi. | ||||
| * | | | | | Merge pull request #644 from worktycho/warningfixes | Mattes D | 2014-02-04 | 76 | -178/+199 |
| |\| | | | | | | | | | | | | | | | | Improved Type safety of eBlockFace | ||||
| | * | | | | Fix gcc not having operator ++ on enums | Tycho | 2014-02-04 | 1 | -6/+7 |
| | | | | | | |||||
| | * | | | | Improved Type safety of eBlockFace | Tycho | 2014-02-04 | 76 | -174/+194 |
| | | | | | | | | | | | | | | | | | | | | | | | | May Fix #640 | ||||
| * | | | | | Fixed chest placement. | madmaxoft | 2014-02-04 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #624. | ||||
| * | | | | | Merge pull request #635 from tonibm19/master | Mattes D | 2014-02-04 | 5 | -3/+16 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API | ||||
| | * | | | | Blank lines and indentation. | tonibm19 | 2014-02-04 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also removed GetClosestPlayer documentation | ||||
| | * | | | | Not exporting FindClosestPlayer | tonibm19 | 2014-02-03 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fixed compilation | tonibm19 | 2014-02-03 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua API | tonibm19 | 2014-02-03 | 6 | -3/+13 |
| | | |_|/ | | |/| | | |||||
| * | | | | Fixed calling plugins with userdata params. | madmaxoft | 2014-02-04 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Removed a leftover debug message. | madmaxoft | 2014-02-04 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Fixed error handling in cPluginManager:CallPlugin() API. | madmaxoft | 2014-02-04 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | Fixed: When the called function malfunctioned, the entire plugin's call was aborted. | ||||
| * | | | | Improved error resistance in cPluginManager:CallPlugin(). | madmaxoft | 2014-02-04 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | Fixed: If the call failed, all the next plugin calls would fail as well. | ||||
| * | | | | Greatly improved TNT propulsion chances | Tiger Wang | 2014-02-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #636 from worktycho/warningfixes | Mattes D | 2014-02-03 | 9 | -18/+31 |
| |\ \ \ \ | | | | | | | | | | | | | Increased Type safety of Biomes | ||||
| | * | | | | Fogot to save Biogen | Tycho | 2014-02-03 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | Fixed Compile errors | Tycho | 2014-02-03 | 3 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | c++11 introduces scoped enums, so the code didn't fail in clang | ||||
| | * | | | | Removed unused lookups | Tycho | 2014-02-03 | 1 | -2/+0 |
| | | | | | | |||||
| | * | | | | Increased Type safety of Biomes | Tycho | 2014-02-03 | 8 | -16/+31 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | Changed a number of funcictions from using integers to store biomes to using EMCSBiome Note that switching from an int to an Enum is a non-breaking chang to the lua bindings | ||||
| * | | | | Merge pull request #633 from mc-server/More_Sideways_Blocks | Mattes D | 2014-02-03 | 4 | -5/+80 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | More sideways blocks. | ||||
| | * | | Named the different quartz block. | STRWarrior | 2014-02-03 | 2 | -1/+6 |
| | | | | |||||
| | * | | Fixed some issues. | STRWarrior | 2014-02-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | Meta wasn't set if the block wasn't a pillar. Fixed typo. | ||||
| | * | | Renamed cBlockQuartsHandler to cBlockQuartzHandler. Fixed not being able to place normal quartz blocks. | STRWarrior | 2014-02-03 | 2 | -4/+4 |
| | | | | |||||
| | * | | This renames the cBlockWoodHandler to cBlockSidewaysHandler, and implements a new cBlockQuartzHandler to handle the quartz pillars. | STRWarrior | 2014-02-03 | 3 | -5/+74 |
| | | | | |||||
| * | | | Merge pull request #623 from mc-server/tnt | Mattes D | 2014-02-03 | 2 | -36/+122 |
| |\ \ \ | | |/ / | |/| | | TNT improvements | ||||
| | * | | Inversed condition | Tiger Wang | 2014-02-03 | 1 | -25/+28 |
| | | | | |||||
| | * | | Uncommented pickup spawner code | Tiger Wang | 2014-02-02 | 1 | -3/+7 |
| | | | | |||||
| | * | | TNT improvements | Tiger Wang | 2014-02-02 | 2 | -37/+116 |
| | | | | | | | | | | | | | | | | | | | | | | | | + Added entity damage + Added entity propulsion * Fixed #67 and fixed #230 | ||||
| * | | | Fixed socket leaking. | madmaxoft | 2014-02-03 | 1 | -0/+5 |
| | | | | |||||
| * | | | SocketThreads: Fixed sending to closed socket. | madmaxoft | 2014-02-03 | 1 | -1/+6 |
| | | | | |||||
| * | | | Groups.ini can contain spaces around commas in values. | madmaxoft | 2014-02-03 | 1 | -21/+25 |
| | | | | | | | | | | | | | | | | | | | | This includes Permissions, Inherits and Commands. Also fixed an unlikely but possible crash with group colors. | ||||
| * | | | Merge pull request #602 from mc-server/improvementsandfixes | Mattes D | 2014-02-03 | 7 | -22/+61 |
| |\ \ \ | | |_|/ | |/| | | Redstone crash fix and current console line replace function | ||||
| | * | | Added IsBlockWaterOrIce() | Tiger Wang | 2014-02-02 | 2 | -10/+12 |
| | | | | |||||
| | * | | Revert "Added LOGREPLACELINE for line replacement" | Tiger Wang | 2014-02-02 | 5 | -94/+16 |
| | | | | | | | | | | | | | | | | This reverts commit 7d03876a3e11aedff0201a8330bfdb2b5523fc5e. | ||||
| | * | | Revert "Improved code" | Tiger Wang | 2014-02-02 | 4 | -19/+13 |
| | | | | | | | | | | | | | | | | This reverts commit d8aa0b0ec7a2ebea2fc157c623ae8cd7d0b6ba1c. | ||||
| | * | | Revert "Added a comment" | Tiger Wang | 2014-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | This reverts commit 7ae5631d89426df6f05b6c8ba656ba02b9d15f93. | ||||
| | * | | Revert "Properly initialised variables" | Tiger Wang | 2014-02-02 | 4 | -13/+10 |
| | | | | | | | | | | | | | | | | This reverts commit 02e752789399ad1b65a0443534ea6a8721efd78c. | ||||
| | * | | Revert "Fixed issues with insufficient console space" | Tiger Wang | 2014-02-02 | 3 | -114/+29 |
| | | | | | | | | | | | | | | | | This reverts commit 6b18add09b5e9d6d6c2a61e90bdd7011f56f4c82. | ||||
| | * | | Revert "A newline issue is resolved" | Tiger Wang | 2014-02-02 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | This reverts commit 397208145ebe5c95ebf32f2985f6800634932230. | ||||
| | * | | Revert "Fixed Linux compile" | Tiger Wang | 2014-02-02 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | This reverts commit 5becfe850a2b4827a21e8ede989545334efbbead. | ||||
| | * | | Revert "Another Linux fix" | Tiger Wang | 2014-02-02 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | This reverts commit 6f660b379ecbc091b9bd92093e0dad01a4f6bf38. | ||||
| | * | | Revert "Again improved LogReplaceLine" | Tiger Wang | 2014-02-02 | 2 | -80/+77 |
| | | | | | | | | | | | | | | | | This reverts commit dd325d742db9db54a25460fcacd093e7cc6f44f0. | ||||
| | * | | Possibly fixed #618 | Tiger Wang | 2014-02-02 | 1 | -2/+2 |
| | | | | |||||
| | * | | Creative players take Plugin damage | Tiger Wang | 2014-02-02 | 2 | -3/+4 |
| | | | | |||||
| | * | | Again improved LogReplaceLine | Tiger Wang | 2014-02-01 | 2 | -77/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed issues on Linux with cursor positioning * Made preprocessor blocks more readable * Improved reliability of line clearing on Windows - Removed an *unneeded* variable | ||||
| | * | | Added checks for ice into IsBlockWater() | Tiger Wang | 2014-02-01 | 2 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | * This fixes players spawning in vast oceans of ice, as opposed to the previous water | ||||
| | * | | Split cCoord template into one and two data types | Tiger Wang | 2014-02-01 | 2 | -12/+34 |
| | | | | |||||
| | * | | Another Linux fix | Tiger Wang | 2014-02-01 | 1 | -0/+6 |
| | | | | |||||
| | * | | Fixed Linux compile | Tiger Wang | 2014-02-01 | 1 | -1/+2 |
| | | | | |||||
| | * | | A newline issue is resolved | Tiger Wang | 2014-02-01 | 2 | -3/+1 |
| | | | | |||||
| | * | | Fixed issues with insufficient console space | Tiger Wang | 2014-02-01 | 3 | -29/+114 |
| | | | | |||||
| | * | | Properly initialised variables | Tiger Wang | 2014-01-31 | 4 | -10/+13 |
| | | | | |||||
| | * | | Added a comment | Tiger Wang | 2014-01-31 | 1 | -1/+1 |
| | | | | |||||
| | * | | Improved code | Tiger Wang | 2014-01-31 | 4 | -13/+19 |
| | | | | | | | | | | | | | | | | | | | | * Fixed some issues * Fixed standard violation | ||||
| | * | | Added LOGREPLACELINE for line replacement | Tiger Wang | 2014-01-29 | 5 | -16/+94 |
| | | | | |||||
| | * | | Fixed redstone simulator crash found in #570 | Tiger Wang | 2014-01-29 | 3 | -18/+25 |
| | | | | |||||
| * | | | Fixed multiple invalid permission nodes | Tiger Wang | 2014-02-02 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | New players can build as default now | ||||
| * | | | Merge branch 'master' of https://github.com/mc-server/MCServer | Tiger Wang | 2014-02-02 | 78 | -550/+730 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into registerfix | Tycho | 2014-02-02 | 44 | -63/+211 |
| | |\ \ \ | |||||
| | | * | | | Fixed dark oak and acacia placement. | madmaxoft | 2014-02-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #621. | ||||
| | | * | | | Added missing files | Tycho | 2014-02-02 | 3 | -0/+39 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-02 | 11 | -3/+72 |
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | Conflicts: src/Blocks/BlockTorch.h | ||||
| | | * | | | Changed Signiture of OnUpdate | Tycho | 2014-02-02 | 20 | -37/+65 |
| | | | | | | |||||
| | | * | | | Changed Signiture of OnDigging | Tycho | 2014-02-01 | 4 | -7/+7 |
| | | | | | | |||||
| | | * | | | Changed Signiture of OnDestroyedByPlayer | Tycho | 2014-02-01 | 12 | -16/+27 |
| | | | | | | |||||
| | * | | | | Removed register keyword from Messinne Twister | Tycho | 2014-02-01 | 1 | -26/+26 |
| | |/ / / | | | | | | | | | | | | | | | | Removed register as it is meaningless in c++ and causes a depreciated warning in clang 3.4 in c++ mode for va_copy | ||||
| | * | | | Changed pointers to references | Tycho | 2014-02-01 | 60 | -249/+247 |
| | | | | | |||||
| | * | | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-02-01 | 41 | -184/+863 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| | * | | | | Changed signitures of Several BLockHandler Methods | Tycho | 2014-02-01 | 55 | -196/+209 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check | ||||
| | * | | | | Removed cWorld Include | Tycho | 2014-01-26 | 3 | -3/+0 |
| | | | | | | |||||
| | * | | | | Refactored GetPlacementBlockTypeMeta | Tycho | 2014-01-26 | 7 | -11/+12 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into GeneratingBenchmark2 | Tycho | 2014-01-26 | 70 | -1195/+2527 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h | ||||
| | * | | | | | Refactored cBlockHandler::OnUse and dependents | Tycho | 2014-01-26 | 21 | -263/+310 |
| | | | | | | | |||||
| | * | | | | | Added support for overide in c++11 supporting varients of gcc/clang | Tycho | 2014-01-26 | 1 | -2/+4 |
| | | | | | | | |||||
| | * | | | | | First attempt at Implementing Interfaces | Tycho | 2014-01-25 | 19 | -38/+80 |
| | | | | | | | |||||
| | * | | | | | dded dependecy on Blocks to Generator | Tycho | 2014-01-25 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fixed #624 | Tiger Wang | 2014-02-02 | 2 | -0/+7 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Fixed #620 | Tiger Wang | 2014-02-02 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Added saving of angry flag. | Kirill Kirilenko | 2014-02-02 | 2 | -0/+7 |
| | | | | | | |||||
| * | | | | | Fixed sitting tag. | Kirill Kirilenko | 2014-02-02 | 2 | -5/+5 |
| | | | | | | |||||
| * | | | | | Monster's nominal speed was increased. | Kirill Kirilenko | 2014-02-01 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fixed teleport to air, if owner is flying. | Kirill Kirilenko | 2014-02-01 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Added saving of collar's color. | Kirill Kirilenko | 2014-02-01 | 2 | -4/+11 |
| | | | | | | |||||
| * | | | | | Merge pull request #585 from daniel0916/hooks | Mattes D | 2014-02-01 | 6 | -0/+47 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Added "player destroying" and "player destroyed" hooks | ||||
| | * | | | | | Removed "player destroying" hook | daniel0916 | 2014-02-01 | 6 | -48/+1 |
| | | | | | | | |||||
| | * | | | | | Added "player destroying" and "player destroyed" hooks | daniel0916 | 2014-01-25 | 6 | -0/+94 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hooks: HOOK_PLAYER_DESTROYING HOOK_PLAYER_DESTROYED Idea from: https://github.com/mc-server/MCServer/issues/473 | ||||
| * | | | | | | Added reading saved state of the wolf (sitting or standing). | Kirill Kirilenko | 2014-01-31 | 1 | -0/+6 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge pull request #607 from mc-server/Wolf_Owner_Saving | Mattes D | 2014-01-31 | 2 | -3/+12 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Wolf: Their owner now gets saved. | ||||
| | * | | | | | Inversed condition. | STRWarrior | 2014-01-31 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Wolf: If Owner tag is missing a normal ownerless wolf will spawn. | STRWarrior | 2014-01-31 | 1 | -9/+6 |
| | | | | | | | |||||
| | * | | | | | Fixed bad variable. | STRWarrior | 2014-01-30 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Check if the tag is found. | STRWarrior | 2014-01-30 | 1 | -0/+5 |
| | | | | | | | |||||
| | * | | | | | Fixes #606 | STRWarrior | 2014-01-30 | 2 | -2/+9 |
| | | | | | | | |||||
| * | | | | | | Fixed cLineBlockTracer:Trace() signature. | madmaxoft | 2014-01-31 | 1 | -13/+27 |
| | | | | | | | |||||
| * | | | | | | Added cPluginManager:BindCommand() form to the API. | madmaxoft | 2014-01-31 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | That's the canonical way to call static functions. | ||||
| * | | | | | | Added cChunkDest::UpdateHeightmap() | madmaxoft | 2014-01-31 | 2 | -17/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is necessary for plugins manipulating the generated chunks, they need to update the heightmap before it is passed back to the generator. | ||||
| * | | | | | | Attempt at implementing #563 | tonibm19 | 2014-01-30 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | Not tested (I don't have RasPi) | ||||
| * | | | | | | Lua: Fixed an error in table-functions callbacks. | madmaxoft | 2014-01-29 | 1 | -1/+5 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Did what xoft said | tonibm19 | 2014-01-29 | 4 | -5/+3 |
| | | | | | | |||||
| * | | | | | Rewritten code. | tonibm19 | 2014-01-29 | 12 | -152/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented xoft suggestion. Using MoveToPosition as tigerw suggested. | ||||
| * | | | | | Fixed sheep | tonibm19 | 2014-01-29 | 1 | -18/+17 |
| | | | | | | |||||
| * | | | | | Fixed a copypasta error... | tonibm19 | 2014-01-29 | 4 | -1/+5 |
| | | | | | | |||||
| * | | | | | Now mobs follow you when holding their breed item | tonibm19 | 2014-01-29 | 10 | -5/+153 |
| | | | | | | |||||
| * | | | | | Limited sign lines to 15 chars. | madmaxoft | 2014-01-29 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #598. | ||||
| * | | | | | Plugin files are loaded in alphabetical order. | madmaxoft | 2014-01-29 | 1 | -17/+35 |
| |/ / / / | | | | | | | | | | | | | | | | Except for the Info.lua file which gets loaded always last. Implements #597. | ||||
| * | | | | Removed debug message when a firework entity hit a solid block. | STRWarrior | 2014-01-29 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Bottle o' Enchanting spawns an experience orb. | STRWarrior | 2014-01-29 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Added 1.7.4 to the list of supported protocols. | madmaxoft | 2014-01-29 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Protocol 1.7: Encryption is enabled only with auth. | madmaxoft | 2014-01-29 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Protocol 1.7: Forced encryption on all connections. | madmaxoft | 2014-01-28 | 4 | -15/+120 |
| | | | | | | | | | | | | | | | | | | | | This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication. | ||||
| * | | | | Crypto: Added public key encryption / decryption. | madmaxoft | 2014-01-28 | 2 | -0/+106 |
| | | | | | |||||
| * | | | | Fixed an error in Crypto. | madmaxoft | 2014-01-28 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #594 from mc-server/Villager_Update | Mattes D | 2014-01-28 | 5 | -2/+185 |
| |\ \ \ \ | | | | | | | | | | | | | Villager update | ||||
| | * | | | | Renamed Farmer functions and added doxycomments | STRWarrior | 2014-01-28 | 2 | -17/+20 |
| | | | | | | |||||
| | * | | | | Villager: NoCountDown and Action function don't check VillagersShouldHarvestCrops anymore because it shoudn't even be activated anywhere. | STRWarrior | 2014-01-28 | 1 | -10/+0 |
| | | | | | | |||||
| | * | | | | Villager doesn't check the environment for crops if it doesn't need to. | STRWarrior | 2014-01-27 | 1 | -0/+5 |
| | | | | | | |||||
| | * | | | | The world can now be configured wether farmers should be able to harvest crops. | STRWarrior | 2014-01-27 | 3 | -0/+14 |
| | | | | | | |||||
| | * | | | | Villager: Few more comments. | STRWarrior | 2014-01-27 | 2 | -4/+9 |
| | | | | | | |||||
| | * | | | | Cleanup | STRWarrior | 2014-01-27 | 2 | -31/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | Most code in Tick is now split up in different functions. | ||||
| | * | | | | Villagers: Harvesting is more rare. | STRWarrior | 2014-01-27 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Villager: Farmers can't place crops on blocks other then farmland. | STRWarrior | 2014-01-27 | 1 | -1/+7 |
| | | | | | | |||||
| | * | | | | Fixed compiler error. | STRWarrior | 2014-01-27 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Villager: Farmer: Crops finding is more random. | STRWarrior | 2014-01-27 | 1 | -18/+19 |
| | | | | | | |||||
| | * | | | | Added GetCropsPos and DidFindCrops functions. | STRWarrior | 2014-01-27 | 1 | -0/+6 |
| | | | | | | |||||
| | * | | | | Villagers: Farmers now replant the crops. | STRWarrior | 2014-01-27 | 2 | -1/+17 |
| | | | | | | |||||
| | * | | | | Villagers: Fixed only gettings the crops block when farming. | STRWarrior | 2014-01-27 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Villagers don't look for new crops when they already found one. | STRWarrior | 2014-01-27 | 1 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | Slight cleanup. | ||||
| | * | | | | E_BLOCK_POTATOES isn't an solid block. Villagers were floating above them. | STRWarrior | 2014-01-27 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Villagers: Farmers can also harvest carrots and potatoes. | STRWarrior | 2014-01-27 | 2 | -9/+38 |
| | | | | | | |||||
| | * | | | | Makes farmers farm crops. | STRWarrior | 2014-01-27 | 2 | -1/+76 |
| | | |_|/ | | |/| | | |||||
| * | | | | Fixed timing on *nix. | madmaxoft | 2014-01-28 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Fixed a slight bug in RSA encryption code. | madmaxoft | 2014-01-28 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Merge pull request #595 from mc-server/NonBlockingSockets | Mattes D | 2014-01-28 | 4 | -63/+171 |
| |\ \ \ \ | | | | | | | | | | | | | Non blocking sockets | ||||
| | * | | | | Squashed common code. | madmaxoft | 2014-01-27 | 1 | -14/+7 |
| | | | | | | |||||
| | * | | | | Fixed Linux compilation. | madmaxoft | 2014-01-27 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Rewritten networking to use non-blocking sockets. | madmaxoft | 2014-01-27 | 4 | -62/+176 |
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes #592. | ||||
| * | | | | | SIGABRT exits with failure. | Tiger Wang | 2014-01-27 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | Fixed client packet parsing. | madmaxoft | 2014-01-26 | 2 | -15/+56 |
| | | | | | | | | | | | | | | | | | | | | | | | | | When the packet wouldn't fit the current buffer, the server would mis-parse the next packet. This was the cause for #541. Also modified comm logging, now each direction can be turned on separately. | ||||
| * | | | | cByteBuffer has more self-tests. | madmaxoft | 2014-01-26 | 1 | -6/+29 |
| | | | | | |||||
| * | | | | Item-loading now checks for weird bytes. | madmaxoft | 2014-01-26 | 1 | -3/+9 |
| | | | | | |||||
| * | | | | Fixed Byte-order reading. | madmaxoft | 2014-01-26 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | The functions would fail on bytes that were above 127. | ||||
| * | | | | Added SIGABRT to catchers list | Tiger Wang | 2014-01-26 | 1 | -1/+6 |
| |/ / / | |||||
| * | | | Merge pull request #589 from mc-server/minecartimprovements | Mattes D | 2014-01-26 | 5 | -110/+438 |
| |\ \ \ | | | | | | | | | | | Minecart improvements | ||||
| | * | | | Reduced unnecessary echoes (thanks xoft) | Tiger Wang | 2014-01-26 | 1 | -5/+3 |
| | | | | | |||||
| | * | | | Rail speed tweak | Tiger Wang | 2014-01-25 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Improved AllToLua UI experience | Tiger Wang | 2014-01-25 | 1 | -2/+8 |
| | | | | | |||||
| | * | | | Added more minecart powered rail directions | Tiger Wang | 2014-01-24 | 3 | -80/+63 |
| | | | | | |||||
| | * | | | Begin implementing ascending rails | Tiger Wang | 2014-01-19 | 2 | -2/+45 |
| | | | | | |||||
| | * | | | Added one more direction into collision checks | Tiger Wang | 2014-01-19 | 1 | -26/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Added direction XM_XP * Improved performance, thanks STR and xoft | ||||
| | * | | | Minecart improvements and fixes | Tiger Wang | 2014-01-19 | 1 | -33/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed curved rails * Fixed detector rails in certain situations * Fixed powered rails and others passing bad meta to SnapToRail() | ||||
| | * | | | Fixed weird meta with curved rails | Tiger Wang | 2014-01-19 | 1 | -5/+15 |
| | | | | | |||||
| | * | | | Added more rail functionality | Tiger Wang | 2014-01-19 | 3 | -18/+22 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'origin/master' into minecartimprovements | Tiger Wang | 2014-01-19 | 72 | -276/+1139 |
| | |\ \ \ | |||||
| | * | | | | Minecart collision and general improvements | Tiger Wang | 2014-01-18 | 2 | -70/+242 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented collision on one type of rail * Improved curved rails somewhat * Fixed a crash bug | ||||
| * | | | | | Merge pull request #590 from mc-server/Wolf_Fix | Mattes D | 2014-01-26 | 1 | -7/+31 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Wolf: Small fix since the new AI and a new small feature. | ||||
| | * | | | | | Fixed bug where wolfs would teleport while they were sitting. | STRWarrior | 2014-01-26 | 1 | -1/+4 |
| | | | | | | | |||||
| | * | | | | | Small fix since the new AI and a new small feature. | STRWarrior | 2014-01-26 | 1 | -6/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You get particles when trying to tame wolfs. They don't walk anymore when they are sitting. | ||||
| * | | | | | | Fixed segmentation fault on villager damage | Tiger Wang | 2014-01-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It occurred when attack was environmental. | ||||
| * | | | | | | Merge pull request #575 from worktycho/GeneratingBenchmark | Mattes D | 2014-01-25 | 8 | -189/+294 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | More Interfaces to decouple Generator from the rest of the code | ||||
| | * | | | | Stupid Mistake fixed | Tycho | 2014-01-25 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Fixed exports | Tycho | 2014-01-25 | 3 | -7/+1 |
| | | | | | | |||||
| | * | | | | Fixed spelling error | Tycho | 2014-01-22 | 4 | -3/+3 |
| | | | | | | |||||
| | * | | | | Added manual bindings for moved functions | Tycho | 2014-01-22 | 3 | -2/+71 |
| | | | | | | |||||
| | * | | | | formatting changes | Tycho | 2014-01-22 | 2 | -6/+26 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into GeneratingBenchmark | Tycho | 2014-01-22 | 27 | -228/+2047 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| | * | | | | | Actually implemented interfaces | Tycho | 2014-01-20 | 4 | -21/+33 |
| | | | | | | | |||||
| | * | | | | | Moved Schematic file methods to seperate class | Tycho | 2014-01-20 | 4 | -175/+177 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'ForEachChunkProvider' into GeneratingBenchmark | Tycho | 2014-01-20 | 4 | -17/+23 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h | ||||
| | | * | | | | | Seperated BlockArea From World | Tycho | 2014-01-20 | 4 | -14/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If anyone can come up with a better name for the interface I'll change it, It contians to methods which do compleatly unrelated things | ||||
| | * | | | | | | Merge branch 'master' into GeneratingBenchmark | Tycho | 2014-01-20 | 43 | -490/+1360 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | | | this merge is necessary, | ||||
| | * | | | | | Added Inifile and OSSupport Linking | Tycho | 2014-01-19 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #588 from mc-server/Sheep_Eating | Mattes D | 2014-01-25 | 2 | -1/+41 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Implemented sheeps eating grass. | ||||
| | * | | | | | | Implemented sheeps eating grass. | STRWarrior | 2014-01-25 | 2 | -1/+41 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #587 from mc-server/mobimprovements | Mattes D | 2014-01-25 | 28 | -563/+716 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Mob improvements & rudimentary artificial intelligence | ||||
| | * | | | | | | | Did what xoft recommended | Tiger Wang | 2014-01-25 | 2 | -2/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Two minor changes | Tiger Wang | 2014-01-25 | 2 | -6/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Implemented fall damage for mobs | Tiger Wang | 2014-01-25 | 5 | -11/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros | ||||
| | * | | | | | | | Attack() is no longer always called | Tiger Wang | 2014-01-25 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Implemented pickup combining | Tiger Wang | 2014-01-25 | 1 | -0/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes FS393 * Part of #131 | ||||
| | * | | | | | | | Mob bugfixes | Tiger Wang | 2014-01-25 | 6 | -26/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Mobs no longer require constant line-of-sight to a player to remain aggravated * Fixed an ASSERT * Fixed mobs jumping * Fixed Idle state not properly using AI + Added FILE_IO_PREFIX to favicon loading + Implemented #563 | ||||
| | * | | | | | | | All mobs now drown (fixes #54) | Tiger Wang | 2014-01-25 | 6 | -127/+137 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implemented mob drowning * Iron Golems and squids are excluded | ||||
| | * | | | | | | | Fixed a generator bug | Tiger Wang | 2014-01-25 | 2 | -1/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | Zombies and skeletons use AI | Tiger Wang | 2014-01-25 | 2 | -9/+15 |
| | | | | | | | | | |||||
| | * | | | | | | | Miscellaneous improvements | Tiger Wang | 2014-01-24 | 3 | -28/+17 |
| | | | | | | | | | |||||
| | * | | | | | | | Changed a condition to IsGameMode | Tiger Wang | 2014-01-24 | 1 | -2/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Made wolves compatible with new AI code | Tiger Wang | 2014-01-24 | 2 | -11/+26 |
| | | | | | | | | | |||||
| | * | | | | | | | Monsters no longer check for direct line of sight | Tiger Wang | 2014-01-24 | 1 | -10/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Large reworking of mob code [SEE DESC] | Tiger Wang | 2014-01-24 | 7 | -242/+334 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented better pathfinding - Removed lots of unused variables, functions, etc. * Changed some variable types * Other miscellaneous fixes, and also completes the previous PRs | ||||
| | * | | | | | | | Fixed mobs too close to player not ticking | Tiger Wang | 2014-01-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A condition would never be fulfilled. A number squared was compared to -1, but there is nothing that, multiplied by itself, gives -1. | ||||
| | * | | | | | | | Implemented creeper abilities | Tiger Wang | 2014-01-24 | 2 | -2/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Creepers now explode with a sound effect * Creepers drop a music disc on the unlikely event of being killed by a skeleton's arrow Inspired by @maniak89's PR #132. | ||||
| | * | | | | | | | Removed unused ReferenceManager | Tiger Wang | 2014-01-24 | 4 | -122/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #583 from mc-server/ChangeToPolarSSL | Mattes D | 2014-01-25 | 14 | -161/+679 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change to polar ssl | ||||
| | * | | | | | | | | Added RSA encryption to crypto wrappers. | madmaxoft | 2014-01-25 | 2 | -0/+39 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merged branch 'master' into ChangeToPolarSSL. | madmaxoft | 2014-01-25 | 15 | -117/+319 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into ChangeToPolarSSL. | madmaxoft | 2014-01-23 | 11 | -198/+254 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fixed a warning in ScoreboardSerializer. | madmaxoft | 2014-01-23 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | PolarSSL is fully used for 1.3.2 protocol encryption. | madmaxoft | 2014-01-23 | 13 | -157/+630 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fixed a bug in LeakFinder. | madmaxoft | 2014-01-23 | 1 | -3/+8 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Replacing CryptoPP with PolarSSL. | madmaxoft | 2014-01-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is only the CMake modification to build with PolarSSL, the actual MCS code doesn't compile at all yet. | ||||
| * | | | | | | | | | | | Merge pull request #581 from worktycho/strerror | Mattes D | 2014-01-25 | 7 | -65/+76 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | Switched cEvent to use strerror_r for error messages | ||||
| | * | | | | | | | | | | Switched cEvent to GetOSErrorString | Tycho | 2014-01-25 | 3 | -18/+14 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Extracted cSocket::GetErrorString into GetOSErrorString | Tycho | 2014-01-25 | 6 | -59/+62 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Switched cEvent to use strerror_r for error messages | Tycho | 2014-01-23 | 1 | -6/+18 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Comm logging is available in both Debug and Release modes. | madmaxoft | 2014-01-25 | 3 | -16/+16 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added cFile::Flush(). | madmaxoft | 2014-01-25 | 2 | -20/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful when using cFile as a log file and we know the server may crash after a specific write, so we flush the file before continuing. | ||||
| * | | | | | | | | | | | Protocol17: Comm logging shows the data left over from previous parse. | madmaxoft | 2014-01-25 | 1 | -2/+15 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #586 from worktycho/BindingsMove | Alexander Harkness | 2014-01-25 | 1 | -28/+65 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | Implented xofts suggestions in #577 | ||||
| | * | | | | | | | | | | Added dependecy output to Bindings/BindingsDependencies.txt | Tycho | 2014-01-25 | 1 | -0/+7 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Reformatted Bindings Dependecies | Tycho | 2014-01-25 | 1 | -28/+58 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed *nix compilation for previous commit. | madmaxoft | 2014-01-24 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added per-connection comm logging in debug mode. | madmaxoft | 2014-01-24 | 3 | -1/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is meant for debugging only, so it is compiled only into debug mode. It is activated by starting the server with "/logcomm" parameter. | ||||
| * | | | | | | | | | | | Fixed a possible deadlock on client disconnect. | madmaxoft | 2014-01-24 | 1 | -9/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed a failure in cSquid. | madmaxoft | 2014-01-24 | 1 | -1/+2 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Probably due to rounding errors the squid was querying out-of-chunk coords. | ||||
| * | | | | | | | | | | Fixed Win nightbuilds not producing PDBs. | madmaxoft | 2014-01-24 | 1 | -0/+7 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed a few compile-time and runtime warnings in ScoreboardSerializer. | madmaxoft | 2014-01-24 | 1 | -8/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Fixed crash with failed entity-loading. | madmaxoft | 2014-01-24 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix issues reported in: http://forum.mc-server.org/showthread.php?tid=1328 http://forum.mc-server.org/showthread.php?tid=1308 | ||||
| * | | | | | | | | | | Merge remote-tracking branch 'MikeHunsinger/master' | madmaxoft | 2014-01-24 | 4 | -49/+89 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fixed indentation once and for all. | Mike Hunsinger | 2014-01-24 | 2 | -46/+46 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fixed indentation and doxygen comments... For real this time. | Mike Hunsinger | 2014-01-24 | 2 | -15/+15 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Fixed spacing and doxycomments. | Mike Hunsinger | 2014-01-24 | 3 | -18/+16 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Removed extra line | Mike Hunsinger | 2014-01-23 | 1 | -2/+0 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Split TossItem into three Toss functions (Held, Equipped and Pickup) | Mike Hunsinger | 2014-01-23 | 4 | -57/+101 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed flint&steel failure on the Y world edges. | madmaxoft | 2014-01-24 | 1 | -0/+4 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #580 from xdot/master | Mattes D | 2014-01-23 | 2 | -41/+33 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | Fixed scoreboard serialization | ||||
| | * | | | | | | | | | Fixed 1.5.x scoreboard packet IDs | andrew | 2014-01-23 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed scoreboard.dat structure | andrew | 2014-01-23 | 1 | -5/+6 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed scoreboard serialization | andrew | 2014-01-23 | 1 | -35/+26 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Make clean now effects Bindings | Tycho | 2014-01-23 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Removed Bindings folder subcmake on *nix | Tycho | 2014-01-23 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Bugfixes | Tycho | 2014-01-23 | 2 | -12/+9 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | added dependecies for bindings regen | Tycho | 2014-01-23 | 2 | -14/+46 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Fixed crash while calling disabled plugins. | madmaxoft | 2014-01-23 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Improved code safety for the Compact world storage. | Mattes D | 2014-01-23 | 1 | -104/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That was a huge chunk of smelly code. | ||||
| * | | | | | | | | Minor style improvements for the merged PR. | Mattes D | 2014-01-23 | 1 | -4/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge remote-tracking branch 'xdot/master' | Mattes D | 2014-01-23 | 6 | -40/+104 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * xdot/master: Command block fixes 2 | ||||
| | * | | | | | | | Command block fixes 2 | andrew | 2014-01-23 | 6 | -40/+104 |
| | | | | | | | | | |||||
| * | | | | | | | | Authenticator: Reduced logging levels. | madmaxoft | 2014-01-22 | 1 | -4/+4 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Fixed compilation on VC2008 | tonibm19 | 2014-01-22 | 1 | -0/+1 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #566 from xdot/master | Mattes D | 2014-01-22 | 20 | -9/+1571 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Scoreboard | ||||
| | * | | | | | | cWorld now saves/loads the scoreboard | andrew | 2014-01-22 | 4 | -15/+44 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-21 | 30 | -478/+679 |
| | |\| | | | | | |||||
| | * | | | | | | Scoreboard SendTo() | andrew | 2014-01-21 | 4 | -6/+74 |
| | | | | | | | | |||||
| | * | | | | | | Scoreboard protocol support | andrew | 2014-01-21 | 17 | -23/+321 |
| | | | | | | | | |||||
| | * | | | | | | Scoreboard serialization | andrew | 2014-01-20 | 3 | -14/+92 |
| | | | | | | | | |||||
| | * | | | | | | Scoreboard deserialization | andrew | 2014-01-20 | 7 | -48/+599 |
| | | | | | | | | |||||
| | * | | | | | | Scoreboard improvements | andrew | 2014-01-19 | 3 | -116/+79 |
| | | | | | | | | |||||
| | * | | | | | | Basic scoreboard implementation | andrew | 2014-01-19 | 5 | -1/+576 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Implemented cPluginManager:CallPlugin() API. | madmaxoft | 2014-01-21 | 7 | -214/+471 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | This function supersedes cPlugin:Call(), is safer to use in regards to multithreading and once again removes the need for the cPlugin class being exported at all. | ||||
| * | | | | | Fix a crash but somewhere... | Alexander Harkness | 2014-01-20 | 1 | -2/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Fixed merge conflict | daniel0916 | 2014-04-07 | 1 | -3/+0 |
| | | | | | |||||
* | | | | | Added Enchantment-Slot-Level generating | daniel0916 | 2014-04-07 | 3 | -9/+32 |
| | | | | | |||||
* | | | | | added EnchantItemPacket to older Protocols | daniel0916 | 2014-02-01 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | Some updates for enchanting (2) | daniel0916 | 2014-01-31 | 9 | -15/+173 |
| | | | | | |||||
* | | | | | removed hook from enchanting commit | daniel0916 | 2014-01-24 | 2 | -5/+1 |
| | | | | | |||||
* | | | | | Some updates for enchanting | daniel0916 | 2014-01-24 | 5 | -17/+29 |
| | | | | | |||||
* | | | | | first changes for enchanting (not finished) | daniel0916 | 2014-01-20 | 8 | -0/+198 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added enchanting table block handler and added it to the blockhandler - added enchanting window - drop item in the slot 0 when the player close the window - added enchanting packet (1.7 only) - some more... | ||||
* | | | | Changed the cWorld::ScheduleTask() signature. | madmaxoft | 2014-01-19 | 3 | -151/+181 |
| | | | | | | | | | | | | | | | | Now it takes the delay in ticks as an argument, and a cTask descendant as the task to run. Lua API has been updated similarly. | ||||
* | | | | cLuaState can now check function params. | madmaxoft | 2014-01-19 | 2 | -0/+37 |
| | | | | |||||
* | | | | Merge pull request #569 from worktycho/EnchantmentsFix | Mattes D | 2014-01-19 | 8 | -88/+120 |
|\ \ \ \ | | |/ / | |/| | | Enchantments fix | ||||
| * | | | Switched EnchantmentSerilizer to namespace | Tycho | 2014-01-19 | 7 | -17/+23 |
| | | | | |||||
| * | | | Spilt Writing of Enchantments to seperate class | Tycho | 2014-01-19 | 8 | -90/+116 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a new class cEnchantmentSerializer to serilize Enchantments to NBT. This breaks a dependecy chain between cChunkGenerator and cWorld. cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments so having it seperate reduces the spread of the frein modifier | ||||
* | | | | Merge pull request #565 from mc-server/commandblockfixes | Mattes D | 2014-01-19 | 11 | -5/+151 |
|\ \ \ \ | | | | | | | | | | | Command block fixes | ||||
| * | | | | Removed unneeded paramters | Tiger Wang | 2014-01-19 | 9 | -15/+23 |
| | | | | | |||||
| * | | | | Changed SendBlockEntity format slightly | Tiger Wang | 2014-01-19 | 9 | -42/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug | ||||
| * | | | | Implemented MC|Brand response | Tiger Wang | 2014-01-19 | 1 | -3/+9 |
| | | | | | |||||
| * | | | | Improved command blocks | Tiger Wang | 2014-01-19 | 11 | -5/+124 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Their command and previous output are displayed on the client * They have a BlockHandler implementation, so you can't place blocks on them anymore + As a side effect, implemented UpdateBlockEntity | ||||
* | | | | | Rewritten SocketThreads for proper shutdown scenario. | madmaxoft | 2014-01-19 | 8 | -178/+189 |
| | | | | | | | | | | | | | | | | | | | | This fixes #560 and #390. | ||||
* | | | | | Merge pull request #551 from worktycho/schedular | Mattes D | 2014-01-19 | 1 | -6/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Implemented xoft's suggestion for a saturating counter in the scheduler | ||||
| * | | | | | Fixed iterators bug | Tycho | 2014-01-18 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | switched to using m_WorldAge rather than m_TickID | Tycho | 2014-01-18 | 2 | -9/+3 |
| | | | | | | |||||
| * | | | | | Increased tick count to long | Tycho | 2014-01-17 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | Implemented xsofts suggestion for a saturating counter in the scheduler | Tycho | 2014-01-17 | 2 | -5/+8 |
| | | | | | | |||||
* | | | | | | SocketThreads: Removed unused code. | madmaxoft | 2014-01-19 | 2 | -53/+3 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #559 from mc-server/SpawnMobParticles | Mattes D | 2014-01-19 | 1 | -3/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | Removed the particles when a mob spawns. | ||||
| * | | | | | Removed the particles when a mob spawns. | STRWarrior | 2014-01-18 | 1 | -3/+0 |
| | | | | | | |||||
* | | | | | | Exported cFloater to the Lua API. | STRWarrior | 2014-01-19 | 2 | -3/+8 |
| | | | | | | |||||
* | | | | | | Fixed compiler error. | STRWarrior | 2014-01-18 | 1 | -3/+3 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #557 from xdot/master | Mattes D | 2014-01-18 | 19 | -62/+592 |
|\ \ \ \ \ | | | | | | | | | | | | | Command blocks | ||||
| * | | | | | Command block fixes | andrew | 2014-01-18 | 3 | -43/+17 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of https://github.com/mc-server/MCServer | andrew | 2014-01-18 | 3 | -3/+150 |
| |\| | | | | |||||
| * | | | | | Parse the MC|AdvCdm plugin message | andrew | 2014-01-18 | 4 | -1/+70 |
| | | | | | | |||||
| * | | | | | Command blocks: Execute() | andrew | 2014-01-18 | 5 | -18/+42 |
| | | | | | | |||||
| * | | | | | Command block (de)serialization | andrew | 2014-01-18 | 6 | -21/+122 |
| | | | | | | |||||
| * | | | | | Basic command block implementation | andrew | 2014-01-18 | 11 | -33/+395 |
| | |_|/ / | |/| | | | |||||
* | | | | | HTTP connections aren't kept alive unless explicitly enabled. | madmaxoft | 2014-01-18 | 4 | -37/+58 |
| |/ / / |/| | | | | | | | | | | | | | | | Only the client can decide that the connection can be kept alive, we must close the socket if the client doesn't indicate keepalive support. This will provide a fix for #390 when #560 is fixed; until then the issue remains, just it's no longer HTTPServer's fault. | ||||
* | | | | Alpha-sorted the finishers. | madmaxoft | 2014-01-18 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merged branch 'NetherFinish'. | madmaxoft | 2014-01-18 | 3 | -3/+150 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fixed errors. | STRWarrior | 2014-01-18 | 2 | -2/+2 |
| | | | | |||||
| * | | | Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo's | STRWarrior | 2014-01-18 | 3 | -10/+10 |
| | | | | |||||
| * | | | Some tweaks. | STRWarrior | 2014-01-18 | 1 | -5/+18 |
| | | | | | | | | | | | | | | | | | | | | Everything generates more often. Fire can only spawn on ForeverBurning blocks. | ||||
| * | | | Fixed bug where only brown mushrooms would spawn. | STRWarrior | 2014-01-18 | 1 | -3/+3 |
| | | | | |||||
| * | | | It now actualy works. | STRWarrior | 2014-01-18 | 1 | -20/+42 |
| | | | | |||||
| * | | | First attempt at creating a clumb version NetherFinisher. | STRWarrior | 2014-01-17 | 2 | -22/+63 |
| | | | | |||||
| * | | | Added cFinishGenNetherSprinkleFoliage. | STRWarrior | 2014-01-10 | 3 | -2/+73 |
| | | | | |||||
* | | | | Merge pull request #552 from worktycho/c++11 | Mattes D | 2014-01-17 | 1 | -4/+0 |
|\ \ \ \ | | | | | | | | | | | Changed std to c++11 in clang to fix va_copy issues | ||||
| * | | | | Changed std to c++11 in clang to fix va_copy issues | Tycho | 2014-01-17 | 1 | -4/+0 |
| | |/ / | |/| | | |||||
* / | | | Added user setting compression factor | Tycho | 2014-01-17 | 10 | -22/+33 |
|/ / / | |||||
* | | | Merge pull request #534 from mc-server/SpawnMinecart | Mattes D | 2014-01-17 | 7 | -11/+62 |
|\ \ \ | | | | | | | | | Added cWorld::SpawnMinecart. | ||||
| * | | | Changed GetContent function. | STRWarrior | 2014-01-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed server crash. | STRWarrior | 2014-01-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Renamed cEmptyMinecart to cRideableMinecart | STRWarrior | 2014-01-12 | 7 | -17/+18 |
| | | | | |||||
| * | | | EmptyMinecarts should be able to get a block inside of them. | STRWarrior | 2014-01-12 | 7 | -10/+33 |
| | | | | |||||
| * | | | Added cWorld::SpawnMinecart. | STRWarrior | 2014-01-12 | 2 | -0/+27 |
| | | | | |||||
* | | | | Fixed SIGABRT_COMPAT on other architectures. | madmaxoft | 2014-01-17 | 1 | -0/+2 |
| | | | | |||||
* | | | | Removed internal cEntity::GetRot() usage. | madmaxoft | 2014-01-17 | 23 | -43/+43 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'origin/customnames' | madmaxoft | 2014-01-17 | 38 | -115/+201 |
|\ \ \ \ | |||||
| * | | | | Changed newline character because of issues | Tiger Wang | 2014-01-16 | 2 | -4/+13 |
| | | | | | |||||
| * | | | | Removed CustomCopy() | Tiger Wang | 2014-01-16 | 2 | -24/+1 |
| | | | | | |||||
| * | | | | Really did what xoft wanted | Tiger Wang | 2014-01-16 | 1 | -5/+8 |
| | | | | | |||||
| * | | | | Fixed #535 | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Removed obsoleted functions | Tiger Wang | 2014-01-16 | 34 | -74/+67 |
| | | | | | |||||
| * | | | | Possibly did what xoft wanted | Tiger Wang | 2014-01-16 | 3 | -10/+25 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into customnames | Tiger Wang | 2014-01-16 | 9 | -75/+90 |
| |\ \ \ \ | |||||
| * | | | | | OBSOLETE'd obsolete functions | Tiger Wang | 2014-01-15 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Implemented custom names and lore | Tiger Wang | 2014-01-15 | 4 | -35/+107 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added custom names and lore + Added saving and loading + Added writing and parsing of NBT | ||||
| * | | | | | Implemented Ctrl-Q drop stack | Tiger Wang | 2014-01-15 | 3 | -3/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also fixed an issue with TossItems not respecting count. | ||||
* | | | | | | Protocol 1.7: More output on unknown packets / protocol states. | madmaxoft | 2014-01-17 | 1 | -4/+21 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Fixed block break packet number | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fixed #535 | Tiger Wang | 2014-01-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fixed SIGPIPE on cSocket::Send(). | madmaxoft | 2014-01-16 | 3 | -12/+13 |
| | | | | | |||||
* | | | | | Protocol 1.7: Unknown packets are dumped to log in Debug mode. | madmaxoft | 2014-01-16 | 1 | -1/+14 |
| | | | | | |||||
* | | | | | Disabled excessive entity-related logging in Debug mode. | madmaxoft | 2014-01-16 | 2 | -3/+26 |
| | | | | | |||||
* | | | | | Fixed whitespace in previous commit. | madmaxoft | 2014-01-16 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Finished exporting cWorld:ScheduleTask() to Lua API. | madmaxoft | 2014-01-16 | 1 | -1/+15 |
| |/ / / |/| | | | |||||
* | | | | CMake: Fixed output paths for all MSVC versions. | madmaxoft | 2014-01-16 | 1 | -7/+9 |
| | | | | |||||
* | | | | Added packet diagnostics to 1.7 protocol. | madmaxoft | 2014-01-16 | 2 | -30/+40 |
| | | | | | | | | | | | | | | | | When the packet is mis-interpreted, a log message is output about the packet type and lengths. | ||||
* | | | | Yet another attempt at VarArgs. | madmaxoft | 2014-01-16 | 1 | -10/+15 |
| | | | | |||||
* | | | | Another VarArgs fix. | madmaxoft | 2014-01-16 | 6 | -39/+37 |
|/ / / | | | | | | | | | | This time using va_copy() on platforms that have it and simple assignment on platforms that don't. | ||||
* | | | Using a 2nd argument instead of va_copy(). | madmaxoft | 2014-01-15 | 6 | -30/+42 |
| | | | | | | | | | | | | This seems to be the only reasonable C++03-only solution. | ||||
* | | | Fixed varargs modification. | madmaxoft | 2014-01-15 | 1 | -1/+5 |
| | | | | | | | | | | | | Ref.: #541. | ||||
* | | | Furnace minecarts now stop being active after a while. | STRWarrior | 2014-01-15 | 2 | -2/+19 |
| | | | |||||
* | | | First implementation for furnace minecarts. | STRWarrior | 2014-01-15 | 2 | -1/+23 |
| | | | |||||
* | | | Merge pull request #542 from worktycho/schedular | Mattes D | 2014-01-15 | 3 | -4/+121 |
|\ \ \ | | | | | | | | | added cWorld::ScheduleTask Function | ||||
| * | | | added cWorld::ScheduleTask Function | Tycho | 2014-01-14 | 3 | -4/+121 |
| | | | | | | | | | | | | | | | | | | | | ScheduleTask schedules a SceduledTask object to be run x ticks in the future. In is exported to lua, fixes #150 | ||||
* | | | | Merge pull request #538 from mc-server/minecarts | Mattes D | 2014-01-15 | 9 | -176/+469 |
|\ \ \ \ | |/ / / |/| | | | Minecarts | ||||
| * | | | Yes newline at end of file :D | Tiger Wang | 2014-01-14 | 1 | -1/+5 |
| | | | | |||||
| * | | | Final improvements to Minecarts | Tiger Wang | 2014-01-13 | 3 | -93/+292 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed curved rails being a little broken + Implemented detector rails + Implemented block collisions on rails * Fixed snapping to rail - Removed minecart physics conditions in Entity.cpp as minecarts use their own simulator when on rails Fixes #148 and #217; partially implemented #215. This is Cave Johnson, and we're done here. | ||||
| * | | | Detaching improvements | Tiger Wang | 2014-01-13 | 4 | -4/+34 |
| | | | | | | | | | | | | | | | | | | | | * Players now search for an area around themselves to teleport to when detaching from something | ||||
| * | | | Fixed wire, rail, and pressure plate unpowering | Tiger Wang | 2014-01-13 | 1 | -3/+4 |
| | | | | |||||
| * | | | Fixed settings plugin generation after IniFile | Tiger Wang | 2014-01-12 | 1 | -3/+3 |
| | | | | |||||
| * | | | Multiple enhancements and fixes to minecarts | Tiger Wang | 2014-01-12 | 4 | -132/+191 |
| | | | | | | | | | | | | | | | | | | | | | | | | + They are destroyed instantly by creative mode * Physics is much improved + Basic implementation of powered rails | ||||
* | | | | CMake: Added postfix for profiled exe | madmaxoft | 2014-01-14 | 1 | -0/+4 |
| | | | | |||||
* | | | | Removed shutdown() from socket closing. | madmaxoft | 2014-01-13 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | It's not there for Windows and everything seems fine, the client doesn't shutdown either, so why should we be polite. Fixes #537. | ||||
* | | | | Added handshake processing to protocol 1.7. | madmaxoft | 2014-01-13 | 2 | -2/+29 |
| | | | | | | | | | | | | | | | | This fixes #495 | ||||
* | | | | Generating the bindings outputs a message at the end. | madmaxoft | 2014-01-13 | 1 | -0/+8 |
| | | | | |||||
* | | | | cCreeper is no longer available in API. | madmaxoft | 2014-01-13 | 3 | -14/+1 |
| | | | | | | | | | | | | | | | | Has been replaced by cMonster. | ||||
* | | | | CMake: Removed leftover debugging output. | madmaxoft | 2014-01-13 | 1 | -1/+0 |
| | | | | |||||
* | | | | CMake: Added resources to windows projects. | madmaxoft | 2014-01-13 | 1 | -1/+14 |
| | | | | |||||
* | | | | Added a generic .user file for MSVC. | madmaxoft | 2014-01-13 | 1 | -0/+167 |
| | | | | | | | | | | | | | | | | This brings in the default debugging settings for the MSVC project, when generated by CMake. | ||||
* | | | | Moved the win resources into a separate subfolder. | madmaxoft | 2014-01-12 | 5 | -0/+22 |
| | | | | | | | | | | | | | | | | This will allow us to use them in CMake builds. | ||||
* | | | | CMake generates Bindings when not existant (win) | madmaxoft | 2014-01-12 | 1 | -0/+10 |
|/ / / | |||||
* | | | Merge pull request #529 from mc-server/derpstonerefactor | Alexander Harkness | 2014-01-12 | 10 | -331/+265 |
|\ \ \ | |/ / |/| | | Major refactoring of redstone | ||||
| * | | Fixed rails powering | Tiger Wang | 2014-01-11 | 1 | -0/+2 |
| | | | |||||
| * | | Did some stuff with the vectors | Tiger Wang | 2014-01-11 | 1 | -32/+17 |
| | | | |||||
| * | | Fixed a door bug and reduced code | Tiger Wang | 2014-01-11 | 1 | -19/+1 |
| | | | | | | | | | | | | | | | Doors wouldn't get powered by repeaters, and some blocks, like glass, were viable middle blocks when they shouldn't have been. | ||||
| * | | Renamed g_TorchPlaceable... | Tiger Wang | 2014-01-11 | 6 | -71/+71 |
| | | | | | | | | | | | | ...to g_FullyOccupiesVoxel, as recommended by @bearbin | ||||
| * | | Fixed doors, fixes #453 | Tiger Wang | 2014-01-10 | 1 | -38/+8 |
| | | | |||||
| * | | Major refactoring of redstone | Tiger Wang | 2014-01-10 | 4 | -186/+181 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is a refactoring of the redstone code, mainly the functions handling the removal of invalid blocks from power supplier data structures. Its aim is to improve performance and potentially reduce the memory footprint of the data structures. It works to reduce the amount of GetBlock()s triggered every tick. Before, a GetBlock() was requested for every single item in the data lists, as well as for every single redstone block in a chunk. Following these changes, the AddBlock() event is utilised more effectively to only update the lists when needed (a block is changed), as well as to insert the block type (and update it when needed) alongside the coordinates into the main redstone simulator chunkdata list. In short, a single GetBlock() is now cached, with this cache being updated when the simulator is awoken due to a block change. At least, I *hope* that this is what it does :P | ||||
* | | | Disabled a useless MSVC warning in Bindings.cpp. | madmaxoft | 2014-01-12 | 1 | -0/+6 |
| | | | |||||
* | | | Merge pull request #532 from mc-server/LuaStateErrorHandler | Mattes D | 2014-01-12 | 5 | -252/+130 |
|\ \ \ | | | | | | | | | Lua state error handler | ||||
| * | | | Lua errors display stack trace. | madmaxoft | 2014-01-11 | 2 | -3/+27 |
| | | | | | | | | | | | | | | | | Fixes #418. | ||||
| * | | | Removed internal methods from public cLuaState interface. | madmaxoft | 2014-01-11 | 3 | -119/+103 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PushFunction(), CallFunction() and GetReturn() are not to be called independently, but rather only by using the Call() templated overrides. Push() needs to be left in the public part, it is used for pushing results in the ManualBindings. Preparation for #418. | ||||
| * | | | Removed an unused file. | madmaxoft | 2014-01-11 | 2 | -130/+0 |
| | | | | |||||
* | | | | Merge pull request #527 from derouinw/biomessplit | Mattes D | 2014-01-11 | 8 | -222/+241 |
|\ \ \ \ | |/ / / |/| | | | Biomessplit | ||||
| * | | | Globals.h needs to be first include | Bill Derouin | 2014-01-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Include Biome enum in ChunkDef | Bill Derouin | 2014-01-10 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | Can't forward declare an enum | ||||
| * | | | Added newlines at ends of files | Bill Derouin | 2014-01-10 | 2 | -2/+2 |
| | | | | |||||
| * | | | Fixed missing externals | Bill Derouin | 2014-01-10 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Turns out you actually have to include the .cpp in the project file | ||||
| * | | | Move biome definition to separate files | Bill Derouin | 2014-01-09 | 8 | -222/+241 |
| | | | | |||||
* | | | | Removed unused variables. | madmaxoft | 2014-01-11 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | The Lua API calls had no side-effects, either. | ||||
* | | | | Merge pull request #530 from mc-server/GeneratorDecouple | Mattes D | 2014-01-11 | 10 | -50/+188 |
|\ \ \ \ | | | | | | | | | | | Decoupled cChunkGenerator from cWorld and cRoot. | ||||
| * | | | | Decoupled cChunkGenerator from cWorld and cRoot. | madmaxoft | 2014-01-10 | 10 | -50/+188 |
| | | | | | | | | | | | | | | | | | | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS. | ||||
* | | | | | Fixed glowstone drop count | andrew | 2014-01-11 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Fixed generator adding values to ini file. | madmaxoft | 2014-01-10 | 2 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #520 from mc-server/SoulSand | Mattes D | 2014-01-10 | 2 | -1/+17 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | NetherGen: Now generates SoulSand. | ||||
| * | | Fixed recurring pattern. | STRWarrior | 2014-01-10 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed chunk borders. | STRWarrior | 2014-01-09 | 1 | -3/+3 |
| | | | |||||
| * | | Speed-up. I got about 40 extra ch/s | STRWarrior | 2014-01-08 | 1 | -9/+14 |
| | | | |||||
| * | | WormNestCaves now remove soul sand. | STRWarrior | 2014-01-08 | 1 | -0/+1 |
| | | | |||||
| * | | NetherGen: Now generates SoulSand. | STRWarrior | 2014-01-08 | 1 | -1/+11 |
| |/ | |||||
* | | Exported cClientHandle::SendPluginMessage() to Lua. | madmaxoft | 2014-01-09 | 1 | -0/+30 |
| | | |||||
* | | Fixed wrong packet number for PluginMessage packet. | madmaxoft | 2014-01-09 | 1 | -1/+1 |
| | | |||||
* | | Added cClientHandle::SendPluginMessage(). | madmaxoft | 2014-01-09 | 9 | -0/+50 |
| | | | | | | | | It is not yet exported in the API, though. | ||||
* | | Composition generator creating moved to a separate function. | madmaxoft | 2014-01-09 | 2 | -61/+83 |
| | | | | | | | | Also it forces the defaults into the INI file. | ||||
* | | Height generator creating moved info HeiGen.cpp. | madmaxoft | 2014-01-09 | 3 | -54/+82 |
| | | | | | | | | The generator also explicitly sets the default back into the INI file. | ||||
* | | Merge pull request #517 from derouinw/master | Mattes D | 2014-01-09 | 1 | -0/+13 |
|\ \ | |/ |/| | Add missing plugin error | ||||
| * | A couple touchups | Bill Derouin | 2014-01-08 | 1 | -2/+3 |
| | | |||||
| * | Add missing plugin error | Bill Derouin | 2014-01-07 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | Previously, if a plugin was included but the folder had no lua files, the error given was ambiguous. Now, it explicitly describes lack of lua files. See issue #512 P.S. This probably isn't the best way, but this is where the fix can be made. | ||||
* | | Fixed AppendVPrintf() handling for large strings. | madmaxoft | 2014-01-08 | 1 | -6/+4 |
| | | | | | | | | This caused a failure in server favicons. | ||||
* | | Graceful shutdown on SIGTERM | Tiger Wang | 2014-01-07 | 1 | -0/+5 |
|/ | |||||
* | Merge pull request #516 from mc-server/favicon | Alexander Harkness | 2014-01-07 | 4 | -18/+8 |
|\ | | | | | Fixed favicons | ||||
| * | Fixed favicons | Tiger Wang | 2014-01-07 | 4 | -18/+8 |
| | | |||||
* | | Plugin messages are received and handed to plugins. | madmaxoft | 2014-01-07 | 8 | -2/+68 |
|/ | | | | Note that MCS doesn't currently handle any channel registrations, this will come later on. | ||||
* | Merge pull request #514 from derouinw/master | Mattes D | 2014-01-07 | 3 | -0/+20 |
|\ | | | | | Implement favicon for 1.7.2 | ||||
| * | Avoid making copies of favicon string | Bill Derouin | 2014-01-07 | 2 | -2/+2 |
| | | |||||
| * | A few more touch ups | Bill Derouin | 2014-01-07 | 2 | -12/+2 |
| | | |||||
| * | A few touch ups | Bill Derouin | 2014-01-07 | 2 | -2/+5 |
| | | |||||
| * | Removed unused line | Bill Derouin | 2014-01-07 | 1 | -1/+0 |
| | | |||||
| * | Implement favicon for 1.7.2 | Bill Derouin | 2014-01-07 | 4 | -0/+28 |
| | | | | | | | | | | Favicon data is a png encoded in base64 which is stored in the server and sent in the server response packet | ||||
* | | Disabled an unneeded MSVC warning. | madmaxoft | 2014-01-07 | 1 | -4/+7 |
| | | | | | | | | Also sorted the enabled warnings by their numerical code for easier searching.. | ||||
* | | Removed a debugging log output in cPluginManager:AddHook(). | madmaxoft | 2014-01-07 | 1 | -1/+0 |
| | | |||||
* | | More MSVC warning fixes. | madmaxoft | 2014-01-07 | 9 | -11/+11 |
| | | |||||
* | | LuaState can push strings with embedded NULs. | madmaxoft | 2014-01-07 | 1 | -1/+1 |
| | | | | | | | | This also marginally improves performance, since a strlen() isn't called (inside lua_pushstring()), the string length is stored in the AString object directly. | ||||
* | | Fixed a few MSVC warnings. | madmaxoft | 2014-01-07 | 8 | -18/+21 |
| | | |||||
* | | Added Base64Encode(). | madmaxoft | 2014-01-07 | 2 | -0/+51 |
| | | |||||
* | | Disabled the type conversion MSVC warning. | madmaxoft | 2014-01-06 | 1 | -1/+3 |
| | | | | | | | | It was hitting way too many false positives. | ||||
* | | Fixed a few MSVC warnings. | madmaxoft | 2014-01-06 | 11 | -16/+12 |
|/ | |||||
* | Merge pull request #511 from mc-server/CmakeOutput | Mattes D | 2014-01-06 | 1 | -1/+1 |
|\ | | | | | Output dir set to $/MCServer. | ||||
| * | Output dir set to $/MCServer. | madmaxoft | 2014-01-06 | 1 | -1/+1 |
| | | | | | | | | Ref.: #510. | ||||
* | | Merge pull request #509 from Diusrex/master | Mattes D | 2014-01-06 | 7 | -5/+87 |
|\ \ | | | | | | | Added #pragma for warnings in MSVC warnings | ||||
| * | | Added fake functions into cCriticalSection because of the change to ASSERT | Diusrex | 2014-01-05 | 1 | -0/+5 |
| | | | |||||
| * | | Changed the release version of ASSERT. | Diusrex | 2014-01-05 | 1 | -1/+1 |
| | | | | | | | | | | | | This was so a variable only used in ASSERT statements will not give a warning about not being used. | ||||
| * | | Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.h | Diusrex | 2014-01-05 | 5 | -3/+68 |
| | | | | | | | | | | | | | | | | | | I also added a warning(push)/(pop) around crpytlib.cpp because it would go crazy with warnings. So now, the only warning from cryptopp that is not blocked is 'unreferenced local function has been removed', which also occurs at a single function. | ||||
| * | | Making all of the useful level 4 warnings be active. | Diusrex | 2014-01-05 | 1 | -1/+13 |
| | | | |||||
* | | | Exported cWorld::BroadcastBlockAction(). | madmaxoft | 2014-01-06 | 1 | -1/+1 |
| |/ |/| | | | | | As requested in #508; no guarantees about it. | ||||
* | | Fixed wrong enqueueing. | madmaxoft | 2014-01-06 | 1 | -2/+9 |
|/ | | | | Fixes #505. | ||||
* | Fixed cPluginManager:AddHook() binding. | madmaxoft | 2014-01-05 | 1 | -6/+13 |
| | | | | Fixes #401. Old formats are still accepted, for compatibility reasons. | ||||
* | Fixed a race condition in the cQueue class. | madmaxoft | 2014-01-05 | 1 | -59/+86 |
| | | | | Fixes #505. | ||||
* | Fixed Documentation | Tycho | 2014-01-03 | 1 | -4/+2 |
| | |||||
* | derp | Tycho | 2014-01-03 | 1 | -1/+1 |
| | |||||
* | actual fix | Tycho | 2014-01-03 | 1 | -2/+9 |
| | |||||
* | fixed failure to return a value from Remove | Tycho | 2014-01-03 | 1 | -1/+1 |
| | |||||
* | implement xsofts recommendations | Tycho Bickerstaff | 2014-01-03 | 1 | -9/+15 |
| | |||||
* | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2014-01-02 | 7 | -29/+80 |
|\ | |||||
| * | Merge pull request #479 from mc-server/cmake-win | Mattes D | 2014-01-02 | 2 | -18/+30 |
| |\ | | | | | | | Cmake-win | ||||
| | * | Added support for out-of-source builds. | madmaxoft | 2013-12-28 | 2 | -18/+30 |
| | | | |||||
| * | | More memory alignment fixes. | madmaxoft | 2014-01-02 | 2 | -6/+6 |
| | | | | | | | | | | | | Ref.: #420. | ||||
| * | | Fixed unaligned memory access in FastNBT. | madmaxoft | 2014-01-02 | 3 | -5/+44 |
| | | | | | | | | | | | | This should fix #420. | ||||
* | | | added documentation | Tycho Bickerstaff | 2014-01-02 | 1 | -7/+45 |
| | | | |||||
* | | | fixed a few remaining issues with worldstorage | Tycho Bickerstaff | 2014-01-02 | 2 | -24/+6 |
| | | | |||||
* | | | rewrote queue not to use promises for waits | Tycho Bickerstaff | 2014-01-02 | 6 | -121/+24 |
| | | | |||||
* | | | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2013-12-31 | 10 | -3/+117 |
|\| | | | | | | | | | | | | | | Conflicts: src/OSSupport/Queue.h | ||||
| * | | merged changes from upstream | Tycho Bickerstaff | 2013-12-31 | 9 | -3/+112 |
| |\ \ | |||||
| | * \ | Merge branch 'FishingHook' | madmaxoft | 2014-01-01 | 8 | -1/+110 |
| | |\ \ | |||||
| | | * | | OnPlayerFishing doesn't have a const cItems anymore | STRWarrior | 2014-01-01 | 5 | -5/+5 |
| | | | | | |||||
| | | * | | implemented the recommendations Xoft gave. | STRWarrior | 2013-12-31 | 7 | -12/+25 |
| | | | | | |||||
| | | * | | Implented OnPlayerFishing and OnPlayerFished. | STRWarrior | 2013-12-30 | 6 | -1/+97 |
| | | | | | |||||
| | * | | | Fixed GetPhysicalRAMUsage on Linux | andrew | 2014-01-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into cmake-fixes | Tycho Bickerstaff | 2013-12-31 | 14 | -16/+56 |
| |\| | | | |||||
| * | | | | fixed bad merge | Tycho Bickerstaff | 2013-12-22 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | merged in more warning fixes | Tycho Bickerstaff | 2013-12-22 | 2 | -3/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | merged in changes | Tycho Bickerstaff | 2013-12-22 | 3 | -2/+12 |
| |\ \ \ \ | |||||
| * | | | | | merged in warnings changes | Tycho Bickerstaff | 2013-12-22 | 26 | -93/+94 |
| | | | | | | |||||
| * | | | | | fixed accedental commit | Tycho Bickerstaff | 2013-12-22 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | fixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker not | Tycho Bickerstaff | 2013-12-22 | 2 | -1/+33 |
| | | | | | | |||||
* | | | | | | fogot to add promise classes | Tycho Bickerstaff | 2013-12-31 | 2 | -0/+92 |
| | | | | | | |||||
* | | | | | | clean up code for patching | Tycho Bickerstaff | 2013-12-31 | 3 | -3/+5 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2013-12-31 | 20 | -91/+69 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | removed unneccisary cast | Tycho Bickerstaff | 2013-12-31 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | fixed warnings in LineBlockTracer.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | fixed warnings in LightingThread.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | take Z axis into account when calculating neighboors in LightingThread::ChunkReady | Tycho Bickerstaff | 2013-12-31 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | fixed warnings in World.cpp | Tycho Bickerstaff | 2013-12-31 | 4 | -6/+34 |
| | | | | | | |||||
| * | | | | | fixxed warnings in Server.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | fixed warnings in Inventory.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | fixed warnings in bytebuffer.cpp | Tycho Bickerstaff | 2013-12-31 | 2 | -4/+4 |
| | | | | | | |||||
| * | | | | | fixed ClientHandle warnings | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | fixed warnings in webadmin.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | fixed warnings in BlockArea.cpp | Tycho Bickerstaff | 2013-12-31 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure. | Morgan Redshaw | 2013-12-31 | 1 | -2/+2 |
| | |_|/ / | |/| | | | |||||
| * | | | | Fixed compilation in VC2008. | madmaxoft | 2013-12-30 | 6 | -75/+13 |
| | |/ / | |/| | | | | | | | | | | Also removed an unused inline header file (yuck). | ||||
* | | | | refactored chunk Queue to seperate class | Tycho Bickerstaff | 2013-12-31 | 7 | -124/+162 |
| | | | | |||||
* | | | | added link dependency between WorldStorage and OSSupport | Tycho Bickerstaff | 2013-12-22 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into threadsafequeue | Tycho Bickerstaff | 2013-12-22 | 24 | -29/+92 |
|\| | | | |||||
| * | | | converted commneted paramater names to the unused macro | Tycho Bickerstaff | 2013-12-22 | 16 | -39/+100 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:mc-server/MCServer | Tycho Bickerstaff | 2013-12-22 | 60 | -233/+1990 |
| |\| | | |||||
| * | | | Chunk is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 4 | -6/+5 |
| | | | | |||||
| * | | | fixed hidden bug with furnaces ignoring time burnt | Tycho Bickerstaff | 2013-12-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | this patch fixes an issue with furnaces where they would ignore the time burnt in setBurnTimes this did not cause a problem as this function was only called with the same value as the one it was using for time burnt | ||||
| * | | | Root is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 8 | -30/+32 |
| | | | | |||||
| * | | | Piston is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 5 | -6/+6 |
| | | | | |||||
| * | | | ChunkSender is now warnings clean | Tycho Bickerstaff | 2013-12-21 | 6 | -9/+10 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'upstream/master' into threadsafequeue | Tycho Bickerstaff | 2013-12-22 | 60 | -233/+1990 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Added HOOK_PLUGINS_LOADED. | madmaxoft | 2013-12-29 | 6 | -3/+64 |
| | | | | | | | | | | | | | | | | This fixes #482. | ||||
| * | | | Merge pull request #481 from MikeHunsinger/master | Mattes D | 2013-12-29 | 2 | -3/+49 |
| |\ \ \ | | | | | | | | | | | Added function to create large birch tree images in birch forests | ||||
| | * | | | Added function to create Tall Birch tree in BirchTreeForest biomes | Mike Hunsinger | 2013-12-29 | 2 | -3/+49 |
| | | |/ | | |/| | |||||
| * / | | Fixed a (valid) warning in RCONServer. | madmaxoft | 2013-12-28 | 1 | -0/+3 |
| |/ / | |||||
| * | | Merge branch 'master' into cmake-win | madmaxoft | 2013-12-27 | 2 | -4/+56 |
| |\ \ | |||||
| | * | | Server now handles death messages | Tiger Wang | 2013-12-26 | 1 | -0/+16 |
| | | | | |||||
| | * | | Merge pull request #472 from mc-server/Extreme_Hills_M | Mattes D | 2013-12-26 | 1 | -4/+40 |
| | |\ \ | | | | | | | | | | | Extreme hills | ||||
| | | * | | Simplefied Extreme Hills M pattern select. | STRWarrior | 2013-12-26 | 1 | -11/+3 |
| | | | | | |||||
| | | * | | Extreme Hills M biomes now generate gravel, stone and grass patterns. | STRWarrior | 2013-12-25 | 1 | -2/+10 |
| | | | | | |||||
| | | * | | Changed tbGravel. Vanilla has 3 layers of gravel and then stone. | STRWarrior | 2013-12-25 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | Normal extreme hills (plus) now generate a stone/grass pattern. | STRWarrior | 2013-12-25 | 1 | -2/+20 |
| | | | | | |||||
| | | * | | Re-added empty line. | STRWarrior | 2013-12-25 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | This generates gravel in Extreme Hills M biomes. | STRWarrior | 2013-12-25 | 2 | -3/+20 |
| | | | | | |||||
| * | | | | Made cmake compilation possible on Windows. | madmaxoft | 2013-12-27 | 4 | -21/+27 |
| | | | | | |||||
| * | | | | Added proper precompiled headers for MSVC. | madmaxoft | 2013-12-26 | 1 | -48/+47 |
| |/ / / | |||||
| * | | | cBlockArea: Fixed writing full-height areas. | madmaxoft | 2013-12-26 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #461 from mc-server/repeaters | Mattes D | 2013-12-26 | 7 | -47/+314 |
| |\ \ \ | | |/ / | |/| | | Repeaters, pressure plates, and others | ||||
| | * | | Moved increment operator to back of variables | Tiger Wang | 2013-12-26 | 1 | -9/+9 |
| | | | | |||||
| | * | | Fixed rails not updating with diagonals | Tiger Wang | 2013-12-25 | 1 | -0/+34 |
| | | | | |||||
| | * | | Braced up some code | Tiger Wang | 2013-12-25 | 1 | -0/+2 |
| | | | | |||||
| | * | | Used IsGamemodeCreative() function | Tiger Wang | 2013-12-25 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixed comments in main.cpp and Player.cpp | Tiger Wang | 2013-12-24 | 2 | -2/+2 |
| | | | | |||||
| | * | | Implemented stone and wooden pressure plates | Tiger Wang | 2013-12-24 | 2 | -3/+105 |
| | | | | |||||
| | * | | Improved knockback animation | Tiger Wang | 2013-12-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Critical hits now actually increase damage * Looking down at an entity and hitting them still produces upwards motion (as per Vanilla experience) * Reduced force to be more realistic | ||||
| | * | | Improved player fall particle positions | Tiger Wang | 2013-12-23 | 1 | -5/+2 |
| | | | | |||||
| | * | | Provides an enhancement to daylight sensors | Tiger Wang | 2013-12-23 | 1 | -2/+27 |
| | | | | |||||
| | * | | Clarified some code in Player.cpp | Tiger Wang | 2013-12-23 | 1 | -2/+5 |
| | | | | |||||
| | * | | Fixed a comment in Entity.cpp | Tiger Wang | 2013-12-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | Added some comments in main.cpp | Tiger Wang | 2013-12-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | Daylight sensor sensing enhancement | Tiger Wang | 2013-12-23 | 1 | -9/+11 |
| | | | | |||||
| | * | | A fix for daylight sensors | Tiger Wang | 2013-12-22 | 1 | -2/+3 |
| | | | | |||||
| | * | | Implemented knockback and critical hit | Tiger Wang | 2013-12-22 | 1 | -4/+21 |
| | | | | |||||
| | * | | Added many event catchers | Tiger Wang | 2013-12-22 | 2 | -20/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Window close * CTRL-C * etc. | ||||
| | * | | Implemented fall particles | Tiger Wang | 2013-12-22 | 1 | -3/+18 |
| | | | | |||||
| | * | | Daylight sensors | Tiger Wang | 2013-12-22 | 1 | -2/+1 |
| | | | | |||||
| | * | | Fixed them again, confound it | Tiger Wang | 2013-12-22 | 1 | -9/+21 |
| | | | | |||||
| * | | | Merge pull request #471 from mc-server/Fishing_Catapult | Mattes D | 2013-12-25 | 3 | -38/+206 |
| |\ \ \ | | | | | | | | | | | You are now able to sweep mobs to your position using fishing rods. | ||||
| | * | | | Fixed Parentheses. | STRWarrior | 2013-12-25 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | You are now able to sweep mobs to your position using fishing rods. | STRWarrior | 2013-12-25 | 3 | -38/+206 |
| | | | | | |||||
| * | | | | Merge branch 'fixes&features' of git://github.com/tonibm19/MCServer | madmaxoft | 2013-12-25 | 2 | -9/+64 |
| |\ \ \ \ | |||||
| | * | | | | (Hopefully) fixed if conditions | tonibm19 | 2013-12-25 | 1 | -4/+1 |
| | | | | | | |||||
| | * | | | | Implemented xoft suggestion (partly) | tonibm19 | 2013-12-25 | 1 | -25/+29 |
| | | | | | | | | | | | | | | | | | | I only get it working in first condition. It seems it's not compatible with else if... | ||||
| | * | | | | BLOCKTYPE... | tonibm19 | 2013-12-24 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Fixed compilation | tonibm19 | 2013-12-24 | 1 | -29/+9 |
| | | | | | | |||||
| | * | | | | Implemented xoft suggestion | tonibm19 | 2013-12-24 | 1 | -7/+11 |
| | | | | | | |||||
| | * | | | | Using BLOCKTYPE instead of int | tonibm19 | 2013-12-24 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Fixed comments | tonibm19 | 2013-12-24 | 1 | -8/+8 |
| | | | | | | |||||
| | * | | | | Changed a little how detection works and added comments. | tonibm19 | 2013-12-24 | 1 | -28/+31 |
| | | | | | | |||||
| | * | | | | Storing Y -1 and -2 blocks in a variable | tonibm19 | 2013-12-24 | 1 | -5/+7 |
| | | | | | | |||||
| | * | | | | Using parenthesis | tonibm19 | 2013-12-24 | 1 | -8/+8 |
| | | | | | | |||||
| | * | | | | Fixed a possible crash | tonibm19 | 2013-12-24 | 1 | -39/+42 |
| | | | | | | |||||
| | * | | | | Improved iron golem detection algorithm | tonibm19 | 2013-12-23 | 1 | -3/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | - You need to make it like in vanilla - Only used blocks are removed | ||||
| | * | | | | Some fixes (SEE DESC) | tonibm19 | 2013-12-23 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | -Added missing mobs (wither, enderdragon and iron golem) to type to string list. -Wither and iron golem can now spawn | ||||
| | * | | | | You can now spawn iron golems. | tonibm19 | 2013-12-23 | 1 | -3/+20 |
| | | | | | | | | | | | | | | | | | | You can spawn them like in vanilla. | ||||
| * | | | | | Fixed block area height check. | madmaxoft | 2013-12-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | The block area couldn't be read up to chunk height. | ||||
| * | | | | | Preliminary mobile entity saving | Tiger Wang | 2013-12-25 | 4 | -13/+790 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #252 * Alleviates #380 + Adds mob saving * Fixed some debug !ASSERTs | ||||
| * | | | | Merge pull request #469 from mc-server/Android_Update | Tiger Wang | 2013-12-24 | 2 | -3/+9 |
| |\ \ \ \ | | | | | | | | | | | | | Android update | ||||
| | * | | | | Fixed getting configure button going to port 0. | STRWarrior | 2013-12-24 | 2 | -3/+9 |
| | |/ / / | |||||
| * | | | | removed the function def also | Alexander Harkness | 2013-12-24 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Finally removed the function. | Alexander Harkness | 2013-12-24 | 1 | -6/+0 |
| | | | | | |||||
| * | | | | fixed compile? | Alexander Harkness | 2013-12-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | finally removed them all? | Alexander Harkness | 2013-12-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | updated another file... | Alexander Harkness | 2013-12-24 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Updated MakeColour's defenition in the header. | Alexander Harkness | 2013-12-24 | 1 | -9/+9 |
| | | | | | |||||
| * | | | | Update as per xoft's instructions. | Alexander Harkness | 2013-12-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Update chat colours | Alexander Harkness | 2013-12-24 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | @madmaxoft, is this right? fixes #467 | ||||
| * | | | | Replaced esCreeper with esMonster. | madmaxoft | 2013-12-23 | 3 | -4/+7 |
| |/ / / | | | | | | | | | | | | | Any monster will be able to explode, and also this fixes #425. | ||||
| * | | | Fixed bug where snowgolems could replace non-solid blocks to snow blocks. | STRWarrior | 2013-12-22 | 1 | -1/+3 |
| | | | | |||||
| * | | | Snow golems die in hot biomes and leave a snow trail. | STRWarrior | 2013-12-22 | 2 | -0/+18 |
| | | | | |||||
| * | | | You can spawn snow golems with snow blocks and pumpkins. | STRWarrior | 2013-12-22 | 1 | -0/+15 |
| | | | | |||||
| * | | | EnderDragons and SnowGolems are able to spawn. | STRWarrior | 2013-12-22 | 1 | -0/+2 |
| | | | | |||||
| * | | | Fixed cacus breaking when next to any non-air block. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Made the lure enchantment work. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixed signedness warning in cItemGrid. | madmaxoft | 2013-12-22 | 2 | -4/+4 |
| | | | | |||||
| * | | | Fixed compiler warning. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fishing underground is slower and fishing while raining is faster. | STRWarrior | 2013-12-22 | 1 | -0/+15 |
| | | | | |||||
| * | | | Fixed compiler warnings. | STRWarrior | 2013-12-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | Countdown time is between 100 and 900 ticks. | STRWarrior | 2013-12-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fishing now uses a countdown instead of a random number each tick. | STRWarrior | 2013-12-22 | 2 | -12/+29 |
| | | | | |||||
| * | | | Implented BroadcastParticleEffect | STRWarrior | 2013-12-22 | 17 | -2/+122 |
| | | | | |||||
| * | | | Using regular assignments. | STRWarrior | 2013-12-21 | 1 | -6/+6 |
| | | | | |||||
| * | | | Once again better Y direction for the items given when fishing. | STRWarrior | 2013-12-21 | 1 | -2/+2 |
| | | | | |||||
| * | | | You are now able to get different items from fishing. | STRWarrior | 2013-12-21 | 1 | -2/+108 |
| | | | | |||||
| * | | | Bindings regen script updated. | madmaxoft | 2013-12-21 | 1 | -11/+6 |
| | | | | | | | | | | | | | | | | The Bindings.cpp / .h files are no longer stored in the git repo. | ||||
| * | | | Floater now dissapears when the player doesn't have an fishing rod equipped. | STRWarrior | 2013-12-21 | 2 | -0/+32 |
| | |/ | |/| | |||||
* / | | basic threadsafe queue interface | Tycho Bickerstaff | 2013-12-21 | 2 | -0/+34 |
|/ / | |||||
* | | Merge branch 'cmake' of github.com:worktycho/MCServer into cmake | Tycho Bickerstaff | 2013-12-21 | 2 | -5/+25 |
|\ \ | |||||
| * | | added precompiled headers | tycho | 2013-12-20 | 1 | -13/+24 |
| | | | |||||
| * | | fixed include of math on windows | tycho | 2013-12-20 | 2 | -1/+10 |
| | | | |||||
* | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-21 | 26 | -174/+221 |
|\ \ \ | |/ / |/| | | |||||
| * | | You could now only get fish from non-source blocks. Fixed it. | STRWarrior | 2013-12-21 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed bug where you could pickup the floater only to get one spawned instantly or the other way around. | STRWarrior | 2013-12-21 | 1 | -0/+5 |
| | | | |||||
| * | | Fixed bug where you could get fish from non-source blocks. | STRWarrior | 2013-12-21 | 1 | -1/+1 |
| |/ | |||||
| * | Fixed repeaters delay, maybe | Tiger Wang | 2013-12-20 | 3 | -12/+41 |
| | | | | | | | | | | Also added basic daylight sensors, though because GetBlockSkylight always is 15, it doesn't work. | ||||
| * | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2013-12-20 | 9 | -97/+92 |
| |\ | |||||
| | * | Fixed the rest of constructor reorders. | madmaxoft | 2013-12-20 | 9 | -97/+92 |
| | | | |||||
| * | | Increased the range an Floater can shoot to. | STRWarrior | 2013-12-20 | 1 | -1/+1 |
| |/ | |||||
| * | Fish now actualy jumps to the player instead of a few block bellow them. | STRWarrior | 2013-12-20 | 1 | -1/+1 |
| | | |||||
| * | Fixed bug where the floater could pop in the water while you could already get a fish. | STRWarrior | 2013-12-20 | 1 | -2/+2 |
| | | |||||
| * | More reordering fixes. | madmaxoft | 2013-12-20 | 3 | -7/+16 |
| | | |||||
| * | Fixed a typo in cBlockArea merging code. | madmaxoft | 2013-12-20 | 1 | -2/+1 |
| | | |||||
| * | Sorted a few constructors to remove warnings. | madmaxoft | 2013-12-20 | 10 | -49/+57 |
| | | |||||
| * | Fixed minor warnings. | madmaxoft | 2013-12-20 | 2 | -5/+7 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-20 | 39 | -97/+114 |
|\| | |||||
| * | Fixed warnings in HTTP parser. | madmaxoft | 2013-12-20 | 4 | -5/+15 |
| | | |||||
| * | Attempt at fixing cChunkDef::Height signedness. | madmaxoft | 2013-12-20 | 4 | -21/+24 |
| | | |||||
| * | Properly fixed warnings in cFastRandom. | madmaxoft | 2013-12-20 | 1 | -4/+4 |
| | | |||||
| * | Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT). | madmaxoft | 2013-12-20 | 28 | -62/+66 |
| | | |||||
| * | Fixed melon and pumpkin growing. | madmaxoft | 2013-12-20 | 1 | -1/+1 |
| | | |||||
| * | Fixed missing parenthesis. | madmaxoft | 2013-12-20 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'cmake' of github.com:worktycho/MCServer into cmake | Tycho Bickerstaff | 2013-12-19 | 1 | -6/+16 |
|\ \ | |||||
| * | | fixed include paths on windows and added build dir to gitignore | tycho | 2013-12-20 | 1 | -0/+2 |
| | | | |||||
| * | | fixed compile errors with headers and math library | tycho | 2013-12-20 | 1 | -6/+15 |
| | | | |||||
| * | | Merge branch 'master' into cmake | tycho | 2013-12-20 | 12 | -26/+276 |
| |\ \ | |||||
| * | | | fixed multiprocessing on windows and removed redundend compile of headers | tycho | 2013-12-20 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 2 | -21/+21 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fixed clang warnings in Noise.cpp. | madmaxoft | 2013-12-20 | 1 | -20/+20 |
| | | | | | | | | | | | | | | | | Fix-a-random-warning-per-day :) | ||||
| * | | | Fixed assertion during dirt block OnUpdate() | Tiger Wang | 2013-12-20 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 12 | -26/+276 |
|\| | | |/ |/| | |||||
| * | Merge pull request #450 from mc-server/redstonefixes | Mattes D | 2013-12-19 | 6 | -26/+94 |
| |\ | | | | | | | Multiple fixes | ||||
| | * | Fixed PlayerAbilities and creative | Tiger Wang | 2013-12-19 | 3 | -13/+24 |
| | | | |||||
| | * | Fixed 1.7 arm swing animation | Tiger Wang | 2013-12-19 | 1 | -1/+23 |
| | | | |||||
| | * | Fixed dust from being placed on nonsolids | Tiger Wang | 2013-12-19 | 2 | -1/+6 |
| | | | |||||
| | * | Fixed repeaters not updating power | Tiger Wang | 2013-12-19 | 1 | -11/+41 |
| | | | |||||
| * | | Fixed #include in Floater.cpp. | STRWarrior | 2013-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | The floater now actualy dives under water. | STRWarrior | 2013-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | You can get fish from fishing :D. Only one type of fish though. | STRWarrior | 2013-12-19 | 1 | -12/+27 |
| | | | |||||
| * | | Implented cItemFishingRodHandler. | STRWarrior | 2013-12-19 | 2 | -0/+65 |
| | | | |||||
| * | | Implented IsFishing, SetIsFishing and GetFloaterID(). | STRWarrior | 2013-12-19 | 2 | -0/+12 |
| | | | |||||
| * | | Added cFloater class. | STRWarrior | 2013-12-19 | 3 | -0/+90 |
| | | | |||||
* | | | fixed a number of windows issues | tycho | 2013-12-19 | 1 | -13/+28 |
| | | | |||||
* | | | added md5 as a dependency for bindings | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+2 |
| | | | |||||
* | | | added expat as lua bindings dependincy | Tycho Bickerstaff | 2013-12-19 | 2 | -2/+2 |
| | | | |||||
* | | | added all cpp files to bindings | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+4 |
| | | | |||||
* | | | moved HTTPServer to globs | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+5 |
| | | | |||||
* | | | added pthread linking code to OSSupport | Tycho Bickerstaff | 2013-12-19 | 1 | -0/+4 |
| | | | |||||
* | | | moved protocol to glob | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+5 |
| | | | |||||
* | | | added blocks and blockentities | Tycho Bickerstaff | 2013-12-19 | 3 | -2/+18 |
| | | | |||||
* | | | linked in lua | Tycho Bickerstaff | 2013-12-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-19 | 3 | -14/+41 |
|\| | | |||||
| * | | Disconnection message no longer shown if ping | Tiger Wang | 2013-12-18 | 1 | -5/+8 |
| | | | |||||
| * | | Prettified command error messages | Tiger Wang | 2013-12-18 | 2 | -9/+23 |
| | | | | | | | | | | | | Using the magic of overlords (overloads) and standards compliance. | ||||
| * | | The "<>" of a player name is now coloured | Tiger Wang | 2013-12-18 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed 1.7 player disconnection not calling hook | Tiger Wang | 2013-12-18 | 1 | -4/+14 |
| |/ | | | | | | | This fixes #357 | ||||
* | | fixed bindings generation | Tycho Bickerstaff | 2013-12-19 | 1 | -8/+2 |
| | | |||||
* | | bindings regenration logic | Tycho Bickerstaff | 2013-12-19 | 3 | -32240/+8 |
| | | |||||
* | | added zlib and UI | Tycho Bickerstaff | 2013-12-18 | 1 | -0/+11 |
| | | |||||
* | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-18 | 50 | -306/+1327 |
|\| | |||||
| * | Merge pull request #440 from mc-server/repeaterfixes | Mattes D | 2013-12-18 | 2 | -84/+77 |
| |\ | | | | | | | Fixed redstone wire and certain repeater scenarios | ||||
| | * | Fixed wire powering blocks beneath | Tiger Wang | 2013-12-18 | 1 | -1/+1 |
| | | | |||||
| | * | Fixed bad repeater power queuing in corner case | Tiger Wang | 2013-12-18 | 2 | -83/+76 |
| | | | | | | | | | | | | | | | Repeaters remain queued to power even if their original source has since unpowered. Also functionised and cleaned up code. | ||||
| * | | Merge pull request #442 from mc-server/Nether_Wart | Mattes D | 2013-12-18 | 4 | -0/+110 |
| |\ \ | | | | | | | | | Implented Nether Wart. | ||||
| | * | | Implented Nether Wart. | STRWarrior | 2013-12-18 | 4 | -0/+110 |
| | | | | |||||
| * | | | Renamed back EntityAnimation to PlayerAnimation | Tiger Wang | 2013-12-18 | 8 | -15/+51 |
| |/ / | | | | | | | | | | | | | This fixes #411 and partially reverts 30ead790490f04248b861db79fddde9148b552f4 | ||||
| * / | Removed offending tr1/memory header inclusion. | madmaxoft | 2013-12-18 | 1 | -3/+0 |
| |/ | | | | | | | We already use <memory> at line 160, this was a double include, additionally causing problems (#424). | ||||
| * | Fixed player falling through the floor on spawn. | madmaxoft | 2013-12-17 | 1 | -1/+5 |
| | | | | | | | | The 1.7 client seems to have math issues with exact coords. Adding 0.001 to the Y coord fixed the problem. | ||||
| * | cBlockArea: origin is initialized in the constructor and the loader. | madmaxoft | 2013-12-17 | 1 | -0/+6 |
| | | |||||
| * | Fixed naming and initialization. | madmaxoft | 2013-12-17 | 1 | -4/+12 |
| | | |||||
| * | Forgot to change one Vector3d to Vector3i. | STRWarrior | 2013-12-17 | 1 | -1/+1 |
| | | |||||
| * | Renamed Pos to m_Pos. | STRWarrior | 2013-12-17 | 1 | -3/+3 |
| | | |||||
| * | Using Recommendations. | STRWarrior | 2013-12-17 | 1 | -10/+23 |
| | | |||||
| * | Made buckets work when the player does not 'look' at a block. This fixes #265 | STRWarrior | 2013-12-17 | 1 | -32/+53 |
| | | |||||
| * | Merge pull request #438 from mc-server/Boats | Tiger Wang | 2013-12-16 | 5 | -14/+80 |
| |\ | | | | | | | Implemented boating functionality. | ||||
| | * | Boats spawn on top of a block. not between 4 blocks. | STRWarrior | 2013-12-16 | 1 | -1/+1 |
| | | | |||||
| | * | Using suggestions for Boat placing. | STRWarrior | 2013-12-16 | 1 | -1/+1 |
| | | | |||||
| | * | Boats drop a boat pickup when destroyed by hand. You can now actualy use boats. | STRWarrior | 2013-12-16 | 2 | -3/+33 |
| | | | |||||
| | * | Added HandleSpeedFromAttachee so an entity can override the function. | STRWarrior | 2013-12-16 | 2 | -4/+15 |
| | | | |||||
| | * | You can spawn boats on water. | STRWarrior | 2013-12-16 | 1 | -7/+32 |
| | | | |||||
| * | | Fixed multiple inheritance in ToLua++. | madmaxoft | 2013-12-16 | 8 | -36/+127 |
| | | | | | | | | | | | | This fixes #422. | ||||
| * | | Removed some old cRedstone remnants | Tiger Wang | 2013-12-16 | 3 | -30/+0 |
| |/ | |||||
| * | Fixed cClientHandle::Tick() being called from two threads. | madmaxoft | 2013-12-16 | 5 | -31/+48 |
| | | | | | | | | | | When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread. Final fix for #187. | ||||
| * | Fixed multiple player spawn broadcasts. | madmaxoft | 2013-12-16 | 1 | -3/+0 |
| | | |||||
| * | Server saves if a player is flying. | STRWarrior | 2013-12-15 | 1 | -1/+3 |
| | | |||||
| * | Merge pull request #437 from mc-server/ShootTo_function | STRWarrior | 2013-12-15 | 5 | -4/+49 |
| |\ | | | | | | | Shoot to function | ||||
| | * | Exported to Lua | STRWarrior | 2013-12-15 | 2 | -10/+10 |
| | | | |||||
| | * | Renamed ShootTo function to ForceSetSpeed. | STRWarrior | 2013-12-15 | 2 | -3/+3 |
| | | | |||||
| | * | This adds a function that allows you to 'shoot' a player towards a direction. | STRWarrior | 2013-12-15 | 5 | -4/+49 |
| | | | |||||
| * | | Fixed player spawning packet. | madmaxoft | 2013-12-15 | 1 | -1/+1 |
| | | | | | | | | | | | | The player was spawned 1.62 blocks below their pos. This fixes #323. | ||||
| * | | Fixed calling OnPlayerJoined() in the wrong place. | madmaxoft | 2013-12-15 | 1 | -6/+1 |
| | | | | | | | | | | | | This is the first part of a fix for #187. | ||||
| * | | Merge pull request #433 from mc-server/redstoneimprovements | Mattes D | 2013-12-15 | 1 | -1/+33 |
| |\ \ | | | | | | | | | Fixed more wire bugs | ||||
| | * | | Implemented xoft's suggestions | Tiger Wang | 2013-12-15 | 1 | -3/+16 |
| | | | | |||||
| | * | | Fixed wire repeater checking | Tiger Wang | 2013-12-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Wires now power repeaters properly | Tiger Wang | 2013-12-15 | 1 | -0/+7 |
| | | | | |||||
| | * | | Fixed the hopefully final wire self-powering bug | Tiger Wang | 2013-12-15 | 1 | -1/+13 |
| | | | | |||||
| * | | | Fixed indentation. | madmaxoft | 2013-12-15 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Moved reading flags to the protocol. | STRWarrior | 2013-12-15 | 3 | -19/+23 |
| | | | |||||
| * | | Exported Set and Get functions to Lua. | STRWarrior | 2013-12-15 | 2 | -2/+136 |
| | | | |||||
| * | | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() function | STRWarrior | 2013-12-15 | 5 | -3/+90 |
| | | | |||||
| * | | Merge pull request #432 from mc-server/Broadcast_Effects | Mattes D | 2013-12-15 | 7 | -3/+92 |
| |\ \ | | | | | | | | | Broadcast effects | ||||
| | * | | cPlayer is using the broadcast functions. | STRWarrior | 2013-12-15 | 1 | -3/+3 |
| | | | | |||||
| | * | | This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions. | STRWarrior | 2013-12-15 | 6 | -0/+89 |
| | | | | |||||
| * | | | Fixed pre 1.7 clients crashing. | STRWarrior | 2013-12-15 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #431 from mc-server/Entity_Effects | Mattes D | 2013-12-14 | 15 | -4/+170 |
| |\ \ | | | | | | | | | Entity Effects | ||||
| | * | | Exported E_EFFECTS_<Effect> to lua. Forgot to commit Globals.h. | STRWarrior | 2013-12-14 | 5 | -4/+31 |
| | | | | |||||
| | * | | Added E_EFFECT_<Effect> | STRWarrior | 2013-12-14 | 2 | -3/+32 |
| | | | | |||||
| | * | | Forgot to commit the ClientHandle. | STRWarrior | 2013-12-14 | 2 | -0/+20 |
| | | | | |||||
| | * | | Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison. | STRWarrior | 2013-12-14 | 8 | -1/+91 |
| | | | | |||||
| * | | | Added tolua++ redirection include. | madmaxoft | 2013-12-14 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | This is needed because ToLua++ regenerates the Bindings file with bad #include, and it would be too difficult to fix ToLua++; this is an easier solution. Should fix PR #431. | ||||
| * | | | Removed leftover debugging messages from cProtocol172. | madmaxoft | 2013-12-14 | 1 | -4/+0 |
| | | | | |||||
| * | | | Merge pull request #430 from mc-server/redstoneimprovements | Mattes D | 2013-12-14 | 9 | -33/+162 |
| |\ \ \ | | |/ / | |/| / | | |/ | Implemented note block playing and fixed wire | ||||
| | * | Potentially fixed debug asserts | Tiger Wang | 2013-12-14 | 1 | -5/+5 |
| | | | |||||
| | * | Wires no longer power if a block cuts them off | Tiger Wang | 2013-12-14 | 1 | -23/+32 |
| | | | | | | | | | | | | Also reduced more unneeded code. | ||||
| | * | Implemented note block playing and fixed wire | Tiger Wang | 2013-12-14 | 9 | -5/+125 |
| | | | | | | | | | | | | Game of Thrones music in Minecraft, here I come! | ||||
* | | | added zlib | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+1 |
| | | | |||||
* | | | moved generating to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | |||||
* | | | added UI folder | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+3 |
| | | | |||||
* | | | moved Worldstorage to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | |||||
* | | | Merge branch 'master' of github.com:mc-server/MCServer into cmake | Tycho Bickerstaff | 2013-12-11 | 2 | -8/+7 |
|\| | | |||||
| * | | Merge branch 'master' into quickfixs | Tycho Bickerstaff | 2013-12-11 | 27 | -514/+603 |
| |\ \ | |||||
| * | | | fixed unused expression warnings in blockFire | Tycho Bickerstaff | 2013-12-10 | 1 | -7/+6 |
| | | | | |||||
| * | | | fixed comparison of thread handle to Null point rather than null handle | Tycho Bickerstaff | 2013-12-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | moved entities to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | | |||||
* | | | | moved mobs to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | | |||||
* | | | | moved simulor to globs | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+5 |
| | | | | |||||
* | | | | removed leakfinder form build | Tycho Bickerstaff | 2013-12-11 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into cmake | Tycho Bickerstaff | 2013-12-11 | 27 | -514/+603 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Exported the cTNTEntity | STRWarrior | 2013-12-14 | 4 | -9/+85 |
| | | | | |||||
| * | | | Merge pull request #423 from mc-server/redstoneimprovements | Mattes D | 2013-12-14 | 4 | -290/+158 |
| |\ \ \ | | | |/ | | |/| | Redstone and configuration improvements | ||||
| | * | | Fixed compilating! | Tiger Wang | 2013-12-14 | 1 | -5/+5 |
| | | | | |||||
| | * | | Improved player permissions logging | Tiger Wang | 2013-12-14 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixes to redstone wire and torches | Tiger Wang | 2013-12-14 | 3 | -21/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | + Wires now power blocks around the block beneath * Torches no longer power off if it is on a linked powered block * Enhanced code, split functions, etc. | ||||
| | * | | Groups.ini and Users.ini are now generated | Tiger Wang | 2013-12-14 | 2 | -3/+25 |
| | | | | |||||
| | * | | Removed loads of unneeded code again | Tiger Wang | 2013-12-14 | 1 | -86/+60 |
| | | | | |||||
| | * | | Reduced loads of unneeded code | Tiger Wang | 2013-12-14 | 1 | -188/+44 |
| | | | | | | | | | | | | | | | | Merged wire powering detection code into a single function. | ||||
| * | | | Merge branch 'master' of https://github.com/mc-server/MCServer | STRWarrior | 2013-12-14 | 6 | -194/+236 |
| |\| | | |||||
| | * | | Merge pull request #419 from mc-server/redstoneloading | Mattes D | 2013-12-13 | 2 | -3/+17 |
| | |\ \ | | | | | | | | | | | Redstone data is now loaded on chunk load | ||||
| | | * | | Improved redstone loading performance | Tiger Wang | 2013-12-13 | 1 | -2/+10 |
| | | | | | |||||
| | | * | | Fixed QueueSetBlock not sending to client changes | Tiger Wang | 2013-12-13 | 1 | -2/+1 |
| | | | | | |||||
| | | * | | Redstone data is now loaded on chunk load | Tiger Wang | 2013-12-13 | 2 | -0/+7 |
| | | | | | |||||
| | * | | | Fixed threading issues affecting cProtocol172. | madmaxoft | 2013-12-13 | 4 | -191/+219 |
| | | | | | |||||
| * | | | | Fixed not getting XP from mobs. | STRWarrior | 2013-12-14 | 2 | -1/+7 |
| |/ / / | |||||
| * / / | Using "a_ClosestPlayer != NULL" in cExpOrb. | STRWarrior | 2013-12-13 | 1 | -1/+1 |
| |/ / | |||||
| * | | Unknown packet type extended to 32 bits. | madmaxoft | 2013-12-12 | 2 | -4/+4 |
| | | | |||||
| * | | Fixed protocol 1.7 recovery after unknown packet. | madmaxoft | 2013-12-12 | 1 | -4/+0 |
| | | | |||||
| * | | Fixed pistons being viable middle block | Tiger Wang | 2013-12-11 | 1 | -0/+3 |
| | | | | | | | | | | | | Also an excuse to update submodules | ||||
| * | | Merge pull request #417 from mc-server/WorldUpdate | Mattes D | 2013-12-11 | 9 | -2/+99 |
| |\ \ | | | | | | | | | World update | ||||
| | * | | HOOK_WORLD_STARTED now gets called when the CreateAndInitializeWorld function is used. | STRWarrior | 2013-12-11 | 1 | -0/+1 |
| | | | | |||||
| | * | | Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins. | STRWarrior | 2013-12-11 | 9 | -2/+98 |
| | | | | |||||
| * | | | ExpOrbs now move. | STRWarrior | 2013-12-11 | 1 | -4/+8 |
| | | | | |||||
| * | | | Provides a possible fix for repeater timings | Tiger Wang | 2013-12-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | Not completely reliable, but at least some types of clock work. | ||||
| * | | | added abort to DeadlockDetector to generate core dumps on failure | Tycho Bickerstaff | 2013-12-10 | 1 | -5/+2 |
| | |/ | |/| | |||||
* | | | added tolua++ command and removed stackwalker from build | Tycho Bickerstaff | 2013-12-10 | 3 | -6/+8 |
| | | | |||||
* | | | more cmake changes | Tycho Bickerstaff | 2013-12-10 | 3 | -6/+15 |
| | | | |||||
* | | | removed more accedentailly commited object files | Tycho Bickerstaff | 2013-12-10 | 9 | -3985/+0 |
| | | | |||||
* | | | removed accedentailly commited object files | Tycho Bickerstaff | 2013-12-10 | 27 | -0/+0 |
| | | | |||||
* | | | more cmake | Tycho Bickerstaff | 2013-12-10 | 46 | -6/+4051 |
| | | | |||||
* | | | more cmake stuff | Tycho Bickerstaff | 2013-12-10 | 3 | -2/+18 |
| | | | |||||
* | | | started work on cmake | Tycho Bickerstaff | 2013-12-10 | 4 | -0/+36 |
|/ / | |||||
* | | Merge remote-tracking branch 'upstream/master' | Tycho Bickerstaff | 2013-12-10 | 5 | -13/+96 |
|\| | |||||
| * | Merge pull request #412 from mc-server/fixes | Mattes D | 2013-12-10 | 5 | -13/+96 |
| |\ | | | | | | | Main feature: repeater delays! | ||||
| | * | Readded initial line | Tiger Wang | 2013-12-10 | 1 | -0/+1 |
| | | | |||||
| | * | Fixed compile (alas, no more goto) | Tiger Wang | 2013-12-10 | 1 | -11/+14 |
| | | | |||||
| | * | Fixed Floody lava to stone fizzle | Tiger Wang | 2013-12-10 | 1 | -2/+16 |
| | | | |||||
| | * | Added repeater delays | Tiger Wang | 2013-12-10 | 2 | -1/+62 |
| | | | | | | | | | | | | They DO sometimes get stuck though :P | ||||
| | * | Slight redstone wire performance improvement | Tiger Wang | 2013-12-10 | 1 | -1/+6 |
| | | | |||||
| | * | Changed more FastSetBlocks to SetBlocks | Tiger Wang | 2013-12-10 | 1 | -3/+3 |
| | | | | | | | | | | | | Fixes duplication bugs. | ||||
| | * | Improved pickups spawning speed again | Tiger Wang | 2013-12-10 | 2 | -7/+6 |
| | | | |||||
* | | | moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741 | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+4 |
| | | | |||||
* | | | reordered initalisation order at src/Generating/Cave.h line 73 | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+2 |
|/ / | |||||
* | | fixed warnings in src/Generating/BioGen.cpp | Tycho Bickerstaff | 2013-12-08 | 1 | -1/+1 |
| | | | | | | | | | | | | removed unused variable at src/Generating/BioGen.cpp line 379 and added default fallthrough clause to switch at src/Generating/BioGen.cpp line 725 | ||||
* | | added default fallthrough clause to switch at line 178 of src/UI/Window.cpp | Tycho Bickerstaff | 2013-12-08 | 1 | -0/+4 |
| | | |||||
* | | Reordered Listed Initalisation order in src/UI/Window.cpp | Tycho Bickerstaff | 2013-12-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | Reordered the Listed Initalisation order for CWindow to the executed initalisation order. The compiler initalises values in the order the fields are declared not the initalisations listed | ||||
* | | Removed unused variable ResultSlot | Tycho Bickerstaff | 2013-12-08 | 1 | -1/+0 |
| | | |||||
* | | Fix Undefined behavior at Bindings/LuaWindow line 32 | worktycho | 2013-12-09 | 1 | -1/+4 |
| | | |||||
* | | Fix Unused Variable Warning at FluidSimulator.cpp line 169 and 176 | worktycho | 2013-12-09 | 1 | -4/+3 |
| | | |||||
* | | Fixed warning unchecked enum value at Chunk.cpp line 841 | worktycho | 2013-12-09 | 1 | -2/+4 |
| | | |||||
* | | Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54 | worktycho | 2013-12-09 | 1 | -1/+4 |
|/ | |||||
* | Fixed angle normalization typo. | madmaxoft | 2013-12-08 | 1 | -1/+1 |
| | |||||
* | Fixed tolua++ compilation. | madmaxoft | 2013-12-08 | 7 | -192/+5 |
| | | | | Duplicate files, wrong includes, const-incorrect code... | ||||
* | Fixed VS2008 compilation after those huge changes. | madmaxoft | 2013-12-08 | 2 | -5/+7 |
| | |||||
* | Merge pull request #408 from mc-server/SpawnPoint_Fix | Mattes D | 2013-12-08 | 1 | -1/+1 |
|\ | | | | | Now spawn points will not be in deep oceans or rivers etc. | ||||
| * | Now spawn points will not be in deep oceans or rivers etc. | STRWarrior | 2013-12-08 | 1 | -1/+1 |
| | | |||||
* | | Readded redstone lamp handler | Tiger Wang | 2013-12-08 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeatures | Tiger Wang | 2013-12-08 | 43 | -1251/+1348 |
|\| | | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp | ||||
| * | Fixed normalizing large angles. | madmaxoft | 2013-12-08 | 4 | -8/+51 |
| | | |||||
| * | Moved bindings-related to a Bindings subfolder. | madmaxoft | 2013-12-08 | 41 | -1238/+1237 |
| | | | | | | | | Ref.: #407 | ||||
| * | Fixed stationary water starting fires and flowing lava not. | madmaxoft | 2013-12-08 | 1 | -2/+2 |
| | | |||||
| * | Added a SpawnFallingBlock function so plugins can make other blocks fall. | STRWarrior | 2013-12-07 | 4 | -2/+93 |
| | | |||||
* | | Fixed tabcompletion packet, fixes #356 | Tiger Wang | 2013-12-08 | 1 | -8/+4 |
| | | |||||
* | | Fixed falling block metas, fixes #406 | Tiger Wang | 2013-12-08 | 1 | -1/+1 |
| | | |||||
* | | Bonemeal has particles, fixes #393 | Tiger Wang | 2013-12-08 | 2 | -3/+8 |
| | | |||||
* | | Console trims its commands before executing 'em | Tiger Wang | 2013-12-07 | 1 | -3/+3 |
| | | |||||
* | | Fixed water starting fires | Tiger Wang | 2013-12-07 | 1 | -1/+0 |
| | | |||||
* | | Improved piston animations | Tiger Wang | 2013-12-07 | 1 | -4/+4 |
| | | |||||
* | | Fixed some new 1.7 client crash bugs | Tiger Wang | 2013-12-07 | 4 | -1/+37 |
| | | | | | | | | | | Some technical blocks were removed; trying to render them as items caused a crash. | ||||
* | | Changed some FastSetBlocks to SetBlock | Tiger Wang | 2013-12-07 | 1 | -3/+3 |
| | | | | | | | | Should fix some duplication glitches. | ||||
* | | Fixed trapdoors not toggling | Tiger Wang | 2013-12-07 | 3 | -17/+103 |
| | | | | | | | | The redstone simulator kept on resetting them. | ||||
* | | Added basic ender chests | Tiger Wang | 2013-12-07 | 10 | -14/+355 |
| | | | | | | | | Note that they just mirror chests now, so no per player inventory. | ||||
* | | Renamed animation function | Tiger Wang | 2013-12-07 | 23 | -47/+82 |
| | | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know. | ||||
* | | Fixed bed leave animation | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | Fixed duplication glitch with QueueSetBlock | Tiger Wang | 2013-12-06 | 7 | -16/+38 |
| | | | | | | | | | | | | | | If a coordinate was queued, and then the block there was broken, it would reappear: double items! Also now just sets meta if previous and current blocktypes matched. | ||||
* | | Added trapdoor cursor Y detection | Tiger Wang | 2013-12-06 | 1 | -2/+0 |
| | | |||||
* | | Puking now uses GetEyeHeight() | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | Added pickup invalid item check | Tiger Wang | 2013-12-06 | 1 | -0/+11 |
| | | | | | | | | | | They aren't spawned at all if their itemtype isn't valid; possibly fixes the client crashing with bad pickups. | ||||
* | | Re-implemented redstone duplicate checking | Tiger Wang | 2013-12-06 | 1 | -0/+29 |
| | | |||||
* | | Fixed eating using wrong animation | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | Fixed trapdoors not overriding OnUse | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
| | | |||||
* | | Spawn eggs use IsGameMode() | Tiger Wang | 2013-12-06 | 1 | -2/+2 |
| | | | | | | | | Possible fix for #316. | ||||
* | | Tools make a sound when breaking, fixes #266 | Tiger Wang | 2013-12-06 | 2 | -2/+5 |
| | | |||||
* | | Cleaned up torch code and added comments | Tiger Wang | 2013-12-06 | 1 | -31/+7 |
| | | |||||
* | | Removed another export and inline'd stuff | Tiger Wang | 2013-12-06 | 1 | -5/+5 |
| | | |||||
* | | Removed exporting of a torch function | Tiger Wang | 2013-12-06 | 1 | -3/+3 |
| | | |||||
* | | Updated comments for slabs | Tiger Wang | 2013-12-06 | 1 | -5/+6 |
| | | |||||
* | | Fixed pickups spawning for BlockEntities | Tiger Wang | 2013-12-06 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #394 from SamJBarney/master | Mattes D | 2013-12-06 | 2 | -4/+8 |
|\ | | | | | Fire no longer goes out when on top of nether rack | ||||
| * | Merged if statements. | Samuel Barney | 2013-12-05 | 1 | -7/+1 |
| | | |||||
| * | Finished Merge | Samuel Barney | 2013-12-05 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of https://github.com/mc-server/MCServer | Samuel Barney | 2013-12-05 | 7 | -10/+97 |
| |\ | | | | | | | | | | | | | Conflicts: src/Simulator/FireSimulator.h | ||||
| * | | Made suggested changes | Samuel Barney | 2013-12-04 | 2 | -6/+11 |
| | | | |||||
| * | | Fire no longer goes out when on top of nether rack | Samuel Barney | 2013-12-02 | 1 | -1/+6 |
| | | | |||||
* | | | Added cPluginManager:GetCurrentPlugin() to Lua API. | madmaxoft | 2013-12-05 | 1 | -7/+22 |
| |/ |/| | |||||
* | | ByteBuffer: Fixed optimization failures with threading checks. | madmaxoft | 2013-12-05 | 1 | -1/+1 |
| | | |||||
* | | Hopefully fixed the sparc not being detected | Alexander Harkness | 2013-12-04 | 1 | -1/+3 |
| | | |||||
* | | Lava can spawn fire. | madmaxoft | 2013-12-04 | 5 | -8/+93 |
| | | | | | | | | Settable in world.ini, lava can spawn fire to fuel blocks near it. Fix #65. | ||||
* | | Fixed an error in cChunk's block ticking. | madmaxoft | 2013-12-04 | 1 | -2/+2 |
|/ | | | | Absolute coords were passed to a handler expecting relative coords. | ||||
* | Removed stray printf, again. | Samuel Barney | 2013-12-02 | 1 | -1/+0 |
| | |||||
* | Switched to using provided ReadItem function. | Samuel Barney | 2013-12-02 | 2 | -17/+12 |
| | | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs. | ||||
* | Removed stray printf. | Samuel Barney | 2013-12-02 | 1 | -1/+0 |
| | |||||
* | Fixed 1.7 slab and stair placement. | Samuel Barney | 2013-12-02 | 1 | -0/+19 |
| | |||||
* | Fixed compiler warnings in LightingThread.cpp. | madmaxoft | 2013-12-01 | 1 | -2/+2 |
| | |||||
* | Fixed linux compile errors and formatting in RedstoneSimulator.cpp | madmaxoft | 2013-12-01 | 1 | -14/+26 |
| | |||||
* | DeadlockDetect is configurable now. | madmaxoft | 2013-11-30 | 3 | -7/+15 |
| | | | | This is needed when debugging Lua plugins. | ||||
* | Fixed compiler warnings in IsBiomeNoDownfall(). | madmaxoft | 2013-11-30 | 1 | -1/+4 |
| | |||||
* | Merge pull request #387 from mc-server/trapdoors | Mattes D | 2013-11-30 | 20 | -330/+431 |
|\ | | | | | Trapdoors, redstone fixes, and snow | ||||
| * | Fixed pistons extending | Tiger Wang | 2013-11-30 | 1 | -0/+10 |
| | | | | | | | | They didn't when a source was in front, but now they do! Yay! | ||||
| * | Removed redstone duplicate power checking | Tiger Wang | 2013-11-30 | 1 | -2/+0 |
| | | | | | | | | There was no need for it, and it introduced some bugs. | ||||
| * | Improved piston direction checking | Tiger Wang | 2013-11-30 | 1 | -62/+8 |
| | | | | | | | | Now uses AddFaceDirection, as suggested by xoft. | ||||
| * | Pistons no longer accept power through front face | Tiger Wang | 2013-11-30 | 2 | -3/+96 |
| | | | | | | | | This fixes #60. | ||||
| * | Fixed thin snow CanBeAt checking | Tiger Wang | 2013-11-30 | 1 | -1/+13 |
| | | | | | | | | | | Now takes into account the possibility that thin snow can be on top of full thin snow. | ||||
| * | Properly fixed snow height, fixes #98 and #264 | Tiger Wang | 2013-11-30 | 3 | -25/+53 |
| | | |||||
| * | Improved redstone speed and fixed a wire bug | Tiger Wang | 2013-11-30 | 1 | -73/+83 |
| | | | | | | | | | | | | | | | | The redstone simulator no longer goes through the Powered and LinkedPowered blocks lists for EVERY item in the chunk data, instead, only at every tick. Also, wires powering each other that had the same data value is now fixed. | ||||
| * | Stairs reset meta when dropped, fixes #269 | Tiger Wang | 2013-11-29 | 1 | -2/+22 |
| | | | | | | | | Additionally, they now have walking sounds. | ||||
| * | Implemented trapdoors, fixes #43 and #105 | Tiger Wang | 2013-11-29 | 5 | -3/+131 |
| | | | | | | | | Also updated redstone simulator to support it | ||||
| * | Removed unneeded CPP files | Tiger Wang | 2013-11-29 | 11 | -221/+77 |
| | | | | | | | | Also removed unneeded #include in BlockStems | ||||
* | | Changed cBlockHandler->OnUpdate() to use cChunk directly. | madmaxoft | 2013-11-30 | 15 | -63/+117 |
| | | |||||
* | | Added IsBiomeNoDownfall() function. | madmaxoft | 2013-11-30 | 3 | -103/+164 |
| | | |||||
* | | Explicitly set spawnpoint fixes. | madmaxoft | 2013-11-30 | 1 | -20/+11 |
| | | | | | | | | | | The value names are case-insensitive. The debug message is printed only once. | ||||
* | | Added the real tick duration to the OnWorldTick hook. | madmaxoft | 2013-11-30 | 8 | -17/+34 |
| | | |||||
* | | Grass doesn't spread to podzol or grassless dirt blocks. | madmaxoft | 2013-11-30 | 1 | -2/+3 |
| | | |||||
* | | Added floor pattern for MegaTaiga biomes. | madmaxoft | 2013-11-30 | 1 | -1/+10 |
| | | |||||
* | | Implemented mesa biomes in DistortedHeightmap CompoGen. | madmaxoft | 2013-11-29 | 3 | -21/+106 |
| | | |||||
* | | Fixed CheckerboardBiomeGen in negative coords. | madmaxoft | 2013-11-29 | 1 | -2/+3 |
| | | |||||
* | | DistortedHeightmap: Improved speed, prepared for mesa biomes. | madmaxoft | 2013-11-29 | 2 | -157/+424 |
| | | | | | | | | This generates the rainbow-mesa as seen on the first mesa screenshot in the forum. | ||||
* | | Fixed an off-by-one error in cByteBuffer. | madmaxoft | 2013-11-29 | 1 | -1/+1 |
| | | | | | | | | Could have caused random protocol errors and maybe even crashes. | ||||
* | | Alpha-sorted BlockMetas, added red sand. | madmaxoft | 2013-11-29 | 1 | -125/+128 |
| | | |||||
* | | Trees will generate in the new biomes. | madmaxoft | 2013-11-28 | 2 | -14/+101 |
| | | | | | | | | Only the generic trees, the special variants haven't yet been implemented. | ||||
* | | Added new biomes to old composition generator. | madmaxoft | 2013-11-28 | 4 | -0/+145 |
| | | | | | | | | Mostly placeholders only, true per-biome characteristics still need to be implemented. This is only to test the new biome generators. | ||||
* | | Added new biomes to old height generators. | madmaxoft | 2013-11-28 | 4 | -39/+179 |
| | | | | | | | | Now Biomal and DistortedHeight generators will work with new biomes. | ||||
* | | Moved BiomeGen creation from INI file data to BioGen.cpp. | madmaxoft | 2013-11-28 | 3 | -48/+74 |
| | | | | | | | | This way it can be shared between MCServer and BiomeVisualiser. | ||||
* | | Moved json includes to where they are really needed. | madmaxoft | 2013-11-28 | 3 | -1/+2 |
| | | |||||
* | | BiomeVisualiser: Added the TwoLevel biome generator. | madmaxoft | 2013-11-28 | 2 | -0/+229 |
|/ | |||||
* | Fixed a bug with TNT waking simulators | Tiger Wang | 2013-11-28 | 1 | -2/+2 |
| | |||||
* | Improved TNT pickup randomisation | Tiger Wang | 2013-11-28 | 1 | -1/+1 |
| | |||||
* | Made TNT pickups spawning chance 25% | Tiger Wang | 2013-11-27 | 2 | -3/+3 |
| | |||||
* | Merged master into redstonefixes | Tiger Wang | 2013-11-27 | 465 | -0/+138834 |
|\ | |||||
| * | Voronoi-related biomegens use the new cVoronoiMap class. | madmaxoft | 2013-11-27 | 3 | -54/+29 |
| | | |||||
| * | Fixed a load of issues, clang autodetection works now. | Alexander Harkness | 2013-11-27 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | This fixes issue #210. This also removes the disableasm option, so it would be wise to remove it from any scripts that use it. I also removed a random line in the middle of globals.h, why was it there? | ||||
| * | Added missing files for Voronoi map generation. | madmaxoft | 2013-11-27 | 2 | -0/+140 |
| | | |||||
| * | Fixed VC2008 compilation, normalized include paths. | madmaxoft | 2013-11-27 | 12 | -12/+12 |
| | | |||||
| * | Fixed the remaining derps | Alexander Harkness | 2013-11-27 | 26 | -30/+30 |
| | | |||||
| * | Fixed some of tiger's derpyness. | Alexander Harkness | 2013-11-27 | 9 | -11/+11 |
| | | |||||
| * | ANOTHER compile fix | Tiger Wang | 2013-11-26 | 1 | -1/+1 |
| | | | | | | | | This one was broken by bear. :P | ||||
| * | Hopefully fixed last of the Linux compile errors | Tiger Wang | 2013-11-26 | 5 | -5/+5 |
| | | |||||
| * | Compile fix again | Tiger Wang | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | Fixed Linux compile again | Tiger Wang | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | Fixed tolua++ files | Tiger Wang | 2013-11-26 | 3 | -4/+4 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-26 | 18 | -6/+268 |
| |\ | |/ |/| | | | | | Conflicts: VC2008/MCServer.vcproj | ||||
| * | Merge branch 'master' into foldermove2 | Alexander Harkness | 2013-11-26 | 1 | -3/+0 |
| |\ | |/ |/| | |||||
| * | Fixed loads more of them. | Alexander Harkness | 2013-11-26 | 11 | -13/+13 |
| | | |||||
| * | Another | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | And another. | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | Fixed another. | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | Fixed another one. | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | Fixed a mis-include | Alexander Harkness | 2013-11-26 | 1 | -1/+1 |
| | | |||||
| * | Further attempts to fix compile | Tiger Wang | 2013-11-25 | 24 | -27/+27 |
| | | |||||
| * | Attempt to fix compilation | Tiger Wang | 2013-11-24 | 48 | -59/+58 |
| | | |||||
| * | Moved SQLite, LuaExpat, and MD5 to /lib | Tiger Wang | 2013-11-24 | 8 | -148557/+0 |
| | | |||||
| * | Merge remote-tracking branch 'origin/master' into foldermove2 | Alexander Harkness | 2013-11-24 | 66 | -1497/+2365 |
| |\ | |/ |/| | | | | | Conflicts: GNUmakefile | ||||
| * | Moved source to src | Alexander Harkness | 2013-11-24 | 469 | -0/+285880 |
|/ | |||||
* | Android: Moved Android stuff to the ~/trunk/Android/ folder! | faketruth | 2012-08-19 | 1 | -267/+0 |
| | | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@758 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Android: Finally a log! :D | faketruth | 2012-08-19 | 1 | -32/+44 |
| | | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@754 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Android: Showing last MCServer related logcat message | faketruth | 2012-08-19 | 1 | -13/+63 |
| | | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@753 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Android: I'm probably using a lot of bad practices, but the app looks somewhat better now and polls the server status | faketruth | 2012-08-18 | 1 | -9/+146 |
| | | | | | | Android: Put quite some testing code in ToJava.h and app-android.cpp ... I still can't send log messages to Java. The issue is threads, I can't use JNI stuff from threads that were not created by Java (at least not easily) git-svn-id: http://mc-server.googlecode.com/svn/trunk@752 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Android: Pressing back button sends stop command to server | faketruth | 2012-08-18 | 1 | -9/+30 |
| | | | | | | | | Android: ToJava can call functions on Java by using JNI Android: Plugins work Android: Added android specific files to VS2008 project, but they are excluded from compiling git-svn-id: http://mc-server.googlecode.com/svn/trunk@747 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | MCServer should run just fine on Android now :D | faketruth | 2012-08-16 | 1 | -3/+13 |
| | | | | | | The server is also stoppable from Android git-svn-id: http://mc-server.googlecode.com/svn/trunk@743 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | Compiles on Android! Added Eclipse project, import it into your workspace and it should be runnable on Android! | faketruth | 2012-08-15 | 1 | -0/+37 |
Disabled Squirrel for Android cLog now logs to Android LogCat as well Fixed Lua so it compiles on Android Removed/commented out exceptions in JsonCpp so it compiles on Android git-svn-id: http://mc-server.googlecode.com/svn/trunk@741 0a769ca7-a7f5-676a-18bf-c427514a06d6 |