summaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Removed old classes from the CMakeLists.txtHowaner2014-08-201-2/+0
|
* Code formatting fixes.Howaner2014-08-1929-152/+83
|
* Player: Silenced a few type conversion warnings.Mattes D2014-08-181-2/+2
|
* Player saving creates the "players" folder, if needed.Mattes D2014-08-171-0/+1
| | | | Fixes #1268.
* SwamplandM: Fixed sometimes having no mountains.STRWarrior2014-08-181-1/+1
|
* Better OnPlayerMoving hook.Howaner2014-08-166-9/+17
|
* Merge pull request #1308 from mc-server/loggerMattes D2014-08-1520-602/+624
|\ | | | | New Logging framework
| * Removed an unneeded cast.madmaxoft2014-08-151-1/+1
| |
| * File logger prefixes are 4 chars wide.madmaxoft2014-08-131-6/+6
| |
| * Logger: Fixed windows debug ODS logger, fixed-size file prefixes.madmaxoft2014-08-131-8/+9
| |
| * Logger: Fixed missing timestamp in log messages.madmaxoft2014-08-131-1/+1
| |
| * Fixed windows compilation and style issues.madmaxoft2014-08-124-37/+177
| |
| * Fix messing renameTycho2014-08-121-1/+1
| |
| * Renamed LoggersTycho2014-08-1214-426/+405
| |
| * Fixed Tools to work with new logging frameworkTycho2014-08-105-206/+0
| |
| * Added forgoten filesTycho2014-08-104-0/+457
| |
| * First Implementatation of new Loggin frameworkTycho2014-08-1014-398/+49
| |
* | CheckBasicStyle checks the src folder as well.madmaxoft2014-08-145-14/+20
| |
* | Fixed shadowing variableTycho2014-08-131-5/+5
| |
* | Removed unused methodTycho2014-08-132-25/+0
| |
* | Merge pull request #1296 from mc-server/LuaAPIFranz Reiter2014-08-1213-33/+66
|\ \ | | | | | | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
| * | Exported daylight cycle flag to the protocol.Howaner2014-08-1112-28/+29
| | |
| * | Added a comment and simplified code.Howaner2014-08-102-11/+5
| | |
| * | Added IsDaylightCycleEnabled saving.Howaner2014-08-101-0/+2
| | |
| * | Renamed functions.Howaner2014-08-102-7/+7
| | |
| * | Merge branch 'master' into LuaAPIHowaner2014-08-106-11/+102
| |\ \
| * | | Renamed m_DoDaylightCycle to m_CycleDaylight.Howaner2014-08-082-7/+7
| | | |
| * | | Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.Howaner2014-08-074-20/+56
| | |/ | |/| | | | I need this for a GameRule plugin.
* | | cProtocol172: Check return values.madmaxoft2014-08-111-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/ChestFixMattes D2014-08-111-5/+5
|\ \ \ | | | | | | | | Fixed potential null dereference
| * | | Fixed potential null dereferenceTycho2014-08-101-5/+5
| | | | | | | | | | | | | | | | Fixes CID 70466
* | | | Merge pull request #1301 from mc-server/OresMattes D2014-08-113-53/+120
|\ \ \ \ | | | | | | | | | | Ore Tweaks
| * | | | Bunch of tweaks:STRWarrior2014-08-103-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed Quarts to Quartz Using const_iterator instead of iterator Used CheckBasicStyle script to find style errors
| * | | | Added NaturalPatches generatorSTRWarrior2014-08-101-0/+22
| | | | | | | | | | | | | | | | | | | | It generates gravel and dirt.
| * | | | Added NetherOreNests.STRWarrior2014-08-101-0/+15
| | | | | | | | | | | | | | | | | | | | It generates Nether Quarts.
| * | | | Changed cStructGenOreNests to take a list of ores + the block to replace.STRWarrior2014-08-103-53/+83
| | |_|/ | |/| |
* | | | Fixed tolua error with static initializationarchshift2014-08-112-3/+12
| | | |
* | | | Gave names to unnamed enumsarchshift2014-08-114-5/+5
| | | |
* | | | Player.cpp: change unnamed enum to constant integersarchshift2014-08-112-7/+8
| | | |
* | | | Merge pull request #1311 from mc-server/CMakeFixMattes D2014-08-101-1/+1
|\ \ \ \ | | | | | | | | | | Fixed circular dependecy luaState_Call.inc
| * | | | Fixed circular dependecy luaState_Call.incTycho2014-08-101-1/+1
| | |/ / | |/| |
* | | | Merge pull request #1309 from mc-server/coverity_fixesMattes D2014-08-101-0/+4
|\ \ \ \ | | | | | | | | | | Fixed potential crash in Player.cpp
| * | | | SpacesTycho2014-08-101-1/+1
| | | | |
| * | | | Fixed potential crash in Player.cppTycho2014-08-101-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/SlabsMattes D2014-08-101-0/+12
|\ \ \ \ | |/ / / |/| | | Send the old slab to the client when the interact cancelled.
| * | | Changed comment.Howaner2014-08-101-3/+1
| | | |
| * | | Added comment.Howaner2014-08-081-0/+3
| | | |
| * | | Send the old slab to the client when the interact cancelled.Howaner2014-08-081-0/+11
| | | |
* | | | Fixed swing arm animation when you ate.Howaner2014-08-101-4/+2
| |/ / |/| |
* | | Removed an old and outdated comment.STRWarrior2014-08-101-2/+0
| | |
* | | WebAdmin: Manually exported string conversion functions.madmaxoft2014-08-092-6/+64
| | | | | | | | | | | | ToLua generated an extra return value for GetHTMLEscapedString() and GetURLEncodedString(), making them difficult to use.
* | | WebAdmin: Added GetURLEncodedString().madmaxoft2014-08-092-1/+36
|/ /
* | Merge pull request #1295 from mc-server/crystalMattes D2014-08-071-3/+3
|\ \ | | | | | | On destroy ender crystal, create bedrock and fire.
| * | On destroy ender crystal, create bedrock and firearchshift2014-08-061-3/+3
| |/
* | Fixed nether wart digging.Howaner2014-08-071-0/+1
| | | | | | Fixes #1265
* | Removed debug message.Howaner2014-08-071-1/+0
|/
* Merge pull request #1291 from mc-server/RedstoneCleanUpMattes D2014-08-066-21/+83
|\ | | | | Redstone clean up
| * Fixed style issuesTycho2014-08-063-5/+8
| |
| * Fixed multiple inhertance being output by toluaTycho2014-08-062-6/+10
| |
| * Removed dependecy of redstone simulator on NoteBlockTycho2014-08-054-12/+20
| |
| * Refactored Redstone simulator not to depend on TNTEntity or DropSpenserENtity DirectlyTycho2014-08-055-9/+56
| |
* | Resending fire to the client when the interact cancelled.Howaner2014-08-061-0/+8
| |
* | Made lua clamp() compatible with all number types.Howaner2014-08-051-4/+4
| |
* | Added api documentation for Clamp()Howaner2014-08-051-2/+2
| |
* | Added Clamp() function to the lua api.Howaner2014-08-051-0/+28
|/
* Fixed unsigned long comparison to size_tarchshift2014-08-051-1/+1
|
* MojangAPI: Fixed PlayerNameToUUID().madmaxoft2014-08-041-1/+1
|
* Merge pull request #1287 from Howaner/BowFranz Reiter2014-08-041-0/+10
|\ | | | | Added arrow consuming on shooting
| * Changed arrow comment.Howaner2014-08-041-1/+1
| |
| * Added arrow consuming on shootingHowaner2014-08-041-0/+10
| |
* | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-041-1/+1
|\|
| * Fixed #1286Howaner2014-08-041-1/+1
| |
* | Fixed signs not staying on other signsTiger Wang2014-08-042-2/+4
| |
* | Made AllToLua output consistentTiger Wang2014-08-041-2/+2
|/
* CheckBasicStyle: multi-level indent change.madmaxoft2014-08-047-13/+33
|
* BasicStyleCheck: Dividers are exactly 80 slashes.madmaxoft2014-08-042-2/+18
|
* Merge branch 'master' into MonsterHowaner2014-08-049-75/+69
|\
| * Merge pull request #1285 from mc-server/StrCaseRefactorMattes D2014-08-047-47/+54
| |\ | | | | | | Refactored case-conversion functions.
| | * Refactored case-conversion functions.madmaxoft2014-08-047-47/+54
| | | | | | | | | | | | StrToLower() returns a modified copy of the string, InPlaceLowercase() modifies the string in-place.
| * | Merge pull request #1283 from Howaner/GlobalFixesMattes D2014-08-041-6/+5
| |\ \ | | |/ | |/| Fixed skins in mc 1.7.9/1.7.10
| | * Changed properties for-loop.Howaner2014-08-041-1/+1
| | |
| | * Merge branch 'master' into GlobalFixesHowaner2014-08-032-0/+18
| | |\
| | * | Fixed skins in mc 1.7.9/1.7.10Howaner2014-08-031-6/+5
| | | |
| * | | Anvil: Wolf owner not saved if not present.madmaxoft2014-08-041-2/+8
| | | |
| * | | Rewritten string case manipulation to use std::transform.madmaxoft2014-08-041-22/+4
| | |/ | |/|
* | | Changed /** to /*Howaner2014-08-041-3/+5
| | |
* | | Fixed warningsHowaner2014-08-041-3/+3
| | |
* | | Attempt to fix knockback and swimming.Howaner2014-08-042-18/+22
|/ /
* / Attempting a compilation fix for gcc / clang.madmaxoft2014-08-032-0/+18
|/
* Wolf uses UUID for owner.madmaxoft2014-08-035-17/+82
| | | | Fixes #1277.
* cMojangAPI: Added UUID-to-Name lookup.madmaxoft2014-08-035-62/+522
| | | | Also fixed the bindings, now all functions are static-like.
* Trailing whitespace fix.madmaxoft2014-08-031-1/+1
|
* Added cMojangAPI:GetUUIDFromPlayerName().madmaxoft2014-08-032-0/+35
| | | | This is a simpler way to ask for a single name -> uuid conversion.
* Added cPlayer::GetUUID().madmaxoft2014-08-031-0/+3
|
* Fixed a ToLua warning - operator = not supported.madmaxoft2014-08-038-8/+16
|
* Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2014-08-033-101/+70
|\
| * Entity.cpp: Air timer comment fixarchshift2014-08-031-1/+1
| |
| * Code reduction and clarity fixesarchshift2014-08-032-29/+16
| |
| * Removed unused cPlayer::FoodPoison functionarchshift2014-08-032-12/+0
| |
| * Entity.cpp: On portal check, use if-else for current dimensionarchshift2014-08-031-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 commentSTRWarrior2014-08-031-1/+1
|/
* Added proper trees and height for SwamplandM biomeSTRWarrior2014-08-023-2/+4
|
* Fixed a bug who can used from hacked clients.Howaner2014-08-022-1/+18
|
* Fixed issues with autocomplete and time loadingTiger Wang2014-08-011-7/+33
| | | | * Fixes #1274
* Improved endermen code a littleTiger Wang2014-08-013-20/+56
|
* Merge pull request #1255 from mc-server/NameToUUIDMattes D2014-08-0115-156/+716
|\ | | | | Name to UUID
| * Merged branch 'master' into NameToUUID.madmaxoft2014-07-3167-441/+1537
| |\
| * | Removed trailing whitespace.madmaxoft2014-07-311-2/+2
| | |
| * | Fixed UUIDs handling in cPlayer.madmaxoft2014-07-312-6/+9
| | | | | | | | | | | | The loading expected dashed UUIDs, MCS uses short UUIDs throughout.
| * | MojangAPI: Moved the settings to a separate ini section.madmaxoft2014-07-311-2/+2
| | |
| * | MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames().madmaxoft2014-07-313-9/+23
| | |
| * | MojangAPI: Renamed cache file to MojangAPI.sqlite.madmaxoft2014-07-301-2/+2
| | |
| * | MojangAPI: Clarified the UUID conversion code.madmaxoft2014-07-302-4/+17
| | |
| * | ManualBindings: Fixed alignment.madmaxoft2014-07-301-3/+3
| | |
| * | MojangAPI: Implemented UUID shortening and dashing.madmaxoft2014-07-305-22/+40
| | |
| * | Exported cMojangAPI to Lua.madmaxoft2014-07-304-5/+20
| | |
| * | Added a cMojangAPI class for PlayerName -> UUID lookups, with cache.madmaxoft2014-07-309-239/+564
| | | | | | | | | | | | The cache is persisted into a SQLite DB file on server shutdown.
| * | Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API.madmaxoft2014-07-281-3/+62
| | |
| * | cAuthenticator: Added GetUUIDsFromPlayerNames().madmaxoft2014-07-282-3/+116
| | |
* | | Added missing HOOK_BLOCK_SPREAD call.Howaner2014-08-011-6/+14
| | |
* | | Merge pull request #1272 from Howaner/FoodMattes D2014-08-018-48/+177
|\ \ \ | | | | | | | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added...
| * | | Compile fix.Howaner2014-08-011-2/+1
| | | |
| * | | Import Statistics.hHowaner2014-07-311-0/+1
| | | |
| * | | Fixed hunger bugs, Implemented golden apple, added jump statistic, added correct food effects.Howaner2014-07-318-48/+177
| | |/ | |/|
* | | Merge pull request #1269 from Howaner/BlockEntitysMattes D2014-08-0126-37/+864
|\ \ \ | | | | | | | | Added beacon.
| * | | Use "default:" in switch.Howaner2014-07-311-3/+6
| | | |
| * | | Renamed "select..." methods to "set..." and better IsValidEffect() function.Howaner2014-07-314-55/+19
| | | |
| * | | Updated documentation.Howaner2014-07-311-3/+3
| | | |
| * | | Renamed functions and added beacon json saving.Howaner2014-07-318-66/+84
| | | |
| * | | Added window update.Howaner2014-07-301-0/+23
| | | |
| * | | Added beacon load/save.Howaner2014-07-305-1/+74
| | | |
| * | | Changed return type from GetPrimaryPotion() and GetSecondaryPotion()Howaner2014-07-301-2/+2
| | | |
| * | | Exported the beacon.Howaner2014-07-3011-17/+107
| | | |
| * | | Added beacon.Howaner2014-07-3013-33/+689
| | | |
* | | | Merge pull request #1270 from Howaner/OptionsMattes D2014-07-311-5/+5
|\ \ \ \ | | | | | | | | | | Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator
| * | | | Capitalised "incremental"Howaner2014-07-311-4/+4
| | | | |
| * | | | Added a default value to WaterSimulator, LavaSimulator and RedstoneSimulator.Howaner2014-07-311-2/+2
| | |/ / | |/| |
* | | | Merge pull request #1271 from Howaner/GlobalFixesMattes D2014-07-312-2/+13
|\ \ \ \ | | | | | | | | | | Fixed water from ice and removed packed ice drop.
| * | | | Changed IsSolid to FullyOccupiesVoxelHowaner2014-07-311-1/+1
| | | | |
| * | | | Fixed water from ice and removed packed ice drop.Howaner2014-07-312-2/+13
| |/ / /
* | | | Merge pull request #1047 from mc-server/EndermanTiger Wang2014-07-312-0/+121
|\ \ \ \ | |/ / / |/| | | Enderman attacks a player if he's looking at him
| * | | Comment suggestionsTiger Wang2014-07-311-9/+8
| | | |
| * | | Added lighting code and added commentsSTRWarrior2014-07-301-0/+17
| | | |
| * | | Removed lighting code in cEnderman::CheckEventSeePlayerSTRWarrior2014-07-301-9/+1
| | | |
| * | | Changed commentworktycho2014-06-301-1/+1
| | | |
| * | | Replaced strange algebra with dot product.worktycho2014-06-181-4/+6
| | | | | | | | | | | | | | | | 10 degrees is a completely arbitary constant I pulled from nowhere. Feel free to adjust this value.
| * | | Improved Enderman codeTiger Wang2014-06-182-14/+34
| | | |
| * | | Swapped m_Player and m_EndermanPosSTRWarrior2014-06-181-2/+2
| | | |
| * | | Enderman attacks a player if he's looking at him.STRWarrior2014-06-182-0/+91
| | | |
* | | | SuggestionsSTRWarrior2014-07-301-2/+2
| | | |
* | | | Moved GetRoofedForestTreeImage content to GetDarkoakTreeImageSTRWarrior2014-07-302-66/+55
| | | |
* | | | Fixed doxy commentSTRWarrior2014-07-301-1/+1
| | | |
* | | | Fixed comment at the end of a for-loopSTRWarrior2014-07-301-1/+1
| | | |
* | | | Fixed compiling using ClangSTRWarrior2014-07-301-4/+2
| | | |
* | | | Added RoofedForest trees.STRWarrior2014-07-302-2/+73
| | | | | | | | | | | | | | | | Could still be improved allot.
* | | | PreSimulator: Added configurations.STRWarrior2014-07-303-6/+30
| |/ / |/| | | | | | | | You can now choose if it should pregenerate something or not
* | | Merged branch 'howaner/Options'.madmaxoft2014-07-308-42/+57
|\ \ \
| * | | Change Group->SetColor() again.Howaner2014-07-271-1/+1
| | | |
| * | | Use AString(1, Color[0])Howaner2014-07-271-1/+1
| | | |
| * | | Use Color[0].Howaner2014-07-271-1/+1
| | | |
| * | | Fixed group color's.Howaner2014-07-272-16/+5
| | | |
| * | | Add "Broadcasting" settings to world.iniHowaner2014-07-275-11/+22
| | | |
| * | | Fixed plugin count and fixed plugin loading, when settings.ini was regenerated.Howaner2014-07-271-16/+30
| | | |
* | | | Fixed "Dependency" typosarchshift2014-07-302-6/+6
| | | |
* | | | Merge pull request #1262 from mc-server/CanBeTerraformedMattes D2014-07-304-44/+32
|\ \ \ \ | | | | | | | | | | Added cBlockInfo::CanBeTerraformed and made finishers use it
| * | | | Added soulsand to the terraformed list.STRWarrior2014-07-291-0/+1
| | | | |
| * | | | Added cBlockInfo::CanBeTerraformed and made finishers use itSTRWarrior2014-07-294-44/+31
| | | | | | | | | | | | | | | | | | | | I might have forgotten some of them though
* | | | | Fixed FinishGen.h types.madmaxoft2014-07-301-2/+2
| | | | |
* | | | | Entity.h: Moved constants out of some unnamed enumarchshift2014-07-301-14/+14
| | | | |
* | | | | Changed size_t to 'unsigned long'Howaner2014-07-301-2/+2
| | | | |
* | | | | Fixed compile error with clang.Howaner2014-07-301-2/+2
| | | | |
* | | | | Slight cleanup after portalsTiger Wang2014-07-298-20/+14
|/ / / /
* | | | Merge pull request #1061 from mc-server/portalsMattes D2014-07-2939-236/+643
|\ \ \ \ | | | | | | | | | | Portals and others
| * | | | Detrailed whitespaceTiger Wang2014-07-291-3/+3
| | | | |
| * | | | Merge branch 'master' into portalsTiger Wang2014-07-29120-687/+1739
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h
| * | | | | SuggestionsTiger Wang2014-07-236-24/+28
| | | | | |
| * | | | | Speed improvements, crash fixes, & self-suggestionsTiger Wang2014-07-228-61/+55
| | | | | |
| * | | | | Suggestion and failed merge fixTiger Wang2014-07-222-1/+6
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-22177-1495/+2517
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * | | | | | SuggestionsTiger Wang2014-07-219-126/+160
| | | | | | |
| * | | | | | Bug and crash fixesTiger Wang2014-07-2012-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 issuesTiger Wang2014-07-1814-77/+28
| | | | | | |
| * | | | | | Merge branch 'master' into portalsTiger Wang2014-07-18357-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 portalsTiger Wang2014-06-2417-98/+290
| |\ \ \ \ \ \ \
| * | | | | | | | Conforms to standardsTiger Wang2014-06-221-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into portalsTiger Wang2014-06-2196-3442/+5529
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Entity.h src/Entities/Player.h
| * | | | | | | | | Fixed invalid iteratorsTiger Wang2014-06-217-39/+26
| | | | | | | | | |
| * | | | | | | | | More suggestionsTiger Wang2014-06-214-5/+7
| | | | | | | | | |
| * | | | | | | | | Implemented PR suggestionsarchshift2014-06-164-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Furnace.txt: newline BlockID: removed extraneous dimension mapping cEntity: fixed typo cPlayer: WorldPtr typedef
| * | | | | | | | | Reverted portal creation codeTiger Wang2014-06-142-103/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It wasn't really working and needs more development
| * | | | | | | | | Cauldrons check the heightmapTiger Wang2014-06-143-8/+12
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-1411-404/+445
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h
| * | | | | | | | | | Fixed order of initalisationTycho2014-06-122-5/+6
| | | | | | | | | | |
| * | | | | | | | | | Removed unnessicary indirection from Entity iterator listTycho2014-06-122-6/+6
| | | | | | | | | | |
| * | | | | | | | | | Fixed compileworktycho2014-06-121-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Portals animate and delay correctlyTiger Wang2014-06-1219-117/+174
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into portalsTiger Wang2014-06-1054-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 suggestionsTiger Wang2014-06-109-54/+175
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed Time of dayworktycho2014-06-071-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | SuggestionsTiger Wang2014-06-055-14/+14
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed decision failureTiger Wang2014-06-051-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed compilationTiger Wang2014-06-051-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | SuggestionsTiger Wang2014-06-042-2/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Time and weather is saved, part of #1058Tiger Wang2014-06-042-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed unreliability in Health and LootPickup loading.
| * | | | | | | | | | | Health of monsters is now savedTiger Wang2014-06-042-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed a NetherFinisher bugTiger Wang2014-06-043-24/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Configurable portalsTiger Wang2014-06-044-14/+83
| | | | | | | | | | | |
| * | | | | | | | | | | SuggestionsTiger Wang2014-06-043-6/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Removed use of autoTiger Wang2014-06-041-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Added checks for no downfall biomesTiger Wang2014-06-043-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-0482-1005/+21372
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Implemented bed homesTiger Wang2014-06-014-16/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented bed home positions * Fixed some inventory and health server/client mismatches after world change
| * | | | | | | | | | | | Implemented end and nether portalsTiger Wang2014-05-3123-92/+254
| | | | | | | | | | | | |
| * | | | | | | | | | | | Very minor code changesTiger Wang2014-05-293-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Cauldrons fillTiger Wang2014-05-294-3/+19
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1254 from mc-server/SingleTopBlockFinisherMattes D2014-07-293-22/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlock
| * | | | | | | | | | | | | Some finishing touchesSTRWarrior2014-07-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed whitespace fixed dead bush comment
| * | | | | | | | | | | | | Fixed comment above cFinishGenSingleTopBlockSTRWarrior2014-07-291-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | SingleTopBlock: All blocktypes and biometypes get initialized properlySTRWarrior2014-07-291-2/+14
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Using suggestionsSTRWarrior2014-07-281-25/+20
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Forgot Mesa Plateau biome.STRWarrior2014-07-281-0/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Renamed cFinishGenSingleBiomeSingleTopBlock to cFinishGenSingleTopBlockSTRWarrior2014-07-283-20/+82
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now accepts a vector of biomes and a vector of allowed blocks.
* | | | | | | | | | | | | Merge pull request #1252 from mc-server/RoughRavinesGenMattes D2014-07-295-3/+451
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Rough ravines gen
| * | | | | | | | | | | | Added a missing include for abs(float).madmaxoft2014-07-271-0/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | RoughRavines: Made floor and ceiling settings-adjustable.madmaxoft2014-07-274-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!madmaxoft2014-07-271-32/+73
| | | | | | | | | | | | |
| * | | | | | | | | | | | RoughRavines: More settings - size, width, roughnessmadmaxoft2014-07-273-23/+84
| | | | | | | | | | | | |
| * | | | | | | | | | | | RoughRavines: Initial generator implementation.madmaxoft2014-07-274-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.STRWarrior2014-07-281-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Hotfixed compilation problems.madmaxoft2014-07-272-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1236 from Howaner/Inventory2Mattes D2014-07-2717-72/+164
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix item durability.
| * | | | | | | | | | | | Derp.Howaner2014-07-261-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Rename function.Howaner2014-07-264-6/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into Inventory2Howaner2014-07-26105-654/+942
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/BlockInfo.cpp
| * | | | | | | | | | | | | Fix item durability.Howaner2014-07-2316-69/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1181
* | | | | | | | | | | | | | NetherClumpGenerator: Fixed generating stuff on halfslabs and fencesSTRWarrior2014-07-271-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Updated NetherForts' weights.madmaxoft2014-07-271-2/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Removed forgotten commentSTRWarrior2014-07-271-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Made nether ceiling smooth.STRWarrior2014-07-271-1/+8
| | | | | | | | | | | | |
* | | | | | | | | | | | | Added a ceiling to disguise the bedrock above it.STRWarrior2014-07-271-1/+9
| | | | | | | | | | | | |
* | | | | | | | | | | | | NetherClumpFoliage: Fixed assertSTRWarrior2014-07-271-8/+39
| | | | | | | | | | | | |
* | | | | | | | | | | | | Updated NetherFort prefabs to latest Gallery content.madmaxoft2014-07-271-37/+752
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1232 from mc-server/splash-entityMattes D2014-07-267-139/+162
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Moved potion static functions to EntityEffect to create splash potions through the world
| * | | | | | | | | | | | SplashPotionEntity: Use `const cItem &` instead of a cItemarchshift2014-07-262-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed indentations, removed redundant init code in SplashPotionEntity.cpparchshift2014-07-264-9/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | Moved potion static functions to EntityEffect to create splash potions through worldarchshift2014-07-267-139/+164
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Change comment.Howaner2014-07-261-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into InventoryHowaner2014-07-26248-1994/+3192
|\| | | | | | | | | | |
| * | | | | | | | | | | Endianness.h: undefined ntohll before redefiningarchshift2014-07-261-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Tweaks to NetherClumpFoliageSTRWarrior2014-07-251-34/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplefied the way NetherClupFoliage creates the X and Z coordinate.
| * | | | | | | | | | | Speed up the NetherClumpFoliage finisher.STRWarrior2014-07-251-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using IntNoiseXX instead of CubicNoiseXX.
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master'Tiger Wang2014-07-2482-221/+462
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Removed redundant semicolons and re-added warningarchshift2014-07-2473-103/+103
| | | | | | | | | | | | |
| | * | | | | | | | | | | Added a queue for setting chunk data.madmaxoft2014-07-2411-118/+349
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1196.
| | * | | | | | | | | | | Made the cWorld::SpawnMobFinalize function more readable.STRWarrior2014-07-241-0/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed block dropsTiger Wang2014-07-245-17/+59
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1242 (the issue addressed within)
| * | | | | | | | | | | Moar view distance!tonibm192014-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's blow up our computers! :D
| * | | | | | | | | | | TallGrass: Less grass on mountains.STRWarrior2014-07-231-0/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed possible crash in the NetherClumpFoliage finisher.STRWarrior2014-07-231-0/+5
| | | | | | | | | | | |
| * | | | | | | | | | | BlockLeaves: Fixed comment style.madmaxoft2014-07-231-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed MSVC bindings regeneration.madmaxoft2014-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still one typo had been left in the cmake file.
| * | | | | | | | | | | Fixed Bindings generation in MSVC.madmaxoft2014-07-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bindings weren't regenerated because of the typo in the dependencies cmake variable.
| * | | | | | | | | | | Merge pull request #1234 from mc-server/GeneratorTweaksarchshift2014-07-221-13/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | ExtremeHillsPlus and ExtremeHills spawn with grass only
| | * | | | | | | | | | | Extreme Hills M variant only spawn with grass and stoneSTRWarrior2014-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed gravel.
| | * | | | | | | | | | | ExtremeHillsPlus and ExtremeHills spawn with grass onlySTRWarrior2014-07-211-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out only the M variants have stone and gravel in them.
| * | | | | | | | | | | | Export SendEntityAnimation to ToLuaarchshift2014-07-221-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix misguided comment on bits...Tiger Wang2014-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...obviously written by someone very confused, also known as me
| * | | | | | | | | | | | Export BroadcastEntityAnimation with ToLuaarchshift2014-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #752
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into saplingsandleavesTiger Wang2014-07-22110-937/+1093
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Defines.h
| | * | | | | | | | | | | Updated prefabs to current Gallery content.madmaxoft2014-07-223-226/+243
| | |/ / / / / / / / / /
| | * | | | | | | | | | Merged branch 'origin/Foliage'.madmaxoft2014-07-213-0/+100
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fixed a missing enter.STRWarrior2014-07-211-0/+1
| | | | | | | | | | | | |
| | | * | | | | | | | | | Removed y for-loop.STRWarrior2014-07-211-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only the top block now gets long grass.
| | | * | | | | | | | | | Fixed indentationSTRWarrior2014-07-211-12/+12
| | | | | | | | | | | | |
| | | * | | | | | | | | | Changed CubicNoiseXX to IntNoiseXXSTRWarrior2014-07-202-40/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some comments
| | | * | | | | | | | | | Renamed cFinishGenFoliage to cFinishGenTallGrassSTRWarrior2014-07-203-17/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better grass density Added double tall grass.
| | | * | | | | | | | | | Fixed warningsSTRWarrior2014-07-202-5/+4
| | | | | | | | | | | | |
| | | * | | | | | | | | | First attempt for a new foliage finisherSTRWarrior2014-07-203-0/+74
| | | | | | | | | | | | |
| | * | | | | | | | | | | Defines.h: Fixed a warning.madmaxoft2014-07-211-1/+1
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | CheckBasicStyle: Added a lua shebang.madmaxoft2014-07-211-0/+1
| | | | | | | | | | | |
| | * | | | | | | | | | CheckBasicStyle: Doesn't require LuaFileSystem.madmaxoft2014-07-211-34/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead it uses the list of files generated by CMake.
| | * | | | | | | | | | CMake: generates a list of all source files.madmaxoft2014-07-211-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used for the style-checking script.
| | * | | | | | | | | | Normalized spaces after "catch".madmaxoft2014-07-212-3/+4
| | | | | | | | | | | |
| | * | | | | | | | | | CheckBasicStyle: Checks spaces after keywords, no space before ")".madmaxoft2014-07-211-1/+16
| | | | | | | | | | | |
| | * | | | | | | | | | Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-2194-535/+541
| | | | | | | | | | | |
| | * | | | | | | | | | Style: Normalized spaces after if, for and while.madmaxoft2014-07-2128-135/+137
| | | | | | | | | | | |
| | * | | | | | | | | | Cuboid: added explicit copy assignment operatorarchshift2014-07-212-0/+13
| | | | | | | | | | | |
| | * | | | | | | | | | Merge pull request #1213 from mc-server/chat-colorMattes D2014-07-206-57/+59
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored cChatColor
| | | * | | | | | | | | | ChatColor.h: The @deprecated tag slipped. Oops.archshift2014-07-201-2/+2
| | | | | | | | | | | | |
| | | * | | | | | | | | | Fixed attempts to call c_str on ChatColorsarchshift2014-07-192-6/+6
| | | | | | | | | | | | |
| | | * | | | | | | | | | Removed references to deprecated cChatColor::Colorarchshift2014-07-192-2/+2
| | | | | | | | | | | | |
| | | * | | | | | | | | | Refactored cChatColorarchshift2014-07-192-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 Wang2014-07-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6484e9814a3a540518606f552398e0b82f91ab4d. * Fixes #1200
| | * | | | | | | | | | | Line tracer invalid chunk fixTiger Wang2014-07-202-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1230 * Additionally improved speed in some scenarios
| * | | | | | | | | | | | Merge branch 'master' into saplingsandleavesTiger Wang2014-07-20339-2329/+3457
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Bindings/DeprecatedBindings.cpp src/Blocks/BlockSapling.h
| | * | | | | | | | | | | NBTChunkSerializer.cpp: Added break after serializing the splash potionarchshift2014-07-201-0/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Added m_TicksAlive to entities, allows projectiles to hit their creatorsarchshift2014-07-203-3/+14
| | | | | | | | | | | | |
| | * | | | | | | | | | | Added destroy-timer system to splash potion entitiesarchshift2014-07-202-3/+24
| | | | | | | | | | | | |
| | * | | | | | | | | | | main.cpp: field style fixesarchshift2014-07-203-12/+12
| | | | | | | | | | | | |
| | * | | | | | | | | | | Socket: removed unused Socket destructorarchshift2014-07-192-10/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | main.cpp: Fixed warnings with g_TERMINATE_EVENT_RAISED and g_SERVER_TERMINATEDarchshift2014-07-193-6/+6
| | | | | | | | | | | | |
| | * | | | | | | | | | | Monsters: Made IsUndead overridable by the respective mob classesarchshift2014-07-196-13/+11
| | |/ / / / / / / / / /
| | * | | | | | | | | | CheckBasicStyle: Checks for braces not on separate lines.madmaxoft2014-07-191-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.madmaxoft2014-07-1914-20/+38
| | | | | | | | | | | |
| | * | | | | | | | | | CheckBasicStyle: Check spaces around commas.madmaxoft2014-07-191-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want no space in front of and at least one space after a comma.
| | * | | | | | | | | | Fixed spaces after commas in protocol data.madmaxoft2014-07-191-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The JSON data is well-formatted with spaces, too; we can afford to waste the few bytes.
| | * | | | | | | | | | Fixed style: spaces after commas.madmaxoft2014-07-1942-101/+100
| | | | | | | | | | | |
| | * | | | | | | | | | Merge pull request #1214 from mc-server/anti-globMattes D2014-07-1916-214/+847
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | CMake - Explicitly lists all source files
| | | * | | | | | | | | | Fixed MSVC bindings generation.madmaxoft2014-07-192-4/+4
| | | | | | | | | | | | |
| | | * | | | | | | | | | Moved Windows custom command to src/CMakeLists.txtarchshift2014-07-192-15/+20
| | | | | | | | | | | | |
| | | * | | | | | | | | | CMakeLists: Moved Bindings-specific code to subdirarchshift2014-07-193-120/+125
| | | | | | | | | | | | |
| | | * | | | | | | | | | Blocks/CMakeLists.txt: Fixed header list after merge of masterarchshift2014-07-192-10/+6
| | | | | | | | | | | | |
| | | * | | | | | | | | | CMake: Add Bindings library from subdirectoryarchshift2014-07-192-23/+12
| | | | | | | | | | | | |
| | | * | | | | | | | | | src/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-192-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 MSVCarchshift2014-07-1913-19/+45
| | | | | | | | | | | | |
| | | * | | | | | | | | | src/CMakeLists: Small changes for increased readabilityarchshift2014-07-191-5/+9
| | | | | | | | | | | | |
| | | * | | | | | | | | | OSSupport/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+32
| | | | | | | | | | | | |
| | | * | | | | | | | | | HTTPServer/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+20
| | | | | | | | | | | | |
| | | * | | | | | | | | | Generating/Prefabs/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+22
| | | | | | | | | | | | |
| | | * | | | | | | | | | Simulator/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+28
| | | | | | | | | | | | |
| | | * | | | | | | | | | WorldStorage/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+26
| | | | | | | | | | | | |
| | | * | | | | | | | | | Generating/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+54
| | | | | | | | | | | | |
| | | * | | | | | | | | | BlockEntities/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+35
| | | | | | | | | | | | |
| | | * | | | | | | | | | UI/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+9
| | | | | | | | | | | | |
| | | * | | | | | | | | | Protocol/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+23
| | | | | | | | | | | | |
| | | * | | | | | | | | | Blocks/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+92
| | | | | | | | | | | | |
| | | * | | | | | | | | | Items/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+47
| | | | | | | | | | | | |
| | | * | | | | | | | | | Entities/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+56
| | | | | | | | | | | | |
| | | * | | | | | | | | | Mobs/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+69
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #1223 from mc-server/fixesMattes D2014-07-1910-61/+16
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed small issues throughout the codebase
| | | * | | | | | | | | | | World.cpp: fixed not all enum fields being used in m_Dimension switcharchshift2014-07-191-1/+2
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Minecart: slimmed down SpawnOn by keeping subtype in the payload enumarchshift2014-07-192-20/+7
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Trees.cpp: removed unused "debug" fieldsarchshift2014-07-191-7/+1
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Fixed clamping issuesarchshift2014-07-196-33/+6
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Splash potions: Renamed PotionParticleType to PotionColor for clarityarchshift2014-07-195-15/+15
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fixed splash potion color on tossarchshift2014-07-192-0/+16
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | Renamed AllToLua_lua script.madmaxoft2014-07-191-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1222.
| | * | | | | | | | | | | Authenticator.cpp: Killed a global destructor warningarchshift2014-07-191-53/+56
| | |/ / / / / / / / / /
| | * | | | | | | | | | Merge branch 'Inventory2'madmaxoft2014-07-184-0/+59
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Clarified RemoveItem()'s comments.madmaxoft2014-07-182-2/+4
| | | | | | | | | | | | |
| | | * | | | | | | | | | Added RemoveItem() function to the player inventory.Howaner2014-07-184-0/+57
| | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'Entities'madmaxoft2014-07-184-11/+87
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fixed slime-related comments.madmaxoft2014-07-183-5/+10
| | | | | | | | | | | | |
| | | * | | | | | | | | | Slime sizes are 1, 2 or 4 and not 1, 2 or 3.Howaner2014-07-183-4/+4
| | | | | | | | | | | | |
| | | * | | | | | | | | | Split into more lines.Howaner2014-07-172-6/+10
| | | | | | | | | | | | |
| | | * | | | | | | | | | Fixed many slime bugs.Howaner2014-07-173-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'madmaxoft2014-07-184-34/+122
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Normalized code style for both sign handlers.madmaxoft2014-07-182-16/+20
| | | | | | | | | | | | |
| | | * | | | | | | | | | Removed cBlockSignPostHandler descend.Howaner2014-07-181-2/+28
| | | | | | | | | | | | |
| | | * | | | | | | | | | Added a extra wall sign handler.Howaner2014-07-184-27/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1119
| | * | | | | | | | | | | Monster fixesTiger Wang2014-07-187-35/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1203 * Fixes #627
| | * | | | | | | | | | | Fixed creative players not being able to drinkarchshift2014-07-181-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1215
| | * | | | | | | | | | | CheckBasicStyle: Proper spaces with commas.madmaxoft2014-07-181-21/+48
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fixed spaces before commas.madmaxoft2014-07-187-14/+14
| | | | | | | | | | | | |
| | * | | | | | | | | | | Removed duplicate IPvX labels.madmaxoft2014-07-183-6/+6
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #1208 from Howaner/MobInventoryMattes D2014-07-182-0/+17
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spawns skeletons with a bow in their hands
| | | * | | | | | | | | | | Skeletons should spawn with a bow in the hand.Howaner2014-07-182-0/+17
| | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1184
| | * | | | | | | | | | | Moved ChatColor.h out of defines where it was not neededarchshift2014-07-182-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | ProtocolRecognizer.cpp: removed unused NumBytesReadarchshift2014-07-181-2/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Generator: removed rnd definitions that are never readarchshift2014-07-182-2/+0
| | |/ / / / / / / / / /
| * | | | | | | | | | | Proper comment for DropBlock()Tiger Wang2014-07-201-2/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed issues relating to saplings and leavesTiger Wang2014-07-1710-139/+32
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed cBlockInfo::RequiresSpecialTool * Fixes #1195 * Fixes #1201
* | | | | | | | | | | Add armor items directly to the armor slots.Howaner2014-07-203-3/+16
| | | | | | | | | | |
* | | | | | | | | | | Moved comment.Howaner2014-07-181-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.Howaner2014-07-182-9/+13
| | | | | | | | | | |
* | | | | | | | | | | Items should first added to the first slot, not the latest.Howaner2014-07-181-3/+3
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fixed NULL being passed instead of a double to AddEntityEffectarchshift2014-07-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Fixed code style in Trees.cpp.madmaxoft2014-07-171-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The src folder now has zero BasicStyle violations.
* | | | | | | | | | Fixed tabs used for alignment.madmaxoft2014-07-1729-99/+115
| | | | | | | | | |
* | | | | | | | | | More trailing whitespace fixes.madmaxoft2014-07-1713-25/+25
| | | | | | | | | |
* | | | | | | | | | Player.cpp: Fixed compile errorarchshift2014-07-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Player.cpp: Added Wither death messagearchshift2014-07-171-0/+1
| | | | | | | | | |
* | | | | | | | | | Basic style fixes.madmaxoft2014-07-17130-286/+290
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServermadmaxoft2014-07-173-25/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix sapling drop.Howaner2014-07-171-1/+1
| |/ / / / / / / / /
| * | | | | | | | | Fixed mob knockbackTiger Wang2014-07-171-23/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #901
| * | | | | | | | | Fixed crash with entities in unloaded chunksTiger Wang2014-07-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1190
* | | | | | | | | | Initial version of a script to check basic style.madmaxoft2014-07-171-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.madmaxoft2014-07-17173-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.madmaxoft2014-07-1734-139/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There should be at least two spaces in front and one space after //-style comments.
* | | | | | | | | | Fixed basic whitespace problems.madmaxoft2014-07-1752-298/+306
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
* | | | | | | | | Merge pull request #1183 from Howaner/SoundsTiger Wang2014-07-171-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Reset meta to zero when the blocks explode
| * | | | | | | | | Derp.Howaner2014-07-151-2/+2
| | | | | | | | | |
| * | | | | | | | | Reset meta to zero when the block explode.Howaner2014-07-141-4/+4
| | | | | | | | | |
* | | | | | | | | | Fixed 3 MSVC warnings in SplashPotionEntity.madmaxoft2014-07-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Updated cPawn::KilledBy signature for custom death messages.madmaxoft2014-07-172-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' into potionsmadmaxoft2014-07-1721-41/+62
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #1193 from mc-server/deathmessagesMattes D2014-07-1721-41/+62
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Death messages
| | * | | | | | | | | | Resolved backwards compatibility issuesTiger Wang2014-07-167-9/+9
| | | | | | | | | | | |
| | * | | | | | | | | | Tailored death messagesTiger Wang2014-07-0420-40/+61
| | | | | | | | | | | |
* | | | | | | | | | | | Reformatted cItemPotionHandler.madmaxoft2014-07-172-48/+79
| | | | | | | | | | | |
* | | | | | | | | | | | Fixed formatting for cWitherSkullEntitymadmaxoft2014-07-172-3/+13
| | | | | | | | | | | |
* | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into potionsmadmaxoft2014-07-1716-124/+261
|\| | | | | | | | | | |
| * | | | | | | | | | | Another fix for excessive food drainTiger Wang2014-07-162-1/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed a bug with bucketsTiger Wang2014-07-162-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 crashTiger Wang2014-07-161-0/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #1192 from mc-server/skinuuidMattes D2014-07-1611-113/+233
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Skins
| | * | | | | | | | | | | SuggestionsTiger Wang2014-07-161-2/+5
| | | | | | | | | | | | |
| | * | | | | | | | | | | Function renameTiger Wang2014-07-162-3/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Unified functionsTiger Wang2014-07-162-34/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks @Howaner!
| | * | | | | | | | | | | Store properties as Json::ValueTiger Wang2014-07-169-21/+44
| | | | | | | | | | | | |
| | * | | | | | | | | | | Player properties are now retrievedTiger Wang2014-07-1411-116/+216
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed a DropSpenser AddFace bugTiger Wang2014-07-151-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into potionsmadmaxoft2014-07-157-80/+246
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1191 from Masy98/BlocksTiger Wang2014-07-151-13/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed stairs and carpet from IsSolid
| | * | | | | | | | | | | | Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them.Masy982014-07-151-1/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Removed Stairs and carpet from the "isSolid" list to prevent mobs falling through them.Masy982014-07-151-12/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1189 from Masy98/BlocksMattes D2014-07-152-63/+214
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added various missing blocks in the lists in BlockInfo.cpp
| | * | | | | | | | | | | | Added Brick fence to m_TransparentMasy982014-07-151-0/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Added various missing blocks in the lists in BlockInfo.cppMasy982014-07-152-64/+214
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed code formatting.madmaxoft2014-07-152-6/+9
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/ClearMetaMixin'madmaxoft2014-07-154-12/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Added super typedefTycho2014-07-153-3/+6
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | COnverted Lilypad back to mixinTycho2014-07-151-8/+2
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Revert "Converted some blockhandlers to use cClearMetaOnDrop"Tycho2014-07-159-21/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 333f4f982cbd24ffcb376594eddef439b3f05e9e.
| | * | | | | | | | | | | | | Added documentationTycho2014-07-141-0/+6
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Converted some blockhandlers to use cClearMetaOnDropTycho2014-07-149-67/+21
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Simplified ClearMetaOnDropTycho2014-07-141-1/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Added cClearOnDrop Mixin to cPumpkinTycho2014-07-141-2/+2
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Added first implementation of cClearMetaOnDropTycho2014-07-142-2/+21
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed FindClosestPlayerTycho2014-07-151-3/+6
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Restructured cSplashPotionEntity code.madmaxoft2014-07-155-72/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The callback doesn't need declaration in the header. Renamed PotionName to PotionParticleType.
* | | | | | | | | | | | | | Only the cEntityEffect::effXXX constants are Lua-exported.madmaxoft2014-07-152-72/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rest of the classes don't need exporting, there's no interface using them anyway.
* | | | | | | | | | | | | | Reformatted EntityEffect code.madmaxoft2014-07-151-25/+29
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed a MSVC warning in cEntityEffect::CreateEntityEffect().madmaxoft2014-07-151-0/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' into potionsmadmaxoft2014-07-1569-425/+679
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Pass cItem by reference.madmaxoft2014-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 66445.
| * | | | | | | | | | | | | Added missing member initialization to cGridStructGen.madmaxoft2014-07-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68228.
| * | | | | | | | | | | | | Fixed redstone simulator crashTiger Wang2014-07-152-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1176 * Fixed #1186
| * | | | | | | | | | | | | Fixed some meta resetting bugsTiger Wang2014-07-146-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1174 * Fixes #1171
| * | | | | | | | | | | | | Maybe improved arrow sinkingTiger Wang2014-07-141-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed placing liquids over liquidsTiger Wang2014-07-141-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1182
| * | | | | | | | | | | | Merge pull request #1177 from mc-server/ChestFixMattes D2014-07-141-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Issue with Comparing agast the wrong chest, potentially causing crashes
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ChestFixTycho2014-07-135-8/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fixed Issue with Comparing agast the wrong chest, potentially causing crashes.worktycho2014-07-131-7/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #1172 from mc-server/coverity_fixesMattes D2014-07-133-4/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | Coverity fixes
| | * | | | | | | | | | | | | Added parenthasiesworktycho2014-07-131-1/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | CopyPaste Errorworktycho2014-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70460.
| | * | | | | | | | | | | | | Another COpyPaste Errorworktycho2014-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70461
| | * | | | | | | | | | | | | Fix CopyPaste error that ment a_MaxRelX wasdn't checkedworktycho2014-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 70464
| | * | | | | | | | | | | | | Check GridSize for 0worktycho2014-06-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68226 and CID 66437
| | * | | | | | | | | | | | | Add Null check to SendBlockToworktycho2014-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 43611
| * | | | | | | | | | | | | | Adjusted calls to CreateProjectile that passed ItemsTycho2014-07-131-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Made CreateProjectile a pointerworktycho2014-07-134-6/+7
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed MSVC warnings in SoundEffect functions.madmaxoft2014-07-133-15/+7
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Update.Howaner2014-07-131-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into SoundsHowaner2014-07-137-16/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #1133 from Howaner/SheepMattes D2014-07-134-10/+75
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sheep fixes
| | | * | | | | | | | | | | Changed comments.Howaner2014-07-131-3/+5
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'master' into SheepHowaner2014-07-1398-1538/+2247
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Add doxy-comments.Howaner2014-07-011-1/+4
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Moved the random code to a function (cSheep::GenerateNaturalRandomColor())Howaner2014-06-302-36/+47
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Code fixes.Howaner2014-06-291-1/+1
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Save IsSheared from Sheep.Howaner2014-06-282-4/+14
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Fix sheep color's, add shear sound.Howaner2014-06-283-3/+42
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge pull request #1166 from Howaner/GlobalFixesMattes D2014-07-133-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE)
| | | * | | | | | | | | | | | Fixed wrong types. (BLOCKTYPE -> NIBBLETYPE)Howaner2014-07-133-6/+6
| | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| * | / | | | | | | | | | | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-1336-83/+77
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Only one instance of server can be startedTiger Wang2014-07-131-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 #31Tiger Wang2014-07-132-31/+4
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 69dc9b4c9aea58ebd95e2dbd0205701dfc4ce54e.
| * | | | | | | | | | | Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-1326-218/+387
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented trapped chests & others
| | * | | | | | | | | | | cNBTChunkSerializer: Fixed alignment.madmaxoft2014-07-121-14/+14
| | | | | | | | | | | | |
| | * | | | | | | | | | | cHopperEntity: Simplified chest conditions.madmaxoft2014-07-121-10/+4
| | | | | | | | | | | | |
| | * | | | | | | | | | | cChestEntity: Renamed a member to avoid confusion.madmaxoft2014-07-122-8/+9
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fixed alignment.madmaxoft2014-07-121-2/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Suggestions and bug fixTiger Wang2014-07-127-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
| | * | | | | | | | | | | SuggestionsTiger Wang2014-07-113-2/+6
| | | | | | | | | | | | |
| | * | | | | | | | | | | SuggestionsTiger Wang2014-07-114-14/+18
| | | | | | | | | | | | |
| | * | | | | | | | | | | Improved LinkedPowering speedTiger Wang2014-07-111-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Additionally fixed wires powering other wires through blocks
| | * | | | | | | | | | | Made things consistentTiger Wang2014-07-082-6/+9
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fixed compilation and pressure platesTiger Wang2014-07-071-8/+4
| | | | | | | | | | | | |
| | * | | | | | | | | | | Implemented trapped chests & othersTiger Wang2014-07-0726-179/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added trapped chests * Fixed a bunch of bugs in the redstone simulator concerning wires and repeaters * Other potential bugfixes
| * | | | | | | | | | | | Comment grammar correctionTiger Wang2014-07-121-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Simplified buckets code slightlyTiger Wang2014-07-121-32/+15
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1162 from daniel0916/FixesTiger Wang2014-07-121-23/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for bucket placing
| | * | | | | | | | | | | | Changesdaniel09162014-07-121-5/+4
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Changesdaniel09162014-07-111-24/+16
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Changesdaniel09162014-07-101-20/+22
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Maybe fixed whitespacesdaniel09162014-07-101-7/+7
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Maybe fixed whitespacesdaniel09162014-07-101-1/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fixed Bucket Placingdaniel09162014-07-101-6/+57
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fixed Bucket placingdaniel09162014-07-091-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | ItemHandler.cpp: removed redundant food and drink checksarchshift2014-07-141-33/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Readability and clarity changesarchshift2014-07-144-59/+68
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | EntityEffect: Inlined functions, added explicit copy constructor and operator.archshift2014-07-142-20/+29
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Changed separating comment style from asterisks to slashes.archshift2014-07-142-93/+93
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Added splash potions to NBT serialization and retrievalarchshift2014-07-126-1/+50
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-1212-161/+371
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Simplified the player data loading.madmaxoft2014-07-111-9/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Player data filenames are based on UUID.madmaxoft2014-07-114-67/+155
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed a missing return value.madmaxoft2014-07-111-0/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Preparation for player UUID-based storage: LoadFromFile()madmaxoft2014-07-112-21/+42
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed style consistency.madmaxoft2014-07-102-61/+64
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Implemented support for forced chunk ticking.madmaxoft2014-07-106-8/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1160.
| * | | | | | | | | | | | | Fixed a missing "inline" keyword.madmaxoft2014-07-101-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed Vector3.h compilation in MSVC2008.madmaxoft2014-07-101-0/+9
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Removed lilypad from plains village prefabs.madmaxoft2014-07-101-7/+8
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | For now, removed creator member from Entity Effect for pointer safetyarchshift2014-07-1212-104/+94
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-10135-4674/+6956
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp
| * | | | | | | | | | | | | Merge pull request #1157 from Howaner/WindowMattes D2014-07-093-41/+237
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more inventory actions.
| | * | | | | | | | | | | | | Removed unused include line.Howaner2014-07-091-1/+0
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Added inventory number click.Howaner2014-07-092-1/+43
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Added drop window action.Howaner2014-07-063-25/+113
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Add middle click.Howaner2014-07-052-21/+88
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed bow chargeTiger Wang2014-07-091-11/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed arrow collection animationTiger Wang2014-07-095-33/+4
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed piston extension non-solidness
| * | | | | | | | | | | | | Merge pull request #1135 from mc-server/fixesTiger Wang2014-07-0919-110/+272
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes to projectiles and the undead
| | * | | | | | | | | | | | | Added extra space before commentsTiger Wang2014-07-071-6/+6
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Changed everything to callbacksTiger Wang2014-07-054-82/+53
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Crash and compile fixTiger Wang2014-07-043-5/+10
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Compile fixTiger Wang2014-07-041-1/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | SuggestionsTiger Wang2014-07-047-11/+20
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Various fixedTiger Wang2014-07-044-17/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed potential invalid pointer dereferencing, fixes #1117 * Fixed ender pearls not being loaded properly
| | * | | | | | | | | | | | | Eps comparisonTiger Wang2014-07-042-2/+2
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | SuggestionsTiger Wang2014-07-024-19/+31
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Vector clamping fixesTiger Wang2014-07-012-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thank you, @madmaxoft.
| | * | | | | | | | | | | | | Implemented Vector3<>::Floor()Tiger Wang2014-06-302-10/+19
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | SuggestionsTiger Wang2014-06-293-3/+20
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | An unification of code styleTiger Wang2014-06-281-1/+1
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Bettered zombie and skeleton AITiger Wang2014-06-222-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed potential issues with skylight detection
| | * | | | | | | | | | | | Some Entity.cpp style improvementsTiger Wang2014-06-222-13/+8
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fixed multiple issues with projectilesTiger Wang2014-06-228-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.madmaxoft2014-07-083-7/+8
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1144 from mc-server/LuaCodeGenMattes D2014-07-065-624/+227
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lua code gen
| | * | | | | | | | | | | | Tolua generates LuaState_Call.inc file.madmaxoft2014-07-014-624/+31
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Initial codegen for LuaState_Call.inc.madmaxoft2014-07-011-0/+196
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed crafting grid updating.Mattes D2014-07-062-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1152.
| * | | | | | | | | | | | | Fixed slime handling in cMonster::StringToMobType().madmaxoft2014-07-061-1/+1
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1151 from mc-server/immediatesocketrebindMattes D2014-07-041-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | MCS sockets can be rebound immediately
| | * | | | | | | | | | | | MCS WebAdmin sockets rebinds instantlyTiger Wang2014-07-041-0/+2
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #272 * Fixes #1150
| * | | | | | | | | | | | cPluginManager: Reformatted the switch statement.madmaxoft2014-07-041-7/+34
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/HandleCommand'madmaxoft2014-07-042-30/+36
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Moved sending error messages to cPluginManager:CallHookChatSTRWarrior2014-07-041-4/+6
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fixed doxycommentsSTRWarrior2014-06-281-3/+3
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | (Force)ExecuteCommand returns the CommandResult enumsSTRWarrior2014-06-182-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exported and documented the CommandResult enums
| | * | | | | | | | | | | | Added crBlocked and crNoPermissionSTRWarrior2014-06-172-2/+4
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | HandleCommand now returns an CommandResult enum.STRWarrior2014-06-172-23/+19
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fixed possible confusion.STRWarrior2014-06-172-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.madmaxoft2014-06-161-1/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Updated the SandFlatRoofVillage prefabs.madmaxoft2014-06-161-288/+381
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Added random offsets to cGridStructGen.madmaxoft2014-06-1517-85/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #740.
| | * | | | | | | | | | | | Merge pull request #1090 from mc-server/saveoncrashMattes D2014-06-152-2/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Data is saved on crash
| | | * | | | | | | | | | | | Players are saved regularlyTiger Wang2014-06-152-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1076
| | * | | | | | | | | | | | | Fixed bad comparison crashTiger Wang2014-06-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1095
| | * | | | | | | | | | | | | Fixed daylight sensor unpoweringTiger Wang2014-06-151-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1094
| | * | | | | | | | | | | | | Merge pull request #1019 from mc-server/cPlayerSetSpeedMattes D2014-06-144-31/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cPlayer set speed
| | | * | | | | | | | | | | | | Removed an unused tolua_end and tolua_begin pair.madmaxoft2014-06-141-2/+0
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Simplified speed clamping.madmaxoft2014-06-141-8/+3
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Refactored speed-setting to use a common function for all cases.madmaxoft2014-06-144-93/+44
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branch 'master' into cPlayerSetSpeedmadmaxoft2014-06-14139-1776/+24668
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Player.h: Moved doxy-comments to Entity.harchshift2014-06-112-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-commentsSTRWarrior2014-05-221-6/+8
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | cEntity::SetSpeed(a_Vector3d) isn't virtualized anymoreSTRWarrior2014-05-222-2/+2
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | cPlayer overrides the SetSpeedXX functionsSTRWarrior2014-05-223-4/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compile error
| | | * | | | | | | | | | | | | | Both SetSpeed functions are now overridden by cPlayerSTRWarrior2014-05-223-6/+32
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixed c1deda5d8f01811efa5094e9375166acb69d50edTiger Wang2014-07-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I keep on breaking stuff :P
| * | | | | | | | | | | | | | | | Removed world-saving log messages.madmaxoft2014-07-043-35/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1518
| * | | | | | | | | | | | | | | | Changed OnWeatherChanging hook to always read the returned weather.madmaxoft2014-07-033-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: http://forum.mc-server.org/showthread.php?tid=1512
| * | | | | | | | | | | | | | | | CMake: Changed slash format to support MSYS.madmaxoft2014-07-031-1/+1
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1044
| * | | | | | | | | | | | | | | Merge pull request #1138 from mc-server/enderchestMattes D2014-07-027-113/+78
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly implemented enderchests
| | * | | | | | | | | | | | | | | SuggestionTiger Wang2014-07-021-13/+13
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Removed unneeded codeTiger Wang2014-06-304-38/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Removed bad commentTiger Wang2014-06-291-1/+0
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Properly implemented enderchestsTiger Wang2014-06-2910-99/+102
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master'Tiger Wang2014-07-028-30/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1139 from Howaner/HooksMattes D2014-07-027-28/+67
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hook HOOK_PLAYER_FOOD_LEVEL_CHANGE
| | | * | | | | | | | | | | | | | | | Removed foodlevel-change possibility. Plugins can cancel the event and use cPlayer:SetFoodLevel()Howaner2014-07-025-6/+6
| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Fixes.Howaner2014-06-302-4/+4
| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Add new hook: HOOK_PLAYER_FOOD_LEVEL_CHANGEHowaner2014-06-306-26/+67
| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Unnecessary returnHowaner2014-06-301-2/+0
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | CMake: Use cmake for file-copying.madmaxoft2014-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should enable MSYS builds.
| * | | | | | | | | | | | | | | | | | Fixed player teleport food drainTiger Wang2014-07-022-1/+14
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Redstone simulator is alerted to lever unpoweringTiger Wang2014-07-024-1/+6
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed the "fix" that broke the fix for #535, thereby fixing said issue * Fixed #535
| * | | | | | | / / / / / / / / / / Fixed printf formats for Win buildsmadmaxoft2014-07-012-4/+4
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixed a possibly unused variable.madmaxoft2014-07-011-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Only fixes the server crash.Howaner2014-07-012-7/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix server-crash with non-existing items.Howaner2014-07-012-2/+8
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixed linking order under MinGW.Mattes D2014-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #1044
| * | | | | | | | | | | | | | | | Fixed size_t printfing under MinGW.Mattes D2014-06-301-3/+18
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixed cFile compilation under MinGW.madmaxoft2014-06-301-0/+3
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Fixed respawningTiger Wang2014-06-2912-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1103
| * | | | | | | | | | | | | | | Fixed offline UUID generator.Mattes D2014-06-291-2/+4
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It generated invalid UUIDs, too many hex chars.
| * | | | | | | | | | | | | | Send statistics to the player, when he logged in.Howaner2014-06-292-2/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #1132 from mc-server/RemoveMD5Mattes D2014-06-293-24/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the md5 library, obsoleted by PolarSSL.
| | * | | | | | | | | | | | | | Fixed a silly path error in #include.Mattes D2014-06-281-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | CMake: Added polarssl include dir as non-system.Mattes D2014-06-281-1/+2
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Changed include folders to work for Bindings, too.Mattes D2014-06-281-3/+3
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Added PolarSSL dependency to Bindings.Mattes D2014-06-271-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Removed the md5 library, obsoleted by PolarSSL.Mattes D2014-06-273-19/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1130.
| * | | | | | | | | | | | | | | Likely fixed too quick food depletionTiger Wang2014-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes FS427 properly, hopefully
| * | | | | | | | | | | | | | | Fixed issue with breaking blocks at -1 coordinatesTiger Wang2014-06-281-6/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Implemented tripwire(s) (hooks)Tiger Wang2014-06-289-17/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #944
| * | | | | | | | | | | | | | | Added more block exceptions to torchesTiger Wang2014-06-281-0/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Minor change to buttons and leversTiger Wang2014-06-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + They now detect if the block they are on occupies its voxel, instead of just being solid
| * | | | | | | | | | | | | | | Fixed bad water/redstone simulator communicationTiger Wang2014-06-281-32/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #713
| * | | | | | | | | | | | | | | Fixed server forcing players afloatTiger Wang2014-06-281-1/+4
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #1131
| * | | | | | | | | | | | | | Added generic entity-collecting.Mattes D2014-06-2717-25/+36
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098.
| * | | | | | | | | | | | | Merged branch 'howaner/Bow'.Mattes D2014-06-264-23/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the pickup collection broadcast due to bad code.
| | * | | | | | | | | | | | | Add comment.Howaner2014-06-261-0/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | GameMode checkHowaner2014-06-261-1/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' into BowHowaner2014-06-2678-3424/+5240
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | derpHowaner2014-06-171-3/+3
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | The same: Float, not DoubleHowaner2014-06-171-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Float, not DoubleHowaner2014-06-171-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Split Broadcast Sound Effect function call in multiple lines.Howaner2014-06-162-3/+24
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | This isn't neededHowaner2014-06-161-1/+0
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix bow sound and creative arrow pickup.Howaner2014-06-162-19/+30
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add bow charging animationHowaner2014-06-162-2/+6
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merged branch 'howaner/Pickups'.Mattes D2014-06-262-7/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fixed a comment and changed CombineCount to short.Howaner2014-06-261-2/+2
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'master' into PickupsHowaner2014-06-264-397/+382
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Optimize combining.Howaner2014-06-241-3/+3
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Better combining.Howaner2014-06-241-3/+20
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix pickup combining over the maximum stack size.Howaner2014-06-242-5/+9
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | FurnaceRecipe parsing: Fixed whitespace removing.Mattes D2014-06-261-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixed misformed trimming.Mattes D2014-06-261-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | FurnaceRecipe: Moved the parsing into separate functions for clarity.Mattes D2014-06-262-60/+68
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | FurnaceRecipe parser: Made the parser more forgiving.Mattes D2014-06-261-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 D2014-06-261-45/+69
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/furnaceparsing'Mattes D2014-06-262-92/+170
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Parenthesised comparisonTiger Wang2014-06-231-1/+1
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/furnaceparsing' into furnaceparsingTiger Wang2014-06-222-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/FurnaceRecipe.cpp
| | | * | | | | | | | | | | | | | | | Fixed compile errorsworktycho2014-06-221-2/+2
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | SuggestionsTiger Wang2014-06-221-6/+7
| | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | SuggestionsTiger Wang2014-06-222-40/+30
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Removed debugging codeTiger Wang2014-06-211-1/+0
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Rewrote furnace recipe parserTiger Wang2014-06-212-93/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #110
| * | | | | | | | | | | | | | | | | Merged branch 'tonibm19/master'.Mattes D2014-06-262-0/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Added pig riding.tonibm192014-06-202-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now you can ride a pig using a carrot on a stick.
| * | | | | | | | | | | | | | | | | Merge pull request #1126 from mc-server/BlockInfoInitMattes D2014-06-252-381/+374
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | BlockInfo is now a proper C++ singleton.
| | * | | | | | | | | | | | | | | | BlockInfo is now a proper C++ singleton.madmaxoft2014-06-252-381/+374
| | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is properly initialized before it is ever used.
| * / | | | | | | | | | | | | | | Add entity health saving.Howaner2014-06-242-16/+8
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Fixed BlockInfo initialization.madmaxoft2014-06-241-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 D2014-06-241-0/+6
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed crashes in HopperEntity.Mattes D2014-06-241-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.madmaxoft2014-06-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68410.
| * | | | | | | | | | | | | | | Added a (disabled) block meta mirror / rotate test code.madmaxoft2014-06-231-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.madmaxoft2014-06-231-9/+6
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed sign and lever rotations.madmaxoft2014-06-232-8/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Prefabs don't draw into chunk if they don't intersect.madmaxoft2014-06-231-0/+11
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #1105 from Howaner/BlocksMattes D2014-06-223-4/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | Added door and fence gate sounds.
| | * | | | | | | | | | | | | | Changed 0xFFFFFFFB to ~0x04Howaner2014-06-221-1/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' into BlocksHowaner2014-06-171-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix fence gate sound (Redstone simulator).Howaner2014-06-171-4/+10
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add fence gate sound.Howaner2014-06-171-0/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add UNUSED() TagsHowaner2014-06-171-0/+6
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add door soundHowaner2014-06-171-0/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-06-223-4/+42
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fixed missing breakworktycho2014-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 68409
| | * | | | | | | | | | | | | | | Fixed invalid iteratorworktycho2014-06-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 60408
| | * | | | | | | | | | | | | | | Added cClientHandle::IsUUIDOnline function.madmaxoft2014-06-212-2/+38
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #771
| * | | | | | | | | | | | | | | Fixed another daylight sensor bugTiger Wang2014-06-221-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally fixed unpowering across chunks.
| * | | | | | | | | | | | | | | Chests don't open if obstructedTiger Wang2014-06-221-0/+13
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes FS383
| * | | | | | | | | | | | | | Added a TestRails generator.madmaxoft2014-06-215-0/+667
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for debugging purposes only.
| * | | | | | | | | | | | | | Fixed a caching bug in GridStructGen.madmaxoft2014-06-211-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.madmaxoft2014-06-214-2049/+2644
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Updated all prefabs to current Gallery content.madmaxoft2014-06-202-650/+824
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | MCA saver marks chunks as populated.madmaxoft2014-06-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #140.
| * | | | | | | | | | | | | | Optimized Voronoi calculation.madmaxoft2014-06-204-21/+81
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #818.
| * | | | | | | | | | | | | Nullify deleted pointers.archshift2014-06-1935-18/+75
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1096 from mc-server/redstonerefactorAlexander Harkness2014-06-183-140/+79
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved delayed repeaters to be handled in a seperate pass
| | * | | | | | | | | | | | FIxed second weird enumTycho2014-06-161-20/+1
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Refactored reversing logic into seperate functionTycho2014-06-162-16/+16
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Fixed tigers weird enumsTycho2014-06-161-14/+6
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into redstonerefactorTycho2014-06-1630-455/+819
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Simulator/IncrementalRedstoneSimulator.cpp
| | * | | | | | | | | | | | | Moved repeater handling to seperate passTycho2014-06-162-97/+64
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #1045 from Howaner/GlobalFixesMattes D2014-06-1812-61/+158
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Little fixes
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into GlobalFixesHowaner2014-06-17149-1814/+25012
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Check block type from cBlockEntityHowaner2014-06-171-8/+8
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add more documentation.Howaner2014-06-171-0/+2
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add comment.Howaner2014-06-171-0/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Revert "Fix right click bugs."Howaner2014-06-171-41/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 61b6fdde7553dac6e2d5c5a071b9a13fa0d71b2f.
| | * | | | | | | | | | | | | | The motion is already set in AddBasicEntity()Howaner2014-06-171-5/+0
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add DoWithBlockEntityAt() to WorldInterface.hHowaner2014-06-174-40/+64
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Wrong arrow commit.Howaner2014-05-301-4/+0
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Code improvementsHowaner2014-05-283-12/+4
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix hay place sound.Howaner2014-05-282-1/+31
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix fire break.Howaner2014-05-282-18/+19
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add throw sound and fix arrow server crash.Howaner2014-05-284-5/+16
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix Y-Position from arrow entity.Howaner2014-05-281-0/+1
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix right click bugs.Howaner2014-05-281-40/+41
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix skull bugs.Howaner2014-05-282-2/+46
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge pull request #1100 from Howaner/Slabsarchshift2014-06-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix doubleslab meta.Howaner2014-06-161-0/+1
| | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | EntityEffects.x -> EntityEffect.x, Object-Oriented effectsarchshift2014-06-1915-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-valuearchshift2014-06-176-36/+20
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Added the OnEntityAddEffect hook.madmaxoft2014-06-177-0/+57
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Entity Effects: Clarified user, added it to AddEntityEffectarchshift2014-06-177-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added second AddEntityEffect with a pass-by-value of the class.
* | | | | | | | | | | | | | | Changed the AddEntityEffect() params for easier calls.madmaxoft2014-06-177-50/+52
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Entity Effect: Separates total duration and ticks of activityarchshift2014-06-173-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed HandleEntityEffect to use cEntityEffect's ticks instead of a static counter
* | | | | | | | | | | | | | | Fixed MSVC compilation.madmaxoft2014-06-173-14/+17
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Pawn: renamed HandleEntityEffects to HandleEntityEffectarchshift2014-06-177-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exported entity effect functions for ToLua and documented them in APIDesc.lua
* | | | | | | | | | | | | | | Cave spider now poisons its victim, added IsPawn function to Entityarchshift2014-06-175-5/+24
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Added wither damage type, wither entity effect.archshift2014-06-174-1/+21
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Monster: added IsUndead(), undead-specific entity effectsarchshift2014-06-173-6/+71
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Applies splash potion effects to mobs as well as playersarchshift2014-06-172-8/+12
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Removed long function wrappingarchshift2014-06-172-12/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | ItemHandler: changed IsDrinkable() to take a short argumentarchshift2014-06-175-18/+14
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Splash potion: Adjusted speed, fixed spawn positionarchshift2014-06-171-6/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Entity effect type: use 'eff' as a prefix instead of 'ef'archshift2014-06-175-74/+74
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Added splash potion functionalityarchshift2014-06-176-15/+122
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Entity: only fire critical hit if damage type is physicalarchshift2014-06-171-1/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Player: made healing instantaneousarchshift2014-06-172-2/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Implemented drinkable potions, noeffect entity effect,archshift2014-06-178-6/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clears entity effects on death
* | | | | | | | | | | | | | | Implemented milk, added documentation to Pawn.harchshift2014-06-177-5/+86
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Pawn.cpp: fixed effect iterator BAD_ACCESSarchshift2014-06-172-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 typedefarchshift2014-06-172-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typedef'd std::map<cEntityEffect::eType, cEntityEffect> to tEffectMap
* | | | | | | | | | | | | | | EntityEffect: read-only getters, added user and distance modifier fieldsarchshift2014-06-173-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 secondsarchshift2014-06-173-27/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://minecraft.gamepedia.com/Hunger#Behavior
* | | | | | | | | | | | | | | Entity effects: Added handlers for entity effectsarchshift2014-06-174-13/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented hunger, instant health, damage, poison, regen Added "template" entity effect implementations
* | | | | | | | | | | | | | | Added iterator on tick to manage entity effect durationarchshift2014-06-171-1/+18
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | cPawn: Remove unused m_bBurnablearchshift2014-06-172-2/+0
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Moved Effects.h to EntityEffects.h, added initial implarchshift2014-06-179-36/+115
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Added classes for splash potions and wither skullsarchshift2014-06-175-0/+149
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1101 from Howaner/FenceGateworktycho2014-06-171-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | Fix fence gate redstone simulator.
| * | | | | | | | | | | | | Fix fence gate redstone simulator.Howaner2014-06-171-2/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1099 from Howaner/BlocksMattes D2014-06-171-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Glass-made blocks don't drop pickups.
| * | | | | | | | | | | | | | Glass shouldn't drop.Howaner2014-06-161-0/+3
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Add parenthesisHowaner2014-06-171-2/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Add end lines to BlockPressurePlate.hHowaner2014-06-171-1/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Add pressure plate handlerHowaner2014-06-173-0/+41
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Fixed GCC compilation.madmaxoft2014-06-161-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Fixed MSVC builds.madmaxoft2014-06-161-9/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #883 from mc-server/CutOffLightingworktycho2014-06-163-16/+96
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Lighting reads blocktypes only for blocks under heightmap.
| * | | | | | | | | | | | Fixed link errorsTycho2014-04-121-0/+9
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed member construction order.madmaxoft2014-04-121-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Lighting reads blocktypes only for blocks under heightmap.madmaxoft2014-04-122-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.madmaxoft2014-06-161-1/+1
| |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-1630-455/+820
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Fix a few warningsTycho2014-06-161-3/+3
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fixed bindings generation for Win64 builds.Mattes D2014-06-143-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1092.
* | | | | | | | | | Fixed MSVC Bindings generation.Mattes D2014-06-141-0/+3
| | | | | | | | | |
* | | | | | | | | | Remove windows bindings crutchworktycho2014-06-141-10/+0
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Fixed a repeater issueTiger Wang2014-06-142-17/+16
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Repeaters now properly continuously update their powering * Minor cosmetic improvements
* | | | | | | | Reduced cPluginManager code duplicationTiger Wang2014-06-141-286/+178
| | | | | | | |
* | | | | | | | Merge pull request #1089 from mc-server/tolua-autoMattes D2014-06-132-84/+85
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | automaticlly build tolua and generate bindings as part of build.
| * | | | | | | | automaticlly build tolua and generate bindings as part of build.tycho2014-06-122-84/+85
| | |_|_|/ / / / | |/| | | | | |
* / | | | | | | Removed an unused fwd declaration.madmaxoft2014-06-131-1/+0
|/ / / / / / /
* | | | | | | Fixed two redstone bugsTiger Wang2014-06-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed chunk border powering * Fixed quick place-replace powering
* | | | | | | Merge pull request #1082 from mc-server/cauldronfixesAlexander Harkness2014-06-121-3/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add biome-aware downfall functions.
| * | | | | | | Fixed constnessworktycho2014-06-111-5/+5
| | | | | | | |
| * | | | | | | Compile fixTiger Wang2014-06-111-1/+1
| | | | | | | |
| * | | | | | | Reduced code duplicationTiger Wang2014-06-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | call @maxmaxoft! calling... call connected (0:20) call ended
| * | | | | | | IsWeatherSunnyAt does something useful :DTiger Wang2014-06-111-9/+5
| | | | | | | |
| * | | | | | | SMICOLOSLAlexander Harkness2014-06-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Meant to be semicolons up there.
| * | | | | | | Updated unnecessary function :/Tiger Wang2014-06-111-1/+5
| | | | | | | |
| * | | | | | | Add DoxyComments to he weather things. Alexander Harkness2014-06-111-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | Also changed the function names.
| * | | | | | | Add new IsWeatherWet hook for cauldrons.Alexander Harkness2014-06-111-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | @madmaxoft can you comment?
* | | | | | | | Merge pull request #1084 from mc-server/PlankRoadsSTRWarrior2014-06-111-4/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Plank Roads
| * | | | | | | | Roads in villages are made out of wooden planks if they generate on water.STRWarrior2014-06-111-4/+17
| | | | | | | | |
* | | | | | | | | DispenserEntity code cleanup after PR merge.madmaxoft2014-06-112-30/+30
| | | | | | | | |
* | | | | | | | | Merge remote-tracking branch 'joannis/master'madmaxoft2014-06-112-19/+91
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | - Fixed a lot of alignmentJoannisO2014-06-051-7/+7
| | | | | | | | | |
| * | | | | | | | | - Removed the code that removed fireworks from a dispenser even thoughtJoannisO2014-06-041-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they weren't launched.
| * | | | | | | | | - Fixed variable names in a function.JoannisO2014-06-041-2/+2
| | | | | | | | | |
| * | | | | | | | | - Fixed a lot of astethicsJoannisO2014-06-042-14/+17
| | | | | | | | | |
| * | | | | | | | | - Fixed an issue where there were 2 "DispChunk"-s in the same function.JoannisO2014-06-031-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resused the initial one.
| * | | | | | | | | - Fixed a bug where I didn't return anything in the GetShootVectorJoannisO2014-06-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function. This was however passed as "working" by GCC.
| * | | | | | | | | - Fixed a bug where I used the FireCharge ITEM instead of the ProjectileJoannisO2014-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ENUM
| * | | | | | | | | - Cleaned up the code massivelyJoannisO2014-06-032-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 luaJoannis2014-06-032-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.JoannisO2014-05-312-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: I still think the new name is unclear. Any other suggestions are welcome.
| * | | | | | | | | - Prefixed all args with "a_"JoannisO2014-05-292-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added braces around the cases.
| * | | | | | | | | - Removed breaks. I thought it wouldn't compile without them but theJoannisO2014-05-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue was appearantly solved with an earlier commit.
| * | | | | | | | | - Fixed an issue where dispensers would only shoot arrows (appearantlyJoannisO2014-05-281-33/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some commits didn't come through) - Cleaned up the code according to suggestions.
| * | | | | | | | | - Implemented vertical dispensing for projectiles.Joannis2014-05-282-16/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed some terrible commit issues on my side.
| * | | | | | | | | - Fixed the ampersands and asterisks to fit the format.Joannis2014-05-272-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed the method "SpawnProjectileFromDispenser" to use CamelCasing.
| * | | | | | | | | - Added support for more types of projectiles in the DispenserJoannisO2014-05-262-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.JoannisO2014-05-262-27/+95
| | | | | | | | | |
* | | | | | | | | | Changed the teleport permissions to the new ones.Alexander Harkness2014-06-111-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Added cBlockArea:GetCoordRange to Lua API.madmaxoft2014-06-111-0/+32
| | | | | | | | |
* | | | | | | | | Revert "Initial Mesa Bryce implementation."madmaxoft2014-06-114-116/+4
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1ff1a93866ab81e3868588a256f446a902a1a8c4.
* | | | | | | | Removed assert that is now informed by type systemworktycho2014-06-111-1/+0
| | | | | | | |
* | | | | | | | Initial Mesa Bryce implementation.madmaxoft2014-06-104-4/+116
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Fixed clang warnings about abs() in Noise.cpp.madmaxoft2014-06-101-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.madmaxoft2014-06-103-4/+29
| | | | | | |
* | | | | | | Fixed gcc compilation.madmaxoft2014-06-101-2/+2
| | | | | | |
* | | | | | | Added an experimental height generator, Mountains.madmaxoft2014-06-092-0/+87
| | | | | | |
* | | | | | | Added cRidgedMultiNoise, fixed cPerlinNoise.madmaxoft2014-06-092-1/+233
| | | | | | |
* | | | | | | Added Y coord checks and documentation to cBlockDoorHandler.madmaxoft2014-06-091-19/+40
| | | | | | |
* | | | | | | Merge remote-tracking branch 'howaner/Redstone'madmaxoft2014-06-093-35/+62
|\ \ \ \ \ \ \
| * | | | | | | Moved the IsDoor check before the meta get.Howaner2014-05-311-2/+1
| | | | | | | |
| * | | | | | | Add doxy-commentHowaner2014-05-311-3/+4
| | | | | | | |
| * | | | | | | Better SetOpen() and IsOpen() function from the doors.Howaner2014-05-302-77/+27
| | | | | | | |
| * | | | | | | Add SetOpen() and IsOpen() to BlockDoor.h and fix door redstone bug.Howaner2014-05-292-13/+90
| |/ / / / / /
* | | | | | | ToLua can now be run in pure-lua mode.madmaxoft2014-06-091-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See the src/Bindings/AllToLua_lua.bat for usage example.
* | | | | | | Fixed a crash when creating negative-size blockareas.madmaxoft2014-06-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the server emits a warning instead and continues execution.
* | | | | | | Fixed deadlock when moving players to other worlds.Mattes D2014-06-0832-96/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1039, fixes #851
* | | | | | | Added queue for adding entities to cWorld.Mattes D2014-06-086-7/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This alone doesn't work properly yet, further changes to cPlayer are needed.
* | | | | | | Proper fix for long interaction.madmaxoft2014-06-081-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1078 and #1038.
* | | | | | | docs/Generator: Added the easy Finishers.madmaxoft2014-06-071-1/+13
| | | | | | |
* | | | | | | Added RainbowRoads finisher generator.madmaxoft2014-06-075-3/+1594
| | | | | | |
* | | | | | | Further improvements on redstone speedTiger Wang2014-06-073-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 TODOsarchshift2014-06-073-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Measured bat and blaze in vanilla, updated values. Cavespiders are, in fact, passive in the day.
* | | | | | | Further reduced redstone idle CPU consumptionTiger Wang2014-06-061-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 Wang2014-06-053-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/SomeWarningFixesMattes D2014-06-043-3/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixed some warnings
| * | | | | | | Update IncrementalRedstoneSimulator.cppJulian Laubstein2014-06-041-8/+8
| | | | | | | |
| * | | | | | | Changed the m_slotarea positionJulian Laubstein2014-05-191-2/+2
| | | | | | | |
| * | | | | | | Fixed warnings in IncrementalRedstoneSimulatorJulian Laubstein2014-05-191-1/+7
| | | | | | | |
| * | | | | | | Fixed some warnings in Server.cpp, and in UI/Julian Laubstein2014-05-193-3/+11
| | | | | | | |
| * | | | | | | Rolled some changes backJulian Laubstein2014-05-191-12/+2
| | | | | | | |
| * | | | | | | Fixed some warningsJulian Laubstein2014-05-191-2/+12
| | | | | | | |
* | | | | | | | Fix itemframe break.Howaner2014-06-041-1/+3
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | derpworktycho2014-06-041-1/+1
| | | | | | |
* | | | | | | Fixed bad coordinateworktycho2014-06-041-1/+1
| | | | | | |
* | | | | | | Make sure m_StackSizeToBeUsedInRepair Always has a valid valueworktycho2014-06-041-1/+3
| | | | | | |
* | | | | | | Removed unused field testworktycho2014-06-041-1/+0
| | | | | | |
* | | | | | | Initialise m_Callbacks field to NULL in empty constructor.worktycho2014-06-041-1/+2
| | | | | | |
* | | | | | | Exploded creepers drop nothing, part of #1058Tiger Wang2014-06-041-2/+8
| | | | | | |
* | | | | | | Fixed mob loading, part of #1058Tiger Wang2014-06-041-1/+1
| | | | | | |
* | | | | | | Fixed #1057Tiger Wang2014-06-041-1/+1
| | | | | | |
* | | | | | | Player permissions aren't logged to console anymore.madmaxoft2014-06-031-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was only logspam on most servers and there are alternative ways to list players' permissions.
* | | | | | | Merge remote-tracking branch 'howaner/Inventory'madmaxoft2014-06-032-2/+133
|\ \ \ \ \ \ \
| * | | | | | | Players can't set items in the result slot, when they shift a item.Howaner2014-06-012-0/+39
| | | | | | | |
| * | | | | | | Add HandleSmeltItem() call for achievements.Howaner2014-06-011-7/+11
| | | | | | | |
| * | | | | | | Missing return;Howaner2014-06-011-0/+1
| | | | | | | |
| * | | | | | | Set DraggingItem to Slot directly.Howaner2014-05-311-1/+1
| | | | | | | |
| * | | | | | | Fix DBL bug.Howaner2014-05-311-5/+4
| | | | | | | |
| * | | | | | | Change "Slot.IsEmpty()" to "Slot.m_ItemCount <= 0"Howaner2014-05-311-1/+1
| | | | | | | |
| * | | | | | | Fix the furnace result slot.Howaner2014-05-301-2/+90
| | | | | | | |
* | | | | | | | Fixed OnProjectileHitBlock bindings.madmaxoft2014-06-033-82/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also sorted the various cLuaState::Push() functions.
* | | | | | | | Merge pull request #1028 from mc-server/pistonfixesMattes D2014-06-0315-457/+401
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Piston fixes
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/pistonfixes'Tiger Wang2014-06-0215-457/+401
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp
| | * | | | | | | | Suggestions twoTiger Wang2014-06-012-10/+12
| | | | | | | | | |
| | * | | | | | | | SuggestionsTiger Wang2014-05-291-1/+6
| | | | | | | | | |
| | * | | | | | | | More comments!Tiger Wang2014-05-291-5/+4
| | | | | | | | | |
| | * | | | | | | | Revert "Fixed a food saturation issue"Tiger Wang2014-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 67308e4337b422ebefb249049e662266072b0ba2.
| | * | | | | | | | Changed block send queue to use vectorsTiger Wang2014-05-293-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested by @worktycho.
| | * | | | | | | | Fixed piston power checkingTiger Wang2014-05-291-11/+6
| | | | | | | | | |
| | * | | | | | | | Fixed a food saturation issueTiger Wang2014-05-251-1/+1
| | | | | | | | | |
| | * | | | | | | | Hopefully fixed piston duplication issuesTiger Wang2014-05-2515-437/+372
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #879 * Fixes #714
* | | | | | | | | Merge pull request #1052 from mc-server/UnderwaterBaseGenMattes D2014-06-025-0/+2489
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Underwater base gen
| * | | | | | | | Update UnderwaterBase prefabs.madmaxoft2014-06-011-12/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the waterfall room and the decaying sphere room. Re-tweaked the pieces' weights.
| * | | | | | | | Updated UnderwaterBase prefabs.madmaxoft2014-06-011-103/+123
| | | | | | | | |
| * | | | | | | | Added an initial version of the underwater base generator.madmaxoft2014-05-315-0/+2103
| | | | | | | | |
* | | | | | | | | Small tweak for mobsSTRWarrior2014-06-021-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mobs move a bit smoother and aren't able to move allot when in air.
* | | | | | | | | cBlockArea reading hotfix.madmaxoft2014-06-021-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/ProjectileHitBlockMattes D2014-06-016-9/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | OnProjectileHitBlock tweak.
| * | | | | | | | | Made a_BlockHitPos a referenceSTRWarrior2014-06-015-6/+6
| | | | | | | | | |
| * | | | | | | | | Used recommendationsSTRWarrior2014-05-316-9/+8
| | | | | | | | | |
| * | | | | | | | | Using recommendations (I think)STRWarrior2014-03-306-6/+7
| | | | | | | | | |
| * | | | | | | | | Added a BlockHitPos parameter to OnProjectileHitBlockSTRWarrior2014-03-306-9/+9
| | | | | | | | | |
| * | | | | | | | | Added a blockface parameter to the OnProjectileHitBlock hook.STRWarrior2014-03-306-8/+8
| | | | | | | | | |
* | | | | | | | | | abort does not take a parameter.worktycho2014-06-011-2/+2
| | | | | | | | | |
* | | | | | | | | | Use abort in SIGSEGV and SIGABRT handlersworktycho2014-06-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should cause Mcserver to generate core dumps when it crashes.
* | | | | | | | | | Updated AlchemistVillage prefabs.madmaxoft2014-06-011-103/+105
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1018 from mc-server/VillageGenMattes D2014-05-3125-23/+17115
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Village gen
| * | | | | | | | | Updated PlainsVillage prefabs.madmaxoft2014-05-311-73/+85
| | | | | | | | | |
| * | | | | | | | | Fixed a memory leak in VillagGen.madmaxoft2014-05-311-0/+5
| | | | | | | | | |
| * | | | | | | | | Updated PlainsVillage and AlchemistVillage.madmaxoft2014-05-302-239/+1270
| | | | | | | | | |
| * | | | | | | | | Fixed a memory leak in cPOCPieceGeneratormadmaxoft2014-05-291-0/+5
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into VillageGenmadmaxoft2014-05-292-1/+34
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Fixed a crash in message formatter.madmaxoft2014-05-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code would fail if a message is sent to a player not yet added to a world.
| * | | | | | | | | Merge branch 'master' into VillageGenmadmaxoft2014-05-2711-64/+140
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Added AlchemistVillage prefabs (Thanks, KingsCraftAu).madmaxoft2014-05-273-9/+3007
| | | | | | | | | |
| * | | | | | | | | Fixed testing weights in PlainsVillages.madmaxoft2014-05-271-3/+3
| | | | | | | | | |
| * | | | | | | | | cPieceGenerator chooses starting pieces based on weights.madmaxoft2014-05-274-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1033.
| * | | | | | | | | Biome generators: biome lists can contain spaces.madmaxoft2014-05-271-1/+1
| | | | | | | | | |
| * | | | | | | | | Fixed prefab test initialization.madmaxoft2014-05-261-0/+3
| | | | | | | | | |
| * | | | | | | | | Added support for Miners' Village.madmaxoft2014-05-2510-2234/+4438
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The village contains both prefabs that snap to ground and prefabs that connect strictly via connectors. Fixes #1027.
| * | | | | | | | | Added Japanese village prefabs.madmaxoft2014-05-245-4/+2442
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into VillageGenMattes D2014-05-2310-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.madmaxoft2014-05-221-186/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expanded the hitboxes so that houses don't touch each other. Fixed minor visual defects.
| * | | | | | | | | | Villages have min and max density setting.madmaxoft2014-05-225-17/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also made roads use 3+9 scheme, instead of 3+5, for the house connectors. Fixes #1020.
| * | | | | | | | | | Updated plains village prefabs.madmaxoft2014-05-221-44/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DoublePlantBed had sponges in wrong places, plus a few cosmetic fixes.
| * | | | | | | | | | Changed desert village roads to gravel.madmaxoft2014-05-211-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Added second kind of desert village (FlatRoof).madmaxoft2014-05-213-4/+1535
| | | | | | | | | | |
| * | | | | | | | | | Merged branch 'master' into VillageGen.madmaxoft2014-05-1854-323/+1559
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updated SandVillage prefabs to latest Gallery content.madmaxoft2014-05-181-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes sand village generation.
| * | | | | | | | | | | Village roads are drawn properly.madmaxoft2014-05-172-8/+35
| | | | | | | | | | | |
| * | | | | | | | | | | Village houses are height-adjusted onto the terrain.madmaxoft2014-05-175-7/+67
| | | | | | | | | | | |
| * | | | | | | | | | | Updated PlainsVillage prefabs to the latest Gallery contents.madmaxoft2014-05-171-2265/+2892
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed a NULL ptr failure in GridStructGen.madmaxoft2014-05-152-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.madmaxoft2014-05-151-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Changed village road generation to use multiple prefabs.madmaxoft2014-05-153-39/+38
| | | | | | | | | | | |
| * | | | | | | | | | | VillageGen rewritten using BFSPieceGenerator.madmaxoft2014-05-155-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.madmaxoft2014-05-152-0/+51
| | | | | | | | | | | |
| * | | | | | | | | | | VillageGen: Added well placement and the general algorithm description.madmaxoft2014-05-123-6/+152
| | | | | | | | | | | |
| * | | | | | | | | | | Initial VillageGen implementation.madmaxoft2014-05-116-0/+5807
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WIP, doesn't generate anything yet. Ref.: 740.
* | | | | | | | | | | | Merge pull request #951 from worktycho/chunksparsing/structsMattes D2014-05-3124-449/+1072
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | Chunksparsing with segments
| * | | | | | | | | | | removed NULL assignment to const valueTycho2014-05-301-1/+0
| | | | | | | | | | | |
| * | | | | | | | | | | removed unneded addressofTycho2014-05-301-7/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed cChunkData nibble copying.madmaxoft2014-05-301-9/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Test failures break into MSVC debugger.madmaxoft2014-05-301-0/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Test failures are reported verbosely and into the debug console on Win.madmaxoft2014-05-301-2/+18
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed sign comparison.madmaxoft2014-05-301-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed wrong copy sizes in cChunkData.madmaxoft2014-05-301-10/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Attempt at fixing an unresolved symbol in gcc / clang.madmaxoft2014-05-291-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fix bug when a_Idx is not a multiple of SectionBLockCountworktycho2014-05-291-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Derpworktycho2014-05-291-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | fix underflowworktycho2014-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wish c++ could specify saturating unsigned underflow.
| * | | | | | | | | | | Fixed wrong block sizes for copying / setting.madmaxoft2014-05-292-42/+36
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed Wrong types in nibble sizeofsworktycho2014-05-291-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed overflow bugworktycho2014-05-291-6/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Added comments, reformatted code.madmaxoft2014-05-296-280/+226
| | | | | | | | | | | |
| * | | | | | | | | | | Add commentworktycho2014-05-291-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed forgotten changes.madmaxoft2014-05-291-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | cChunkData: Normalized code style.madmaxoft2014-05-282-89/+106
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed cChunkData formatting.madmaxoft2014-05-282-39/+101
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed test globals to work with precompiled headersTycho2014-05-272-16/+36
| | | | | | | | | | | |
| * | | | | | | | | | | inject TestGlobals.h correctlyTycho2014-05-241-3/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Moved accessors to cpp fileTycho2014-05-242-216/+241
| | | | | | | | | | | |
| * | | | | | | | | | | Implemented style changesTycho2014-05-246-92/+95
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-2470-1163/+2294
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Fixed if spacesTycho2014-05-212-22/+23
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed reversed comparisons to nullTycho2014-05-212-17/+17
| | | | | | | | | | | |
| * | | | | | | | | | | Added space to ChunkData.cppTycho2014-05-211-20/+100
| | | | | | | | | | | |
| * | | | | | | | | | | Changed cChunkData::SetMeta to return a bool indicating whether the value changedTycho2014-05-212-7/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed stylistic issuesTycho2014-05-214-25/+25
| | | | | | | | | | | |
| * | | | | | | | | | | Renamed cChunkBuffer to cChunkDataTycho2014-05-219-67/+67
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed minor style issuesTycho2014-05-213-7/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed issue with types not being defined for an unused parameterTycho2014-05-188-107/+111
| | | | | | | | | | | |
| * | | | | | | | | | | derpTycho2014-05-171-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | fixed assignment bugs and Skylight bugTycho2014-05-171-3/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Fix assignment ops 2worktycho2014-05-171-3/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Fix assignment operatorsworktycho2014-05-171-10/+14
| | | | | | | | | | | |
| * | | | | | | | | | | Added several more testsfor arrays and coordinatesTycho2014-05-111-4/+16
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed bug that caused Array Setters to always create segmentsTycho2014-05-111-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | SkyLight defaults to 0xFFTycho2014-05-111-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed a bug in writting zeros to a non-allocated sectionTycho2014-05-112-0/+23
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed stupid errorTycho2014-05-101-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-102-1/+15
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed stupid buffer overflow in array setblocksTycho2014-05-102-5/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed bug in setting metasTycho2014-05-102-19/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-10102-936/+1998
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.h
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into chunksparsing/structsTycho2014-05-0333-81/+138
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp
| * | | | | | | | | | | | | | cCHunkBuffer that compiles with TestGlobals.hTycho2014-05-034-1/+13
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-01120-2375/+3985
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed bad commentTycho2014-04-271-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed a couple of segfaults and made Free a seperate functionTycho2014-04-272-6/+39
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Added other half of implementationTycho2014-04-271-14/+133
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed issues with gccTycho2014-04-271-6/+7
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed MobProximity Counter to remove chunk copysTycho2014-04-272-5/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed bad mergeTycho2014-04-271-13/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-04-27166-3545/+9240
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Chunk.h
| * | | | | | | | | | | | | | | | Implemented Chunk Sparsing with segmentsTycho2014-04-2617-401/+610
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Fixed bindings for cCompositeChat:SetMessageType().madmaxoft2014-05-301-2/+2
| |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fixed a memory leak in cPrefabPiecePool.madmaxoft2014-05-282-1/+34
| |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pool pieces weren't freed upon pool destruction.
* | | | | | | | | | | | | | | ClientHandle.cpp: Process look before posarchshift2014-05-271-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | ClientHandle.cpp: remove redundant codearchshift2014-05-261-22/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HandlePlayerMoveLook() calls HandlePlayerPos() and HandlePlayerLook() to reduce code redundancy.
* | | | | | | | | | | | | | | Revert "Add more move checks"madmaxoft2014-05-262-59/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 989312c4e7f517ae324e857cb255211e3fd8bb06.
* | | | | | | | | | | | | | | Merge pull request #1003 from Howaner/GlobalFixesMattes D2014-05-262-17/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more move checks
| * | | | | | | | | | | | | | | Add more move checksHowaner2014-05-162-17/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Invalid X/Y/Z/Stance check (std::isnan) - Illegal stance - Illegal position (32.000.000 is the world size)
* | | | | | | | | | | | | | | | SEMICOLONS!Alexander Harkness2014-05-251-2/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Update GroupManager.hworktycho2014-05-251-2/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | A fix that is better than #950.Alexander Harkness2014-05-251-5/+15
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'master' into achievementtranslateTiger Wang2014-05-2510-18/+142
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Player.cpp
| * | | | | | | | | | | | | | | Fixed Mineshaft system size.Mattes D2014-05-231-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Auto-enlargement for cGridStructGen cache.Mattes D2014-05-231-0/+9
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed datatype conversion warning.Mattes D2014-05-231-2/+2
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #1015 from mc-server/Statsxdot2014-05-217-15/+130
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | Statistics
| | * | | | | | | | | | | | | Fixed cWither::KilledByandrew2014-05-212-1/+3
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Cleaned up cPlayer::UpdateMovementStats; Wither achievementsandrew2014-05-207-15/+128
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Update CompositeChat.hTiger Wang2014-05-201-2/+4
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Update Player.cppAlexander Harkness2014-05-201-19/+19
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed a cactus Y position issueTiger Wang2014-05-191-2/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Simplified cacti conditionsTiger Wang2014-05-191-2/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | cCompositeChat message type is now formattedTiger Wang2014-05-194-5/+13
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Added client translation to achievementsTiger Wang2014-05-194-4/+70
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1010 from mc-server/cactidamageAlexander Harkness2014-05-193-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | Implemented cacti damage
| * | | | | | | | | | | | DerpAlexander Harkness2014-05-191-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Should have fixed assumptions about entity width.Alexander Harkness2014-05-191-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @madmaxoft can you comment?
| * | | | | | | | | | | | Fixed clanging errors.Alexander Harkness2014-05-191-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please @tigerw make sure this is correct.
| * | | | | | | | | | | | Implemented cacti damageTiger Wang2014-05-183-2/+29
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented cacti damage * Fixed pickup tossing (PR #994 bug)
* | | | | | | | | | | | There's no "round" function in MSVC2008.madmaxoft2014-05-182-4/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Fixed datatype truncation in Diff() template.madmaxoft2014-05-181-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #998 from mc-server/StatManagerMattes D2014-05-1824-61/+711
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Statistic Manager
| * | | | | | | | | | | Fixesandrew2014-05-135-20/+23
| | | | | | | | | | | |
| * | | | | | | | | | | Movement Statisticsandrew2014-05-126-14/+101
| | | | | | | | | | | |
| * | | | | | | | | | | cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()andrew2014-05-128-10/+143
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed compilationandrew2014-05-111-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed stat serializationandrew2014-05-114-24/+44
| | | | | | | | | | | |
| * | | | | | | | | | | Statistic Managerandrew2014-05-1116-43/+448
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | removed the <list> includeJulian Laubstein2014-05-181-1/+0
| | | | | | | | | | |
* | | | | | | | | | | Added unload <pluginname> commandJulian Laubstein2014-05-181-5/+9
| | | | | | | | | | |
* | | | | | | | | | | Added load cmdJulian Laubstein2014-05-171-5/+29
| | | | | | | | | | |
* | | | | | | | | | | Added load command in the cServer classJulian Laubstein2014-05-171-0/+6
| | | | | | | | | | |
* | | | | | | | | | | Fixed anvil exp removingtonibm192014-05-161-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #994 from Howaner/GlobalFixesMattes D2014-05-155-36/+125
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | Add place/break radius, add dig cancel packet and add item resend on break/place cancel.
| * | | | | | | | | | Fix compile error.Howaner2014-05-151-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Move radius check.Howaner2014-05-151-25/+40
| | | | | | | | | | |
| * | | | | | | | | | Rename HandleBlockDigCancel to FinishDigAnimtion.Howaner2014-05-112-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Add block place/break distance check.Howaner2014-05-092-0/+31
| | | | | | | | | | |
| * | | | | | | | | | Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break.Howaner2014-05-094-36/+79
| |/ / / / / / / / /
* | | | | | | | | | More switch warnings.archshift2014-05-122-7/+34
| | | | | | | | | |
* | | | | | | | | | Fixed a few more switch warnings.archshift2014-05-123-32/+35
| | | | | | | | | |
* | | | | | | | | | Fixed a warning and a complaint about a never-read variable.archshift2014-05-112-15/+11
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' into SslWebAdminMattes D2014-05-10125-1826/+2692
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #993 from mc-server/GridStructGenMattes D2014-05-1012-838/+581
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | Grid struct gen
| | * | | | | | | | Merged branch 'master' into GridStructGen.Mattes D2014-05-099-31/+38
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Removed unused constants from MineShafts and Ravines.Mattes D2014-05-092-9/+0
| | | | | | | | | | |
| | * | | | | | | | | Removed an unused NetherFortGen variable.Mattes D2014-05-091-6/+0
| | | | | | | | | | |
| | * | | | | | | | | Removed an unused macro.Mattes D2014-05-091-7/+0
| | | | | | | | | | |
| | * | | | | | | | | Ravines rewritten using cGridStructGen.Mattes D2014-05-092-182/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #987.
| | * | | | | | | | | cWormNestCaves rewritten using cGridStructGen.Mattes D2014-05-092-223/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #987.
| | * | | | | | | | | Mineshafts generator rewritten to use GridStructGen.Mattes D2014-05-092-156/+33
| | | | | | | | | | |
| | * | | | | | | | | Fixed cGridStructGen.Mattes D2014-05-081-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now cNetherFortGen works with the new architecture.
| | * | | | | | | | | Merge branch 'master' into GridStructGenMattes D2014-05-0884-344/+1148
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fixed MSVC 64-bit build warnings.Mattes D2014-05-0846-156/+173
| | | | | | | | | | | |
| | * | | | | | | | | | cNetherFortGen uses cGridStructGen.madmaxoft2014-05-075-264/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WIP, this doesn't work properly yet.
| | * | | | | | | | | | Initial cPrefabPiecePool refactoring.madmaxoft2014-05-072-0/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #986.
| | * | | | | | | | | | Initial cGridStructGen refactoring.madmaxoft2014-05-062-0/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #987.
| * | | | | | | | | | | Fixed the console saying no plugins are loaded.STRWarrior2014-05-101-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed compile problem.STRWarrior2014-05-101-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | A portal block now chooses a number between 2000 and 0STRWarrior2014-05-101-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Each time a portal block receives a tick it has a 1 in 500 chance of spawning a zombie pigman.STRWarrior2014-05-101-0/+14
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #992 from mc-server/coverity_fixesMattes D2014-05-092-1/+9
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | Coverity fixes
| | * | | | | | | | | Range Check on schematic sizeworktycho2014-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 55830
| | * | | | | | | | | Check the height and width values read.worktycho2014-05-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 55831
| * | | | | | | | | | Fixed size_t in FireworksSerializer.Mattes D2014-05-091-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fixed message formatting.Mattes D2014-05-091-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Even more size_t fixes.Mattes D2014-05-091-4/+4
| | | | | | | | | | |
| * | | | | | | | | | More size_t fixes.Mattes D2014-05-092-6/+6
| | | | | | | | | | |
| * | | | | | | | | | Build fixes after the last size_t batch.Mattes D2014-05-096-15/+15
| | | | | | | | | | |
| * | | | | | | | | | World pre-generation distance is settable in world.ini.Mattes D2014-05-091-2/+6
| | | | | | | | | | |
| * | | | | | | | | | Lighting thread disabled its chunkstays before deleting them.Mattes D2014-05-091-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Fixed MSVC 64-bit build warnings.Mattes D2014-05-0946-156/+173
| |/ / / / / / / / /
| * | / / / / / / / Initialise m_HasTeleported in both constructorsworktycho2014-05-091-0/+1
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #989 from Howaner/AnvilMattes D2014-05-079-55/+118
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix ...
| | * | | | | | | | Missing commaHowaner2014-05-071-2/+2
| | | | | | | | | |
| | * | | | | | | | Send item back to the client when the item get damage.Howaner2014-05-071-0/+1
| | | | | | | | | |
| | * | | | | | | | Change m_RepairCost to int.Howaner2014-05-076-16/+10
| | | | | | | | | |
| | * | | | | | | | Where is the problem with clang?Howaner2014-05-071-1/+1
| | | | | | | | | |
| | * | | | | | | | Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.Howaner2014-05-078-57/+125
| | | | | | | | | |
| * | | | | | | | | Merge pull request #853 from Howaner/SlabsMattes D2014-05-0710-4/+53
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Grass now grows under up-side-down slabs
| | * | | | | | | | | Superfluous method override.Howaner2014-05-071-6/+0
| | | | | | | | | | |
| | * | | | | | | | | Add lava and water check to block handlers.Howaner2014-05-072-2/+14
| | | | | | | | | | |
| | * | | | | | | | | Rename CanChangeDirtToGrass to CanDirtGrowGrassHowaner2014-05-076-9/+9
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into SlabsHowaner2014-05-07242-5938/+14161
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove old importHowaner2014-04-062-3/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into SlabsHowaner2014-04-0653-328/+514
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add CanChangeDirtToGrass function to Block Handlers.Howaner2014-04-069-4/+45
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into SlabsHowaner2014-04-03292-3468/+12905
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockDirt.h
| | * | | | | | | | | | | | Remove old functionHowaner2014-04-031-6/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Grass now grows under up-side-down slabsHowaner2014-04-031-3/+12
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix MagmaCube save.Howaner2014-05-072-3/+9
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Fixed wires powering wires diagonally below themTiger Wang2014-05-071-5/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #985 from Howaner/AnvilMattes D2014-05-0616-3/+671
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | Add anvil inventory.
| | * | | | | | | | | | | Rename CanRepairWithItem to CanRepairWithRawMaterial and rename Size() to Count()Howaner2014-05-069-34/+33
| | | | | | | | | | | | |
| | * | | | | | | | | | | Simplified the HandleAnvilItemName() code.Howaner2014-05-061-7/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Change int to size_t return.Howaner2014-05-052-3/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fix SetRepairedItemName() in SlotArea.cppHowaner2014-05-051-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add comments to CanTakeResultItem()Howaner2014-05-051-5/+5
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add doxycomments to cSlotAreaAnvil functions.Howaner2014-05-051-0/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Changed HandleAnvilItemName() length to size_t in ClientHandle.hHowaner2014-05-051-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add anvil shift click.Howaner2014-05-052-5/+86
| | | | | | | | | | | | |
| | * | | | | | | | | | | This isn't a enchantment table :DHowaner2014-05-051-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add clicks, exp subtraction, item check, ...Howaner2014-05-057-18/+210
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add MC|ItemName plugin message.Howaner2014-05-056-8/+51
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add anvil window and slot area.Howaner2014-05-0513-0/+356
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #927 from mc-server/fixesMattes D2014-05-0612-155/+160
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | Small fixes
| | * | | | | | | | | | | Merge branch 'master' into fixesTiger Wang2014-05-0619-506/+704
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Vector3.h
| | * | | | | | | | | | | Suggestions'd #2Tiger Wang2014-05-062-1/+6
| | | | | | | | | | | | |
| | * | | | | | | | | | | Suggestions'dTiger Wang2014-05-063-7/+11
| | | | | | | | | | | | |
| | * | | | | | | | | | | A bit of reformatting.madmaxoft2014-05-021-5/+10
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into fixes.madmaxoft2014-05-02162-2490/+4545
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | A tiny speed improvement in ApplyFoodExhaustion()Tiger Wang2014-04-271-5/+5
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | More comments!Tiger Wang2014-04-272-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also fixed a potential issue with position sending - if someone moved slowly enough, their position would never be updated.
| | * | | | | | | | | | | | Implemented suggestionsTiger Wang2014-04-241-7/+6
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into fixesTiger Wang2014-04-2472-527/+2943
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h
| | * | | | | | | | | | | | | Some change to Entity.cppTiger Wang2014-04-237-123/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added comments to BroadcastMovementUpdate() and the collision tracer
| | * | | | | | | | | | | | | Small changesTiger Wang2014-04-234-12/+15
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Changed cPieceGenerator to support pairings.madmaxoft2014-05-053-57/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #982.
| * | | | | | | | | | | | | | Prefabs can specify that they don't want flooring.madmaxoft2014-05-051-30/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the flag was ignored.
| * | | | | | | | | | | | | | Fixed a flipped condition in cBlockArea::Merge().madmaxoft2014-05-051-2/+2
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #978 from mc-server/VectorAssignmentOperatorMattes D2014-05-051-12/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vector3 warning fixes
| | * | | | | | | | | | | | | Removed convert-assign operator.madmaxoft2014-05-041-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want all conversions to be explicit, not hidden.
| | * | | | | | | | | | | | | Removed the controversial Vector3::operator <.madmaxoft2014-05-031-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It hasn't been used in any C++ code and Lua doesn't need it.
| | * | | | | | | | | | | | | Fixed float comparison warnings in Vector3.madmaxoft2014-05-031-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a bitwise comparison (Equals), and there's Eps-based comparison (EqualsEps).
| | * | | | | | | | | | | | | Implemented a true assignment operator for Vector3.madmaxoft2014-05-031-1/+9
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Attempted fix for CLang warnings in Vector3.h.madmaxoft2014-05-021-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 initialisationworktycho2014-05-051-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed formattingTiger Wang2014-05-051-4/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed 027efe09ea3d3222c3cbf169643e57773c1614aeTiger Wang2014-05-041-3/+49
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into redstoneimprovementsTiger Wang2014-05-04133-2294/+3963
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp
| | * | | | | | | | | | | | | Fixed pressure plate oversightsTiger Wang2014-05-041-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 failureTiger Wang2014-05-041-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.madmaxoft2014-05-031-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.madmaxoft2014-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #975.
| | * | | | | | | | | | | | | Fixed vanilla fluid simulator.madmaxoft2014-05-031-4/+1
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #919.
| | * | | | | | | | | | | | Fixed vanilla fluid simulator.madmaxoft2014-05-024-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #919.
| | * | | | | | | | | | | | Fixed a buffer overflow in cChunk:SetLight().madmaxoft2014-05-021-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.madmaxoft2014-05-021-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.madmaxoft2014-05-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #928.
| | * | | | | | | | | | | Added a sanitizer for Spawn egg damage value.madmaxoft2014-05-021-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This disallows spawning unknown mobs from unknown spawn eggs. Ref.: #928.
| | * | | | | | | | | | | HOOK_DISCONNECT has cClientHandle as its first parameter.madmaxoft2014-05-026-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #655.
| | * | | | | | | | | | | Fixed warnings in ManualBindings.madmaxoft2014-05-011-20/+20
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fixed warnings in Lua helpers.madmaxoft2014-05-012-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed lever and button powering directionTiger Wang2014-05-041-16/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | Redstone simulator now directly accesses cChunkTiger Wang2014-04-2710-453/+586
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes
* | | | | | | | | | | | | Client cert is not requested.Mattes D2014-05-101-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Fixed an extra space.madmaxoft2014-05-061-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | WebAdmin outputs a log message about HTTP / HTTPS status.madmaxoft2014-05-021-18/+31
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merged branch 'master' into SslWebAdmin.madmaxoft2014-05-0117-31/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Fixed a warning in Noise.madmaxoft2014-05-011-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | More ClientHandle fixes.madmaxoft2014-05-012-3/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed warnings in ClientHandle.madmaxoft2014-05-018-9/+9
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed warnings in cByteBuffer.madmaxoft2014-05-012-14/+14
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed warning in BlockID.madmaxoft2014-05-011-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed warnings in cBlockArea.madmaxoft2014-05-011-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed warnings in FastNBT.madmaxoft2014-05-011-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed warning in cCallbackSslContext::cDataCallbacks.madmaxoft2014-05-011-0/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed warning in cBlockArea.madmaxoft2014-05-011-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' into SslWebAdminmadmaxoft2014-05-013-1/+12
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Removed the explicit copy constructor for cItem.madmaxoft2014-05-011-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 D2014-05-011-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Anvil saver pads data to 4K boundaries.madmaxoft2014-05-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #524.
* | | | | | | | | | | | Added a missing return statement.madmaxoft2014-05-011-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | cSslContext has virtual destructor now.madmaxoft2014-05-011-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Renamed PublicKey to CryptoKey in CMakeLists.txtMattes D2014-05-011-3/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Renamed cPublicKey to cCryptoKey.madmaxoft2014-05-019-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.madmaxoft2014-05-019-23/+36
| | | | | | | | | | | |
* | | | | | | | | | | | Implemented SSL connection for WebAdmin.madmaxoft2014-05-014-2/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes FS-319.
* | | | | | | | | | | | Fixed HTTP message parsing, prepared for SSL.madmaxoft2014-05-012-3/+4
| | | | | | | | | | | |
* | | | | | | | | | | | Added a (disabled) test of low-security ciphersuites.madmaxoft2014-05-011-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.madmaxoft2014-05-011-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | cSslContext supports setting own cert / privkey.madmaxoft2014-05-015-7/+187
| | | | | | | | | | | |
* | | | | | | | | | | | Added cBufferedSslContext implementation.madmaxoft2014-05-012-20/+51
|/ / / / / / / / / / /
* | | | | | | | | | | If webadmin.ini doesn't exist, example one is written immediately.madmaxoft2014-04-301-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Fixed a warning when an empty item is being created.madmaxoft2014-04-301-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Ladders set as transparent.madmaxoft2014-04-301-0/+1
| | | | | | | | | | |
* | | | | | | | | | | Removed the unused cBlockingTCPLink class.madmaxoft2014-04-303-171/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #965 from mc-server/SslWrappersMattes D2014-04-3038-857/+2089
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ssl wrappers
| * | | | | | | | | | | Removed unneeded #includes.madmaxoft2014-04-291-6/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Moved the rest of the Crypto objects into their own respective files.madmaxoft2014-04-2913-422/+465
| | | | | | | | | | | |
| * | | | | | | | | | | Moved cPublicKey to its separate file in PolarSSL++.madmaxoft2014-04-296-109/+124
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into SslWrappersmadmaxoft2014-04-293-12/+29
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added BiomeToString() API function.madmaxoft2014-04-292-81/+106
| | | | | | | | | | | | |
| * | | | | | | | | | | | Added missing initialization.madmaxoft2014-04-291-2/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects.madmaxoft2014-04-299-225/+244
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merged branch 'master' into SslWrappers.madmaxoft2014-04-28106-1343/+2177
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added the G1 root cert.madmaxoft2014-04-281-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the authenticator finally works.
| * | | | | | | | | | | | | Added a debug cert printing function.madmaxoft2014-04-282-0/+65
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Reordered constructors.madmaxoft2014-04-271-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed a late-night typo.madmaxoft2014-04-271-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes.madmaxoft2014-04-271-91/+45
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | PolarSSL wrappers for the SSL context.madmaxoft2014-04-2710-5/+847
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | cSocket creates the socket in Connect if no socket is present yet.madmaxoft2014-04-271-2/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed C++11 check for SharedPtr.madmaxoft2014-04-251-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Added shared_ptr handling for C++03 mode.madmaxoft2014-04-251-3/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Replaced MSVC-specific decorators with our universal ones.madmaxoft2014-04-242-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | cByteBuffer uses void * instead of char * in data interface.madmaxoft2014-04-242-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it compatible with any pointer type.
| * | | | | | | | | | | | | Declared a SharedPtr that hopefully resolves on all platforms.madmaxoft2014-04-241-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC2008 has it in std::tr1, all the others in std.
| * | | | | | | | | | | | | Fixed filename case.madmaxoft2014-04-241-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Attempted CMake inclusion for PolarSSL++.madmaxoft2014-04-242-2/+19
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Authenticator uses some C++ SSL objects.madmaxoft2014-04-241-19/+40
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Initial C++ SSL classes.madmaxoft2014-04-247-2/+248
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Delayed sending the KeepAlive packet for 3 seconds after login.madmaxoft2014-04-291-0/+5
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should alleviate #889.
* | | | | | | | | | | | | Added BiomeToString() API function.madmaxoft2014-04-292-81/+106
| | | | | | | | | | | | |
* | | | | | | | | | | | | Disabled MSVC warnings about constant bool expressions.madmaxoft2014-04-281-2/+19
| | | | | | | | | | | | |
* | | | | | | | | | | | | Hopefully fixed repeated clang warnings.madmaxoft2014-04-281-9/+9
| | | | | | | | | | | | |
* | | | | | | | | | | | | Fixed a MSVC warning.madmaxoft2014-04-281-1/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #940 from Howaner/GlobalFixesMattes D2014-04-2826-68/+132
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add entity invulnerable
| * | | | | | | | | | | | Revert "Withers now use the new invulnerable."Howaner2014-04-282-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 619592b5a0ab651e714d55932bc7909e4204cee9.
| * | | | | | | | | | | | Revert "Changed the old invulnerable methods from the wither to the new."Howaner2014-04-285-28/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34.
| * | | | | | | | | | | | Changed the old invulnerable methods from the wither to the new.Howaner2014-04-265-4/+28
| | | | | | | | | | | | |
| * | | | | | | | | | | | Withers now use the new invulnerable.Howaner2014-04-262-26/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | FixesHowaner2014-04-268-23/+26
| | | | | | | | | | | | |
| * | | | | | | | | | | | Change m_InvulnerableTicks description again again :DHowaner2014-04-261-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Change m_InvulnerableTicks description again.Howaner2014-04-261-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Change m_InvulnerableTicks descriptionHowaner2014-04-261-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into GlobalFixesHowaner2014-04-261-7/+34
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add entity invulnerableHowaner2014-04-2622-50/+111
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed braces.madmaxoft2014-04-281-1/+5
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed missing return value warning in MSVC.madmaxoft2014-04-281-0/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge remote-tracking branch 'worktycho/master'madmaxoft2014-04-287-177/+225
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removed static from combinators.Tycho2014-04-281-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | THis allows us to use the functions in template params at the cost of polluting the global namespace.
| * | | | | | | | | | | | | | Fixed unbraced ifsTycho2014-04-281-10/+40
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Removed inlines from combinatorsTycho2014-04-281-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gcc requires external linkage for functions provided to template parameters
| * | | | | | | | | | | | | | Template MagicTycho2014-04-284-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 pointerTycho2014-04-271-2/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixes to uninitallsed array access in Noise.cppTycho2014-04-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CID 43634, 43634
| * | | | | | | | | | | | | | Initalize counter in fastrandomTycho2014-04-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 43622
| * | | | | | | | | | | | | | Initialised MetaArrays in BlockAreaTycho2014-04-271-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CID 43621
| * | | | | | | | | | | | | | Removed unneeded assertTycho2014-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed CID 43610
* | | | | | | | | | | | | | | Merge pull request #954 from mc-server/projectiles-splitMattes D2014-04-2827-857/+932
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files.
| * | | | | | | | | | | | | | | Fixed projectile source filenames, indentationsarchshift2014-04-2826-80/+80
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed ToLua errors, added newlinesarchshift2014-04-2718-19/+19
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed ToLua issuesarchshift2014-04-279-19/+24
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Moved cFireworkEntity out of ProjectileEntity.harchshift2014-04-275-115/+116
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Moved cGhastFireballEntity out of ProjectileEntity.harchshift2014-04-276-74/+85
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Moved cFireChargeEntity out of ProjectileEntity.harchshift2014-04-276-82/+90
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Moved cThrownSnowballEntity out of ProjectileEntity.harchshift2014-04-275-74/+84
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Moved cExpBottleEntity out of ProjectileEntity.harchshift2014-04-274-52/+61
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Moved cThrownEnderPearl out of ProjectileEntity.harchshift2014-04-275-86/+95
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Moved cThrownEggEntity out of ProjectileEntity.harchshift2014-04-275-91/+100
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Moved cArrowEntity out of ProjectileEntity.harchshift2014-04-2710-284/+297
| | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fixed warnings.madmaxoft2014-04-272-2/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fixed player spawning #953.madmaxoft2014-04-271-1/+4
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #958 from worktycho/bugfixMattes D2014-04-273-8/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix
| * | | | | | | | | | | | | | | Removed Old AssertsTycho2014-04-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed asserts about non-negative numbers on what are now unsigned types Fixes CID 43608
| * | | | | | | | | | | | | | | Removed old unused codeTycho2014-04-271-5/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed OnPluginMessage hook not exiting early.Tycho2014-04-271-1/+1
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OnPluginMessage hook would call all plugins even after one returned true. Fixes CID 43512
* | | | | | | | | | | | | | | Merge pull request #959 from mc-server/fixes-2worktycho2014-04-274-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | Coverity fixes
| * | | | | | | | | | | | | | Revert "Creative players cannot throw ender pearls."archshift2014-04-271-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 75bb36574b4bb78e8b5975bf905a97402fd8a4bb.
| * | | | | | | | | | | | | | Creative players cannot throw ender pearls.archshift2014-04-271-0/+16
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Added static const, initialized fields.archshift2014-04-274-2/+7
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #864 from mc-server/StatMattes D2014-04-272-0/+255
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Statistic/Achievement defs
| * | | | | | | | | | | | | | Added some commentsandrew2014-04-272-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Statistic/Achievement defsandrew2014-04-072-0/+255
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Another attempt at #889.madmaxoft2014-04-271-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/staticFixesMattes D2014-04-275-3/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Fixes motivated by Coverity #1
| * | | | | | | | | | | | | | Fixed unitialized member in gZipFile (CID 43673)jfhumann2014-04-261-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed a memory leak in tolua_cWorld_ChunkStay. (CID 43618)jfhumann2014-04-261-1/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixes resource leaks in the yggdrasil authenticator. (CID 43617)jfhumann2014-04-261-0/+33
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix for minor resource leak (CID 43616)jfhumann2014-04-261-1/+9
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Should fix CIDs 43631, 43632 and 43633jfhumann2014-04-251-0/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #941 from archshift/masterMattes D2014-04-2619-174/+172
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | Fixed lots of warnings, and other small changes.
| * | | | | | | | | | | | | | More small fixes.archshift2014-04-263-11/+11
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Moar alignment.archshift2014-04-261-7/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Further refactored, Reverted Minecart changearchshift2014-04-2611-90/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other small changes.
| * | | | | | | | | | | | | | Fixed mobs that don't naturally spawn.archshift2014-04-263-7/+11
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Moved switch{} out of GetArmorCoverAgainst().archshift2014-04-262-5/+29
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Removed unused assignments.archshift2014-04-263-6/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed a couple more warnings.archshift2014-04-262-21/+17
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Moved the weather picker out of TickWeather(), squashing a warning and improving readability.archshift2014-04-262-25/+30
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Removed impossible default case.archshift2014-04-261-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed a warning.
| * | | | | | | | | | | | | | Removed extraneous switch{} in Start()archshift2014-04-262-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed a warning.
| * | | | | | | | | | | | | | Moved huge conditional out of InStateChasing(), improving readabilityarchshift2014-04-262-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed a warning.
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'archshift2014-04-2518-17/+201
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Small changes; warning fixing.archshift2014-04-256-14/+12
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Oops, fixed that.archshift2014-04-251-0/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Giants!archshift2014-04-252-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.archshift2014-04-252-84/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed default case warning in the process.
* | | | | | | | | | | | | | | | Merge pull request #863 from mc-server/chunkysparsingMattes D2014-04-263-67/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | Chunky sparsing
| * | | | | | | | | | | | | | | Implemented commentsTiger Wang2014-04-253-33/+52
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed indentTiger Wang2014-04-241-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Another small speed improvement?Tiger Wang2014-04-241-12/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Implemented suggestionsTiger Wang2014-04-242-89/+16
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Replaced all the .data() calls so the code compiles in VS2008Tycho2014-04-101-5/+5
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Maybe speed improvements?Tiger Wang2014-04-072-48/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use a single index to determine from when to begin copying data * Use heightmap to determine first nonair block
| * | | | | | | | | | | | | | Attempt to fix errorsTiger Wang2014-04-072-12/+12
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Blocklight and skylight now compressedTiger Wang2014-04-073-32/+90
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Nibbletypes are compressedTiger Wang2014-04-053-18/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added nibble compression * Fixed an off by one
| * | | | | | | | | | | | | | Speed and memory improvementsTiger Wang2014-04-042-62/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Changed array to be continuous, so no more layer splitting
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into chunkysparsingTiger Wang2014-04-03138-955/+5608
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed some bugsTiger Wang2014-04-031-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed undefined behaviour * Fixed compression failure
| * | | | | | | | | | | | | | | Performance improvements and chunk flipping fixedTiger Wang2014-04-021-30/+32
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Sort of implementation of chunk sparsingTiger Wang2014-03-232-18/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issues: * Chunks are flipped * Slow/inefficient/badly coded * Only blocktypes are 'compressed'
* | | | | | | | | | | | | | | | Merge pull request #920 from axisd/masterMattes D2014-04-251-7/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining
| * | | | | | | | | | | | | | | Fix formattingr.ramazanov2014-04-251-9/+15
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix for clangr.ramazanov2014-04-251-5/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining & Mob Knockback is far too muchr.ramazanov2014-04-251-8/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerr.ramazanov2014-04-2512-23/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/mc-server/MCServerr.ramazanov2014-04-243-8/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/mc-server/MCServerr.ramazanov2014-04-2356-521/+1252
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining #906r.ramazanov2014-04-231-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mob Knockback is far too much #776
| * | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining #906r.ramazanov2014-04-211-5/+12
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #935 from archshift/projectile-fixesMattes D2014-04-252-7/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chicken eggs and ender pearls can hit entities.
| * | | | | | | | | | | | | | | | | | | Creator not user.archshift2014-04-252-5/+5
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Comments for TrySpawnChicken() and TeleportUser().archshift2014-04-251-0/+2
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Rename spawn chicken method, Initialize m_HasTeleported.archshift2014-04-252-4/+5
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Chicken eggs and ender pearls can hit entities.archshift2014-04-252-7/+66
| | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed warning by adding dedicated m_HasTeleported for fired arrows.
* | | | | | | | | | | | | | | | | | | Missed these CMakeLists.archshift2014-04-252-1/+7
| |_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Cmake generated projects for IDEs include headers in project files.archshift2014-04-2512-0/+12
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #932 from Howaner/InventoryMattes D2014-04-256-17/+189
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Fix armor in survival mode.
| * | | | | | | | | | | | | | | | | Add commit what the code is doing.Howaner2014-04-251-0/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add unkown armor warning and fix armor stacks.Howaner2014-04-251-2/+14
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add armor to switch() in ItemHandler.cppHowaner2014-04-242-7/+26
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix armor in survival mode.Howaner2014-04-246-17/+157
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #929 from archshift/masterMattes D2014-04-2410-21/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | / / / / / / / / | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | Renamed mob source files to better fit the CamelCase naming style.
| * | | | | | | | | | | | | | | Fixed class capitalization for the cave spider.archshift2014-04-244-7/+7
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed references to renamed files.archshift2014-04-245-8/+8
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Rename mob source files to fit CamelCase.archshift2014-04-246-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.madmaxoft2014-04-242-2/+2
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Updated docs for StringToEnchantmentID.madmaxoft2014-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: mc-server/Core#67
* | | | | | | | | | | | | | Updated NetherFort prefabs to latest Gallery content.madmaxoft2014-04-231-7/+29
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | The new leaves don't decay anymore.STRWarrior2014-04-231-0/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #792
* | | | | | | | | | | | Merge pull request #925 from archshift/masterMattes D2014-04-233-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Added monsters.ini rule for fireproof mobs.
| * | | | | | | | | | | | Renamed getter and setter for IsFireproof.archshift2014-04-233-4/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Added IsFireproof hook for monsters.iniarchshift2014-04-231-0/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fireproof status getter and setter.archshift2014-04-232-0/+16
| | | | | | | | | | | | |
* | | | | | | | | | | | | Updated NetherFort prefabs from the Gallery server.madmaxoft2014-04-221-274/+785
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #923 from archshift/masterMattes D2014-04-222-3/+15
|\| | | | | | | | | | | | | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | Added flag for fireproof entities.
| * | | | | | | | | | | Fixed indentation and changed m_Fireproof to m_IsFireproof.archshift2014-04-222-14/+14
| | | | | | | | | | | |
| * | | | | | | | | | | Lay foundation for fireproof entities.archshift2014-04-222-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent any entities with the m_Fireproof flag from taking fire or lava damage.
* | | | | | | | | | | | Merge pull request #909 from jfhumann/fixesMattes D2014-04-2248-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.jfhumann2014-04-211-2/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed Flint and Steel, reverted Minecart change, renamed a parameter namejfhumann2014-04-194-9/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Declared one mutex as mutable in order to allow for const correct get accessors.jfhumann2014-04-193-7/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed clang compilation errors. Apparently gcc and MSVC do not care about the order of initializer lists, but clang does.jfhumann2014-04-182-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Small style changesjfhumann2014-04-184-9/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-1843-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 codejfhumann2014-04-1848-212/+257
| | | | | | | | | | | | |
* | | | | | | | | | | | | Added prefab hitboxes.madmaxoft2014-04-213-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.madmaxoft2014-04-212-16/+33
| | | | | | | | | | | | |
* | | | | | | | | | | | | Replaced X.size() with X.empty(), where applicable.madmaxoft2014-04-211-3/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Fixed a warning in CraftingRecipes.Mattes D2014-04-211-1/+1
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Allow 1.6.4 Forge clients to log in.Mattes D2014-04-212-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #913.
* | | | | | | | | | | | Fixed enchanting return values.Mattes D2014-04-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Items are enchanted in those cases, so return true. Ref.: #914.
* | | | | | | | | | | | Fixed MSVC compilation.madmaxoft2014-04-201-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Fixed Codedaniel09162014-04-192-145/+148
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into Enchantingdaniel09162014-04-197-2/+182
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed formatting, made function static.madmaxoft2014-04-192-13/+18
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/Beacons'madmaxoft2014-04-194-0/+159
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Some tweaksSTRWarrior2014-04-121-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.STRWarrior2014-04-121-1/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Simplefied GetPyramidLevelSTRWarrior2014-04-121-10/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Implemented the skeleton code for the beacon.STRWarrior2014-04-124-0/+155
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no handling for the GUI. It can now check how big the pyramid is under the beacon.
| * | | | | | | | | | | Compilation fixTiger Wang2014-04-181-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-04-182-0/+35
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Fixed #906Tiger Wang2014-04-182-1/+12
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed #904Tiger Wang2014-04-182-1/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Fixed Code (2)daniel09162014-04-191-97/+93
| | | | | | | | | | | |
* | | | | | | | | | | | Fixed Codedaniel09162014-04-195-411/+418
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into Enchantingdaniel09162014-04-1827-424/+1496
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Added performance test of the nether fort generator.madmaxoft2014-04-182-0/+35
| |/ / / / / / / / / /
| * | | | | | | | | | Removed unsupported C++11 features.madmaxoft2014-04-181-13/+19
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #891 from mc-server/fixesMattes D2014-04-1717-330/+449
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes to redstone & general
| | * | | | | | | | | | Compile fix?Tiger Wang2014-04-171-2/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Implemented weighted pressure platesTiger Wang2014-04-173-29/+175
| | | | | | | | | | | |
| | * | | | | | | | | | Rewrote redstone powering to use power levelsTiger Wang2014-04-156-183/+157
| | | | | | | | | | | |
| | * | | | | | | | | | Entities handle chunks properly againTiger Wang2014-04-1210-123/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty
| | * | | | | | | | | | Simplified pickup speed randomisationTiger Wang2014-04-121-4/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Added area flooring.madmaxoft2014-04-171-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #743.
| * | | | | | | | | | | Added new AI rulesTiger Wang2014-04-176-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.madmaxoft2014-04-171-1/+13
| | | | | | | | | | | |
| * | | | | | | | | | | Prefabs can have per-piece per-placement weights.madmaxoft2014-04-175-32/+752
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #753. Also upgraded NetherFortPrefabs to lates Gallery contents.
| * | | | | | | | | | | Merge pull request #896 from axisd/masterMattes D2014-04-171-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Mobs rotation
| | * | | | | | | | | | | Mobs rotationr.ramazanov2014-04-171-4/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Added asserts for proper game state.madmaxoft2014-04-161-5/+131
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to help hunt #889.
* | | | | | | | | | | | Fixed Errorsdaniel09162014-04-183-5/+23
| | | | | | | | | | | |
* | | | | | | | | | | | Removed old includedaniel09162014-04-182-2/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Fixed some Errors (not all)daniel09162014-04-174-20/+21
| | | | | | | | | | | |
* | | | | | | | | | | | Modified many thingsdaniel09162014-04-1710-918/+1000
| | | | | | | | | | | |
* | | | | | | | | | | | Fixed conflicting enchantments checkingdaniel09162014-04-162-24/+24
| | | | | | | | | | | |
* | | | | | | | | | | | Added deletions from merge conflictdaniel09162014-04-161-0/+875
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into Enchantingdaniel09162014-04-1623-382/+661
|\| | | | | | | | | | |
| * | | | | | | | | | | Attempted fix for the client crash with the new protocols.madmaxoft2014-04-152-6/+16
| | | | | | | | | | | |
| * | | | | | | | | | | Added support for per-piece per-placement weights in cPieceGenerator.madmaxoft2014-04-152-28/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref.: #753.
| * | | | | | | | | | | NetherFortPrefabs: Fixed a connector in MidStaircase.madmaxoft2014-04-151-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Implemented the 1.7.6 protocol and authenticator.madmaxoft2014-04-1410-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.madmaxoft2014-04-143-5/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.7.9 client works with these changes in offline mode.
| * | | | | | | | | | | Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176madmaxoft2014-04-1410-296/+362
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed mistakedaniel09162014-04-132-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Fixed Error?daniel09162014-04-131-2/+2
| | | | | | | | | | | | |
| | * | | | | | | | | | | Code Updatedaniel09162014-04-131-4/+5
| | | | | | | | | | | | |
| | * | | | | | | | | | | Added Yggdrasil Authentication Systemdaniel09162014-04-139-295/+360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code by Howaner. Fixes/Changes by me.
| * | | | | | | | | | | | Initial 1.7.6 protocol support.madmaxoft2014-04-144-2/+69
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doesn't work yet because of missing UUIDs.
| * | | | | | | | | | | ChunkStay must be disabled while being deleted.ProtoProxy_1.7.2_001madmaxoft2014-04-123-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #758.
| * | | | | | | | | | | Fixed chunkstays not being removed on auto-delete.madmaxoft2014-04-122-10/+19
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #837.
* | | | | | | | | | | Fixed merge conflictdaniel09162014-04-161-877/+0
| | | | | | | | | | |
* | | | | | | | | | | Fixed double enchanting itemsdaniel09162014-04-161-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Code Optimizationdaniel09162014-04-152-358/+183
| | | | | | | | | | |
* | | | | | | | | | | Added Book Enchantingdaniel09162014-04-152-2/+311
| | | | | | | | | | |
* | | | | | | | | | | Add more checks to cSlotAreaEnchantingHowaner2014-04-153-99/+212
| | | | | | | | | | |
* | | | | | | | | | | Modified namesdaniel09162014-04-152-49/+49
| | | | | | | | | | |
* | | | | | | | | | | Add linux compatibilityHowaner2014-04-151-61/+71
| | | | | | | | | | |
* | | | | | | | | | | Added ItemPlaceCount in SlotAreadaniel09162014-04-142-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Howaner for helping
* | | | | | | | | | | Removed Debug Messagedaniel09162014-04-141-2/+0
| | | | | | | | | | |
* | | | | | | | | | | Added/Modified last things for Enchanting Systemdaniel09162014-04-141-15/+53
| | | | | | | | | | |
* | | | | | | | | | | Blocked enchanting a item twicedaniel09162014-04-142-8/+10
| | | | | | | | | | |
* | | | | | | | | | | Fixed Bookshelf Checkingdaniel09162014-04-141-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code by LO1ZB
* | | | | | | | | | | Bug fixesdaniel09162014-04-144-26/+21
| | | | | | | | | | |
* | | | | | | | | | | Fixed invisibility enchantmentsdaniel09162014-04-134-1/+8
| | | | | | | | | | |
* | | | | | | | | | | Fixed mistakedaniel09162014-04-131-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Fixed Server Crashdaniel09162014-04-131-0/+6
| | | | | | | | | | |
* | | | | | | | | | | Some Fixesdaniel09162014-04-132-2/+9
| | | | | | | | | | |
* | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into Enchantingdaniel09162014-04-1211-2051/+3448
|\| | | | | | | | | |
| * | | | | | | | | | Updated the NetherFort prefabs to current Gallery contents.madmaxoft2014-04-123-1958/+3329
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Code exported from the Gallery server by the GalExport plugin.
| * | | | | | | | | Fixed issues with 64-bit MSVC compilation.madmaxoft2014-04-113-21/+35
| |/ / / / / / / /
| * | | | | | | | Fixed enchantment parsing.madmaxoft2014-04-101-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #880. Enchantment parsing now reports in detail which value failed to parse
| * | | | | | | | Fixed GitHuB WebEdit fail.Alexander Harkness2014-04-101-0/+1
| | | | | | | | |
| * | | | | | | | Update Monster.cppAlexander Harkness2014-04-101-2/+4
| | | | | | | | |
| * | | | | | | | Merge pull request #871 from worktycho/worldstorageMattes D2014-04-081-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 loadedTycho2014-04-081-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 improvementsTiger Wang2014-04-081-40/+41
| | | | | | | | |
| * | | | | | | | Merge pull request #872 from worktycho/bugfixAlexander Harkness2014-04-081-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 chunkmapTycho2014-04-081-1/+1
| | |/ / / / / / /
| * | | | | | | | Uppercased Zwiseoldman952014-04-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Minor, no code changed.
| * | | | | | | | Comments: Inverted Z axis.wiseoldman952014-04-081-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 orientationwiseoldman952014-04-081-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | No real code was changed.
| * | | | | | | | Fixed the thing properly.Alexander Harkness2014-04-081-8/+8
| | | | | | | | |
| * | | | | | | | Merge pull request #862 from mc-server/redstonefixAlexander Harkness2014-04-081-23/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixed #859
| | * | | | | | | | Fixed #859Tiger Wang2014-04-071-23/+3
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Fixed IsOnwiseoldman952014-04-071-3/+2
| | | | | | | | |
| * | | | | | | | Removed stray IsLockedwiseoldman952014-04-071-2/+2
| | | | | | | | |
| * | | | | | | | Removed unneeded spacingswiseoldman952014-04-071-6/+3
| | | | | | | | |
| * | | | | | | | Slight cleanupwiseoldman952014-04-071-13/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | It is more efficient and readable if we do nothing unless we're not locked.
* | | | | | | | | Fixed Bookshelves Checking (not completly)daniel09162014-04-121-7/+10
| | | | | | | | |
* | | | | | | | | Added complete Enchanting Systemdaniel09162014-04-128-147/+803
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://minecraft.gamepedia.com/Enchantment_mechanics
* | | | | | | | | Modified commentdaniel09162014-04-071-1/+1
| | | | | | | | |
* | | | | | | | | Fixed Errorsdaniel09162014-04-072-3/+3
| | | | | | | | |
* | | | | | | | | Added deleted things for mergingdaniel09162014-04-071-0/+3
| | | | | | | | |
* | | | | | | | | Merge remote-tracking branch 'upstream/master' into Enchantingdaniel09162014-04-07435-8455/+29130
|\| | | | | | | |
| * | | | | | | | Fixed some more minor issues with the redstone simulator.Alexander Harkness2014-04-071-34/+39
| | | | | | | | |
| * | | | | | | | Improved the speed a little more.Alexander Harkness2014-04-071-1/+1
| | | | | | | | |
| * | | | | | | | Fixed the redstone simulator.Alexander Harkness2014-04-071-49/+40
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Fix some of the comments in the PR tycho just did.Alexander Harkness2014-04-071-8/+6
| | | | | | | |
| * | | | | | | Merge pull request #861 from worktycho/simulatorAlexander Harkness2014-04-072-2/+65
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Added support for redstone latching
| | * | | | | | | Added support for redstone latchingTycho2014-04-062-2/+65
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | fixes #856
| * | | | | | | Fixed HTTP chunked encoding.madmaxoft2014-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #858.
| * | | | | | | Fixed 1.6.4 client crash on composite chat messages.madmaxoft2014-04-062-0/+14
| | | | | | | |
| * | | | | | | Fixed crash in protocols sending 64-bit ints.madmaxoft2014-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #855.
| * | | | | | | Updated the tolua executable for Windows.madmaxoft2014-04-061-0/+0
| | | | | | | |
| * | | | | | | Merge branch 'master' into overrideTycho2014-04-05180-1316/+6155
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/tolua++/CMakeLists.txt
| | * | | | | | Fixed Endiannes conversion routines for floats and doubles.madmaxoft2014-04-052-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug has been introduced in 8825d30aabbee8cb2e452dc5a17deb6f9b6892a7. This change fixes #854.
| | * | | | | | Fixed double projectile spawning.madmaxoft2014-04-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two spawn packets were sent per projectile.
| | * | | | | | Removed debugging log from entity physics handling.madmaxoft2014-04-051-1/+2
| | | | | | | |
| | * | | | | | Added cPlayer:SendRotation() API function.madmaxoft2014-04-052-0/+17
| | | | | | | |
| | * | | | | | Merge pull request #840 from Howaner/NewBlocksMattes D2014-04-043-5/+152
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add tall flower handler.
| | | * | | | | | Change CanBeAt() from big flowerHowaner2014-04-031-5/+1
| | | | | | | | |
| | | * | | | | | Add "a_RelY < cChunkDef::Height" to BlockBigFlowerHowaner2014-03-291-0/+1
| | | | | | | | |
| | | * | | | | | Add tallgrass drop to big flowers.Howaner2014-03-282-8/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add tallgrass drop, when a players break a tallgrass with the shear.
| | | * | | | | | door -> flowerHowaner2014-03-281-1/+1
| | | | | | | | |
| | | * | | | | | Add tall flower handler.Howaner2014-03-282-0/+99
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into HTTPSizeTmadmaxoft2014-04-0436-574/+348
| | |\ \ \ \ \ \ \
| | | * | | | | | | Explicit change record size.madmaxoft2014-04-041-1/+1
| | | | | | | | | |
| | | * | | | | | | Changed cNoise seed to signed.madmaxoft2014-04-042-4/+4
| | | | | | | | | |
| | | * | | | | | | Fixed format string mismatch.madmaxoft2014-04-041-1/+1
| | | | | | | | | |
| | | * | | | | | | More Clang warning fixes in the protocols.madmaxoft2014-04-046-81/+82
| | | | | | | | | |
| | | * | | | | | | Fixed CreateHexDump's format string.madmaxoft2014-04-041-2/+2
| | | | | | | | | |
| | | * | | | | | | Fixed CreateHexDump's signedness.madmaxoft2014-04-043-11/+11
| | | | | | | | | |
| | | * | | | | | | More Clang warning fixes in the protocols.madmaxoft2014-04-043-30/+39
| | | | | | | | | |
| | | * | | | | | | Fixed silly Clang's warnings in FastNBT.madmaxoft2014-04-041-28/+28
| | | | | | | | | |
| | | * | | | | | | Fixed some Clang warnings in protocols.madmaxoft2014-04-0413-43/+51
| | | | | | | | | |
| | | * | | | | | | Fixed Clang warnings in itemhandlers.madmaxoft2014-04-046-20/+21
| | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Documented the units and range for entity rotations.madmaxoft2014-04-031-7/+7
| | | | | | | | |
| | | * | | | | | Removed unneeded asserts.madmaxoft2014-04-031-2/+0
| | | | |_|/ / / | | | |/| | | |
| | | * | | | | Fixed a few MSVC type warnings.Mattes D2014-04-033-2/+5
| | | | | | | |
| | | * | | | | Removed the bindings to set old g_BlockXXX arrays.Mattes D2014-04-031-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/minorfixesMattes D2014-04-026-48/+34
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | Minor fixes
| | | | * | | | | With eXtra line!Tiger Wang2014-04-021-0/+1
| | | | | | | | |
| | | | * | | | | Removed extra bracketsTiger Wang2014-04-021-5/+2
| | | | | | | | |
| | | | * | | | | Final realisation of suggestionsTiger Wang2014-03-311-5/+7
| | | | | | | | |
| | | | * | | | | Realised suggestionsTiger Wang2014-03-312-6/+12
| | | | | | | | |
| | | | * | | | | Simplified and fixed slabs, fixes #835Tiger Wang2014-03-313-36/+13
| | | | | | | | |
| | | | * | | | | Fixed a few Y too high/low assertsTiger Wang2014-03-313-12/+15
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into HTTPSizeTTycho2014-04-0223-29/+44
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/HTTPServer/EnvelopeParser.h src/HTTPServer/HTTPFormParser.h src/HTTPServer/MultipartParser.h
| | | * | | | | | Fixed boat placement code.madmaxoft2014-04-021-9/+17
| | | | | | | | |
| | | * | | | | | Fixed more virtual destructors for interfaces.madmaxoft2014-04-024-0/+12
| | | | | | | | |
| | | * | | | | | Merge branch 'MacFixes'Tycho2014-04-0218-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 Barney2014-03-2515-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
| | | | * | | | | | Added one more missing newline.Samuel Barney2014-03-251-1/+1
| | | | | | | | | |
| | | | * | | | | | Added newlines. Without them, the files would not compile.Samuel Barney2014-03-254-4/+4
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' into HTTPSizeTTycho2014-04-0212-10/+315
| | |\| | | | | | |
| | | * | | | | | | Merge pull request #831 from mc-server/WitherMattes D2014-04-025-3/+153
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Wither
| | | | * | | | | | | Fixed clang compilationandrew2014-03-252-14/+17
| | | | | | | | | | |
| | | | * | | | | | | Fixed wither summoningandrew2014-03-253-3/+37
| | | | | | | | | | |
| | | | * | | | | | | Protocol: Wither metadataandrew2014-03-255-3/+116
| | | | | | | | | | |
| | | * | | | | | | | Added schematic string serializer self-test.madmaxoft2014-04-021-0/+33
| | | | | | | | | | |
| | | * | | | | | | | Fixed StringCompression's GZIP handling for larger strings.madmaxoft2014-04-022-5/+7
| | | | | | | | | | |
| | | * | | | | | | | Exported the Base64 encoding and decoding functions to Lua API.madmaxoft2014-04-012-2/+48
| | | | | | | | | | |
| | | * | | | | | | | Merged branch 'msDifference'.madmaxoft2014-04-012-0/+35
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Added new merge strategy "msDifference"STRWarrior2014-03-312-0/+35
| | | | | | | | | | | |
| | | * | | | | | | | | cBlockArea: Added the msMask merge strategy.madmaxoft2014-04-012-0/+39
| | | | | | | | | | | |
| | * | | | | | | | | | Fixed All signedness warnings in HTTPServer.cppTycho2014-04-0210-14/+17
| | | | | | | | | | | |
| | * | | | | | | | | | Fixed format string in HTTPConnectionTycho2014-04-021-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Fixed Comparison to -1 in HTTPMessage.hTycho2014-04-021-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Rewritten HTTPServer to use size_t for data lengths.madmaxoft2014-04-0116-90/+97
| | |/ / / / / / / / /
| | * | | | | | | | | More cFile warning fixes.madmaxoft2014-04-011-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Fixed clang warnings in cGZipFile.madmaxoft2014-04-011-2/+2
| | | | | | | | | | |
| | * | | | | | | | | Fixed clang warnings in BlockHandlers.madmaxoft2014-04-014-5/+6
| | | | | | | | | | |
| | * | | | | | | | | Fixed clang warnings in cFile.madmaxoft2014-04-011-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only support 32-bit filesizes (files < 2 GiB).
| | * | | | | | | | | Simplified the anvil placement code.madmaxoft2014-04-011-11/+9
| | | | | | | | | | |
| | * | | | | | | | | Removed an unneeded code branch.madmaxoft2014-04-011-5/+0
| | | | | | | | | | |
| | * | | | | | | | | LOG() API reads the LogLevel from the cCompositeChat's MessageType.madmaxoft2014-04-015-22/+79
| | | | | | | | | | |
| | * | | | | | | | | Console logging supports cCompositeChat as its parameters.madmaxoft2014-03-314-34/+69
| | | | | | | | | | |
| | * | | | | | | | | cCompositeChat has a MessageType param in the constructor.madmaxoft2014-03-312-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make it easier to use.
| | * | | | | | | | | Fixed a few Clang warnings in BlockHandlers.madmaxoft2014-03-3011-48/+54
| | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Fixed a few clang warnings.madmaxoft2014-03-304-7/+13
| | | | | | | | | |
| | * | | | | | | | Merge branch 'NetherFortGen'.madmaxoft2014-03-3011-22/+3228
| | |\| | | | | | |
| | | * | | | | | | Added all current NetherFort prefabs.madmaxoft2014-03-301-3/+1547
| | | | | | | | | |
| | | * | | | | | | Added asserts for critical data in cPrefab.madmaxoft2014-03-301-0/+4
| | | | | | | | | |
| | | * | | | | | | Re-fixed nether fort piece count check.madmaxoft2014-03-301-2/+2
| | | | | | | | | |
| | | * | | | | | | Fixed chest rotator.madmaxoft2014-03-301-2/+2
| | | | | | | | | |
| | | * | | | | | | NetherForts have a minimum number of pieces.madmaxoft2014-03-301-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 NetherFortGenmadmaxoft2014-03-2914-15/+224
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | NetherFortGen: Added several more prefabs.madmaxoft2014-03-282-2/+783
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also extended the defauls MaxDepth value to 12.
| | | * | | | | | | | Added Prefabs to *nix builds.madmaxoft2014-03-281-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Merge branch 'master' into NetherFortGenmadmaxoft2014-03-2811-37/+61
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Implemented the msSpongePrint merge strategy.madmaxoft2014-03-283-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.madmaxoft2014-03-281-29/+158
| | | | | | | | | | | |
| | | * | | | | | | | | Fixed a memory leak in NetherFortGen.madmaxoft2014-03-281-0/+7
| | | | | | | | | | | |
| | | * | | | | | | | | Sponged the netherfort balcony prefab.madmaxoft2014-03-281-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 NetherFortGenmadmaxoft2014-03-281-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | |
| | | * | | | | | | | | Initial NetherFortGen import.madmaxoft2014-03-288-15/+713
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple fortresses of 2 different rooms will generate.
| | * | | | | | | | | | Merge pull request #834 from narroo/issue503Mattes D2014-03-3023-121/+372
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Issue503 pull Request
| | | * | | | | | | | | | Added in MetaMirrorXY and MetaMirrorYZ to cBlockSignHandler.narroo2014-03-291-0/+19
| | | | | | | | | | | | |
| | | * | | | | | | | | | Altered the rotates for cBlockSignHandler. The functions as a whole is still unfinished though; no wall sign or mirroring support yet.narroo2014-03-261-2/+2
| | | | | | | | | | | | |
| | | * | | | | | | | | | Fixed Minor typos.narroo2014-03-263-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....)narroo2014-03-251-2/+8
| | | | | | | | | | | | |
| | | * | | | | | | | | | Fixed spelling; Rotater to Rotator.narroo2014-03-2515-46/+46
| | | | | | | | | | | | |
| | | * | | | | | | | | | Changed Rotater to Rotator. Added partial sign post rotation support.narroo2014-03-252-0/+12
| | | | | | | | | | | | |
| | | * | | | | | | | | | Added MetaRotate/Mirror Support for a number of classes.narroo2014-03-2412-84/+295
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #838 from mc-server/lilypadsworktycho2014-03-3010-13/+162
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | | Lilypads
| | | * | | | | | | | | | Another curlyTiger Wang2014-03-301-1/+2
| | | | | | | | | | | | |
| | | * | | | | | | | | | Compare for inequality in FACE_NONE checksTiger Wang2014-03-291-3/+3
| | | | | | | | | | | | |
| | | * | | | | | | | | | Removed leftover clienthandle codeTiger Wang2014-03-291-10/+6
| | | | | | | | | | | | |
| | | * | | | | | | | | | Curly bracketsTiger Wang2014-03-291-1/+4
| | | | | | | | | | | | |
| | | * | | | | | | | | | Fixed infinite minecart itemsTiger Wang2014-03-281-0/+3
| | | | | | | | | | | | |
| | | * | | | | | | | | | Fixed block interaction rate checkTiger Wang2014-03-281-2/+4
| | | | | | | | | | | | |
| | | * | | | | | | | | | Fixed a potential crashTiger Wang2014-03-281-1/+1
| | | | | | | | | | | | |
| | | * | | | | | | | | | Some fixes to lilypadsTiger Wang2014-03-285-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 placementTiger Wang2014-03-234-8/+98
| | | | | | | | | | | | |
| | * | | | | | | | | | | cPrefab now uses a struct for block type definition in CharMap.madmaxoft2014-03-292-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/ProjectileHooksMattes D2014-03-298-1/+118
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | Projectile hooks
| | | * | | | | | | | | | Fixed the OnProjectileHitBlock hook not stopping projectiles.STRWarrior2014-03-291-1/+1
| | | | | | | | | | | | |
| | | * | | | | | | | | | Added HOOK_PROJECTILE_HIT_BLOCK.STRWarrior2014-03-296-0/+50
| | | | | | | | | | | | |
| | | * | | | | | | | | | Fixed error when the hook gets called.STRWarrior2014-03-293-1/+14
| | | | | | | | | | | | |
| | | * | | | | | | | | | Added HOOK_PROJECTILE_HIT_ENTITYSTRWarrior2014-03-296-0/+54
| | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Renamed lua dll for tolua++.exe.madmaxoft2014-03-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #843.
| | * | | | | | | | | | Fixed players not updating after world changeTiger Wang2014-03-291-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addendum to 6dea7993f2a563a8b3a0746feeb2174922631526
| | * | | | | | | | | | Fixed #721 and FS439Tiger Wang2014-03-291-0/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Fixed a minor ini key duplication bugTiger Wang2014-03-291-0/+1
| | |/ / / / / / / / /
| | * | | | / / / / / Fixed non-virtual destructors warnings.madmaxoft2014-03-2811-37/+61
| | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Fixed compilation after last PR merge.madmaxoft2014-03-281-1/+1
| | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'howaner/GlobalFixes'.madmaxoft2014-03-2812-6/+83
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add missing ChunkDesc import.Howaner2014-03-281-1/+1
| | | | | | | | | |
| | | * | | | | | | Fix merge conflictsHowaner2014-03-271-7/+0
| | | | | | | | | |
| | | * | | | | | | Change SpreadSource prefix to ssHowaner2014-03-274-8/+8
| | | | | | | | | |
| | | * | | | | | | Wrong if in BlockLeavesHowaner2014-03-271-1/+1
| | | | | | | | | |
| | | * | | | | | | Add SpreadSourceHowaner2014-03-2711-10/+34
| | | | | | | | | |
| | | * | | | | | | Add HOOK_BLOCK_SPREADHowaner2014-03-276-3/+57
| | | | | | | | | |
| | | * | | | | | | Add new leaves to all classes.Howaner2014-03-272-1/+8
| | | | | | | | | |
| | * | | | | | | | Fixed Prefab's rotations.madmaxoft2014-03-282-7/+39
| | |/ / / / / / /
| | * | | | | | | cPrefab can draw itself into a cChunkDesc.madmaxoft2014-03-272-6/+9
| | | | | | | | |
| | * | | | | | | Fixed chunk neighbor-getting for long distances.madmaxoft2014-03-271-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a server hang when teleporting to coords too far away.
| | * | | | | | | Prefabs support connectors, rotations and merge strategy.madmaxoft2014-03-262-3/+72
| | | | | | | | |
| | * | | | | | | Removed unused constants.madmaxoft2014-03-252-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now.
| | * | | | | | | Added a basic cPrefab class.madmaxoft2014-03-252-0/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be defined in the source by GalExport's cpp output.
| | * | | | | | | BlockArea: Create() can take the size as Vector3i, too.madmaxoft2014-03-252-2/+17
| | | | | | | | |
| | * | | | | | | BlockArea: Switched internal coords to Vector3i.madmaxoft2014-03-254-200/+176
| | | | | | | | |
| | * | | | | | | Added Vector3::Move(const Vector3 &).madmaxoft2014-03-251-0/+7
| | | | | | | | |
| | * | | | | | | Merge pull request #833 from mc-server/EnderCrystalMattes D2014-03-257-11/+137
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | Ender crystals
| | | * | | | | | Ender crystalsandrew2014-03-257-11/+137
| | | | | | | | |
| | * | | | | | | Merge pull request #828 from mc-server/WitherMattes D2014-03-259-15/+109
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | Wither invulnerability
| | | * | | | | | Minor fixesandrew2014-03-253-14/+13
| | | | | | | | |
| | | * | | | | | Wither invulnerabilityandrew2014-03-248-5/+100
| | | |/ / / / /
| | * | | | | | Merge pull request #829 from Howaner/CakeMattes D2014-03-241-1/+7
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | Add log pickups.
| | | * | | | | Add log pickups.Howaner2014-03-241-1/+7
| | | | | | | |
| | * | | | | | Updated the ToLua windows executable.madmaxoft2014-03-231-0/+0
| | | |_|_|/ / | | |/| | | |
| | * | | | | Implemented faster upscaling using templates.madmaxoft2014-03-216-36/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #819.
| * | | | | | Added override specifier to functions declared in cWorldTycho2014-03-221-8/+8
| |/ / / / /
| * | | | | Updated the tolua++ executable for Win builds.madmaxoft2014-03-201-0/+0
| | | | | |
| * | | | | Merge branch 'unreachable'madmaxoft2014-03-207-5/+12
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Merge branch 'master' into unreachableTycho2014-03-194-14/+14
| | |\ \ \ \
| | * | | | | Added unreachable lines backit prtected by preprocessor guardsTycho2014-03-192-0/+10
| | | | | | |
| | * | | | | Merge branch 'master' into unreachableTycho2014-03-1737-215/+827
| | |\ \ \ \ \
| | * | | | | | Fixed unessicary returnTycho2014-03-151-1/+0
| | | | | | | |
| | * | | | | | Merge branch 'master' into unreachableTycho2014-03-156-3/+29
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake
| | * | | | | | | Patched tolua to emit range checks for enumsTycho2014-03-151-0/+1
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into unreachableTycho2014-03-143-10/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake
| | * | | | | | | | Fixed a few unneeded breaksTycho2014-03-143-3/+3
| | | | | | | | | |
| | * | | | | | | | Removed missiterperatable malfunctioning error handling codeTycho2014-03-141-2/+0
| | | | | | | | | |
| | * | | | | | | | Removed invalid block face handling codeTycho2014-03-141-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.madmaxoft2014-03-203-77/+119
| | | | | | | | | |
| * | | | | | | | | Rewritten player speeds to be relative unit-less.madmaxoft2014-03-204-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.madmaxoft2014-03-202-31/+33
| | | | | | | | | |
| * | | | | | | | | Made pushing plain pointer to Lua a valid operation, with a warning.madmaxoft2014-03-202-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/awesometntMattes D2014-03-209-217/+258
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | TNT Shrapnel
| | * | | | | | | | | Added bracesTiger Wang2014-03-201-0/+2
| | | | | | | | | | |
| | * | | | | | | | | Minor Entity.cpp cleanupTiger Wang2014-03-201-12/+9
| | | | | | | | | | |
| | * | | | | | | | | ENUMified shrapnel levelTiger Wang2014-03-204-15/+17
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into awesometntTiger Wang2014-03-18120-1024/+3001
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkMap.cpp
| | * | | | | | | | | | Added levels of shrapnelTiger Wang2014-03-183-8/+18
| | | | | | | | | | | |
| | * | | | | | | | | | Merge remote-tracking branch 'origin/master' into awesometntTiger Wang2014-03-1028-206/+743
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemLighter.h src/Simulator/IncrementalRedstoneSimulator.cpp
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into awesometntTiger Wang2014-03-1080-595/+1990
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Shrapnel now configurableTiger Wang2014-03-103-3/+8
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Added extra awesomeness to TNTTiger Wang2014-03-057-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.madmaxoft2014-03-192-7/+7
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #817.
| * | | | | | | | | | | | LuaChunkStay: Removed a debugging output.madmaxoft2014-03-191-3/+0
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fixed chunkmap tree block replacing.madmaxoft2014-03-181-8/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed cGZipFile::ReadRestOfFile returning incorrect value.madmaxoft2014-03-181-1/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed a crash in firework rockets.madmaxoft2014-03-171-2/+8
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #816.
| * | | | | | | | | | Fixed double to float conversions.madmaxoft2014-03-164-52/+53
| | | | | | | | | | |
| * | | | | | | | | | Added override specifier where appropriate in cWorld.madmaxoft2014-03-161-37/+38
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #782 from mc-server/bedsMattes D2014-03-165-17/+94
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Beds now work properly, fixes #707
| | * | | | | | | | | | Fixed VERIFYTiger Wang2014-03-091-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Beds now work properly fixes #707Tiger Wang2014-03-095-17/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes FS392 Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp
| * | | | | | | | | | | Merge pull request #809 from Howaner/BlockEntitysMattes D2014-03-1619-99/+512
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | More entity saving.
| | * | | | | | | | | | | Fix anvil pickups.Howaner2014-03-161-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add anvil direction.Howaner2014-03-163-1/+74
| | | | | | | | | | | | |
| | * | | | | | | | | | | Remove old debug messages.Howaner2014-03-151-3/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into BlockEntitysHowaner2014-03-15125-1229/+3223
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add item frame saving.Howaner2014-03-159-46/+251
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Add health and age load to pickup's.Howaner2014-03-155-22/+43
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Add ExpOrb saving.Howaner2014-03-157-38/+124
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Add fireball interactHowaner2014-03-144-2/+33
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Wrong if in BlockLeavesHowaner2014-03-161-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add new leaves to all classes.Howaner2014-03-169-5/+18
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Added common eMessageType aliases.madmaxoft2014-03-161-10/+16
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Change if-clause in BlockCake.hHowaner2014-03-161-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add cakeHowaner2014-03-164-0/+101
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #800 from mc-server/EntireCommandErrorMattes D2014-03-151-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.madmaxoft2014-03-121-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Added cCuboid:Assign(OtherCuboid) API function.madmaxoft2014-03-152-0/+15
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into noreturnTycho2014-03-143-10/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SetFlags.cmake
| | * | | | | | | | | | Merge pull request #805 from worktycho/undefMattes D2014-03-143-10/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | Fixed a couple of missing defs
| | | * | | | | | | | | Fixed a couple of missing defsTycho2014-03-143-10/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Added Noreturn attribtes to a couple of functions and made a missing noreturn an errorTycho2014-03-143-4/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Added NORETURN macroTycho2014-03-141-0/+4
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'master' into warningsTycho2014-03-142-4/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | cPlugin:BindConsoleCommand can be called statically.madmaxoft2014-03-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been documented before it was written.
| | * | | | | | | | | Fixed a warning.madmaxoft2014-03-141-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Fixed xofts issuesTycho2014-03-1410-23/+24
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into warningsTycho2014-03-142-11/+13
| |\| | | | | | | | |
| | * | | | | | | | | Merge pull request #793 from xdot/masterMattes D2014-03-141-9/+9
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Unified Vector classes
| | | * | | | | | | | | Vector3: More castsandrew2014-03-121-9/+9
| | | | | | | | | | | |
| | * | | | | | | | | | cPluginManager:Bind[Console]Command returns true on success.madmaxoft2014-03-141-2/+4
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #801.
| * | | | | | | | | | Fixed commaTycho2014-03-121-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Added additional macros to support the MSVC size_t format and changed all formats to use the macrosTycho2014-03-1213-29/+33
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'Werror' into warningsTycho2014-03-1243-648/+649
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Globals.h
| | * | | | | | | | | | Fixed printf format compatabiltyTycho2014-03-122-5/+9
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into WerrorTycho2014-03-1243-642/+639
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp
| | | * | | | | | | | | Fixed missing comment terminator.madmaxoft2014-03-121-1/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Merge remote-tracking branch 'xdot/master'madmaxoft2014-03-122-2/+2
| | | |\| | | | | | | |
| | | | * | | | | | | | M_PI MSVC Fixandrew2014-03-122-2/+2
| | | | | | | | | | | |
| | | * | | | | | | | | Merge remote-tracking branch 'xdot/master'madmaxoft2014-03-1235-632/+546
| | | |\| | | | | | | |
| | | | * | | | | | | | Vector3: Length() should always return a floatandrew2014-03-121-9/+9
| | | | | | | | | | | |
| | | | * | | | | | | | Matrix4: Removed enumandrew2014-03-112-22/+24
| | | | | | | | | | | |
| | | | * | | | | | | | Unified Matrix4 codeandrew2014-03-117-233/+230
| | | | | | | | | | | |
| | | | * | | | | | | | LineCoeff Docandrew2014-03-111-4/+20
| | | | | | | | | | | |
| | | | * | | | | | | | Unified Vector classesandrew2014-03-1132-401/+300
| | | | | | | | | | | |
| | | * | | | | | | | | Fixed Lua string return values.madmaxoft2014-03-121-4/+0
| | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #773.
| | | * | | | | | | | Moved Lua API registering into a separate function.madmaxoft2014-03-124-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'madmaxoft2014-03-122-2/+25
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | TakeDamage now has the cThrownSnowballEntity instead of the creator's object.STRWarrior2014-03-111-1/+1
| | | | | | | | | | | |
| | | | * | | | | | | | Snowballs now actualy hurt other entities.STRWarrior2014-03-112-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3 damage for blazes and 1 for the ender dragon. Otherwise 0
| | | * | | | | | | | | Renamed cBlockArea Offset to WEOffset.madmaxoft2014-03-123-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even in getters / setters.
| | | * | | | | | | | | Merge branch 'master' into cBlockArea_Offsetmadmaxoft2014-03-1276-497/+2530
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | * | | | | | | | | Renamed m_Offset to m_WEOffsetSTRWarrior2014-03-113-8/+9
| | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Using ```const Vector3i &```STRWarrior2014-03-112-3/+3
| | | | | | | | | | |
| | | * | | | | | | | This allows a blockarea to have an Offset.STRWarrior2014-03-103-0/+47
| | | | | | | | | | |
| | * | | | | | | | | Fixed comments an assertTycho2014-03-121-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fixed more Format issuesTycho2014-03-116-17/+17
| | | | | | | | | | |
| * | | | | | | | | | Fixed a load of format string errorsTycho2014-03-1113-27/+29
| | | | | | | | | | |
| * | | | | | | | | | Move Format issuesTycho2014-03-113-4/+4
| | | | | | | | | | |
| * | | | | | | | | | Fixed format errors in protocolTycho2014-03-111-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Added macros to follow format string checking through wrappersTycho2014-03-113-4/+8
| |/ / / / / / / / /
| * | | | | | | | | Fixed Chunkdef warningsTycho2014-03-111-2/+2
| | | | | | | | | |
| * | | | | | | | | Fixed Warnings in PieceGeneratorTycho2014-03-112-9/+9
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into WerrorTycho2014-03-1111-36/+1364
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ChunkDef.h
| | * | | | | | | | Merge pull request #791 from mc-server/PieceGeneratorMattes D2014-03-1011-30/+1358
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Piece generator
| | | * | | | | | | | Removed debugging output.madmaxoft2014-03-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kept it commented-out for later revisions, if needed.
| | | * | | | | | | | POCPieces: Added height.madmaxoft2014-03-101-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the pieces connect in different heights, too, creating a true 3D maze.
| | | * | | | | | | | A working POCPiece generator.madmaxoft2014-03-095-6/+359
| | | | | | | | | | |
| | | * | | | | | | | Hardened cCuboid with asserts for its assumptions.madmaxoft2014-03-092-3/+11
| | | | | | | | | | |
| | | * | | | | | | | ChunkDef: Replaced enums with static const ints.madmaxoft2014-03-091-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes them easier to use in std::min et al.
| | | * | | | | | | | Added cCuboid::Engulf().madmaxoft2014-03-092-0/+37
| | | | | | | | | | |
| | | * | | | | | | | cPieceGenerator: New connectors are added to the free pool.madmaxoft2014-03-092-9/+30
| | | | | | | | | | |
| | | * | | | | | | | Merge branch 'master' into PieceGeneratormadmaxoft2014-03-091-0/+21
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' into PieceGeneratormadmaxoft2014-03-091-0/+1
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | PieceGenerator can connect two connectors of the same type.madmaxoft2014-03-092-60/+338
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added extensive debugging output and a test.
| | | * | | | | | | | | | Added BlockFaceToString() translation function.madmaxoft2014-03-091-0/+20
| | | | | | | | | | | | |
| | | * | | | | | | | | | Added Vector3i::Move().madmaxoft2014-03-092-17/+82
| | | | | | | | | | | | |
| | | * | | | | | | | | | Added the first skeleton code for PieceGenerator.madmaxoft2014-03-092-0/+545
| | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a WIP and won't work / isn't used at all.
| * | | | | | | | | | | Merge branch 'master' into WerrorTycho2014-03-101-2/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | Merge pull request #767 from worktycho/envmatrixMattes D2014-03-101-2/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Added support to control build type with env vars
| | | * | | | | | | | | | Move env code part 1worktycho2014-03-071-10/+0
| | | | | | | | | | | | |
| | | * | | | | | | | | | Added support to overide CMake build type with env varsTycho2014-03-071-0/+8
| | | | | | | | | | | | |
| | * | | | | | | | | | | Revert "Fixed some warnings"madmaxoft2014-03-101-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4cb0b82d1df560ad32c92eede91f466c75a87c87.
| * | | | | | | | | | | | Fixed xofts issuesTycho2014-03-104-20/+14
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed test assertsTycho2014-03-104-37/+37
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed assertTycho2014-03-101-14/+17
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into WerrorTycho2014-03-101-7/+19
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #779 from mc-server/tntburnexplodeAlexander Harkness2014-03-101-7/+19
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | TNT explodes when consumed by fire
| | | * | | | | | | | | | Fixed compileTiger Wang2014-03-101-1/+2
| | | | | | | | | | | | |
| | | * | | | | | | | | | Removed uneeded meta obtainTiger Wang2014-03-091-3/+1
| | | | | | | | | | | | |
| | | * | | | | | | | | | TNT explodes when consumed by fireTiger Wang2014-03-091-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed FS#406
| | * | | | | | | | | | | Merge pull request #788 from worktycho/warningsAlexander Harkness2014-03-101-7/+10
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some warnings
| * | | | | | | | | | | | | Fixed Alignment issue in ByteBufferTycho2014-03-103-7/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Removed Some unnessicary macrosTycho2014-03-103-21/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use string.reserve to avoid the need to do inplace byteswapTycho2014-03-101-10/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Removed unused macro from WSSCompactTycho2014-03-101-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed alignment issues in Fireworks SerializerTycho2014-03-101-7/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Removed unused macroTycho2014-03-101-13/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed cast to type with different alignment in BlockingTCPLinkTycho2014-03-101-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed cast between types of different alignment in cSocketTycho2014-03-101-1/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed MTRand warningsTycho2014-03-101-4/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into WerrorTycho2014-03-1027-199/+733
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Fixed MSVC2008 compilation.madmaxoft2014-03-101-4/+4
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-0911-28/+87
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | Add TNT load/save
| | | * | | | | | | | | | | Merge branch 'master' into BlockEntitysHowaner2014-03-0822-65/+633
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Change TNT Fuse to ticksHowaner2014-03-089-21/+20
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Add TNT Save/Load and add Netbeans projects to .gitignoreHowaner2014-03-086-18/+78
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge pull request #731 from mc-server/ballisticmissilesTiger Wang2014-03-0920-171/+646
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | Ballistic firework missiles
| | | * | | | | | | | | | | | != FACE_NONETiger Wang2014-03-091-1/+1
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge branch 'master' into ballisticmissilesTiger Wang2014-03-09121-1342/+3619
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| | | * | | | | | | | | | | | Hexified coloursTiger Wang2014-03-091-16/+16
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Fixed data length issuesTiger Wang2014-03-092-3/+4
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Demonstrated issues with GetDataLength()Tiger Wang2014-03-092-5/+11
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Improved formatting of username tabcompleteTiger Wang2014-03-091-7/+7
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Moved firework handler to separate functionTiger Wang2014-03-092-48/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also simplified and improved readability of code
| | | * | | | | | | | | | | | CheckBlockInteractionsRate() fixed & enabledTiger Wang2014-03-094-65/+23
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Fix Linux compileTiger Wang2014-03-091-2/+3
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Removed unneeded includes in Player.cppTiger Wang2014-02-271-7/+0
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Fixed compileTiger Wang2014-02-272-3/+2
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Fixed sheep ASSERTing sometimesTiger Wang2014-02-271-8/+18
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-2714-84/+591
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added fireworks
| * | | | | | | | | | | | | | Be more parinoid about int sizesTycho2014-03-093-5/+18
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed Mesannine twister to use UInt32Tycho2014-03-094-4/+6
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into WerrorTycho2014-03-0920-184/+300
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Fixed #778 - stack overflow.comTiger Wang2014-03-091-1/+1
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Silenced useless MSVC warnings in cMetaRotater.madmaxoft2014-03-091-0/+21
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Hotfix for MSVC compilation.madmaxoft2014-03-091-0/+1
| | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge pull request #777 from jfhumann/issue317Mattes D2014-03-095-32/+62
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
| | | * | | | | | | | | | Adjusted style of switch/caseJan-Fabian Humann2014-03-093-45/+15
| | | | | | | | | | | | |
| | | * | | | | | | | | | Changed if-else to switch-caseJan-Fabian Humann2014-03-083-39/+33
| | | | | | | | | | | | |
| | | * | | | | | | | | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.Jan-Fabian Humann2014-03-085-32/+98
| | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge pull request #775 from worktycho/warningsMattes D2014-03-0925-75/+120
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | Fixed a few warnings
| | * | | | | | | | | | Slight plugin messaging changesTiger Wang2014-03-091-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/MetaRotateMattes D2014-03-0813-151/+202
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | Alternitive solution to #503
| | | * | | | | | | | | Moved returnsworktycho2014-03-081-3/+3
| | | | | | | | | | | |
| | | * | | | | | | | | ReformattedTycho2014-03-0210-20/+20
| | | | | | | | | | | |
| | | * | | | | | | | | Reformated MetaRotaterTycho2014-03-021-19/+30
| | | | | | | | | | | |
| | | * | | | | | | | | Reverted BlockVineworktycho2014-03-021-3/+27
| | | | | | | | | | | |
| | | * | | | | | | | | Fixed errorsTycho2014-03-012-2/+2
| | | | | | | | | | | |
| | | * | | | | | | | | Revesed typedefTycho2014-03-011-1/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Implemented RotationsTycho2014-03-0111-170/+28
| | | | | | | | | | | |
| | | * | | | | | | | | Merge branch 'master' into MetaRotateTycho2014-03-0125-165/+459
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Final implementation of MetaRotaterTycho2014-03-011-45/+51
| | | | | | | | | | | | |
| | | * | | | | | | | | | Added some Metadate rotaters using templated MixinTycho2014-02-2710-16/+168
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix IsThread destructorTycho2014-03-091-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Globals.h is now warnings free again.Tycho2014-03-092-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also turned off Wpadded as it is indicates potental performance issues rather than potential bugs
| * | | | | | | | | | | | Its a const not a macroTycho2014-03-091-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Take 5Tycho2014-03-091-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Take 4Tycho2014-03-091-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Unsigned types take 3Tycho2014-03-091-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix gcc error attempt 2Tycho2014-03-091-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed gcc errorTycho2014-03-091-1/+1
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fixed some warningsTycho2014-03-091-7/+10
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | FIxed int in testTycho2014-03-091-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Added staticTycho2014-03-081-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Added tons more asserts to bytebufferTycho2014-03-081-7/+17
| | | | | | | | | | |
| * | | | | | | | | | Enabled self test of bytebufferTycho2014-03-081-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fixed issues with int vs size_t and a few other warningsTycho2014-03-0810-28/+26
| | | | | | | | | | |
| * | | | | | | | | | Actually Fixed ByteBufferTycho2014-03-081-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into warningsTycho2014-03-089-24/+107
| |\| | | | | | | | |
| | * | | | | | | | | cBlockInfo-related changes from #723andrew2014-03-083-11/+21
| | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge pull request #764 from xdot/masterMattes D2014-03-073-4/+74
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixed water/lava interaction
| | | * | | | | | | | Added some commentsandrew2014-03-072-1/+6
| | | | | | | | | | |
| | | * | | | | | | | Fixed water/lava interactionandrew2014-03-073-4/+69
| | | | | | | | | | |
| | * | | | | | | | | Fixed cBlockArea schematic string saving signature.madmaxoft2014-03-073-9/+12
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | WarningsTycho2014-03-072-1/+3
| | | | | | | | | |
| * | | | | | | | | WarningsTycho2014-03-0711-29/+42
| | | | | | | | | |
| * | | | | | | | | Fixed warningsTycho2014-03-072-3/+21
| | | | | | | | | |
| * | | | | | | | | Fixed warningsTycho2014-03-073-1/+5
| |/ / / / / / / /
| * | | | | | | | Merge pull request #763 from Howaner/BlockEntitysMattes D2014-03-0720-101/+419
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | Add Flower Pots
| | * | | | | | | Add Lua Bindings for FlowerPotEntity.h and add documentation.Howaner2014-03-0710-14/+18
| | | | | | | | |
| | * | | | | | | Add Flower PotsHowaner2014-03-0717-87/+401
| | | | | | | | |
| * | | | | | | | Fixed a typo.madmaxoft2014-03-071-4/+4
| | | | | | | | |
| * | | | | | | | Merge pull request #760 from Howaner/GlobalFixesMattes D2014-03-0713-6/+116
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | Add data backsending, when the Client interacts a Block and the Interact...
| | * | | | | | | Fix commentHowaner2014-03-061-1/+1
| | | | | | | | |
| | * | | | | | | Broadcast the Equipped Item, if the Slot is changed.Howaner2014-03-061-0/+6
| | | | | | | | |
| | * | | | | | | Add SendBlockTo to cWorldInterfaceHowaner2014-03-059-10/+18
| | | | | | | | |
| | * | | | | | | Set tnt step sound to step.grassHowaner2014-03-051-1/+1
| | | | | | | | |
| | * | | | | | | Add data backsending, when the Client interacts a Block and the Interact is cancelled.Howaner2014-03-0510-6/+102
| | |/ / / / / /
| * | | | | | | Added cBlockArea serialization to string.madmaxoft2014-03-073-38/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #665.
| * | | | | | | Merge remote-tracking branch 'xdot/master'madmaxoft2014-03-066-17/+238
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Implemented vanilla-like fluid simulatorandrew2014-03-056-17/+238
| | | | | | | |
| * | | | | | | Fixed some gcc warnings in Defines.h.madmaxoft2014-03-041-3/+3
| | | | | | | |
| * | | | | | | Manually exported cCompositeChat modifiers.madmaxoft2014-03-042-7/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds chaining support to them. Fixes #755.
| * | | | | | | cLuaState: Made public the GetStackValue() functions.madmaxoft2014-03-042-54/+61
| | | | | | | |
| * | | | | | | Fixed an assert in map-loading.madmaxoft2014-03-041-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The maps were loaded too soon, the world wasn't initialized yet.
| * | | | | | | Fixed previous weather changes.madmaxoft2014-03-032-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cWorld::GetDefaultWeatherInterval() returns -1 for unknown weather.
| * | | | | | | Merge pull request #746 from Howaner/SlabsMattes D2014-03-034-19/+96
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone Bugs
| | * | | | | Add cancelling to WeatherChanging event.Howaner2014-03-022-13/+43
| | | | | | |
| | * | | | | More documentation (thanks to madmaxoft) and use GetBlockTypeMetaHowaner2014-03-022-6/+10
| | | | | | |
| | * | | | | Add Trapdoor Functions to cWorld and fix Trapdoor Redstone BugsHowaner2014-03-024-6/+49
| | | | | | |
| * | | | | | Removed if conditionandrew2014-03-021-4/+1
| | | | | | |
| * | | | | | cBlockInfo now manages the respective cBlockHandlerandrew2014-03-0211-73/+70
| | |_|_|_|/ | |/| | | |
| * | | | | Fixed MSVC warnings in DeprecatedBindings.madmaxoft2014-03-021-8/+76
| | | | | |
| * | | | | Added blockface mirroring and rotating.madmaxoft2014-03-021-0/+50
| | | | | |
| * | | | | Merge pull request #738 from xdot/masterMattes D2014-03-0240-503/+1013
| |\ \ \ \ \ | | | | | | | | | | | | | | Refactored global block property arrays
| | * | | | | GetById => Getandrew2014-03-023-22/+22
| | | | | | |
| | * | | | | Removed g_BlockXXX arraysandrew2014-03-024-440/+4
| | | | | | |
| | * | | | | Manually exported g_Block tablesandrew2014-03-024-0/+445
| | | | | | |
| | * | | | | Exported cBlockInfoandrew2014-03-022-3/+9
| | | | | | |
| | * | | | | g_BlockXXX => cBlockInfo::XXXandrew2014-03-0133-73/+91
| | | | | | |
| | * | | | | Refactored global block property arraysandrew2014-03-012-0/+477
| | | |_|/ / | | |/| | |
| * | | | | Creeper fixestonibm192014-03-022-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/SlabsMattes D2014-03-023-13/+35
| |\ \ \ \ \ | | | |/ / / | | |/| | | Fix Double Slabs, fix Slab Meta and add more things to burnable
| | * | | | Use switch in GetStepSoundHowaner2014-02-282-8/+6
| | | | | |
| | * | | | Merge branch 'master' into SlabsHowaner2014-02-2812-41/+137
| | |\ \ \ \
| | * | | | | Fix Double Slabs, fix Slab Meta and add more things to burnableHowaner2014-02-283-13/+37
| | | |_|/ / | | |/| | |
| * | | | | Added more documentation for FastNBT parser.madmaxoft2014-03-021-3/+45
| | | | | |
| * | | | | ChunkDesc warns about StructureGen's deprecation.madmaxoft2014-03-011-0/+2
| | | | | |
| * | | | | Unified StructureGens and FinisherGens.madmaxoft2014-03-0110-163/+128
| | |_|/ / | |/| | | | | | | | | | | | | Now they are all Finishers. Fixes #398.
| * | | | Exported cScoreboard::ForEachTeamandrew2014-03-013-1/+34
| | | | |
| * | | | Shortened enumsandrew2014-03-014-58/+58
| | | | |
| * | | | Exported cScoreboard::ForEachObjectiveandrew2014-03-013-4/+43
| | | | |
| * | | | Exported and documented cScoreboardandrew2014-03-014-49/+70
| | | | |
| * | | | Forgotten changes to cChunkInterface.madmaxoft2014-03-011-2/+2
| | | | |
| * | | | Removed cBlockHandler forward declaration from cChunkInterface.madmaxoft2014-03-011-9/+22
| | | | | | | | | | | | | | | | | | | | Wasn't needed. Also reformatted the code.
| * | | | Improved comments in float size check.madmaxoft2014-03-011-2/+2
| | | | |
| * | | | Fixed multiple gcc warnings about unused params.madmaxoft2014-02-287-5/+78
| | | | |
| * | | | Documented the changes in cJukeboxEntity.madmaxoft2014-02-281-2/+3
| | | | |
| * | | | Moved common cGroupManager code to a separate function.madmaxoft2014-02-283-12/+30
| | |/ / | |/| | | | | | | | | | This fixes my concerns in PR #709.
| * | | Merge pull request #709 from Howaner/GlobalFixesMattes D2014-02-288-24/+112
| |\ \ \ | | | | | | | | | | Add 'Group not found', when the Server load the users.ini and add auto g...
| | * | | Better Jukebox APIHowaner2014-02-213-16/+52
| | | | |
| | * | | Remove users.ini generation in Player.cpp and use the CheckUsers() FunctionHowaner2014-02-211-6/+1
| | | | |
| | * | | Remove old Output FinishHowaner2014-02-211-2/+0
| | | | |
| | * | | Unicode :-(Howaner2014-02-211-1/+1
| | | | |
| | * | | Add 'Group not found', when the Server load the users.ini and add auto generate from users.iniHowaner2014-02-215-2/+61
| | | | |
| * | | | Better fix for the 32-bit float reading.madmaxoft2014-02-281-4/+5
| | | | |
| * | | | Merge pull request #730 from tonibm19/masterAlexander Harkness2014-02-271-0/+2
| |\ \ \ \ | | | | | | | | | | | | added mooshroom to cow conversion
| | * | | | added mooshroom to cow conversiontonibm192014-02-271-0/+2
| | | | | |
| * | | | | Added a "nooutbuf" cmdline param.madmaxoft2014-02-272-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.madmaxoft2014-02-272-3/+5
| | |_|/ | |/| | | | | | | | | | Fixes #728.
| * | | Fixed a gcc warning in FastNBT.h.madmaxoft2014-02-261-2/+11
| | | |
| * | | Attempted fix for several GCC warnings.madmaxoft2014-02-263-3/+15
| |/ /
| * | Added more utility functions to cCuboid.madmaxoft2014-02-262-4/+105
| | | | | | | | | | | | GetVolume(), Expand(), ClampX(), ClampY(), ClampZ()
| * | Added useful parameter overloads to cBlockArea Lua API.madmaxoft2014-02-242-0/+133
| | |
| * | Fixed tolua export for Byte.madmaxoft2014-02-241-0/+7
| | | | | | | | | | | | No longer treated as an unknown class.
| * | Fixed compilation in MSVC (forward class definitions).madmaxoft2014-02-242-0/+2
| | |
| * | BlockEntities is warnings freeTycho2014-02-246-3/+11
| | |
| * | Merge pull request #710 from TheJumper/masterMattes D2014-02-2428-39/+517
| |\ \ | | | | | | | | Fixed Mob Drops, Add Rare, Uncommon and Gear Drops, Looting inflicts Drops
| | * | Fixed Formatting, added compiler warning suppressing methods, fixed commentsTheJumper2014-02-245-3/+6
| | | |
| | * | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to MonstersTheJumper2014-02-2329-40/+515
| | | |
| | * | BlockBed.cpp: Fixed Multiple people in one bed.TheJumper2014-02-231-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().madmaxoft2014-02-232-29/+110
| | | | | | | | | | | | | | | | They no longer require the ghost output params.
| | * | Rename SkullEntity to MobHeadEntityHowaner2014-02-2323-256/+254
| | | |
| | * | Add break to Protocol17x.cpp and use new comment delimiterHowaner2014-02-232-7/+8
| | | |
| | * | Add Heads completelyHowaner2014-02-2314-7/+154
| | | |
| | * | Add Skulls/HeadsHowaner2014-02-2313-5/+354
| | | |
| * | | Fixed MCServer not compiling with C++03 compilersSTRWarrior2014-02-243-12/+12
| | | |
| * | | Small improvements to boats.STRWarrior2014-02-241-3/+7
| | | |
| * | | Merge pull request #669 from xdot/masterTiger Wang2014-02-2428-10/+1871
| |\ \ \ | | | | | | | | | | Implementation of in-game maps :D
| | * | | Maps: Improvementsandrew2014-02-237-13/+26
| | | | |
| | * | | Manually exported DoWithMapandrew2014-02-234-2/+11
| | | | |
| | * | | Documented and exported cMapManagerandrew2014-02-232-3/+6
| | | | |
| | * | | Documented and exported cMapandrew2014-02-223-9/+53
| | | | |
| | * | | Semi-working implementation of cMap::UpdatePixelandrew2014-02-222-11/+95
| | | | |
| | * | | Split cMap::UpdateClientandrew2014-02-212-73/+114
| | | | |
| | * | | Thread safe cMap managerandrew2014-02-207-17/+275
| | | | |
| | * | | Manual merge (Fixed conflicts)andrew2014-02-2079-389/+2685
| | |\ \ \
| | * | | | cMapDecorator: Implemented random rotationsandrew2014-02-192-13/+18
| | | | | |
| | * | | | Documented cMapandrew2014-02-193-7/+31
| | | | | |
| | * | | | Map decorators; Map clientsandrew2014-02-1812-45/+351
| | | | | |
| | * | | | Map item handler; Fixed several bugsandrew2014-02-1713-29/+195
| | | | | |
| | * | | | cMap::UpdateRadiusandrew2014-02-154-16/+121
| | | | | |
| | * | | | EmptyMap item handlerandrew2014-02-143-4/+52
| | | | | |
| | * | | | Send map when selectedandrew2014-02-147-27/+114
| | | | | |
| | * | | | IDCount Serializationandrew2014-02-137-3/+191
| | | | | |
| | * | | | Implementation of in-game mapsandrew2014-02-1313-0/+596
| | | | | |
| * | | | | Removed an unused member variable from cChunk.madmaxoft2014-02-242-8/+0
| | | | | |
| * | | | | Fixed crash in cBlockArea rotation.madmaxoft2014-02-241-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #720.
| * | | | | Fixed a possible crash in cWorld::WakeUpSimulatorsInArea().madmaxoft2014-02-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | The Y coords weren't checked.
| * | | | | Merge pull request #716 from Howaner/BreakFixMattes D2014-02-231-0/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | No Sword Block Destroying in Creative Mode
| | * | | | | Use the ItemCategorie::IsSword() Method.Howaner2014-02-232-20/+1
| | | | | | |
| | * | | | | No Sword Block Destroying in Creative ModeHowaner2014-02-232-0/+29
| | | | | | |
| * | | | | | fixed globals.h warningsTycho2014-02-233-2/+11
| |/ / / / /
| * | | | | Added cBlockArea::GetVolume, exported to Lua API.madmaxoft2014-02-231-27/+30
| | | | | |
| * | | | | Added cBlockArea:GetSize() and :GetOrigin() to Lua API.madmaxoft2014-02-231-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | These don't have a direct C++ equivalent, but are rather useful for the plugins.
| * | | | | cClientHandle manages the client-registered plugin channels.madmaxoft2014-02-202-36/+123
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #706.
| * | | | | Removed problematic utf8.madmaxoft2014-02-201-2/+2
| | | | | |
| * | | | | Merge pull request #704 from Howaner/GlobalFixesMattes D2014-02-206-29/+81
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | Global fixes
| | * | | | Bad UTF-8 o.OHowaner2014-02-201-2/+2
| | | | | |
| | * | | | Remove typeinfo import in IncrementalRedstoneSimulatorHowaner2014-02-201-2/+0
| | | | | |
| | * | | | Fix CauldronHowaner2014-02-201-8/+11
| | | | | |
| | * | | | Add Wolf Heal with FoodHowaner2014-02-201-10/+34
| | | | | |
| | * | | | Add Pressure Plate SoundHowaner2014-02-201-0/+9
| | | | | |
| | * | | | Add Light weighted pressure platesHowaner2014-02-203-10/+24
| | | | | |
| | * | | | Add Hay Bale to BurnableHowaner2014-02-201-0/+1
| | | | | |
| | * | | | Add 'Meta < 3' to CauldronHowaner2014-02-201-5/+8
| | | | | |
| * | | | | Merge pull request #702 from TheJumper/masterMattes D2014-02-201-7/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | BlockBed.cpp: Fixed Multiple people in one bed.
| | * | | | | BlockBed.cpp: Fixed space at if statementTheJumper2014-02-201-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.TheJumper2014-02-201-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.madmaxoft2014-02-202-2/+6
| | |/ / / | |/| | |
| * | | | Merge pull request #700 from Howaner/GlobalFixesMattes D2014-02-207-8/+84
| |\ \ \ \ | | |/ / / | |/| | | Add new Trees (without Generator)
| | * | | Add BlockNewLeaves.h and rename Darkoac to DarkoakHowaner2014-02-195-15/+57
| | | | |
| | * | | Add new Trees (without Generator)Howaner2014-02-196-0/+34
| | | |/ | | |/|
| * | | Fixed bindings for cBlockArea:Get(Rel)BlockTypeMeta().madmaxoft2014-02-202-29/+110
| | | | | | | | | | | | | | | | They no longer require the ghost output params.
| * | | Merge pull request #697 from Howaner/SkullMattes D2014-02-1921-6/+501
| |\ \ \ | | |/ / | |/| | Add Skulls/Heads to MCServer
| | * | Rename SkullEntity to MobHeadEntityHowaner2014-02-1923-256/+254
| | | |
| | * | Add break to Protocol17x.cpp and use new comment delimiterHowaner2014-02-192-7/+8
| | | |
| | * | Add Heads completelyHowaner2014-02-1814-7/+154
| | | |
| | * | Add Skulls/HeadsHowaner2014-02-1713-5/+354
| | | |
| * | | Merge branch 'master' into itemframesTiger Wang2014-02-1824-11/+433
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp
| | * \ \ Merge pull request #696 from mc-server/paintingsMattes D2014-02-1817-3/+231
| | |\ \ \ | | | | | | | | | | | | Implemented paintings, fixes #689
| | | * | | Properly exported and documented paintingsTiger Wang2014-02-183-2/+4
| | | | | |
| | | * | | Comments & new BLOCK_FACE constantsTiger Wang2014-02-181-7/+10
| | | | | |
| | | * | | Implemented paintings, fixes #689Tiger Wang2014-02-1815-3/+226
| | | | | | | | | | | | | | | | | | | | | | | | + Implemented paintings
| | * | | | The cuboid for cWorld::SetAreaBiome() doesn't need sorting.madmaxoft2014-02-182-2/+7
| | | | | |
| | * | | | Added cWorld:SetAreaBiome() API function.madmaxoft2014-02-186-3/+164
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #675.
| | * | | | Added a bit more documentation to cForEachChunkProvider.madmaxoft2014-02-182-5/+33
| | |/ / /
| * | | | Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframesTiger Wang2014-02-181-1/+1
| |\ \ \ \
| | * | | | Fixed possible ASSERT failureTiger Wang2014-02-181-1/+1
| | | | | |
| * | | | | De-breaked stuffTiger Wang2014-02-181-2/+0
| |/ / / /
| * | | | Changed BlockFace type to eBlockFaceTiger Wang2014-02-183-26/+27
| | | | |
| * | | | Merge branch 'itemframes' of https://github.com/mc-server/MCServer into itemframesTiger Wang2014-02-181-7/+10
| |\ \ \ \
| | * | | | Added an explanatory commentTiger Wang2014-02-181-0/+2
| | | | | |
| | * | | | Used new BLOCK_FACE constantsTiger Wang2014-02-181-7/+8
| | | | | | | | | | | | | | | | | | Also added more comments
| * | | | | Added a braceTiger Wang2014-02-181-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ==== { } { __ } { | | } ==== REMOVE ALL THE BRACES!!
| * / / / Implemented item frames, a part of #689Tiger Wang2014-02-187-2/+233
| |/ / / | | | | | | | | | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
| * | | Added cPluginManager:GetPluginsPath() to the Lua API.madmaxoft2014-02-172-1/+5
| | | |
| * | | Add Lua plugin path to package.path and .cpath.madmaxoft2014-02-173-0/+37
| | | | | | | | | | | | | | | | Fixes #693.
| * | | Merge pull request #690 from tonibm19/masterAlexander Harkness2014-02-171-2/+2
| |\ \ \ | | |/ / | |/| | Now mobs can't escape from fences.
| | * | Improved formattingtonibm192014-02-171-2/+2
| | | |
| | * | Now mobs can't escape from fences.tonibm192014-02-161-2/+2
| | | |
| * | | Merge pull request #692 from mc-server/wolfcleanupAlexander Harkness2014-02-171-30/+15
| |\ \ \ | | | | | | | | | | Wolf cleanup
| | * | | Fixes to previous commitTiger Wang2014-02-161-9/+10
| | | | |
| | * | | Slight cleanup of wolf codeTiger Wang2014-02-161-23/+7
| | | | |
| * | | | Fixed a memory leak in CompositeChat.madmaxoft2014-02-171-0/+3
| | | | |
| * | | | Links sent via chat messages are clickable.madmaxoft2014-02-164-9/+34
| | | | | | | | | | | | | | | | | | | | Fixes #658.
| * | | | Implemented cCompositeChat::ParseText(), incl. self-test.madmaxoft2014-02-162-1/+211
| | | | |
| * | | | Fixed cBoundingBox self-test code-style.madmaxoft2014-02-161-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/redstoneimprovementsMattes D2014-02-165-94/+167
| |\ \ \ \ | | |_|/ / | |/| | | Redstone speed improvements
| | * | | Fixed a glaring bug with chunk cross-simulatingTiger Wang2014-02-161-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 switchTiger Wang2014-02-151-0/+1
| | | | |
| | * | | A fix and an improvementTiger Wang2014-02-152-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 everywhereTiger Wang2014-02-152-2/+2
| | | | |
| | * | | Sizeable speed improvements to redstoneTiger Wang2014-02-153-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/GlobalFixesMattes D2014-02-165-3/+11
| |\ \ \ \ | | |_|/ / | |/| | | Add Locale to ClientHandle
| | * | | Add Locale to ClientHandleHowaner2014-02-165-3/+11
| | | | |
| * | | | Fixed minor formatting issues from #682Tiger Wang2014-02-163-16/+3
| |/ / / | | | | | | | | | | | | | | | | - Removed unused PlaySoundEffect * Simplified and parenthesised code
| * | | Replace random Float Generation and broadcast the Exp Pickup SoundHowaner2014-02-162-9/+4
| | | |
| * | | Add Exp Bottle EffectsHowaner2014-02-164-1/+23
| | | |
| * | | Set max. Players in the Tablist to 60Howaner2014-02-161-1/+1
| | | |
| * | | Disable Hunger DeathHowaner2014-02-161-1/+7
| | | |
| * | | Removed the unnecessary LoopPlayersAndBroadcastChat() functions.madmaxoft2014-02-154-23/+19
| | | |
| * | | Implemented cCompositeChat.madmaxoft2014-02-1518-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/NotchDeathAlexander Harkness2014-02-151-0/+6
| |\ \ \ | | |/ / | |/| | NotchApple
| | * | If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/NotchSTRWarrior2014-02-151-0/+6
| | | |
| * | | Add more Sounds to Redstone SimulatorHowaner2014-02-151-1/+23
| | | |
| * | | Add Fence Gate to Redstone SimulatorHowaner2014-02-152-0/+31
| | | |
| * | | Merge pull request #664 from mc-server/generalfixesMattes D2014-02-1519-46/+130
| |\ \ \ | | | | | | | | | | General fixes
| | * | | Fixed typographical errorTiger Wang2014-02-151-2/+1
| | | | |
| | * | | Removed debug messages againTiger Wang2014-02-151-6/+0
| | | | |
| | * | | Added proper debug messagesTiger Wang2014-02-131-3/+8
| | | | |
| | * | | Fancy stuff with constant referencesTiger Wang2014-02-131-2/+2
| | | | |
| | * | | Added more missing GetClassStatic()sTiger Wang2014-02-122-0/+4
| | | | |
| | * | | Removed some unneeded BroadcastWholeWindow()sTiger Wang2014-02-124-23/+2
| | | | |
| | * | | Changed inheritance a bitTiger Wang2014-02-128-33/+54
| | | | | | | | | | | | | | | | | | | | * cBlockEntityWithItems now inherits from cBlockEntityWindowOwner
| | * | | Made player jump reset less ambiguousTiger Wang2014-02-121-1/+2
| | | | |
| | * | | Simplified Attack() tracingTiger Wang2014-02-121-1/+6
| | | | |
| | * | | Improved pressure platesTiger Wang2014-02-122-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 #190Tiger Wang2014-02-111-2/+67
| | | | | | | | | | | | | | | | | | | | + Hoppers now collect pickups above them
| | * | | Fixed #627Tiger Wang2014-02-115-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 #612Tiger Wang2014-02-112-0/+16
| | | | | | | | | | | | | | | | | | | | * Chests send contents updates to client
| * | | | Merge pull request #677 from mc-server/BroadcastParticleEffectAlexander Harkness2014-02-151-1/+1
| |\ \ \ \ | | | |/ / | | |/| | Broadcast particle effect
| | * | | Exported cWorld::BroadcastParticleEffect.STRWarrior2014-02-151-1/+1
| | | |/ | | |/|
| * | | Merged branch 'narroo/master'.madmaxoft2014-02-132-1/+36
| |\ \ \ | | |/ / | |/| | | | | | This merges pull request #661.
| | * | Fixed formatting. Moved UnloadUnusedChunks from public to private.narroo2014-02-112-4/+10
| | | |
| | * | Fixed formatting of previous commit.narroo2014-02-112-2/+7
| | | |
| | * | Fixed bug #385. UnloadUnusedChunks now has the same interface asnarroo2014-02-112-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | SaveAllChunks. Meaning, QueueUnloadUnusedChunks and the supporting cTaskUnloadUnusedChunks has been added. Use QueueUnloadUnusedChunks from now on to prevent deadlocking.
| * | | Fixed #573STRWarrior2014-02-121-4/+4
| | | |
| * | | cWorld:ChunkStay() accepts nils as callbacks.madmaxoft2014-02-111-5/+3
| | | | | | | | | | | | | | | | Also removed leftover debug logging.
| * | | Added cLuaState::CheckParamFunctionOrNil().madmaxoft2014-02-112-2/+37
| | |/ | |/| | | | | | | Also fixed error reporting for the two function-checking functions.
| * | More gcc warnings fixed.madmaxoft2014-02-112-4/+5
| | |
| * | Made cChunkStay's destructor virtual.madmaxoft2014-02-111-1/+1
| | |
| * | Fixed gcc warnings in Item.h.madmaxoft2014-02-111-21/+21
| | |
| * | Fixed nested plugin function calls.madmaxoft2014-02-111-6/+9
| | |
| * | Merge branch 'master' into ChunkStaymadmaxoft2014-02-111-2/+1
| |\ \
| | * | Added additional parenthasiesworktycho2014-02-101-2/+1
| | | |
| | * | Merge branch 'master' into boatsFixTycho2014-02-101-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/Items/ItemBoat.h
| | | * | Maybe fixed boat placingtonibm192014-02-101-1/+1
| | | |/
| | * / Fixed stupid mistax in conditionalworktycho2014-02-101-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.madmaxoft2014-02-101-36/+47
| | | | | | | | | | | | This should fix *nix compilation. Also alpha-sorted the lists.
| * | Rewritten Lua ChunkStay API into a single function, cWorld:ChunkStay().madmaxoft2014-02-109-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.madmaxoft2014-02-101-1/+1
| | |
| * | Added cPluginLua::cOperation.madmaxoft2014-02-101-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.madmaxoft2014-02-094-17/+92
| | | | | | | | | | | | It works, but has random failures, probably due to threading issues.
| * | Initial Lua cChunkStay export.madmaxoft2014-02-094-1/+123
| | |
| * | cLuaState::cRef can be unbound and re-bound.madmaxoft2014-02-092-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.madmaxoft2014-02-091-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 ChunkStaymadmaxoft2014-02-0930-127/+328
| |\|
| | * Fixed compile and some warnings in MSVSTiger Wang2014-02-097-17/+6
| | |
| | * Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-0933-1897/+2087
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| | | * Merge pull request #656 from mc-server/ReloadGroupsMattes D2014-02-091-0/+11
| | | |\ | | | | | | | | | | The console reload command also reloads the groups.
| | | | * "reload" is back.STRWarrior2014-02-091-0/+7
| | | | |
| | | | * Split "reload" in "reloadplugins" and "reloadgroups".STRWarrior2014-02-091-2/+5
| | | | |
| | | | * The console reload command also reloads the groups.STRWarrior2014-02-091-0/+1
| | | | |
| | * | | Merge branch 'master' into playerimprovementsTiger Wang2014-02-0992-214/+347
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| | * | | | Fixed a boat ASSERTTiger Wang2014-02-091-2/+8
| | | | | |
| | * | | | Moved Gamemode setting into General root tagTiger Wang2014-02-071-1/+1
| | | | | |
| | * | | | Added sender name to PM if prefixes disabledTiger Wang2014-02-072-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | * Also moved the PVP setting into Mechanics
| | * | | | Improved chat messaging functionsTiger Wang2014-02-079-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 functionsTiger Wang2014-02-064-17/+13
| | | | | |
| | * | | | Added more chat functionsTiger Wang2014-02-064-27/+46
| | | | | |
| | * | | | Reduced max explosions per tickTiger Wang2014-02-051-1/+1
| | | | | |
| | * | | | Fixed explosions bugTiger Wang2014-02-053-32/+13
| | | | | | | | | | | | | | | | | | | | | | | | * Fixed bug where explosions would sometimes never be sent
| | * | | | Fixed annoying creative on fire bugTiger Wang2014-02-052-0/+20
| | | | | |
| | * | | | Fixed a bunch of MSVS warningsTiger Wang2014-02-056-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely
| | * | | | Added more SendMessageXXX() functionsTiger Wang2014-02-043-47/+62
| | | | | |
| | * | | | Pickup constructor no longer exportedTiger Wang2014-02-033-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It didn't do anything without Initialize() exported, anyway, pickups are spawned with cWorld.
| | * | | | Added SendMessageXXX() to cPlayerTiger Wang2014-02-032-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 #130Tiger Wang2014-02-031-0/+1
| | | | | |
| | * | | | Fixed #491Tiger Wang2014-02-031-2/+14
| | | | | |
| | * | | | Fixed a crash bugTiger Wang2014-02-032-11/+5
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-0311-80/+219
| | |\ \ \ \
| | * | | | | Fixed #626Tiger Wang2014-02-033-13/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed consumption of carrots and potatoes
| | * | | | | Fixed issues with farmlandTiger Wang2014-02-032-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed farmland reversion checks not taking into account carrots and potatoes * Fixed #623
| | * | | | | Server now handles join messages alsoTiger Wang2014-02-032-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revised as well hook documentation
| * | | | | | Moved a forgotten comment back to its place.madmaxoft2014-02-081-2/+2
| | | | | | |
| * | | | | | Fixed lighting thread queueing.madmaxoft2014-02-081-2/+4
| | | | | | |
| * | | | | | Fixed ChunkStay initialization.madmaxoft2014-02-081-1/+1
| | | | | | |
| * | | | | | Fixed gcc compilation.madmaxoft2014-02-081-1/+1
| | | | | | |
| * | | | | | Initial ChunkStay code.madmaxoft2014-02-0811-406/+560
| | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #653 from mc-server/RedstoneSimulatorMattes D2014-02-088-1772/+1881
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | Improvements for the redstone simulator.
| | * | | | Fixed comment.STRWarrior2014-02-081-1/+1
| | | | | |
| | * | | | Renamed cRedstoneManager to cRedstoneSimulator and renamed cRedstoneSimulator to cIncrementalRedstoneSimulator (Might change later).STRWarrior2014-02-0710-1826/+1822
| | | | | |
| | * | | | Fixed some end of linesSTRWarrior2014-02-072-2/+2
| | | | | |
| | * | | | Implemented an easy way of adding new redstone simulators.STRWarrior2014-02-076-9/+122
| | | | | | | | | | | | | | | | | | | | | | | | Also added a "noop" redstone simulator that does the same as the fluid version.
| * | | | | Fixed cWorld:TryGetHeight() API.madmaxoft2014-02-081-1/+5
| |/ / / /
| * | | | WebAdmin is stopped properly on server shutdown / restart.madmaxoft2014-02-073-36/+55
| | | | | | | | | | | | | | | | | | | | Fixes #272.
| * | | | Fixed wiki link in auto-generated settings.ini.madmaxoft2014-02-071-1/+2
| | | | |
| * | | | Merge pull request #648 from worktycho/runMCServerMattes D2014-02-051-9/+27
| |\ \ \ \ | | | | | | | | | | | | Added BoundingBox Test
| | * | | | Change Output to stderrworktycho2014-02-051-4/+3
| | | | | |
| | * | | | Merge branch 'master' into runMCServerTycho2014-02-0516-45/+96
| | |\ \ \ \
| | * | | | | Modified automatic test for boundingBoxTycho2014-02-051-7/+26
| | | | | | |
| | * | | | | Simplified shutdownTycho2014-02-051-4/+0
| | | | | | |
| | * | | | | Added support to start up MCServer and then immediatly sut it down in travisTycho2014-02-051-0/+4
| | | | | | |
| * | | | | | Merge pull request #649 from mc-server/GroupsPermissionsMattes D2014-02-054-36/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Removed deprecated HasCommand function
| | * | | | | Removed deprecated HasCommand functionSTRWarrior2014-02-054-36/+1
| | | | | | |
| * | | | | | Merge pull request #645 from mc-server/GroupsPermissionsMattes D2014-02-056-18/+69
| |\| | | | | | | | | | | | | | | | | | | Improvements to the GroupManager
| | * | | | | Forgot extra lines.STRWarrior2014-02-051-0/+4
| | | | | | |
| | * | | | | Improvements:STRWarrior2014-02-056-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/warningfixesAlexander Harkness2014-02-0510-27/+27
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Fixed most of the reordering warnings
| | * | | | | Fixed most of the reordering warningsTycho2014-02-0512-33/+33
| | | | | | |
| * | | | | | Improved the signedness conversion.madmaxoft2014-02-051-2/+2
| | | | | | |
| * | | | | | Added cPluginManager:LogStackTrace() to the Lua API.madmaxoft2014-02-051-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #637.
| * | | | | | Crypto: Removed unused member, fixed gcc warning.madmaxoft2014-02-042-6/+4
| | | | | | |
| * | | | | | Added dtExplosion to damage<->string functions.madmaxoft2014-02-041-1/+2
| | | | | | |
| * | | | | | Protocol 1.7: Fixed a signed / unsigned comparison warning.madmaxoft2014-02-041-2/+2
| | |_|_|_|/ | |/| | | |
| * | | | | Fixed a gcc warning in ManualBindings.madmaxoft2014-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Constructor member order...
| * | | | | Removed a useless check in cLuaState.madmaxoft2014-02-041-3/+1
| | | | | |
| * | | | | Fixed a warning in cItem in gcc.madmaxoft2014-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Constructor member order...
| * | | | | Protocol 1.7 uses char for blockface.madmaxoft2014-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | That should fix #644 on RasPi.
| * | | | | Merge pull request #644 from worktycho/warningfixesMattes D2014-02-0476-178/+199
| |\| | | | | | | | | | | | | | | | Improved Type safety of eBlockFace
| | * | | | Fix gcc not having operator ++ on enumsTycho2014-02-041-6/+7
| | | | | |
| | * | | | Improved Type safety of eBlockFaceTycho2014-02-0476-174/+194
| | | | | | | | | | | | | | | | | | | | | | | | May Fix #640
| * | | | | Fixed chest placement.madmaxoft2014-02-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #624.
| * | | | | Merge pull request #635 from tonibm19/masterMattes D2014-02-045-3/+16
| |\ \ \ \ \ | | |/ / / / | |/| | | | Exported Item:IsEnchantable and Monster:MoveToPosition to Lua API
| | * | | | Blank lines and indentation.tonibm192014-02-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Also removed GetClosestPlayer documentation
| | * | | | Not exporting FindClosestPlayertonibm192014-02-031-1/+1
| | | | | |
| | * | | | Fixed compilationtonibm192014-02-031-1/+0
| | | | | |
| | * | | | Exporded World:FindClosestPlayer, Item:IsEnchantable and Monster:MoveToPosition to Lua APItonibm192014-02-036-3/+13
| | | |_|/ | | |/| |
| * | | | Fixed calling plugins with userdata params.madmaxoft2014-02-041-0/+1
| | | | |
| * | | | Removed a leftover debug message.madmaxoft2014-02-041-1/+0
| | | | |
| * | | | Fixed error handling in cPluginManager:CallPlugin() API.madmaxoft2014-02-041-2/+5
| | | | | | | | | | | | | | | | | | | | Fixed: When the called function malfunctioned, the entire plugin's call was aborted.
| * | | | Improved error resistance in cPluginManager:CallPlugin().madmaxoft2014-02-041-0/+8
| | | | | | | | | | | | | | | | | | | | Fixed: If the call failed, all the next plugin calls would fail as well.
| * | | | Greatly improved TNT propulsion chancesTiger Wang2014-02-031-1/+1
| | | | |
| * | | | Merge pull request #636 from worktycho/warningfixesMattes D2014-02-039-18/+31
| |\ \ \ \ | | | | | | | | | | | | Increased Type safety of Biomes
| | * | | | Fogot to save BiogenTycho2014-02-031-4/+4
| | | | | |
| | * | | | Fixed Compile errorsTycho2014-02-033-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | c++11 introduces scoped enums, so the code didn't fail in clang
| | * | | | Removed unused lookupsTycho2014-02-031-2/+0
| | | | | |
| | * | | | Increased Type safety of BiomesTycho2014-02-038-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_BlocksMattes D2014-02-034-5/+80
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / More sideways blocks.
| | * | Named the different quartz block.STRWarrior2014-02-032-1/+6
| | | |
| | * | Fixed some issues.STRWarrior2014-02-031-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.STRWarrior2014-02-032-4/+4
| | | |
| | * | This renames the cBlockWoodHandler to cBlockSidewaysHandler, and implements a new cBlockQuartzHandler to handle the quartz pillars.STRWarrior2014-02-033-5/+74
| | | |
| * | | Merge pull request #623 from mc-server/tntMattes D2014-02-032-36/+122
| |\ \ \ | | |/ / | |/| | TNT improvements
| | * | Inversed conditionTiger Wang2014-02-031-25/+28
| | | |
| | * | Uncommented pickup spawner codeTiger Wang2014-02-021-3/+7
| | | |
| | * | TNT improvementsTiger Wang2014-02-022-37/+116
| | | | | | | | | | | | | | | | | | | | | | | | + Added entity damage + Added entity propulsion * Fixed #67 and fixed #230
| * | | Fixed socket leaking.madmaxoft2014-02-031-0/+5
| | | |
| * | | SocketThreads: Fixed sending to closed socket.madmaxoft2014-02-031-1/+6
| | | |
| * | | Groups.ini can contain spaces around commas in values.madmaxoft2014-02-031-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/improvementsandfixesMattes D2014-02-037-22/+61
| |\ \ \ | | |_|/ | |/| | Redstone crash fix and current console line replace function
| | * | Added IsBlockWaterOrIce()Tiger Wang2014-02-022-10/+12
| | | |
| | * | Revert "Added LOGREPLACELINE for line replacement"Tiger Wang2014-02-025-94/+16
| | | | | | | | | | | | | | | | This reverts commit 7d03876a3e11aedff0201a8330bfdb2b5523fc5e.
| | * | Revert "Improved code"Tiger Wang2014-02-024-19/+13
| | | | | | | | | | | | | | | | This reverts commit d8aa0b0ec7a2ebea2fc157c623ae8cd7d0b6ba1c.
| | * | Revert "Added a comment"Tiger Wang2014-02-021-1/+1
| | | | | | | | | | | | | | | | This reverts commit 7ae5631d89426df6f05b6c8ba656ba02b9d15f93.
| | * | Revert "Properly initialised variables"Tiger Wang2014-02-024-13/+10
| | | | | | | | | | | | | | | | This reverts commit 02e752789399ad1b65a0443534ea6a8721efd78c.
| | * | Revert "Fixed issues with insufficient console space"Tiger Wang2014-02-023-114/+29
| | | | | | | | | | | | | | | | This reverts commit 6b18add09b5e9d6d6c2a61e90bdd7011f56f4c82.
| | * | Revert "A newline issue is resolved"Tiger Wang2014-02-022-1/+3
| | | | | | | | | | | | | | | | This reverts commit 397208145ebe5c95ebf32f2985f6800634932230.
| | * | Revert "Fixed Linux compile"Tiger Wang2014-02-021-2/+1
| | | | | | | | | | | | | | | | This reverts commit 5becfe850a2b4827a21e8ede989545334efbbead.
| | * | Revert "Another Linux fix"Tiger Wang2014-02-021-6/+0
| | | | | | | | | | | | | | | | This reverts commit 6f660b379ecbc091b9bd92093e0dad01a4f6bf38.
| | * | Revert "Again improved LogReplaceLine"Tiger Wang2014-02-022-80/+77
| | | | | | | | | | | | | | | | This reverts commit dd325d742db9db54a25460fcacd093e7cc6f44f0.
| | * | Possibly fixed #618Tiger Wang2014-02-021-2/+2
| | | |
| | * | Creative players take Plugin damageTiger Wang2014-02-022-3/+4
| | | |
| | * | Again improved LogReplaceLineTiger Wang2014-02-012-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 Wang2014-02-012-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 typesTiger Wang2014-02-012-12/+34
| | | |
| | * | Another Linux fixTiger Wang2014-02-011-0/+6
| | | |
| | * | Fixed Linux compileTiger Wang2014-02-011-1/+2
| | | |
| | * | A newline issue is resolvedTiger Wang2014-02-012-3/+1
| | | |
| | * | Fixed issues with insufficient console spaceTiger Wang2014-02-013-29/+114
| | | |
| | * | Properly initialised variablesTiger Wang2014-01-314-10/+13
| | | |
| | * | Added a commentTiger Wang2014-01-311-1/+1
| | | |
| | * | Improved codeTiger Wang2014-01-314-13/+19
| | | | | | | | | | | | | | | | | | | | * Fixed some issues * Fixed standard violation
| | * | Added LOGREPLACELINE for line replacementTiger Wang2014-01-295-16/+94
| | | |
| | * | Fixed redstone simulator crash found in #570Tiger Wang2014-01-293-18/+25
| | | |
| * | | Fixed multiple invalid permission nodesTiger Wang2014-02-021-2/+2
| | | | | | | | | | | | | | | | New players can build as default now
| * | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-02-0278-550/+730
| |\ \ \
| | * \ \ Merge branch 'master' into registerfixTycho2014-02-0244-63/+211
| | |\ \ \
| | | * | | Fixed dark oak and acacia placement.madmaxoft2014-02-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #621.
| | | * | | Added missing filesTycho2014-02-023-0/+39
| | | | | |
| | | * | | Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-0211-3/+72
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | Conflicts: src/Blocks/BlockTorch.h
| | | * | | Changed Signiture of OnUpdateTycho2014-02-0220-37/+65
| | | | | |
| | | * | | Changed Signiture of OnDiggingTycho2014-02-014-7/+7
| | | | | |
| | | * | | Changed Signiture of OnDestroyedByPlayerTycho2014-02-0112-16/+27
| | | | | |
| | * | | | Removed register keyword from Messinne TwisterTycho2014-02-011-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 referencesTycho2014-02-0160-249/+247
| | | | |
| | * | | Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-0141-184/+863
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h
| | * | | | Changed signitures of Several BLockHandler MethodsTycho2014-02-0155-196/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check
| | * | | | Removed cWorld IncludeTycho2014-01-263-3/+0
| | | | | |
| | * | | | Refactored GetPlacementBlockTypeMetaTycho2014-01-267-11/+12
| | | | | |
| | * | | | Merge branch 'master' into GeneratingBenchmark2Tycho2014-01-2670-1195/+2527
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h
| | * | | | | Refactored cBlockHandler::OnUse and dependentsTycho2014-01-2621-263/+310
| | | | | | |
| | * | | | | Added support for overide in c++11 supporting varients of gcc/clangTycho2014-01-261-2/+4
| | | | | | |
| | * | | | | First attempt at Implementing InterfacesTycho2014-01-2519-38/+80
| | | | | | |
| | * | | | | dded dependecy on Blocks to GeneratorTycho2014-01-251-1/+1
| | | | | | |
| * | | | | | Fixed #624Tiger Wang2014-02-022-0/+7
| | |_|_|/ / | |/| | | |
| * | | | | Fixed #620Tiger Wang2014-02-021-1/+2
| | | | | |
| * | | | | Added saving of angry flag.Kirill Kirilenko2014-02-022-0/+7
| | | | | |
| * | | | | Fixed sitting tag.Kirill Kirilenko2014-02-022-5/+5
| | | | | |
| * | | | | Monster's nominal speed was increased.Kirill Kirilenko2014-02-011-1/+1
| | | | | |
| * | | | | Fixed teleport to air, if owner is flying.Kirill Kirilenko2014-02-011-0/+1
| | | | | |
| * | | | | Added saving of collar's color.Kirill Kirilenko2014-02-012-4/+11
| | | | | |
| * | | | | Merge pull request #585 from daniel0916/hooksMattes D2014-02-016-0/+47
| |\ \ \ \ \ | | | | | | | | | | | | | | Added "player destroying" and "player destroyed" hooks
| | * | | | | Removed "player destroying" hookdaniel09162014-02-016-48/+1
| | | | | | |
| | * | | | | Added "player destroying" and "player destroyed" hooksdaniel09162014-01-256-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 Kirilenko2014-01-311-0/+6
| | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #607 from mc-server/Wolf_Owner_SavingMattes D2014-01-312-3/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | Wolf: Their owner now gets saved.
| | * | | | | Inversed condition.STRWarrior2014-01-311-1/+1
| | | | | | |
| | * | | | | Wolf: If Owner tag is missing a normal ownerless wolf will spawn.STRWarrior2014-01-311-9/+6
| | | | | | |
| | * | | | | Fixed bad variable.STRWarrior2014-01-301-1/+1
| | | | | | |
| | * | | | | Check if the tag is found.STRWarrior2014-01-301-0/+5
| | | | | | |
| | * | | | | Fixes #606STRWarrior2014-01-302-2/+9
| | | | | | |
| * | | | | | Fixed cLineBlockTracer:Trace() signature.madmaxoft2014-01-311-13/+27
| | | | | | |
| * | | | | | Added cPluginManager:BindCommand() form to the API.madmaxoft2014-01-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | That's the canonical way to call static functions.
| * | | | | | Added cChunkDest::UpdateHeightmap()madmaxoft2014-01-312-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 #563tonibm192014-01-301-2/+1
| | | | | | | | | | | | | | | | | | | | | Not tested (I don't have RasPi)
| * | | | | | Lua: Fixed an error in table-functions callbacks.madmaxoft2014-01-291-1/+5
| | |_|_|_|/ | |/| | | |
| * | | | | Did what xoft saidtonibm192014-01-294-5/+3
| | | | | |
| * | | | | Rewritten code.tonibm192014-01-2912-152/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented xoft suggestion. Using MoveToPosition as tigerw suggested.
| * | | | | Fixed sheeptonibm192014-01-291-18/+17
| | | | | |
| * | | | | Fixed a copypasta error...tonibm192014-01-294-1/+5
| | | | | |
| * | | | | Now mobs follow you when holding their breed itemtonibm192014-01-2910-5/+153
| | | | | |
| * | | | | Limited sign lines to 15 chars.madmaxoft2014-01-291-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #598.
| * | | | | Plugin files are loaded in alphabetical order.madmaxoft2014-01-291-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.STRWarrior2014-01-291-2/+0
| | | | |
| * | | | Bottle o' Enchanting spawns an experience orb.STRWarrior2014-01-291-1/+2
| | | | |
| * | | | Added 1.7.4 to the list of supported protocols.madmaxoft2014-01-291-1/+1
| | | | |
| * | | | Protocol 1.7: Encryption is enabled only with auth.madmaxoft2014-01-291-1/+1
| | | | |
| * | | | Protocol 1.7: Forced encryption on all connections.madmaxoft2014-01-284-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.madmaxoft2014-01-282-0/+106
| | | | |
| * | | | Fixed an error in Crypto.madmaxoft2014-01-281-2/+2
| | | | |
| * | | | Merge pull request #594 from mc-server/Villager_UpdateMattes D2014-01-285-2/+185
| |\ \ \ \ | | | | | | | | | | | | Villager update
| | * | | | Renamed Farmer functions and added doxycommentsSTRWarrior2014-01-282-17/+20
| | | | | |
| | * | | | Villager: NoCountDown and Action function don't check VillagersShouldHarvestCrops anymore because it shoudn't even be activated anywhere.STRWarrior2014-01-281-10/+0
| | | | | |
| | * | | | Villager doesn't check the environment for crops if it doesn't need to.STRWarrior2014-01-271-0/+5
| | | | | |
| | * | | | The world can now be configured wether farmers should be able to harvest crops.STRWarrior2014-01-273-0/+14
| | | | | |
| | * | | | Villager: Few more comments.STRWarrior2014-01-272-4/+9
| | | | | |
| | * | | | CleanupSTRWarrior2014-01-272-31/+65
| | | | | | | | | | | | | | | | | | | | | | | | Most code in Tick is now split up in different functions.
| | * | | | Villagers: Harvesting is more rare.STRWarrior2014-01-271-1/+1
| | | | | |
| | * | | | Villager: Farmers can't place crops on blocks other then farmland.STRWarrior2014-01-271-1/+7
| | | | | |
| | * | | | Fixed compiler error.STRWarrior2014-01-271-1/+1
| | | | | |
| | * | | | Villager: Farmer: Crops finding is more random.STRWarrior2014-01-271-18/+19
| | | | | |
| | * | | | Added GetCropsPos and DidFindCrops functions.STRWarrior2014-01-271-0/+6
| | | | | |
| | * | | | Villagers: Farmers now replant the crops.STRWarrior2014-01-272-1/+17
| | | | | |
| | * | | | Villagers: Fixed only gettings the crops block when farming.STRWarrior2014-01-271-2/+2
| | | | | |
| | * | | | Villagers don't look for new crops when they already found one.STRWarrior2014-01-271-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | Slight cleanup.
| | * | | | E_BLOCK_POTATOES isn't an solid block. Villagers were floating above them.STRWarrior2014-01-271-0/+1
| | | | | |
| | * | | | Villagers: Farmers can also harvest carrots and potatoes.STRWarrior2014-01-272-9/+38
| | | | | |
| | * | | | Makes farmers farm crops.STRWarrior2014-01-272-1/+76
| | | |_|/ | | |/| |
| * | | | Fixed timing on *nix.madmaxoft2014-01-282-2/+2
| | | | |
| * | | | Fixed a slight bug in RSA encryption code.madmaxoft2014-01-281-2/+1
| | | | |
| * | | | Merge pull request #595 from mc-server/NonBlockingSocketsMattes D2014-01-284-63/+171
| |\ \ \ \ | | | | | | | | | | | | Non blocking sockets
| | * | | | Squashed common code.madmaxoft2014-01-271-14/+7
| | | | | |
| | * | | | Fixed Linux compilation.madmaxoft2014-01-271-1/+2
| | | | | |
| | * | | | Rewritten networking to use non-blocking sockets.madmaxoft2014-01-274-62/+176
| | | | | | | | | | | | | | | | | | | | | | | | This fixes #592.
| * | | | | SIGABRT exits with failure.Tiger Wang2014-01-271-0/+1
| |/ / / /
| * | | | Fixed client packet parsing.madmaxoft2014-01-262-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.madmaxoft2014-01-261-6/+29
| | | | |
| * | | | Item-loading now checks for weird bytes.madmaxoft2014-01-261-3/+9
| | | | |
| * | | | Fixed Byte-order reading.madmaxoft2014-01-261-2/+4
| | | | | | | | | | | | | | | | | | | | The functions would fail on bytes that were above 127.
| * | | | Added SIGABRT to catchers listTiger Wang2014-01-261-1/+6
| |/ / /
| * | | Merge pull request #589 from mc-server/minecartimprovementsMattes D2014-01-265-110/+438
| |\ \ \ | | | | | | | | | | Minecart improvements
| | * | | Reduced unnecessary echoes (thanks xoft)Tiger Wang2014-01-261-5/+3
| | | | |
| | * | | Rail speed tweakTiger Wang2014-01-251-2/+2
| | | | |
| | * | | Improved AllToLua UI experienceTiger Wang2014-01-251-2/+8
| | | | |
| | * | | Added more minecart powered rail directionsTiger Wang2014-01-243-80/+63
| | | | |
| | * | | Begin implementing ascending railsTiger Wang2014-01-192-2/+45
| | | | |
| | * | | Added one more direction into collision checksTiger Wang2014-01-191-26/+51
| | | | | | | | | | | | | | | | | | | | | | | | | * Added direction XM_XP * Improved performance, thanks STR and xoft
| | * | | Minecart improvements and fixesTiger Wang2014-01-191-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 railsTiger Wang2014-01-191-5/+15
| | | | |
| | * | | Added more rail functionalityTiger Wang2014-01-193-18/+22
| | | | |
| | * | | Merge remote-tracking branch 'origin/master' into minecartimprovementsTiger Wang2014-01-1972-276/+1139
| | |\ \ \
| | * | | | Minecart collision and general improvementsTiger Wang2014-01-182-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_FixMattes D2014-01-261-7/+31
| |\ \ \ \ \ | | | | | | | | | | | | | | Wolf: Small fix since the new AI and a new small feature.
| | * | | | | Fixed bug where wolfs would teleport while they were sitting.STRWarrior2014-01-261-1/+4
| | | | | | |
| | * | | | | Small fix since the new AI and a new small feature.STRWarrior2014-01-261-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You get particles when trying to tame wolfs. They don't walk anymore when they are sitting.
| * | | | | | Fixed segmentation fault on villager damageTiger Wang2014-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It occurred when attack was environmental.
| * | | | | | Merge pull request #575 from worktycho/GeneratingBenchmarkMattes D2014-01-258-189/+294
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | More Interfaces to decouple Generator from the rest of the code
| | * | | | Stupid Mistake fixedTycho2014-01-251-2/+2
| | | | | |
| | * | | | Fixed exportsTycho2014-01-253-7/+1
| | | | | |
| | * | | | Fixed spelling errorTycho2014-01-224-3/+3
| | | | | |
| | * | | | Added manual bindings for moved functionsTycho2014-01-223-2/+71
| | | | | |
| | * | | | formatting changesTycho2014-01-222-6/+26
| | | | | |
| | * | | | Merge branch 'master' into GeneratingBenchmarkTycho2014-01-2227-228/+2047
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h
| | * | | | | Actually implemented interfacesTycho2014-01-204-21/+33
| | | | | | |
| | * | | | | Moved Schematic file methods to seperate classTycho2014-01-204-175/+177
| | | | | | |
| | * | | | | Merge branch 'ForEachChunkProvider' into GeneratingBenchmarkTycho2014-01-204-17/+23
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/World.h
| | | * | | | | Seperated BlockArea From WorldTycho2014-01-204-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 GeneratingBenchmarkTycho2014-01-2043-490/+1360
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | | this merge is necessary,
| | * | | | | Added Inifile and OSSupport LinkingTycho2014-01-191-0/+2
| | | | | | |
| * | | | | | Merge pull request #588 from mc-server/Sheep_EatingMattes D2014-01-252-1/+41
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Implemented sheeps eating grass.
| | * | | | | | Implemented sheeps eating grass.STRWarrior2014-01-252-1/+41
| | | | | | | |
| * | | | | | | Merge pull request #587 from mc-server/mobimprovementsMattes D2014-01-2528-563/+716
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Mob improvements & rudimentary artificial intelligence
| | * | | | | | | Did what xoft recommendedTiger Wang2014-01-252-2/+6
| | | | | | | | |
| | * | | | | | | Two minor changesTiger Wang2014-01-252-6/+4
| | | | | | | | |
| | * | | | | | | Implemented fall damage for mobsTiger Wang2014-01-255-11/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Implemented mobile fall damage * Formatting fixes + Defined new Position->Integer macros
| | * | | | | | | Attack() is no longer always calledTiger Wang2014-01-251-1/+1
| | | | | | | | |
| | * | | | | | | Implemented pickup combiningTiger Wang2014-01-251-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes FS393 * Part of #131
| | * | | | | | | Mob bugfixesTiger Wang2014-01-256-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 Wang2014-01-256-127/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implemented mob drowning * Iron Golems and squids are excluded
| | * | | | | | | Fixed a generator bugTiger Wang2014-01-252-1/+9
| | | | | | | | |
| | * | | | | | | Zombies and skeletons use AITiger Wang2014-01-252-9/+15
| | | | | | | | |
| | * | | | | | | Miscellaneous improvementsTiger Wang2014-01-243-28/+17
| | | | | | | | |
| | * | | | | | | Changed a condition to IsGameModeTiger Wang2014-01-241-2/+1
| | | | | | | | |
| | * | | | | | | Made wolves compatible with new AI codeTiger Wang2014-01-242-11/+26
| | | | | | | | |
| | * | | | | | | Monsters no longer check for direct line of sightTiger Wang2014-01-241-10/+2
| | | | | | | | |
| | * | | | | | | Large reworking of mob code [SEE DESC]Tiger Wang2014-01-247-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 tickingTiger Wang2014-01-241-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 abilitiesTiger Wang2014-01-242-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 ReferenceManagerTiger Wang2014-01-244-122/+1
| | | | | | | | |
| * | | | | | | | Merge pull request #583 from mc-server/ChangeToPolarSSLMattes D2014-01-2514-161/+679
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Change to polar ssl
| | * | | | | | | | Added RSA encryption to crypto wrappers.madmaxoft2014-01-252-0/+39
| | | | | | | | | |
| | * | | | | | | | Merged branch 'master' into ChangeToPolarSSL.madmaxoft2014-01-2515-117/+319
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into ChangeToPolarSSL.madmaxoft2014-01-2311-198/+254
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed a warning in ScoreboardSerializer.madmaxoft2014-01-231-2/+2
| | | | | | | | | | | |
| | * | | | | | | | | | PolarSSL is fully used for 1.3.2 protocol encryption.madmaxoft2014-01-2313-157/+630
| | | | | | | | | | | |
| | * | | | | | | | | | Fixed a bug in LeakFinder.madmaxoft2014-01-231-3/+8
| | | | | | | | | | | |
| | * | | | | | | | | | Replacing CryptoPP with PolarSSL.madmaxoft2014-01-221-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/strerrorMattes D2014-01-257-65/+76
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | Switched cEvent to use strerror_r for error messages
| | * | | | | | | | | | Switched cEvent to GetOSErrorStringTycho2014-01-253-18/+14
| | | | | | | | | | | |
| | * | | | | | | | | | Extracted cSocket::GetErrorString into GetOSErrorStringTycho2014-01-256-59/+62
| | | | | | | | | | | |
| | * | | | | | | | | | Switched cEvent to use strerror_r for error messagesTycho2014-01-231-6/+18
| | | | | | | | | | | |
| * | | | | | | | | | | Comm logging is available in both Debug and Release modes.madmaxoft2014-01-253-16/+16
| | | | | | | | | | | |
| * | | | | | | | | | | Added cFile::Flush().madmaxoft2014-01-252-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.madmaxoft2014-01-251-2/+15
| | | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #586 from worktycho/BindingsMoveAlexander Harkness2014-01-251-28/+65
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | Implented xofts suggestions in #577
| | * | | | | | | | | | Added dependecy output to Bindings/BindingsDependencies.txtTycho2014-01-251-0/+7
| | | | | | | | | | | |
| | * | | | | | | | | | Reformatted Bindings DependeciesTycho2014-01-251-28/+58
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed *nix compilation for previous commit.madmaxoft2014-01-241-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Added per-connection comm logging in debug mode.madmaxoft2014-01-243-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.madmaxoft2014-01-241-9/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed a failure in cSquid.madmaxoft2014-01-241-1/+2
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Probably due to rounding errors the squid was querying out-of-chunk coords.
| * | | | | | | | | | Fixed Win nightbuilds not producing PDBs.madmaxoft2014-01-241-0/+7
| | | | | | | | | | |
| * | | | | | | | | | Fixed a few compile-time and runtime warnings in ScoreboardSerializer.madmaxoft2014-01-241-8/+4
| | | | | | | | | | |
| * | | | | | | | | | Fixed crash with failed entity-loading.madmaxoft2014-01-242-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'madmaxoft2014-01-244-49/+89
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed indentation once and for all.Mike Hunsinger2014-01-242-46/+46
| | | | | | | | | | | |
| | * | | | | | | | | | Fixed indentation and doxygen comments... For real this time.Mike Hunsinger2014-01-242-15/+15
| | | | | | | | | | | |
| | * | | | | | | | | | Fixed spacing and doxycomments.Mike Hunsinger2014-01-243-18/+16
| | | | | | | | | | | |
| | * | | | | | | | | | Removed extra lineMike Hunsinger2014-01-231-2/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Split TossItem into three Toss functions (Held, Equipped and Pickup)Mike Hunsinger2014-01-234-57/+101
| | | | | | | | | | | |
| * | | | | | | | | | | Fixed flint&steel failure on the Y world edges.madmaxoft2014-01-241-0/+4
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #580 from xdot/masterMattes D2014-01-232-41/+33
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | Fixed scoreboard serialization
| | * | | | | | | | | Fixed 1.5.x scoreboard packet IDsandrew2014-01-231-3/+3
| | | | | | | | | | |
| | * | | | | | | | | Fixed scoreboard.dat structureandrew2014-01-231-5/+6
| | | | | | | | | | |
| | * | | | | | | | | Fixed scoreboard serializationandrew2014-01-231-35/+26
| | | | | | | | | | |
| * | | | | | | | | | Make clean now effects BindingsTycho2014-01-231-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Removed Bindings folder subcmake on *nixTycho2014-01-231-1/+2
| | | | | | | | | | |
| * | | | | | | | | | BugfixesTycho2014-01-232-12/+9
| | | | | | | | | | |
| * | | | | | | | | | added dependecies for bindings regenTycho2014-01-232-14/+46
| | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fixed crash while calling disabled plugins.madmaxoft2014-01-231-1/+1
| |/ / / / / / / /
| * | | | | | | | Improved code safety for the Compact world storage.Mattes D2014-01-231-104/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That was a huge chunk of smelly code.
| * | | | | | | | Minor style improvements for the merged PR.Mattes D2014-01-231-4/+4
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'xdot/master'Mattes D2014-01-236-40/+104
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * xdot/master: Command block fixes 2
| | * | | | | | | Command block fixes 2andrew2014-01-236-40/+104
| | | | | | | | |
| * | | | | | | | Authenticator: Reduced logging levels.madmaxoft2014-01-221-4/+4
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Fixed compilation on VC2008tonibm192014-01-221-0/+1
| |/ / / / / /
| * | | | | | Merge pull request #566 from xdot/masterMattes D2014-01-2220-9/+1571
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Scoreboard
| | * | | | | | cWorld now saves/loads the scoreboardandrew2014-01-224-15/+44
| | | | | | | |
| | * | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-2130-478/+679
| | |\| | | | |
| | * | | | | | Scoreboard SendTo()andrew2014-01-214-6/+74
| | | | | | | |
| | * | | | | | Scoreboard protocol supportandrew2014-01-2117-23/+321
| | | | | | | |
| | * | | | | | Scoreboard serializationandrew2014-01-203-14/+92
| | | | | | | |
| | * | | | | | Scoreboard deserializationandrew2014-01-207-48/+599
| | | | | | | |
| | * | | | | | Scoreboard improvementsandrew2014-01-193-116/+79
| | | | | | | |
| | * | | | | | Basic scoreboard implementationandrew2014-01-195-1/+576
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Implemented cPluginManager:CallPlugin() API.madmaxoft2014-01-217-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 Harkness2014-01-201-2/+1
| | |_|/ / | |/| | |
* | | | | Fixed merge conflictdaniel09162014-04-071-3/+0
| | | | |
* | | | | Added Enchantment-Slot-Level generatingdaniel09162014-04-073-9/+32
| | | | |
* | | | | added EnchantItemPacket to older Protocolsdaniel09162014-02-011-1/+4
| | | | |
* | | | | Some updates for enchanting (2)daniel09162014-01-319-15/+173
| | | | |
* | | | | removed hook from enchanting commitdaniel09162014-01-242-5/+1
| | | | |
* | | | | Some updates for enchantingdaniel09162014-01-245-17/+29
| | | | |
* | | | | first changes for enchanting (not finished)daniel09162014-01-208-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.madmaxoft2014-01-193-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.madmaxoft2014-01-192-0/+37
| | | |
* | | | Merge pull request #569 from worktycho/EnchantmentsFixMattes D2014-01-198-88/+120
|\ \ \ \ | | |/ / | |/| | Enchantments fix
| * | | Switched EnchantmentSerilizer to namespaceTycho2014-01-197-17/+23
| | | |
| * | | Spilt Writing of Enchantments to seperate classTycho2014-01-198-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/commandblockfixesMattes D2014-01-1911-5/+151
|\ \ \ \ | | | | | | | | | | Command block fixes
| * | | | Removed unneeded paramtersTiger Wang2014-01-199-15/+23
| | | | |
| * | | | Changed SendBlockEntity format slightlyTiger Wang2014-01-199-42/+55
| | | | | | | | | | | | | | | | | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug
| * | | | Implemented MC|Brand responseTiger Wang2014-01-191-3/+9
| | | | |
| * | | | Improved command blocksTiger Wang2014-01-1911-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.madmaxoft2014-01-198-178/+189
| | | | | | | | | | | | | | | | | | | | This fixes #560 and #390.
* | | | | Merge pull request #551 from worktycho/schedularMattes D2014-01-191-6/+2
|\ \ \ \ \ | | | | | | | | | | | | Implemented xoft's suggestion for a saturating counter in the scheduler
| * | | | | Fixed iterators bugTycho2014-01-181-2/+1
| | | | | |
| * | | | | switched to using m_WorldAge rather than m_TickIDTycho2014-01-182-9/+3
| | | | | |
| * | | | | Increased tick count to longTycho2014-01-172-3/+3
| | | | | |
| * | | | | Implemented xsofts suggestion for a saturating counter in the schedulerTycho2014-01-172-5/+8
| | | | | |
* | | | | | SocketThreads: Removed unused code.madmaxoft2014-01-192-53/+3
| |_|_|/ / |/| | | |
* | | | | Merge pull request #559 from mc-server/SpawnMobParticlesMattes D2014-01-191-3/+0
|\ \ \ \ \ | | | | | | | | | | | | Removed the particles when a mob spawns.
| * | | | | Removed the particles when a mob spawns.STRWarrior2014-01-181-3/+0
| | | | | |
* | | | | | Exported cFloater to the Lua API.STRWarrior2014-01-192-3/+8
| | | | | |
* | | | | | Fixed compiler error.STRWarrior2014-01-181-3/+3
| |_|/ / / |/| | | |
* | | | | Merge pull request #557 from xdot/masterMattes D2014-01-1819-62/+592
|\ \ \ \ \ | | | | | | | | | | | | Command blocks
| * | | | | Command block fixesandrew2014-01-183-43/+17
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-183-3/+150
| |\| | | |
| * | | | | Parse the MC|AdvCdm plugin messageandrew2014-01-184-1/+70
| | | | | |
| * | | | | Command blocks: Execute()andrew2014-01-185-18/+42
| | | | | |
| * | | | | Command block (de)serializationandrew2014-01-186-21/+122
| | | | | |
| * | | | | Basic command block implementationandrew2014-01-1811-33/+395
| | |_|/ / | |/| | |
* | | | | HTTP connections aren't kept alive unless explicitly enabled.madmaxoft2014-01-184-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.madmaxoft2014-01-181-4/+4
| | | |
* | | | Merged branch 'NetherFinish'.madmaxoft2014-01-183-3/+150
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed errors.STRWarrior2014-01-182-2/+2
| | | |
| * | | Renamed cFinishGenNetherSprinkleFoliage to cFinishGenNetherClumpFoliage. Fixed typo'sSTRWarrior2014-01-183-10/+10
| | | |
| * | | Some tweaks.STRWarrior2014-01-181-5/+18
| | | | | | | | | | | | | | | | | | | | Everything generates more often. Fire can only spawn on ForeverBurning blocks.
| * | | Fixed bug where only brown mushrooms would spawn.STRWarrior2014-01-181-3/+3
| | | |
| * | | It now actualy works.STRWarrior2014-01-181-20/+42
| | | |
| * | | First attempt at creating a clumb version NetherFinisher.STRWarrior2014-01-172-22/+63
| | | |
| * | | Added cFinishGenNetherSprinkleFoliage.STRWarrior2014-01-103-2/+73
| | | |
* | | | Merge pull request #552 from worktycho/c++11Mattes D2014-01-171-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 issuesTycho2014-01-171-4/+0
| | |/ / | |/| |
* / | | Added user setting compression factorTycho2014-01-1710-22/+33
|/ / /
* | | Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-177-11/+62
|\ \ \ | | | | | | | | Added cWorld::SpawnMinecart.
| * | | Changed GetContent function.STRWarrior2014-01-161-1/+1
| | | |
| * | | Fixed server crash.STRWarrior2014-01-121-1/+1
| | | |
| * | | Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-127-17/+18
| | | |
| * | | EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-127-10/+33
| | | |
| * | | Added cWorld::SpawnMinecart.STRWarrior2014-01-122-0/+27
| | | |
* | | | Fixed SIGABRT_COMPAT on other architectures.madmaxoft2014-01-171-0/+2
| | | |
* | | | Removed internal cEntity::GetRot() usage.madmaxoft2014-01-1723-43/+43
| | | |
* | | | Merge remote-tracking branch 'origin/customnames'madmaxoft2014-01-1738-115/+201
|\ \ \ \
| * | | | Changed newline character because of issuesTiger Wang2014-01-162-4/+13
| | | | |
| * | | | Removed CustomCopy()Tiger Wang2014-01-162-24/+1
| | | | |
| * | | | Really did what xoft wantedTiger Wang2014-01-161-5/+8
| | | | |
| * | | | Fixed #535Tiger Wang2014-01-161-1/+1
| | | | |
| * | | | Removed obsoleted functionsTiger Wang2014-01-1634-74/+67
| | | | |
| * | | | Possibly did what xoft wantedTiger Wang2014-01-163-10/+25
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into customnamesTiger Wang2014-01-169-75/+90
| |\ \ \ \
| * | | | | OBSOLETE'd obsolete functionsTiger Wang2014-01-151-2/+2
| | | | | |
| * | | | | Implemented custom names and loreTiger Wang2014-01-154-35/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Added custom names and lore + Added saving and loading + Added writing and parsing of NBT
| * | | | | Implemented Ctrl-Q drop stackTiger Wang2014-01-153-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | Also fixed an issue with TossItems not respecting count.
* | | | | | Protocol 1.7: More output on unknown packets / protocol states.madmaxoft2014-01-171-4/+21
| |_|_|_|/ |/| | | |
* | | | | Fixed block break packet numberTiger Wang2014-01-161-1/+1
| | | | |
* | | | | Fixed #535Tiger Wang2014-01-161-1/+1
| | | | |
* | | | | Fixed SIGPIPE on cSocket::Send().madmaxoft2014-01-163-12/+13
| | | | |
* | | | | Protocol 1.7: Unknown packets are dumped to log in Debug mode.madmaxoft2014-01-161-1/+14
| | | | |
* | | | | Disabled excessive entity-related logging in Debug mode.madmaxoft2014-01-162-3/+26
| | | | |
* | | | | Fixed whitespace in previous commit.madmaxoft2014-01-161-1/+1
| | | | |
* | | | | Finished exporting cWorld:ScheduleTask() to Lua API.madmaxoft2014-01-161-1/+15
| |/ / / |/| | |
* | | | CMake: Fixed output paths for all MSVC versions.madmaxoft2014-01-161-7/+9
| | | |
* | | | Added packet diagnostics to 1.7 protocol.madmaxoft2014-01-162-30/+40
| | | | | | | | | | | | | | | | When the packet is mis-interpreted, a log message is output about the packet type and lengths.
* | | | Yet another attempt at VarArgs.madmaxoft2014-01-161-10/+15
| | | |
* | | | Another VarArgs fix.madmaxoft2014-01-166-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().madmaxoft2014-01-156-30/+42
| | | | | | | | | | | | This seems to be the only reasonable C++03-only solution.
* | | Fixed varargs modification.madmaxoft2014-01-151-1/+5
| | | | | | | | | | | | Ref.: #541.
* | | Furnace minecarts now stop being active after a while.STRWarrior2014-01-152-2/+19
| | |
* | | First implementation for furnace minecarts.STRWarrior2014-01-152-1/+23
| | |
* | | Merge pull request #542 from worktycho/schedularMattes D2014-01-153-4/+121
|\ \ \ | | | | | | | | added cWorld::ScheduleTask Function
| * | | added cWorld::ScheduleTask FunctionTycho2014-01-143-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/minecartsMattes D2014-01-159-176/+469
|\ \ \ \ | |/ / / |/| | | Minecarts
| * | | Yes newline at end of file :DTiger Wang2014-01-141-1/+5
| | | |
| * | | Final improvements to MinecartsTiger Wang2014-01-133-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 improvementsTiger Wang2014-01-134-4/+34
| | | | | | | | | | | | | | | | | | | | * Players now search for an area around themselves to teleport to when detaching from something
| * | | Fixed wire, rail, and pressure plate unpoweringTiger Wang2014-01-131-3/+4
| | | |
| * | | Fixed settings plugin generation after IniFileTiger Wang2014-01-121-3/+3
| | | |
| * | | Multiple enhancements and fixes to minecartsTiger Wang2014-01-124-132/+191
| | | | | | | | | | | | | | | | | | | | | | | | + They are destroyed instantly by creative mode * Physics is much improved + Basic implementation of powered rails
* | | | CMake: Added postfix for profiled exemadmaxoft2014-01-141-0/+4
| | | |
* | | | Removed shutdown() from socket closing.madmaxoft2014-01-131-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.madmaxoft2014-01-132-2/+29
| | | | | | | | | | | | | | | | This fixes #495
* | | | Generating the bindings outputs a message at the end.madmaxoft2014-01-131-0/+8
| | | |
* | | | cCreeper is no longer available in API.madmaxoft2014-01-133-14/+1
| | | | | | | | | | | | | | | | Has been replaced by cMonster.
* | | | CMake: Removed leftover debugging output.madmaxoft2014-01-131-1/+0
| | | |
* | | | CMake: Added resources to windows projects.madmaxoft2014-01-131-1/+14
| | | |
* | | | Added a generic .user file for MSVC.madmaxoft2014-01-131-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.madmaxoft2014-01-125-0/+22
| | | | | | | | | | | | | | | | This will allow us to use them in CMake builds.
* | | | CMake generates Bindings when not existant (win)madmaxoft2014-01-121-0/+10
|/ / /
* | | Merge pull request #529 from mc-server/derpstonerefactorAlexander Harkness2014-01-1210-331/+265
|\ \ \ | |/ / |/| | Major refactoring of redstone
| * | Fixed rails poweringTiger Wang2014-01-111-0/+2
| | |
| * | Did some stuff with the vectorsTiger Wang2014-01-111-32/+17
| | |
| * | Fixed a door bug and reduced codeTiger Wang2014-01-111-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 Wang2014-01-116-71/+71
| | | | | | | | | | | | ...to g_FullyOccupiesVoxel, as recommended by @bearbin
| * | Fixed doors, fixes #453Tiger Wang2014-01-101-38/+8
| | |
| * | Major refactoring of redstoneTiger Wang2014-01-104-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.madmaxoft2014-01-121-0/+6
| | |
* | | Merge pull request #532 from mc-server/LuaStateErrorHandlerMattes D2014-01-125-252/+130
|\ \ \ | | | | | | | | Lua state error handler
| * | | Lua errors display stack trace.madmaxoft2014-01-112-3/+27
| | | | | | | | | | | | | | | | Fixes #418.
| * | | Removed internal methods from public cLuaState interface.madmaxoft2014-01-113-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.madmaxoft2014-01-112-130/+0
| | | |
* | | | Merge pull request #527 from derouinw/biomessplitMattes D2014-01-118-222/+241
|\ \ \ \ | |/ / / |/| | | Biomessplit
| * | | Globals.h needs to be first includeBill Derouin2014-01-101-1/+1
| | | |
| * | | Include Biome enum in ChunkDefBill Derouin2014-01-101-2/+1
| | | | | | | | | | | | | | | | Can't forward declare an enum
| * | | Added newlines at ends of filesBill Derouin2014-01-102-2/+2
| | | |
| * | | Fixed missing externalsBill Derouin2014-01-101-1/+2
| | | | | | | | | | | | | | | | Turns out you actually have to include the .cpp in the project file
| * | | Move biome definition to separate filesBill Derouin2014-01-098-222/+241
| | | |
* | | | Removed unused variables.madmaxoft2014-01-111-2/+0
| | | | | | | | | | | | | | | | The Lua API calls had no side-effects, either.
* | | | Merge pull request #530 from mc-server/GeneratorDecoupleMattes D2014-01-1110-50/+188
|\ \ \ \ | | | | | | | | | | Decoupled cChunkGenerator from cWorld and cRoot.
| * | | | Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-1010-50/+188
| | | | | | | | | | | | | | | | | | | | Now the chunk generator can be used by other projects without depending on the two hugest structures in MCS.
* | | | | Fixed glowstone drop countandrew2014-01-111-2/+2
|/ / / /
* | | | Fixed generator adding values to ini file.madmaxoft2014-01-102-1/+3
| | | |
* | | | Merge pull request #520 from mc-server/SoulSandMattes D2014-01-102-1/+17
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| NetherGen: Now generates SoulSand.
| * | Fixed recurring pattern.STRWarrior2014-01-101-1/+1
| | |
| * | Fixed chunk borders.STRWarrior2014-01-091-3/+3
| | |
| * | Speed-up. I got about 40 extra ch/sSTRWarrior2014-01-081-9/+14
| | |
| * | WormNestCaves now remove soul sand.STRWarrior2014-01-081-0/+1
| | |
| * | NetherGen: Now generates SoulSand.STRWarrior2014-01-081-1/+11
| |/
* | Exported cClientHandle::SendPluginMessage() to Lua.madmaxoft2014-01-091-0/+30
| |
* | Fixed wrong packet number for PluginMessage packet.madmaxoft2014-01-091-1/+1
| |
* | Added cClientHandle::SendPluginMessage().madmaxoft2014-01-099-0/+50
| | | | | | | | It is not yet exported in the API, though.
* | Composition generator creating moved to a separate function.madmaxoft2014-01-092-61/+83
| | | | | | | | Also it forces the defaults into the INI file.
* | Height generator creating moved info HeiGen.cpp.madmaxoft2014-01-093-54/+82
| | | | | | | | The generator also explicitly sets the default back into the INI file.
* | Merge pull request #517 from derouinw/masterMattes D2014-01-091-0/+13
|\ \ | |/ |/| Add missing plugin error
| * A couple touchupsBill Derouin2014-01-081-2/+3
| |
| * Add missing plugin errorBill Derouin2014-01-071-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.madmaxoft2014-01-081-6/+4
| | | | | | | | This caused a failure in server favicons.
* | Graceful shutdown on SIGTERMTiger Wang2014-01-071-0/+5
|/
* Merge pull request #516 from mc-server/faviconAlexander Harkness2014-01-074-18/+8
|\ | | | | Fixed favicons
| * Fixed faviconsTiger Wang2014-01-074-18/+8
| |
* | Plugin messages are received and handed to plugins.madmaxoft2014-01-078-2/+68
|/ | | | Note that MCS doesn't currently handle any channel registrations, this will come later on.
* Merge pull request #514 from derouinw/masterMattes D2014-01-073-0/+20
|\ | | | | Implement favicon for 1.7.2
| * Avoid making copies of favicon stringBill Derouin2014-01-072-2/+2
| |
| * A few more touch upsBill Derouin2014-01-072-12/+2
| |
| * A few touch upsBill Derouin2014-01-072-2/+5
| |
| * Removed unused lineBill Derouin2014-01-071-1/+0
| |
| * Implement favicon for 1.7.2Bill Derouin2014-01-074-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.madmaxoft2014-01-071-4/+7
| | | | | | | | Also sorted the enabled warnings by their numerical code for easier searching..
* | Removed a debugging log output in cPluginManager:AddHook().madmaxoft2014-01-071-1/+0
| |
* | More MSVC warning fixes.madmaxoft2014-01-079-11/+11
| |
* | LuaState can push strings with embedded NULs.madmaxoft2014-01-071-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.madmaxoft2014-01-078-18/+21
| |
* | Added Base64Encode().madmaxoft2014-01-072-0/+51
| |
* | Disabled the type conversion MSVC warning.madmaxoft2014-01-061-1/+3
| | | | | | | | It was hitting way too many false positives.
* | Fixed a few MSVC warnings.madmaxoft2014-01-0611-16/+12
|/
* Merge pull request #511 from mc-server/CmakeOutputMattes D2014-01-061-1/+1
|\ | | | | Output dir set to $/MCServer.
| * Output dir set to $/MCServer.madmaxoft2014-01-061-1/+1
| | | | | | | | Ref.: #510.
* | Merge pull request #509 from Diusrex/masterMattes D2014-01-067-5/+87
|\ \ | | | | | | Added #pragma for warnings in MSVC warnings
| * | Added fake functions into cCriticalSection because of the change to ASSERTDiusrex2014-01-051-0/+5
| | |
| * | Changed the release version of ASSERT.Diusrex2014-01-051-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/*.hDiusrex2014-01-055-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.Diusrex2014-01-051-1/+13
| | |
* | | Exported cWorld::BroadcastBlockAction().madmaxoft2014-01-061-1/+1
| |/ |/| | | | | As requested in #508; no guarantees about it.
* | Fixed wrong enqueueing.madmaxoft2014-01-061-2/+9
|/ | | | Fixes #505.
* Fixed cPluginManager:AddHook() binding.madmaxoft2014-01-051-6/+13
| | | | Fixes #401. Old formats are still accepted, for compatibility reasons.
* Fixed a race condition in the cQueue class.madmaxoft2014-01-051-59/+86
| | | | Fixes #505.
* Fixed DocumentationTycho2014-01-031-4/+2
|
* derpTycho2014-01-031-1/+1
|
* actual fixTycho2014-01-031-2/+9
|
* fixed failure to return a value from RemoveTycho2014-01-031-1/+1
|
* implement xsofts recommendationsTycho Bickerstaff2014-01-031-9/+15
|
* Merge branch 'master' into threadsafequeueTycho Bickerstaff2014-01-027-29/+80
|\
| * Merge pull request #479 from mc-server/cmake-winMattes D2014-01-022-18/+30
| |\ | | | | | | Cmake-win
| | * Added support for out-of-source builds.madmaxoft2013-12-282-18/+30
| | |
| * | More memory alignment fixes.madmaxoft2014-01-022-6/+6
| | | | | | | | | | | | Ref.: #420.
| * | Fixed unaligned memory access in FastNBT.madmaxoft2014-01-023-5/+44
| | | | | | | | | | | | This should fix #420.
* | | added documentationTycho Bickerstaff2014-01-021-7/+45
| | |
* | | fixed a few remaining issues with worldstorageTycho Bickerstaff2014-01-022-24/+6
| | |
* | | rewrote queue not to use promises for waitsTycho Bickerstaff2014-01-026-121/+24
| | |
* | | Merge branch 'master' into threadsafequeueTycho Bickerstaff2013-12-3110-3/+117
|\| | | | | | | | | | | | | | Conflicts: src/OSSupport/Queue.h
| * | merged changes from upstreamTycho Bickerstaff2013-12-319-3/+112
| |\ \
| | * \ Merge branch 'FishingHook'madmaxoft2014-01-018-1/+110
| | |\ \
| | | * | OnPlayerFishing doesn't have a const cItems anymoreSTRWarrior2014-01-015-5/+5
| | | | |
| | | * | implemented the recommendations Xoft gave.STRWarrior2013-12-317-12/+25
| | | | |
| | | * | Implented OnPlayerFishing and OnPlayerFished.STRWarrior2013-12-306-1/+97
| | | | |
| | * | | Fixed GetPhysicalRAMUsage on Linuxandrew2014-01-011-2/+2
| | | | |
| * | | | Merge branch 'master' into cmake-fixesTycho Bickerstaff2013-12-3114-16/+56
| |\| | |
| * | | | fixed bad mergeTycho Bickerstaff2013-12-221-4/+0
| | | | |
| * | | | merged in more warning fixesTycho Bickerstaff2013-12-222-3/+2
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | merged in changesTycho Bickerstaff2013-12-223-2/+12
| |\ \ \ \
| * | | | | merged in warnings changesTycho Bickerstaff2013-12-2226-93/+94
| | | | | |
| * | | | | fixed accedental commitTycho Bickerstaff2013-12-221-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 notTycho Bickerstaff2013-12-222-1/+33
| | | | | |
* | | | | | fogot to add promise classesTycho Bickerstaff2013-12-312-0/+92
| | | | | |
* | | | | | clean up code for patchingTycho Bickerstaff2013-12-313-3/+5
| | | | | |
* | | | | | Merge branch 'master' into threadsafequeueTycho Bickerstaff2013-12-3120-91/+69
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | removed unneccisary castTycho Bickerstaff2013-12-311-1/+2
| | | | | |
| * | | | | fixed warnings in LineBlockTracer.cppTycho Bickerstaff2013-12-311-1/+0
| | | | | |
| * | | | | fixed warnings in LightingThread.cppTycho Bickerstaff2013-12-311-0/+1
| | | | | |
| * | | | | take Z axis into account when calculating neighboors in LightingThread::ChunkReadyTycho Bickerstaff2013-12-311-1/+1
| | | | | |
| * | | | | fixed warnings in World.cppTycho Bickerstaff2013-12-314-6/+34
| | | | | |
| * | | | | fixxed warnings in Server.cppTycho Bickerstaff2013-12-311-0/+5
| | | | | |
| * | | | | fixed warnings in Inventory.cppTycho Bickerstaff2013-12-311-2/+2
| | | | | |
| * | | | | fixed warnings in bytebuffer.cppTycho Bickerstaff2013-12-312-4/+4
| | | | | |
| * | | | | fixed ClientHandle warningsTycho Bickerstaff2013-12-311-0/+1
| | | | | |
| * | | | | fixed warnings in webadmin.cppTycho Bickerstaff2013-12-311-0/+3
| | | | | |
| * | | | | fixed warnings in BlockArea.cppTycho Bickerstaff2013-12-311-0/+2
| | | | | |
| * | | | | Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure.Morgan Redshaw2013-12-311-2/+2
| | |_|/ / | |/| | |
| * | | | Fixed compilation in VC2008.madmaxoft2013-12-306-75/+13
| | |/ / | |/| | | | | | | | | | Also removed an unused inline header file (yuck).
* | | | refactored chunk Queue to seperate classTycho Bickerstaff2013-12-317-124/+162
| | | |
* | | | added link dependency between WorldStorage and OSSupportTycho Bickerstaff2013-12-221-0/+2
| | | |
* | | | Merge branch 'master' into threadsafequeueTycho Bickerstaff2013-12-2224-29/+92
|\| | |
| * | | converted commneted paramater names to the unused macroTycho Bickerstaff2013-12-2216-39/+100
| | | |
| * | | Merge branch 'master' of github.com:mc-server/MCServerTycho Bickerstaff2013-12-2260-233/+1990
| |\| |
| * | | Chunk is now warnings cleanTycho Bickerstaff2013-12-214-6/+5
| | | |
| * | | fixed hidden bug with furnaces ignoring time burntTycho Bickerstaff2013-12-211-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 cleanTycho Bickerstaff2013-12-218-30/+32
| | | |
| * | | Piston is now warnings cleanTycho Bickerstaff2013-12-215-6/+6
| | | |
| * | | ChunkSender is now warnings cleanTycho Bickerstaff2013-12-216-9/+10
| | | |
* | | | Merge remote-tracking branch 'upstream/master' into threadsafequeueTycho Bickerstaff2013-12-2260-233/+1990
|\ \ \ \ | | |/ / | |/| |
| * | | Added HOOK_PLUGINS_LOADED.madmaxoft2013-12-296-3/+64
| | | | | | | | | | | | | | | | This fixes #482.
| * | | Merge pull request #481 from MikeHunsinger/masterMattes D2013-12-292-3/+49
| |\ \ \ | | | | | | | | | | Added function to create large birch tree images in birch forests
| | * | | Added function to create Tall Birch tree in BirchTreeForest biomesMike Hunsinger2013-12-292-3/+49
| | | |/ | | |/|
| * / | Fixed a (valid) warning in RCONServer.madmaxoft2013-12-281-0/+3
| |/ /
| * | Merge branch 'master' into cmake-winmadmaxoft2013-12-272-4/+56
| |\ \
| | * | Server now handles death messagesTiger Wang2013-12-261-0/+16
| | | |
| | * | Merge pull request #472 from mc-server/Extreme_Hills_MMattes D2013-12-261-4/+40
| | |\ \ | | | | | | | | | | Extreme hills
| | | * | Simplefied Extreme Hills M pattern select.STRWarrior2013-12-261-11/+3
| | | | |
| | | * | Extreme Hills M biomes now generate gravel, stone and grass patterns.STRWarrior2013-12-251-2/+10
| | | | |
| | | * | Changed tbGravel. Vanilla has 3 layers of gravel and then stone.STRWarrior2013-12-251-3/+3
| | | | |
| | | * | Normal extreme hills (plus) now generate a stone/grass pattern.STRWarrior2013-12-251-2/+20
| | | | |
| | | * | Re-added empty line.STRWarrior2013-12-251-0/+1
| | | | |
| | | * | This generates gravel in Extreme Hills M biomes.STRWarrior2013-12-252-3/+20
| | | | |
| * | | | Made cmake compilation possible on Windows.madmaxoft2013-12-274-21/+27
| | | | |
| * | | | Added proper precompiled headers for MSVC.madmaxoft2013-12-261-48/+47
| |/ / /
| * | | cBlockArea: Fixed writing full-height areas.madmaxoft2013-12-261-2/+2
| | | |
| * | | Merge pull request #461 from mc-server/repeatersMattes D2013-12-267-47/+314
| |\ \ \ | | |/ / | |/| | Repeaters, pressure plates, and others
| | * | Moved increment operator to back of variablesTiger Wang2013-12-261-9/+9
| | | |
| | * | Fixed rails not updating with diagonalsTiger Wang2013-12-251-0/+34
| | | |
| | * | Braced up some codeTiger Wang2013-12-251-0/+2
| | | |
| | * | Used IsGamemodeCreative() functionTiger Wang2013-12-251-1/+1
| | | |
| | * | Fixed comments in main.cpp and Player.cppTiger Wang2013-12-242-2/+2
| | | |
| | * | Implemented stone and wooden pressure platesTiger Wang2013-12-242-3/+105
| | | |
| | * | Improved knockback animationTiger Wang2013-12-241-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 positionsTiger Wang2013-12-231-5/+2
| | | |
| | * | Provides an enhancement to daylight sensorsTiger Wang2013-12-231-2/+27
| | | |
| | * | Clarified some code in Player.cppTiger Wang2013-12-231-2/+5
| | | |
| | * | Fixed a comment in Entity.cppTiger Wang2013-12-231-1/+1
| | | |
| | * | Added some comments in main.cppTiger Wang2013-12-231-1/+1
| | | |
| | * | Daylight sensor sensing enhancementTiger Wang2013-12-231-9/+11
| | | |
| | * | A fix for daylight sensorsTiger Wang2013-12-221-2/+3
| | | |
| | * | Implemented knockback and critical hitTiger Wang2013-12-221-4/+21
| | | |
| | * | Added many event catchersTiger Wang2013-12-222-20/+78
| | | | | | | | | | | | | | | | | | | | | | | | * Window close * CTRL-C * etc.
| | * | Implemented fall particlesTiger Wang2013-12-221-3/+18
| | | |
| | * | Daylight sensorsTiger Wang2013-12-221-2/+1
| | | |
| | * | Fixed them again, confound itTiger Wang2013-12-221-9/+21
| | | |
| * | | Merge pull request #471 from mc-server/Fishing_CatapultMattes D2013-12-253-38/+206
| |\ \ \ | | | | | | | | | | You are now able to sweep mobs to your position using fishing rods.
| | * | | Fixed Parentheses.STRWarrior2013-12-251-2/+2
| | | | |
| | * | | You are now able to sweep mobs to your position using fishing rods.STRWarrior2013-12-253-38/+206
| | | | |
| * | | | Merge branch 'fixes&features' of git://github.com/tonibm19/MCServermadmaxoft2013-12-252-9/+64
| |\ \ \ \
| | * | | | (Hopefully) fixed if conditionstonibm192013-12-251-4/+1
| | | | | |
| | * | | | Implemented xoft suggestion (partly)tonibm192013-12-251-25/+29
| | | | | | | | | | | | | | | | | | I only get it working in first condition. It seems it's not compatible with else if...
| | * | | | BLOCKTYPE...tonibm192013-12-241-2/+2
| | | | | |
| | * | | | Fixed compilationtonibm192013-12-241-29/+9
| | | | | |
| | * | | | Implemented xoft suggestiontonibm192013-12-241-7/+11
| | | | | |
| | * | | | Using BLOCKTYPE instead of inttonibm192013-12-241-2/+2
| | | | | |
| | * | | | Fixed commentstonibm192013-12-241-8/+8
| | | | | |
| | * | | | Changed a little how detection works and added comments.tonibm192013-12-241-28/+31
| | | | | |
| | * | | | Storing Y -1 and -2 blocks in a variabletonibm192013-12-241-5/+7
| | | | | |
| | * | | | Using parenthesistonibm192013-12-241-8/+8
| | | | | |
| | * | | | Fixed a possible crashtonibm192013-12-241-39/+42
| | | | | |
| | * | | | Improved iron golem detection algorithmtonibm192013-12-231-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | - You need to make it like in vanilla - Only used blocks are removed
| | * | | | Some fixes (SEE DESC)tonibm192013-12-231-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.tonibm192013-12-231-3/+20
| | | | | | | | | | | | | | | | | | You can spawn them like in vanilla.
| * | | | | Fixed block area height check.madmaxoft2013-12-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The block area couldn't be read up to chunk height.
| * | | | | Preliminary mobile entity savingTiger Wang2013-12-254-13/+790
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes #252 * Alleviates #380 + Adds mob saving * Fixed some debug !ASSERTs
| * | | | Merge pull request #469 from mc-server/Android_UpdateTiger Wang2013-12-242-3/+9
| |\ \ \ \ | | | | | | | | | | | | Android update
| | * | | | Fixed getting configure button going to port 0.STRWarrior2013-12-242-3/+9
| | |/ / /
| * | | | removed the function def alsoAlexander Harkness2013-12-241-1/+0
| | | | |
| * | | | Finally removed the function.Alexander Harkness2013-12-241-6/+0
| | | | |
| * | | | fixed compile?Alexander Harkness2013-12-241-1/+1
| | | | |
| * | | | finally removed them all?Alexander Harkness2013-12-241-1/+1
| | | | |
| * | | | updated another file...Alexander Harkness2013-12-241-4/+4
| | | | |
| * | | | Updated MakeColour's defenition in the header.Alexander Harkness2013-12-241-9/+9
| | | | |
| * | | | Update as per xoft's instructions.Alexander Harkness2013-12-241-1/+1
| | | | |
| * | | | Update chat coloursAlexander Harkness2013-12-241-3/+2
| | | | | | | | | | | | | | | @madmaxoft, is this right? fixes #467
| * | | | Replaced esCreeper with esMonster.madmaxoft2013-12-233-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.STRWarrior2013-12-221-1/+3
| | | |
| * | | Snow golems die in hot biomes and leave a snow trail.STRWarrior2013-12-222-0/+18
| | | |
| * | | You can spawn snow golems with snow blocks and pumpkins.STRWarrior2013-12-221-0/+15
| | | |
| * | | EnderDragons and SnowGolems are able to spawn.STRWarrior2013-12-221-0/+2
| | | |
| * | | Fixed cacus breaking when next to any non-air block.STRWarrior2013-12-221-1/+1
| | | |
| * | | Made the lure enchantment work.STRWarrior2013-12-221-1/+1
| | | |
| * | | Fixed signedness warning in cItemGrid.madmaxoft2013-12-222-4/+4
| | | |
| * | | Fixed compiler warning.STRWarrior2013-12-221-1/+1
| | | |
| * | | Fishing underground is slower and fishing while raining is faster.STRWarrior2013-12-221-0/+15
| | | |
| * | | Fixed compiler warnings.STRWarrior2013-12-221-2/+2
| | | |
| * | | Countdown time is between 100 and 900 ticks.STRWarrior2013-12-221-1/+1
| | | |
| * | | Fishing now uses a countdown instead of a random number each tick.STRWarrior2013-12-222-12/+29
| | | |
| * | | Implented BroadcastParticleEffectSTRWarrior2013-12-2217-2/+122
| | | |
| * | | Using regular assignments.STRWarrior2013-12-211-6/+6
| | | |
| * | | Once again better Y direction for the items given when fishing.STRWarrior2013-12-211-2/+2
| | | |
| * | | You are now able to get different items from fishing.STRWarrior2013-12-211-2/+108
| | | |
| * | | Bindings regen script updated.madmaxoft2013-12-211-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.STRWarrior2013-12-212-0/+32
| | |/ | |/|
* / | basic threadsafe queue interfaceTycho Bickerstaff2013-12-212-0/+34
|/ /
* | Merge branch 'cmake' of github.com:worktycho/MCServer into cmakeTycho Bickerstaff2013-12-212-5/+25
|\ \
| * | added precompiled headerstycho2013-12-201-13/+24
| | |
| * | fixed include of math on windowstycho2013-12-202-1/+10
| | |
* | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-2126-174/+221
|\ \ \ | |/ / |/| |
| * | You could now only get fish from non-source blocks. Fixed it.STRWarrior2013-12-211-1/+1
| | |
| * | Fixed bug where you could pickup the floater only to get one spawned instantly or the other way around.STRWarrior2013-12-211-0/+5
| | |
| * | Fixed bug where you could get fish from non-source blocks.STRWarrior2013-12-211-1/+1
| |/
| * Fixed repeaters delay, maybeTiger Wang2013-12-203-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/MCServerSTRWarrior2013-12-209-97/+92
| |\
| | * Fixed the rest of constructor reorders.madmaxoft2013-12-209-97/+92
| | |
| * | Increased the range an Floater can shoot to.STRWarrior2013-12-201-1/+1
| |/
| * Fish now actualy jumps to the player instead of a few block bellow them.STRWarrior2013-12-201-1/+1
| |
| * Fixed bug where the floater could pop in the water while you could already get a fish.STRWarrior2013-12-201-2/+2
| |
| * More reordering fixes.madmaxoft2013-12-203-7/+16
| |
| * Fixed a typo in cBlockArea merging code.madmaxoft2013-12-201-2/+1
| |
| * Sorted a few constructors to remove warnings.madmaxoft2013-12-2010-49/+57
| |
| * Fixed minor warnings.madmaxoft2013-12-202-5/+7
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-2039-97/+114
|\|
| * Fixed warnings in HTTP parser.madmaxoft2013-12-204-5/+15
| |
| * Attempt at fixing cChunkDef::Height signedness.madmaxoft2013-12-204-21/+24
| |
| * Properly fixed warnings in cFastRandom.madmaxoft2013-12-201-4/+4
| |
| * Fixed compiler warning when iterating over a fixed array of items (ARRAYCOUNT).madmaxoft2013-12-2028-62/+66
| |
| * Fixed melon and pumpkin growing.madmaxoft2013-12-201-1/+1
| |
| * Fixed missing parenthesis.madmaxoft2013-12-201-4/+4
| |
* | Merge branch 'cmake' of github.com:worktycho/MCServer into cmakeTycho Bickerstaff2013-12-191-6/+16
|\ \
| * | fixed include paths on windows and added build dir to gitignoretycho2013-12-201-0/+2
| | |
| * | fixed compile errors with headers and math librarytycho2013-12-201-6/+15
| | |
| * | Merge branch 'master' into cmaketycho2013-12-2012-26/+276
| |\ \
| * | | fixed multiprocessing on windows and removed redundend compile of headerstycho2013-12-201-1/+0
| | | |
* | | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-192-21/+21
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed clang warnings in Noise.cpp.madmaxoft2013-12-201-20/+20
| | | | | | | | | | | | | | | | Fix-a-random-warning-per-day :)
| * | | Fixed assertion during dirt block OnUpdate()Tiger Wang2013-12-201-1/+1
| | |/ | |/|
* | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-1912-26/+276
|\| | | |/ |/|
| * Merge pull request #450 from mc-server/redstonefixesMattes D2013-12-196-26/+94
| |\ | | | | | | Multiple fixes
| | * Fixed PlayerAbilities and creativeTiger Wang2013-12-193-13/+24
| | |
| | * Fixed 1.7 arm swing animationTiger Wang2013-12-191-1/+23
| | |
| | * Fixed dust from being placed on nonsolidsTiger Wang2013-12-192-1/+6
| | |
| | * Fixed repeaters not updating powerTiger Wang2013-12-191-11/+41
| | |
| * | Fixed #include in Floater.cpp.STRWarrior2013-12-191-1/+1
| | |
| * | The floater now actualy dives under water.STRWarrior2013-12-191-1/+1
| | |
| * | You can get fish from fishing :D. Only one type of fish though.STRWarrior2013-12-191-12/+27
| | |
| * | Implented cItemFishingRodHandler.STRWarrior2013-12-192-0/+65
| | |
| * | Implented IsFishing, SetIsFishing and GetFloaterID().STRWarrior2013-12-192-0/+12
| | |
| * | Added cFloater class.STRWarrior2013-12-193-0/+90
| | |
* | | fixed a number of windows issuestycho2013-12-191-13/+28
| | |
* | | added md5 as a dependency for bindingsTycho Bickerstaff2013-12-191-1/+2
| | |
* | | added expat as lua bindings dependincyTycho Bickerstaff2013-12-192-2/+2
| | |
* | | added all cpp files to bindingsTycho Bickerstaff2013-12-191-1/+4
| | |
* | | moved HTTPServer to globsTycho Bickerstaff2013-12-191-1/+5
| | |
* | | added pthread linking code to OSSupportTycho Bickerstaff2013-12-191-0/+4
| | |
* | | moved protocol to globTycho Bickerstaff2013-12-191-1/+5
| | |
* | | added blocks and blockentitiesTycho Bickerstaff2013-12-193-2/+18
| | |
* | | linked in luaTycho Bickerstaff2013-12-191-1/+1
| | |
* | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-193-14/+41
|\| |
| * | Disconnection message no longer shown if pingTiger Wang2013-12-181-5/+8
| | |
| * | Prettified command error messagesTiger Wang2013-12-182-9/+23
| | | | | | | | | | | | Using the magic of overlords (overloads) and standards compliance.
| * | The "<>" of a player name is now colouredTiger Wang2013-12-181-1/+1
| | |
| * | Fixed 1.7 player disconnection not calling hookTiger Wang2013-12-181-4/+14
| |/ | | | | | | This fixes #357
* | fixed bindings generationTycho Bickerstaff2013-12-191-8/+2
| |
* | bindings regenration logicTycho Bickerstaff2013-12-193-32240/+8
| |
* | added zlib and UITycho Bickerstaff2013-12-181-0/+11
| |
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-1850-306/+1327
|\|
| * Merge pull request #440 from mc-server/repeaterfixesMattes D2013-12-182-84/+77
| |\ | | | | | | Fixed redstone wire and certain repeater scenarios
| | * Fixed wire powering blocks beneathTiger Wang2013-12-181-1/+1
| | |
| | * Fixed bad repeater power queuing in corner caseTiger Wang2013-12-182-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_WartMattes D2013-12-184-0/+110
| |\ \ | | | | | | | | Implented Nether Wart.
| | * | Implented Nether Wart.STRWarrior2013-12-184-0/+110
| | | |
| * | | Renamed back EntityAnimation to PlayerAnimationTiger Wang2013-12-188-15/+51
| |/ / | | | | | | | | | | | | This fixes #411 and partially reverts 30ead790490f04248b861db79fddde9148b552f4
| * / Removed offending tr1/memory header inclusion.madmaxoft2013-12-181-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.madmaxoft2013-12-171-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.madmaxoft2013-12-171-0/+6
| |
| * Fixed naming and initialization.madmaxoft2013-12-171-4/+12
| |
| * Forgot to change one Vector3d to Vector3i.STRWarrior2013-12-171-1/+1
| |
| * Renamed Pos to m_Pos.STRWarrior2013-12-171-3/+3
| |
| * Using Recommendations.STRWarrior2013-12-171-10/+23
| |
| * Made buckets work when the player does not 'look' at a block. This fixes #265STRWarrior2013-12-171-32/+53
| |
| * Merge pull request #438 from mc-server/BoatsTiger Wang2013-12-165-14/+80
| |\ | | | | | | Implemented boating functionality.
| | * Boats spawn on top of a block. not between 4 blocks.STRWarrior2013-12-161-1/+1
| | |
| | * Using suggestions for Boat placing.STRWarrior2013-12-161-1/+1
| | |
| | * Boats drop a boat pickup when destroyed by hand. You can now actualy use boats.STRWarrior2013-12-162-3/+33
| | |
| | * Added HandleSpeedFromAttachee so an entity can override the function.STRWarrior2013-12-162-4/+15
| | |
| | * You can spawn boats on water.STRWarrior2013-12-161-7/+32
| | |
| * | Fixed multiple inheritance in ToLua++.madmaxoft2013-12-168-36/+127
| | | | | | | | | | | | This fixes #422.
| * | Removed some old cRedstone remnantsTiger Wang2013-12-163-30/+0
| |/
| * Fixed cClientHandle::Tick() being called from two threads.madmaxoft2013-12-165-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.madmaxoft2013-12-161-3/+0
| |
| * Server saves if a player is flying.STRWarrior2013-12-151-1/+3
| |
| * Merge pull request #437 from mc-server/ShootTo_functionSTRWarrior2013-12-155-4/+49
| |\ | | | | | | Shoot to function
| | * Exported to LuaSTRWarrior2013-12-152-10/+10
| | |
| | * Renamed ShootTo function to ForceSetSpeed.STRWarrior2013-12-152-3/+3
| | |
| | * This adds a function that allows you to 'shoot' a player towards a direction.STRWarrior2013-12-155-4/+49
| | |
| * | Fixed player spawning packet.madmaxoft2013-12-151-1/+1
| | | | | | | | | | | | The player was spawned 1.62 blocks below their pos. This fixes #323.
| * | Fixed calling OnPlayerJoined() in the wrong place.madmaxoft2013-12-151-6/+1
| | | | | | | | | | | | This is the first part of a fix for #187.
| * | Merge pull request #433 from mc-server/redstoneimprovementsMattes D2013-12-151-1/+33
| |\ \ | | | | | | | | Fixed more wire bugs
| | * | Implemented xoft's suggestionsTiger Wang2013-12-151-3/+16
| | | |
| | * | Fixed wire repeater checkingTiger Wang2013-12-151-1/+1
| | | |
| | * | Wires now power repeaters properlyTiger Wang2013-12-151-0/+7
| | | |
| | * | Fixed the hopefully final wire self-powering bugTiger Wang2013-12-151-1/+13
| | | |
| * | | Fixed indentation.madmaxoft2013-12-151-1/+1
| | |/ | |/|
| * | Moved reading flags to the protocol.STRWarrior2013-12-153-19/+23
| | |
| * | Exported Set and Get functions to Lua.STRWarrior2013-12-152-2/+136
| | |
| * | Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() functionSTRWarrior2013-12-155-3/+90
| | |
| * | Merge pull request #432 from mc-server/Broadcast_EffectsMattes D2013-12-157-3/+92
| |\ \ | | | | | | | | Broadcast effects
| | * | cPlayer is using the broadcast functions.STRWarrior2013-12-151-3/+3
| | | |
| | * | This adds the cWorld::BroadcastEntityEffect and cWorld::BroadcastRemoveEntityEffect functions.STRWarrior2013-12-156-0/+89
| | | |
| * | | Fixed pre 1.7 clients crashing.STRWarrior2013-12-151-2/+2
| |/ /
| * | Merge pull request #431 from mc-server/Entity_EffectsMattes D2013-12-1415-4/+170
| |\ \ | | | | | | | | Entity Effects
| | * | Exported E_EFFECTS_<Effect> to lua. Forgot to commit Globals.h.STRWarrior2013-12-145-4/+31
| | | |
| | * | Added E_EFFECT_<Effect>STRWarrior2013-12-142-3/+32
| | | |
| | * | Forgot to commit the ClientHandle.STRWarrior2013-12-142-0/+20
| | | |
| | * | Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison.STRWarrior2013-12-148-1/+91
| | | |
| * | | Added tolua++ redirection include.madmaxoft2013-12-141-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.madmaxoft2013-12-141-4/+0
| | | |
| * | | Merge pull request #430 from mc-server/redstoneimprovementsMattes D2013-12-149-33/+162
| |\ \ \ | | |/ / | |/| / | | |/ Implemented note block playing and fixed wire
| | * Potentially fixed debug assertsTiger Wang2013-12-141-5/+5
| | |
| | * Wires no longer power if a block cuts them offTiger Wang2013-12-141-23/+32
| | | | | | | | | | | | Also reduced more unneeded code.
| | * Implemented note block playing and fixed wireTiger Wang2013-12-149-5/+125
| | | | | | | | | | | | Game of Thrones music in Minecraft, here I come!
* | | added zlibTycho Bickerstaff2013-12-111-1/+1
| | |
* | | moved generating to globsTycho Bickerstaff2013-12-111-1/+5
| | |
* | | added UI folderTycho Bickerstaff2013-12-111-1/+3
| | |
* | | moved Worldstorage to globsTycho Bickerstaff2013-12-111-1/+5
| | |
* | | Merge branch 'master' of github.com:mc-server/MCServer into cmakeTycho Bickerstaff2013-12-112-8/+7
|\| |
| * | Merge branch 'master' into quickfixsTycho Bickerstaff2013-12-1127-514/+603
| |\ \
| * | | fixed unused expression warnings in blockFireTycho Bickerstaff2013-12-101-7/+6
| | | |
| * | | fixed comparison of thread handle to Null point rather than null handleTycho Bickerstaff2013-12-101-1/+1
| | | |
* | | | moved entities to globsTycho Bickerstaff2013-12-111-1/+5
| | | |
* | | | moved mobs to globsTycho Bickerstaff2013-12-111-1/+5
| | | |
* | | | moved simulor to globsTycho Bickerstaff2013-12-111-1/+5
| | | |
* | | | removed leakfinder form buildTycho Bickerstaff2013-12-111-1/+1
| | | |
* | | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-1127-514/+603
|\ \ \ \ | | |/ / | |/| |
| * | | Exported the cTNTEntitySTRWarrior2013-12-144-9/+85
| | | |
| * | | Merge pull request #423 from mc-server/redstoneimprovementsMattes D2013-12-144-290/+158
| |\ \ \ | | | |/ | | |/| Redstone and configuration improvements
| | * | Fixed compilating!Tiger Wang2013-12-141-5/+5
| | | |
| | * | Improved player permissions loggingTiger Wang2013-12-141-1/+1
| | | |
| | * | Fixes to redstone wire and torchesTiger Wang2013-12-143-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 generatedTiger Wang2013-12-142-3/+25
| | | |
| | * | Removed loads of unneeded code againTiger Wang2013-12-141-86/+60
| | | |
| | * | Reduced loads of unneeded codeTiger Wang2013-12-141-188/+44
| | | | | | | | | | | | | | | | Merged wire powering detection code into a single function.
| * | | Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2013-12-146-194/+236
| |\| |
| | * | Merge pull request #419 from mc-server/redstoneloadingMattes D2013-12-132-3/+17
| | |\ \ | | | | | | | | | | Redstone data is now loaded on chunk load
| | | * | Improved redstone loading performanceTiger Wang2013-12-131-2/+10
| | | | |
| | | * | Fixed QueueSetBlock not sending to client changesTiger Wang2013-12-131-2/+1
| | | | |
| | | * | Redstone data is now loaded on chunk loadTiger Wang2013-12-132-0/+7
| | | | |
| | * | | Fixed threading issues affecting cProtocol172.madmaxoft2013-12-134-191/+219
| | | | |
| * | | | Fixed not getting XP from mobs.STRWarrior2013-12-142-1/+7
| |/ / /
| * / / Using "a_ClosestPlayer != NULL" in cExpOrb.STRWarrior2013-12-131-1/+1
| |/ /
| * | Unknown packet type extended to 32 bits.madmaxoft2013-12-122-4/+4
| | |
| * | Fixed protocol 1.7 recovery after unknown packet.madmaxoft2013-12-121-4/+0
| | |
| * | Fixed pistons being viable middle blockTiger Wang2013-12-111-0/+3
| | | | | | | | | | | | Also an excuse to update submodules
| * | Merge pull request #417 from mc-server/WorldUpdateMattes D2013-12-119-2/+99
| |\ \ | | | | | | | | World update
| | * | HOOK_WORLD_STARTED now gets called when the CreateAndInitializeWorld function is used.STRWarrior2013-12-111-0/+1
| | | |
| | * | Added a HOOK_WORLD_STARTED hook and a cRoot::CreateAndInitializeWorld function for plugins.STRWarrior2013-12-119-2/+98
| | | |
| * | | ExpOrbs now move.STRWarrior2013-12-111-4/+8
| | | |
| * | | Provides a possible fix for repeater timingsTiger Wang2013-12-102-2/+2
| | | | | | | | | | | | | | | | Not completely reliable, but at least some types of clock work.
| * | | added abort to DeadlockDetector to generate core dumps on failureTycho Bickerstaff2013-12-101-5/+2
| | |/ | |/|
* | | added tolua++ command and removed stackwalker from buildTycho Bickerstaff2013-12-103-6/+8
| | |
* | | more cmake changesTycho Bickerstaff2013-12-103-6/+15
| | |
* | | removed more accedentailly commited object filesTycho Bickerstaff2013-12-109-3985/+0
| | |
* | | removed accedentailly commited object filesTycho Bickerstaff2013-12-1027-0/+0
| | |
* | | more cmakeTycho Bickerstaff2013-12-1046-6/+4051
| | |
* | | more cmake stuffTycho Bickerstaff2013-12-103-2/+18
| | |
* | | started work on cmakeTycho Bickerstaff2013-12-104-0/+36
|/ /
* | Merge remote-tracking branch 'upstream/master'Tycho Bickerstaff2013-12-105-13/+96
|\|
| * Merge pull request #412 from mc-server/fixesMattes D2013-12-105-13/+96
| |\ | | | | | | Main feature: repeater delays!
| | * Readded initial lineTiger Wang2013-12-101-0/+1
| | |
| | * Fixed compile (alas, no more goto)Tiger Wang2013-12-101-11/+14
| | |
| | * Fixed Floody lava to stone fizzleTiger Wang2013-12-101-2/+16
| | |
| | * Added repeater delaysTiger Wang2013-12-102-1/+62
| | | | | | | | | | | | They DO sometimes get stuck though :P
| | * Slight redstone wire performance improvementTiger Wang2013-12-101-1/+6
| | |
| | * Changed more FastSetBlocks to SetBlocksTiger Wang2013-12-101-3/+3
| | | | | | | | | | | | Fixes duplication bugs.
| | * Improved pickups spawning speed againTiger Wang2013-12-102-7/+6
| | |
* | | moved deafult action into deafult clause at src/Generating/DistortedHeightmap.cpp line 741Tycho Bickerstaff2013-12-081-2/+4
| | |
* | | reordered initalisation order at src/Generating/Cave.h line 73Tycho Bickerstaff2013-12-081-2/+2
|/ /
* | fixed warnings in src/Generating/BioGen.cppTycho Bickerstaff2013-12-081-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.cppTycho Bickerstaff2013-12-081-0/+4
| |
* | Reordered Listed Initalisation order in src/UI/Window.cppTycho Bickerstaff2013-12-081-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 ResultSlotTycho Bickerstaff2013-12-081-1/+0
| |
* | Fix Undefined behavior at Bindings/LuaWindow line 32worktycho2013-12-091-1/+4
| |
* | Fix Unused Variable Warning at FluidSimulator.cpp line 169 and 176worktycho2013-12-091-4/+3
| |
* | Fixed warning unchecked enum value at Chunk.cpp line 841worktycho2013-12-091-2/+4
| |
* | Fixed Warning Unhandeled enum values in switch as src/UI/SlotArea.cpp line 54worktycho2013-12-091-1/+4
|/
* Fixed angle normalization typo.madmaxoft2013-12-081-1/+1
|
* Fixed tolua++ compilation.madmaxoft2013-12-087-192/+5
| | | | Duplicate files, wrong includes, const-incorrect code...
* Fixed VS2008 compilation after those huge changes.madmaxoft2013-12-082-5/+7
|
* Merge pull request #408 from mc-server/SpawnPoint_FixMattes D2013-12-081-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.STRWarrior2013-12-081-1/+1
| |
* | Readded redstone lamp handlerTiger Wang2013-12-081-0/+2
| |
* | Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-0843-1251/+1348
|\| | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Fixed normalizing large angles.madmaxoft2013-12-084-8/+51
| |
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-0841-1238/+1237
| | | | | | | | Ref.: #407
| * Fixed stationary water starting fires and flowing lava not.madmaxoft2013-12-081-2/+2
| |
| * Added a SpawnFallingBlock function so plugins can make other blocks fall.STRWarrior2013-12-074-2/+93
| |
* | Fixed tabcompletion packet, fixes #356Tiger Wang2013-12-081-8/+4
| |
* | Fixed falling block metas, fixes #406Tiger Wang2013-12-081-1/+1
| |
* | Bonemeal has particles, fixes #393Tiger Wang2013-12-082-3/+8
| |
* | Console trims its commands before executing 'emTiger Wang2013-12-071-3/+3
| |
* | Fixed water starting firesTiger Wang2013-12-071-1/+0
| |
* | Improved piston animationsTiger Wang2013-12-071-4/+4
| |
* | Fixed some new 1.7 client crash bugsTiger Wang2013-12-074-1/+37
| | | | | | | | | | Some technical blocks were removed; trying to render them as items caused a crash.
* | Changed some FastSetBlocks to SetBlockTiger Wang2013-12-071-3/+3
| | | | | | | | Should fix some duplication glitches.
* | Fixed trapdoors not togglingTiger Wang2013-12-073-17/+103
| | | | | | | | The redstone simulator kept on resetting them.
* | Added basic ender chestsTiger Wang2013-12-0710-14/+355
| | | | | | | | Note that they just mirror chests now, so no per player inventory.
* | Renamed animation functionTiger Wang2013-12-0723-47/+82
| | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* | Fixed bed leave animationTiger Wang2013-12-061-1/+1
| |
* | Fixed duplication glitch with QueueSetBlockTiger Wang2013-12-067-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 detectionTiger Wang2013-12-061-2/+0
| |
* | Puking now uses GetEyeHeight()Tiger Wang2013-12-061-1/+1
| |
* | Added pickup invalid item checkTiger Wang2013-12-061-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 checkingTiger Wang2013-12-061-0/+29
| |
* | Fixed eating using wrong animationTiger Wang2013-12-061-1/+1
| |
* | Fixed trapdoors not overriding OnUseTiger Wang2013-12-061-1/+1
| |
* | Spawn eggs use IsGameMode()Tiger Wang2013-12-061-2/+2
| | | | | | | | Possible fix for #316.
* | Tools make a sound when breaking, fixes #266Tiger Wang2013-12-062-2/+5
| |
* | Cleaned up torch code and added commentsTiger Wang2013-12-061-31/+7
| |
* | Removed another export and inline'd stuffTiger Wang2013-12-061-5/+5
| |
* | Removed exporting of a torch functionTiger Wang2013-12-061-3/+3
| |
* | Updated comments for slabsTiger Wang2013-12-061-5/+6
| |
* | Fixed pickups spawning for BlockEntitiesTiger Wang2013-12-061-1/+1
|/
* Merge pull request #394 from SamJBarney/masterMattes D2013-12-062-4/+8
|\ | | | | Fire no longer goes out when on top of nether rack
| * Merged if statements.Samuel Barney2013-12-051-7/+1
| |
| * Finished MergeSamuel Barney2013-12-051-2/+2
| |
| * Merge branch 'master' of https://github.com/mc-server/MCServerSamuel Barney2013-12-057-10/+97
| |\ | | | | | | | | | | | | Conflicts: src/Simulator/FireSimulator.h
| * | Made suggested changesSamuel Barney2013-12-042-6/+11
| | |
| * | Fire no longer goes out when on top of nether rackSamuel Barney2013-12-021-1/+6
| | |
* | | Added cPluginManager:GetCurrentPlugin() to Lua API.madmaxoft2013-12-051-7/+22
| |/ |/|
* | ByteBuffer: Fixed optimization failures with threading checks.madmaxoft2013-12-051-1/+1
| |
* | Hopefully fixed the sparc not being detectedAlexander Harkness2013-12-041-1/+3
| |
* | Lava can spawn fire.madmaxoft2013-12-045-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.madmaxoft2013-12-041-2/+2
|/ | | | Absolute coords were passed to a handler expecting relative coords.
* Removed stray printf, again.Samuel Barney2013-12-021-1/+0
|
* Switched to using provided ReadItem function.Samuel Barney2013-12-022-17/+12
| | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs.
* Removed stray printf.Samuel Barney2013-12-021-1/+0
|
* Fixed 1.7 slab and stair placement.Samuel Barney2013-12-021-0/+19
|
* Fixed compiler warnings in LightingThread.cpp.madmaxoft2013-12-011-2/+2
|
* Fixed linux compile errors and formatting in RedstoneSimulator.cppmadmaxoft2013-12-011-14/+26
|
* DeadlockDetect is configurable now.madmaxoft2013-11-303-7/+15
| | | | This is needed when debugging Lua plugins.
* Fixed compiler warnings in IsBiomeNoDownfall().madmaxoft2013-11-301-1/+4
|
* Merge pull request #387 from mc-server/trapdoorsMattes D2013-11-3020-330/+431
|\ | | | | Trapdoors, redstone fixes, and snow
| * Fixed pistons extendingTiger Wang2013-11-301-0/+10
| | | | | | | | They didn't when a source was in front, but now they do! Yay!
| * Removed redstone duplicate power checkingTiger Wang2013-11-301-2/+0
| | | | | | | | There was no need for it, and it introduced some bugs.
| * Improved piston direction checkingTiger Wang2013-11-301-62/+8
| | | | | | | | Now uses AddFaceDirection, as suggested by xoft.
| * Pistons no longer accept power through front faceTiger Wang2013-11-302-3/+96
| | | | | | | | This fixes #60.
| * Fixed thin snow CanBeAt checkingTiger Wang2013-11-301-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 #264Tiger Wang2013-11-303-25/+53
| |
| * Improved redstone speed and fixed a wire bugTiger Wang2013-11-301-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 #269Tiger Wang2013-11-291-2/+22
| | | | | | | | Additionally, they now have walking sounds.
| * Implemented trapdoors, fixes #43 and #105Tiger Wang2013-11-295-3/+131
| | | | | | | | Also updated redstone simulator to support it
| * Removed unneeded CPP filesTiger Wang2013-11-2911-221/+77
| | | | | | | | Also removed unneeded #include in BlockStems
* | Changed cBlockHandler->OnUpdate() to use cChunk directly.madmaxoft2013-11-3015-63/+117
| |
* | Added IsBiomeNoDownfall() function.madmaxoft2013-11-303-103/+164
| |
* | Explicitly set spawnpoint fixes.madmaxoft2013-11-301-20/+11
| | | | | | | | | | The value names are case-insensitive. The debug message is printed only once.
* | Added the real tick duration to the OnWorldTick hook.madmaxoft2013-11-308-17/+34
| |
* | Grass doesn't spread to podzol or grassless dirt blocks.madmaxoft2013-11-301-2/+3
| |
* | Added floor pattern for MegaTaiga biomes.madmaxoft2013-11-301-1/+10
| |
* | Implemented mesa biomes in DistortedHeightmap CompoGen.madmaxoft2013-11-293-21/+106
| |
* | Fixed CheckerboardBiomeGen in negative coords.madmaxoft2013-11-291-2/+3
| |
* | DistortedHeightmap: Improved speed, prepared for mesa biomes.madmaxoft2013-11-292-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.madmaxoft2013-11-291-1/+1
| | | | | | | | Could have caused random protocol errors and maybe even crashes.
* | Alpha-sorted BlockMetas, added red sand.madmaxoft2013-11-291-125/+128
| |
* | Trees will generate in the new biomes.madmaxoft2013-11-282-14/+101
| | | | | | | | Only the generic trees, the special variants haven't yet been implemented.
* | Added new biomes to old composition generator.madmaxoft2013-11-284-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.madmaxoft2013-11-284-39/+179
| | | | | | | | Now Biomal and DistortedHeight generators will work with new biomes.
* | Moved BiomeGen creation from INI file data to BioGen.cpp.madmaxoft2013-11-283-48/+74
| | | | | | | | This way it can be shared between MCServer and BiomeVisualiser.
* | Moved json includes to where they are really needed.madmaxoft2013-11-283-1/+2
| |
* | BiomeVisualiser: Added the TwoLevel biome generator.madmaxoft2013-11-282-0/+229
|/
* Fixed a bug with TNT waking simulatorsTiger Wang2013-11-281-2/+2
|
* Improved TNT pickup randomisationTiger Wang2013-11-281-1/+1
|
* Made TNT pickups spawning chance 25%Tiger Wang2013-11-272-3/+3
|
* Merged master into redstonefixesTiger Wang2013-11-27465-0/+138834
|\
| * Voronoi-related biomegens use the new cVoronoiMap class.madmaxoft2013-11-273-54/+29
| |
| * Fixed a load of issues, clang autodetection works now.Alexander Harkness2013-11-271-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.madmaxoft2013-11-272-0/+140
| |
| * Fixed VC2008 compilation, normalized include paths.madmaxoft2013-11-2712-12/+12
| |
| * Fixed the remaining derpsAlexander Harkness2013-11-2726-30/+30
| |
| * Fixed some of tiger's derpyness.Alexander Harkness2013-11-279-11/+11
| |
| * ANOTHER compile fixTiger Wang2013-11-261-1/+1
| | | | | | | | This one was broken by bear. :P
| * Hopefully fixed last of the Linux compile errorsTiger Wang2013-11-265-5/+5
| |
| * Compile fix againTiger Wang2013-11-261-1/+1
| |
| * Fixed Linux compile againTiger Wang2013-11-261-1/+1
| |
| * Fixed tolua++ filesTiger Wang2013-11-263-4/+4
| |
| * Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-2618-6/+268
| |\ | |/ |/| | | | | Conflicts: VC2008/MCServer.vcproj
| * Merge branch 'master' into foldermove2Alexander Harkness2013-11-261-3/+0
| |\ | |/ |/|
| * Fixed loads more of them.Alexander Harkness2013-11-2611-13/+13
| |
| * AnotherAlexander Harkness2013-11-261-1/+1
| |
| * And another.Alexander Harkness2013-11-261-1/+1
| |
| * Fixed another.Alexander Harkness2013-11-261-1/+1
| |
| * Fixed another one.Alexander Harkness2013-11-261-1/+1
| |
| * Fixed a mis-includeAlexander Harkness2013-11-261-1/+1
| |
| * Further attempts to fix compileTiger Wang2013-11-2524-27/+27
| |
| * Attempt to fix compilationTiger Wang2013-11-2448-59/+58
| |
| * Moved SQLite, LuaExpat, and MD5 to /libTiger Wang2013-11-248-148557/+0
| |
| * Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-2466-1497/+2365
| |\ | |/ |/| | | | | Conflicts: GNUmakefile
| * Moved source to srcAlexander Harkness2013-11-24469-0/+285880
|/
* Android: Moved Android stuff to the ~/trunk/Android/ folder!faketruth2012-08-191-267/+0
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@758 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Android: Finally a log! :Dfaketruth2012-08-191-32/+44
| | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@754 0a769ca7-a7f5-676a-18bf-c427514a06d6
* Android: Showing last MCServer related logcat messagefaketruth2012-08-191-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 statusfaketruth2012-08-181-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 serverfaketruth2012-08-181-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 :Dfaketruth2012-08-161-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!faketruth2012-08-151-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 16:20:12 +0100