summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into SpongeSpongeHowaner2015-03-10112-2380/+7754
|\
| * Fixed client kick/crash if many block changes happendHowaner2015-03-091-3/+15
| * Merge pull request #1794 from mc-server/MesaPlateauFMattes D2015-03-082-6/+24
| |\
| | * Added parenthesis around the comparisonsSTRWarrior2015-03-081-2/+2
| | * Added proper trees to Mesa biomesSTRWarrior2015-03-081-6/+10
| | * Added grass/course dirt layer on MesaPlateauF(M)STRWarrior2015-03-081-0/+14
| |/
| * Merge pull request #1784 from mc-server/SteppyHeiGenTiger Wang2015-03-063-1/+409
| |\
| | * Steppy HeiGen: Fixed Linux compilation.Mattes D2015-03-011-1/+1
| | * Added Steppy height generator.Mattes D2015-03-013-1/+409
| * | Updated license year.Alexander Harkness2015-03-051-1/+1
| * | Merge pull request #1791 from joshi07/masterTiger Wang2015-03-052-2/+31
| |\ \
| | * | Added OnEntityTeleport.lua hook to APIDumpjoshi072015-03-051-0/+29
| | * | Added description to APIDump for OnEntityTeleportjoshi072015-03-051-2/+2
| * | | Grass checks for sufficient light before spreadingAlexander Harkness2015-03-051-1/+13
| * | | Merge pull request #1790 from joshi07/masterMattes D2015-03-058-12/+81
| |\| |
| | * | Added OnTeleportEntity hook for plugins.joshi072015-03-058-12/+81
| |/ /
| * | Lua API: Fixed md5 and sha1 hex formatting.Mattes D2015-03-031-4/+4
| * | Merge pull request #1781 from mc-server/VinesMattes D2015-03-013-0/+122
| |\ \
| | * | Removed trailing whitespaceSTRWarrior2015-03-011-1/+1
| | * | Replaced IntNoiseXX with IntNoiseXXIntSTRWarrior2015-03-011-2/+2
| | * | Replaced cFinishGenPtr with std::make_sharedSTRWarrior2015-03-011-1/+1
| | * | Made the minimum vine level configurableSTRWarrior2015-02-283-4/+7
| | * | Implemented a vines finisher that creates vines in jungle biomesSTRWarrior2015-02-283-0/+119
| * | | Merge pull request #1780 from DevToaster/masterMattes D2015-03-012-53/+53
| |\ \ \ | | |_|/ | |/| |
| | * | Changed C-styled casts to static_cast and removed unneeded castsDevToaster2015-02-281-34/+34
| | * | Replaced short int with int for Player experienceDevToaster2015-02-281-1/+1
| | * | modified: src/Entities/Player.cppDevToaster2015-02-282-27/+27
| * | | Debuggers plugin: Disabled WECUI manipulation.Mattes D2015-03-011-1/+2
| * | | Fixed raspi easyinstall.Alexander Harkness2015-03-011-1/+1
| | |/ | |/|
| * | Merge pull request #1769 from mc-server/snowweatherNiLSPACE2015-02-284-114/+220
| |\ \
| | * | GetSnowStartHeight returns an intSTRWarrior2015-02-282-2/+2
| | * | changed int to unsignedSTRWarrior2015-02-262-4/+4
| | * | Ice finisher uses GetSnowStartHeight instead of specific biomesSTRWarrior2015-02-251-26/+19
| | * | Snow finisher uses GetSnowStartHeight instead of specific biomesSTRWarrior2015-02-251-22/+14
| | * | Weather: Snow starts forming when the top block is at the right height or higherSTRWarrior2015-02-251-66/+57
| | * | Added GetSnowStartHeightSTRWarrior2015-02-252-0/+130
| * | | Merge pull request #1779 from mc-server/DoorHingesFixMattes D2015-02-281-4/+17
| |\ \ \ | | |_|/ | |/| |
| | * | Fixed door placement.Mattes D2015-02-281-4/+17
| |/ /
| * | Merge pull request #1778 from mc-server/OreXPAlexander Harkness2015-02-281-0/+59
| |\ \
| | * | Added experience drops when mining oresSTRWarrior2015-02-281-0/+59
| |/ /
| * | Merge pull request #1771 from Raekye/masterMattes D2015-02-261-10/+4
| |\ \ | | |/ | |/|
| | * use DoSetSpeed in AddSpeed* in Entity.cppRaekye2015-02-261-10/+4
| |/
| * Fixed flowing water turning into ice when snowingSTRWarrior2015-02-251-1/+1
| * Merge pull request #1762 from mc-server/LuaStringCompressMattes D2015-02-252-0/+172
| |\
| | * Added documentation for CompressStringZLIBSTRWarrior2015-02-231-1/+1
| | * Fixed operatorsSTRWarrior2015-02-231-6/+6
| | * Added forgotten indentSTRWarrior2015-02-231-2/+2
| | * Replaced lua_isXYZ with cLuaState::CheckParamXYZSTRWarrior2015-02-231-12/+13
| | * Documented cStringCompressionSTRWarrior2015-02-231-2/+21
| | * Exported all compression functions in a new class.STRWarrior2015-02-231-16/+129
| | * Documented CompressString and UncompressStringSTRWarrior2015-02-221-0/+2
| | * Exported CompressString and UncompressString to LuaSTRWarrior2015-02-221-0/+37
| * | 1.8 Protocol: Fixed a possible race condition.Mattes D2015-02-241-5/+9
| * | Fixed race condition for TCP link deleting.Mattes D2015-02-221-2/+6
| * | Merge pull request #1760 from Samvbnm/patch-1Mattes D2015-02-221-0/+1
| |\ \ | | |/ | |/|
| | * Update COMPILING.mdSamvbnm2015-02-221-1/+1
| | * Update COMPILING.mdSamvbnm2015-02-211-1/+2
| | * Update COMPILING.mdSamvbnm2015-02-211-1/+1
| |/
| * Door handler: Removed needless check.Mattes D2015-02-211-1/+1
| * Fix door placement checkFreddie Wang2015-02-211-7/+3
| * Merge pull request #1758 from mc-server/CryptoHashAPIMattes D2015-02-214-19/+190
| |\
| | * Added cCryptoHash namespace to Lua API.Mattes D2015-02-214-19/+190
| * | Merge pull request #1755 from mc-server/NetworkUDPMattes D2015-02-2117-51/+1591
| |\ \ | | |/ | |/|
| | * APIDump: Added the UDP zero port policy.Mattes D2015-02-201-1/+1
| | * Network tests: Fixed clang warnings.Mattes D2015-02-203-3/+3
| | * UDPEndpointImpl: Fixed clang warnings.Mattes D2015-02-201-3/+3
| | * cNetwork: Added UDP API.Mattes D2015-02-2014-48/+1588
| * | Fixed monster spawn randomness.Mattes D2015-02-201-1/+2
| * | Fixed crash when logging nil values.Matyas Dolak2015-02-201-0/+32
| * | Flower pots: In 1.8 items are saved with the name and not the id.Howaner2015-02-181-5/+12
| |/
| * NetworkSingleton: LibEvent thread is joined properly on server exit.Mattes D2015-02-182-7/+5
| * InfoReg: Fixed MultiCommand return values.Mattes D2015-02-181-2/+1
| * Network: Fixed two-socket servers.Mattes D2015-02-181-1/+1
| * Merge pull request #1750 from tommysanterre/gitignoreMattes D2015-02-181-0/+6
| |\
| | * Ignore files generated on buildTommy Santerre2015-02-181-0/+6
| |/
| * Merge pull request #1748 from Creaprog/patch-1Mattes D2015-02-161-2/+4
| |\
| | * Fixed guest.htmlCreaprog2015-02-161-1/+1
| | * Fixed guest.htmlCreaprog2015-02-161-2/+4
| |/
| * Fixed guest page.Alexander Harkness2015-02-161-2/+16
| * Merge pull request #1741 from Creaprog/patch-2Alexander Harkness2015-02-161-4/+4
| |\
| | * Fixed Server.cppCreaprog2015-02-161-1/+1
| | * Fixed Server.cppCreaprog2015-02-151-4/+3
| | * Fixed Server.cppCreaprog2015-02-151-0/+1
| | * Fixed Server.cppCreaprog2015-02-151-4/+4
| | * Fixed Server.cppCreaprog2015-02-151-4/+4
| |/
| * Merge pull request #1740 from Creaprog/patch-1Mattes D2015-02-151-1/+1
| |\
| | * Fixed login_template.htmlCreaprog2015-02-151-1/+1
| |/
| * Fixed TCP link shutdown.Mattes D2015-02-143-11/+71
| * SslContext: Turned debug messages off.Mattes D2015-02-141-1/+1
| * Fixed Linux compilation.Mattes D2015-02-142-2/+2
| * Exported TLS server start on cTCPLink to Lua API.Mattes D2015-02-135-10/+292
| * Exported cTCPLink:Close and :Shutdown() to Lua API.Mattes D2015-02-132-13/+85
| * PolarSSL++: Fixed debugging output.Mattes D2015-02-121-0/+3
| * Fixed Linux compilation.Mattes D2015-02-121-1/+1
| * LuaAPI: Added client TLS support for TCP links.Mattes D2015-02-1212-8/+395
| * Update COMPILING.mdMattes D2015-02-081-2/+2
| * Protocol 1.7: Fixed Coverity issues.Mattes D2015-02-081-4/+7
| * ServerHandle: Fixed socket reuse.Mattes D2015-02-081-10/+30
| * WSSAnvil: Fixed chunk data padding.Mattes D2015-02-081-2/+5
| * Merge pull request #1729 from mc-server/ReuseFlagMattes D2015-02-081-1/+14
| |\
| | * Use evutil_make_listen_socket_reuseableHowaner2015-02-071-16/+6
| | * Set reuse flag to socketsHowaner2015-02-071-1/+24
| * | Merge pull request #1718 from mc-server/LuaNetworkAPIMattes D2015-02-0720-3/+2453
| |\ \
| | * | APIDump: Added client and server examples.Mattes D2015-02-071-0/+137
| | * | APIDump: Added cNetwork documentation.Mattes D2015-02-062-1/+184
| | * | NetworkTest plugin: updated comments and splash loading.Mattes D2015-02-041-7/+10
| | * | LuaServerHandle: Removed debugging output.Mattes D2015-02-041-4/+0
| | * | Exported cServerHandle and cNetwork:Listen to Lua.Mattes D2015-02-0415-15/+1145
| | * | cNetwork: Exported lookup functions to Lua API.Mattes D2015-02-047-3/+282
| | * | NetworkTest plugin: Added cNetwork:Connect test code.Mattes D2015-02-042-0/+109
| | * | cTCPLink: Fixed missing addresses on link connection.Mattes D2015-02-041-2/+2
| | * | cNetwork: Exported the Connect() method and cTCPLink class to Lua.Mattes D2015-02-048-1/+614
| | |/
| * | Merge pull request #1727 from mc-server/EntitiesMattes D2015-02-074-8/+11
| |\ \ | | |/ | |/|
| | * SpacingHowaner2015-02-071-1/+1
| | * Updated IsOnGround() documentationHowaner2015-02-071-1/+1
| | * cPlayer should override IsOnGround()Howaner2015-02-072-3/+3
| | * Added IsOnGround() to cEntityHowaner2015-02-072-6/+9
| |/
| * Switched LuaState to use sizeof...tycho2015-01-311-15/+1
| * Merge pull request #1713 from mc-server/UseLibeventMattes D2015-01-3048-2071/+1363
| |\
| | * Fixed listening ports not closed on cServerHandle::Close.Mattes D2015-01-271-0/+3
| | * Fixed server failure to open any port not aborting the server.Mattes D2015-01-271-29/+35
| | * Fixed a deadlock in cClientHandle network sending.Mattes D2015-01-272-5/+28
| | * Added network termination called at app exit.Mattes D2015-01-276-17/+90
| | * cTCPLinkImpl: Added the BEV_OPT_THREADSAFE flag.Mattes D2015-01-271-2/+8
| | * ServerHandleImpl: Removed needless diagnostic output.Mattes D2015-01-271-4/+0
| | * Client: Only decode protocol when there's actual data incoming.Mattes D2015-01-271-2/+8
| | * Added LibEvent license to the binary distribution pack.Mattes D2015-01-271-0/+99
| | * Fix clang compile errorworktycho2015-01-271-1/+1
| | * Removed cFile::ReplaceFileNameInvalidChars().Mattes D2015-01-273-27/+3
| | * Fixed enchant packet handling.Mattes D2015-01-271-3/+3
| | * Turned off echo in Windows script.Mattes D2015-01-271-0/+1
| | * RCONServer: Changed variables to UInt32.Mattes D2015-01-272-32/+29
| | * Replaced atoi() with StringToInteger().Mattes D2015-01-275-9/+11
| | * Removed ListenThread and SocketThreads.Mattes D2015-01-275-1225/+0
| | * BlockingSslClientSocket: Migrated to cNetwork API.Mattes D2015-01-273-15/+198
| | * Converted cServer to use the cNetwork API.Mattes D2015-01-278-413/+330
| | * cNetwork: Fixed IP address reading for incoming connections.Mattes D2015-01-271-1/+2
| | * Protocol18: Fixed failure with invalig logfile names.Mattes D2015-01-271-8/+15
| | * cFile: Added ReplaceFileNameInvalidChars().Mattes D2015-01-272-0/+26
| | * StringUtils: Fixed bad predicate in MergeStringVectors().Mattes D2015-01-271-1/+1
| | * RCON server: fixed compilation.Mattes D2015-01-271-1/+1
| | * Fixed RCONClient compilation.Mattes D2015-01-273-14/+55
| | * Migrated RCON server to cNetwork API.Mattes D2015-01-272-100/+116
| | * Fixed a crash in RCON server.Mattes D2015-01-271-1/+0
| | * Fixed missing LibEvent reference in OSSupport.Mattes D2015-01-271-1/+1
| | * WebAdmin uses the new cNetwork API.Mattes D2015-01-278-203/+237
| | * IniFile: Added common code to migrate ports.Mattes D2015-01-272-4/+56
| | * StringUtils: Added string vector manipulation.Mattes D2015-01-272-1/+54
| * | Updated PolarSSL.Matyas Dolak2015-01-291-0/+0
| * | CheckBasicStyle: Fixed a forgotten file close.Mattes D2015-01-291-0/+1
| * | Fixed missing LibEvent reference in OSSupport.Mattes D2015-01-291-1/+1
| * | Updated PolarSSL.Mattes D2015-01-271-0/+0
| * | Updated LibEvent.Mattes D2015-01-271-0/+0
| |/
| * Debuggers: Logging the os.clock for console-scheduled tasks.Matyas Dolak2015-01-271-3/+6
| * Merge pull request #1716 from Raekye/masterMattes D2015-01-261-6/+12
| |\
| | * fix logic bug in cChunk::FastSetBlock filtering out leaves meta changesRaekye2015-01-261-7/+9
| | * filter out leaves meta changes from being sent to the clientRaekye2015-01-261-0/+4
| |/
* | Changed return type from AbsorbWater() to void.Howaner2015-01-251-4/+2
* | Updated to latest code.Howaner2015-01-251-8/+6
* | Merge branch 'master' into SpongeHowaner2015-01-25232-1534/+5177
|\|
| * Gamosocm supportAlexander Harkness2015-01-241-2/+1
| * Merge pull request #1701 from mc-server/libeventMattes D2015-01-2423-8/+2292
| |\
| | * cNetwork: Added self pointers to keep objects alive for callbacks.Mattes D2015-01-235-17/+39
| | * cNetwork: Renamed callback to OnConnected()Mattes D2015-01-223-4/+7
| | * cNetwork: Added link creation callback.Mattes D2015-01-226-26/+90
| | * cNetwork: Changed listening API.Mattes D2015-01-225-51/+79
| | * cNetwork: Added error message to error callbacks.Mattes D2015-01-228-21/+28
| | * cTCPLinkImpl: Fixed type conversion warning.Mattes D2015-01-223-5/+5
| | * cNetwork: Fixed race conditions with lookups; proper shutdown.Mattes D2015-01-227-82/+124
| | * cNetwork: Split the main cpp file into several files.Mattes D2015-01-2214-1052/+1170
| | * cNetwork: Fixed WinXP dualstack listening.Mattes D2015-01-221-21/+42
| | * cNetwork: Split cNetworkSingleton to a separate file.Mattes D2015-01-225-326/+442
| | * cNetwork: Fixed WSAStartup()-not-called error in Listen().Mattes D2015-01-221-0/+3
| | * cNetwork: Handle WSA initialization failures.Mattes D2015-01-221-1/+7
| | * cNetwork: Added an OnError callback for listening servers.Mattes D2015-01-223-0/+13
| | * cNetwork: Rewritten server listen into a factory method.Mattes D2015-01-221-88/+102
| | * cNetwork: Removed unneeded dependency.Mattes D2015-01-221-1/+0
| | * cNetwork: Refactored cTCPLinkImpl::Connect into a factory.Mattes D2015-01-221-41/+48
| | * cNetwork: Cosmetics.Mattes D2015-01-221-6/+10
| | * cNetwork: Fixed compilation in out-of-source builds.Mattes D2015-01-221-0/+3
| | * cNetwork: Fixed compilation.Mattes D2015-01-221-9/+8
| | * Wrap debug variable in ifdef worktycho2015-01-221-0/+2
| | * cNetwork: Added error logging to server socket creation.Mattes D2015-01-221-6/+24
| | * cNetwork: Added multithreading protection.Mattes D2015-01-223-4/+35
| | * cNetwork: Implemented connection shutdown and close.Mattes D2015-01-223-18/+74
| | * cNetwork: Fixed Linux compilation.Mattes D2015-01-222-6/+24
| | * cNetwork: Implemented link address getting.Mattes D2015-01-222-61/+121
| | * cNetwork: Implemented basic server functionality.Mattes D2015-01-222-123/+282
| | * cNetwork: Implemented IP-to-hostname lookup.Mattes D2015-01-222-11/+130
| | * cNetwork: Implemented HostnameToIP lookups.Mattes D2015-01-226-9/+256
| | * Excluded PolarSSL tests from MCS tests.Mattes D2015-01-221-1/+2
| | * Added newline to logged messages in the tests.Mattes D2015-01-221-8/+12
| | * Extracted Google connection testTycho2015-01-225-74/+113
| | * cNetwork: Linux compilation fix.Mattes D2015-01-222-4/+23
| | * Implemented LibEvent-based client connections.Mattes D2015-01-224-0/+1028
| | * Added the libevent library.Mattes D2015-01-224-1/+15
| * | Merge pull request #1712 from UltraCoderRU/fix_coverityMattes D2015-01-236-3/+52
| |\ \
| | * | Fixed defect #43662 in Coverity list.Kirill Kirilenko2015-01-231-1/+17
| | * | Fixed defect #43665 in Coverity list.Kirill Kirilenko2015-01-231-0/+11
| | * | Fixed defect #73101 in Coverity list.Kirill Kirilenko2015-01-231-1/+13
| | * | Fixed defect #43671 in Coverity list.Kirill Kirilenko2015-01-231-0/+4
| | * | Fixed defect #43661 in Coverity list.Kirill Kirilenko2015-01-231-1/+2
| | * | Fixed defect #71781 in Coverity list.Kirill Kirilenko2015-01-231-0/+5
| |/ /
| * | ProtoProxy: Added socket startup error reporting.Matyas Dolak2015-01-231-3/+31
| * | Fixed negative return values in SchematicFileSerializer.Matyas Dolak2015-01-231-1/+3
| |/
| * Merge pull request #1708 from mc-server/WarningFixesMattes D2015-01-2214-310/+384
| |\
| | * Fixed warnings in StringUtils.Mattes D2015-01-212-49/+59
| | * ProtoProxy: Fixed warnings in Connection.cpp.Matyas Dolak2015-01-211-87/+89
| | * ByteBuffer: Added support for reading unsigned shorts and ints.Matyas Dolak2015-01-212-1/+33
| | * ProtoProxy: Fixed warnings in Connection.cpp.Matyas Dolak2015-01-212-16/+24
| | * Fixed warnings in FastNBT.cpp.Mattes D2015-01-201-39/+40
| | * Fixed warnings in 1.7 protocol.Mattes D2015-01-183-110/+131
| | * Fixed various warnings.Mattes D2015-01-183-8/+8
| | * cWorld: Fixed a type warning.Mattes D2015-01-181-1/+1
| |/
| * Fixed type conversion warnings.Mattes D2015-01-182-4/+4
| * Merge pull request #1702 from mc-server/chronoMattes D2015-01-18117-260/+262
| |\
| | * Fixed type-conversion warnings.Mattes D2015-01-184-8/+8
| | * correct comment to say millisecondsworktycho2015-01-171-1/+1
| | * Converted Monster to std::chronoTycho2015-01-164-18/+18
| | * Converted cPickupEntity to std::chronoTycho2015-01-162-12/+12
| | * Converted MinecartEntity to std::chronoTycho2015-01-162-8/+8
| | * Converted cExpOrbEntity to std::chronoTycho2015-01-162-7/+7
| | * Converted ArrowEntityTiers to std::chronoTycho2015-01-162-7/+7
| | * Fix trailing whitespaceTycho2015-01-111-1/+1
| | * Initial convertion of a_Dt to std::chronoTycho2015-01-11117-221/+221
| | * Created new type cTickTime and rewrote cWorld::TickThread to use itTycho2015-01-112-6/+8
| * | Merge pull request #1707 from UltraCoderRU/masterMattes D2015-01-178-11/+11
| |\ \ | | |/ | |/|
| | * Fixed CppCheck: (performance) Prefer prefix ++/-- operators for non-primitive types.Kirill Kirilenko2015-01-172-2/+2
| | * Fixed CppCheck: (performance) Possible inefficient checking for emptiness.Kirill Kirilenko2015-01-174-5/+5
| | * Fixed CppCheck: (performance) Function parameter should be passed by reference.Kirill Kirilenko2015-01-172-4/+4
| |/
| * CMake: Check libs in submodules before configuring.Mattes D2015-01-091-0/+8
| * Fixed Linux compilation.Mattes D2015-01-032-2/+2
| * Protocols: Ignore garbage data at the end of PluginMessage packets.Mattes D2015-01-032-0/+21
| * cByteBuffer: Improved SingleThreadAccessChecker performance.Mattes D2015-01-031-1/+6
| * Merge pull request #1691 from tonibm19/patch-3Mattes D2014-12-301-0/+2
| |\
| | * Use cRoot:Get():GetServer():GetNumPlayers() instead of a custom function.tonibm192014-12-301-9/+1
| | * Added player count to webadmintonibm192014-12-291-0/+10
| |/
| * Add make as a required program for *nixworktycho2014-12-261-2/+2
| * MobHead: Fixed wither spawning.Mattes D2014-12-251-13/+40
| * ProtoProxy: Log block change packet details.Mattes D2014-12-251-0/+3
| * MobHeads: fixed regular head placement.Mattes D2014-12-251-2/+22
| * Merge pull request #1687 from mc-server/StyleCheckTravisMattes D2014-12-252-0/+6
| |\
| | * Travis style check in the right folder.Mattes D2014-12-251-1/+3
| | * Travis: Added lua installation before build.Mattes D2014-12-251-0/+3
| | * Added basic style checking to Travis builds.Mattes D2014-12-251-0/+1
| |/
| * Fixed tools compilation.Mattes D2014-12-253-0/+5
| * Fixed door placement.Mattes D2014-12-252-3/+4
| * Fixed forgotten big flower handler.Mattes D2014-12-251-1/+2
| * Fixed basic style.Mattes D2014-12-254-23/+71
| * APIDump: Added details about client handle in OnServerPing hook.Mattes D2014-12-251-1/+4
| * cIsThread: Fixed a race condition on thread start.Mattes D2014-12-252-7/+30
| * Merge pull request #1686 from mc-server/PlaceBlockRefactorMattes D2014-12-2548-786/+1489
| |\
| | * APIDump: Updated the player block placement documentation.Mattes D2014-12-244-11/+14
| | * Fixed redstone dust placement on upside-down slabs.Mattes D2014-12-241-1/+36
| | * Replaced a std::hash specialization with explicit type.Mattes D2014-12-242-8/+4
| | * gcc compilation fix.Mattes D2014-12-241-1/+6
| | * Refactored all player block placing to go through hooks.Mattes D2014-12-2443-775/+1423
| | * Added Vector3::TurnCW() and Vector3::TurnCCW()Mattes D2014-12-241-0/+16
| * | ByteBuffer: SingleThreadAccessChecker is request-only.Mattes D2014-12-241-1/+10
| |/
| * Fixed too many slashes.Alexander Harkness2014-12-231-1/+1
| * Better installation script.Alexander Harkness2014-12-231-5/+3
| * Fixed armhf download URL.Alexander Harkness2014-12-231-1/+1
| * Init Mojang API pointerworktycho2014-12-231-0/+1
| * Merge pull request #1684 from jonfabe/DepthStriderMattes D2014-12-223-1/+17
| |\
| | * Fix compile error on OS X introduced by commit ecf778bbec2794562bf5e5b8645e2171f7cd081cJonathan Fabian2014-12-221-1/+1
| | * Added Depth Strider enchantmentJonathan Fabian2014-12-222-0/+16
| |/
| * ProtoProxy: Added a sanity check to metadata string lengths.Mattes D2014-12-211-2/+6
| * MCADefrag: Added a sanity check for chunk size.Mattes D2014-12-211-1/+1
| * WSSAnvil: Added clamping to entity coords.Mattes D2014-12-211-3/+3
| * FastNBT: Added a sanity check for number of list items.Mattes D2014-12-211-1/+8
| * cChunk: Fixed missing initialization.Mattes D2014-12-211-0/+2
| * cWorld: Moved initialization into constructor.Mattes D2014-12-211-3/+2
| * cEndGen: Fixed unitialized member variables.Mattes D2014-12-211-1/+3
| * cNoise3DComposable: Fixed unitialized member variables.Mattes D2014-12-211-1/+3
| * Fixed coverity issues in protocols.Mattes D2014-12-212-4/+11
| * Fixed a possible division by zero.Mattes D2014-12-213-6/+16
| * Fixed crash on restartTiger Wang2014-12-212-5/+14
| * Merge pull request #1682 from Masy98/entitiesMattes D2014-12-2115-92/+203
| |\
| | * Fixed damn empty line with no useMasy982014-12-202-5/+1
| | * Added Rabbit.h and Rabbit.cpp to the CMakeListMasy982014-12-201-0/+2
| | * Fixed Rabbit sizeMasy982014-12-201-1/+1
| | * Added RabbitsMasy982014-12-2014-92/+205
| * | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-12-2117-1/+150
| |\|
| | * Merge pull request #1680 from Masy98/entitiesMattes D2014-12-1916-1/+149
| | |\
| | | * Fixed Guardians size and healthMasy982014-12-193-1/+8
| | | * Guardian can now spawn if wanted!?Masy982014-12-182-2/+2
| | | * Merge branch 'master' into entitiesMasy982014-12-1837-2880/+2822
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #1679 from SphinxC0re/masterMattes D2014-12-181-0/+1
| | |\ \
| | | * | Added itemblacklist to gitignoreJulian Laubstein2014-12-171-0/+1
| | |/ /
| | | * Added Entity GuardianMasy982014-12-1817-2/+143
| * | | Fix repeater unpoweringTiger Wang2014-12-181-2/+4
| |/ /
| * | Merge pull request #1677 from mc-server/GlobalFixesMattes D2014-12-171-0/+1
| |\ \
| | * | derpHowaner2014-12-171-1/+1
| | * | Added comment.Howaner2014-12-171-1/+1
| | * | Fixed eMonsterType lua bugs.Howaner2014-12-171-0/+1
| |/ /
* / / Added sponge.Howaner2014-12-174-0/+108
|/ /
* | Merge pull request #1674 from gushromp/masterMattes D2014-12-171-8/+7
|\ \
| * | Removed unneeded newlinesIvan Đorđević2014-12-171-6/+0
| * | Merge branch 'master' of https://github.com/gushromp/MCServergushromp2014-12-161-0/+1
| |\ \
| | * | Fixed water from spreading on bottom of worldgushromp2014-12-161-5/+8
| * | | Fixed water from spreading on bottom of worldgushromp2014-12-161-7/+11
| |/ /
* | | Merge pull request #1581 from mc-server/redstoneMattes D2014-12-1725-2864/+2645
|\ \ \ | |/ / |/| |
| * | NULL -> nullptrTiger Wang2014-12-175-18/+22
| * | Removed testTiger Wang2014-12-133-176/+0
| * | Merge branch 'master' into redstoneTiger Wang2014-12-13232-5012/+11651
| |\ \
| * | | Fixed compilation?Tiger Wang2014-11-011-3/+4
| * | | Improved redstone simulatorTiger Wang2014-10-292-818/+808
| * | | Cleaned up simulatorsTiger Wang2014-10-2517-2681/+2644
| * | | Fixed some block checksTiger Wang2014-10-252-4/+3
* | | | Updated Core.Mattes D2014-12-161-0/+0
* | | | Merge pull request #1673 from gushromp/masterMattes D2014-12-151-0/+6
|\ \ \ \
| * | | | Added braces to 'if' according to the code guidelinesgushromp2014-12-151-0/+2
| * | | | Updated cPlayer::DoMoveToWorld to send target world's weather info to Playerblashyrk2014-12-151-0/+4
|/ / / /
* | | | Fixed mob invisibilityHowaner2014-12-141-1/+0
* | | | Merge pull request #1635 from mc-server/CocoaMattes D2014-12-146-4/+158
|\ \ \ \
| * \ \ \ Merge branch 'master' into CocoaHowaner2014-12-142-5/+26
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | "& 0x0f" isn't neededHowaner2014-12-142-3/+3
| * | | | FixesHowaner2014-12-134-5/+22
| * | | | Merge branch 'master' into CocoaHowaner2014-12-13104-1751/+2182
| |\ \ \ \
| * | | | | Added cocoa pod.Howaner2014-12-015-2/+139
* | | | | | Merge pull request #1670 from Masy98/craftingFranz Reiter2014-12-142-3/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fixed fence/-gates and door recipes and added baked potato recipeMasy982014-12-142-3/+4
|/ / / / /
* | | | | Clang needs the libstdc++ that comes with gcc-4.8Tycho2014-12-131-3/+5
* | | | | final syntax errorsTycho2014-12-131-5/+4
* | | | | Double equalsTycho2014-12-131-5/+5
* | | | | Fix forgoten thensTycho2014-12-131-4/+4
* | | | | "Don't set compiler to gcc on clang builds"Tycho2014-12-131-4/+5
* | | | | Merge pull request #1664 from mc-server/SandstoneCavesMattes D2014-12-131-3/+22
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | WormNestCaves occasionally generates sandstone around the caveSTRWarrior2014-12-131-3/+22
| | |_|/ | |/| |
* | | | Merge pull request #1663 from mc-server/APIDumpSizeAlexander Harkness2014-12-131-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Made comment in example code smallerSTRWarrior2014-12-131-1/+3
| * | | Reverted main_APIDump.lua changesSTRWarrior2014-12-131-4/+4
| * | | Fixed the width sometimes going over the div sizeSTRWarrior2014-12-131-4/+4
* | | | Merge pull request #1660 from Seadragon91/masterMattes D2014-12-121-1/+1
|\ \ \ \
| * | | | Fixed print of milliseconds from chronoLukas Pioch2014-12-121-1/+1
* | | | | Updated the Core.Mattes D2014-12-121-0/+0
* | | | | LightingThread: Fixed a memory leak.Mattes D2014-12-121-2/+2
* | | | | Exported cWorld:PrepareChunk to Lua API, test in Debuggers.Mattes D2014-12-122-1/+73
|/ / / /
* | | | Debuggers: Added loadchunk and preparechunk commands.Mattes D2014-12-112-0/+87
* | | | Debuggers: Changed to use Info.lua file.Mattes D2014-12-112-33/+222
* | | | Merge pull request #1657 from mc-server/PrepareChunkMattes D2014-12-1111-51/+293
|\ \ \ \ | |/ / / |/| | |
| * | | Added a cWorld:PrepareChunk function.Mattes D2014-12-109-51/+260
| * | | Lighting thread: skip chunks that are already lit.Mattes D2014-12-101-0/+10
| * | | Added a RemoveIf() function to cQueueMattes D2014-12-091-0/+23
* | | | Cosmetic touchups.Mattes D2014-12-115-10/+11
* | | | Merge remote-tracking branch 'planetx/master'Mattes D2014-12-112-5/+33
|\ \ \ \
| * | | | Check to see if header write out is requiredplanetx2014-12-081-17/+15
| * | | | Added timestamp to merged files WSSAnvilplanetx2014-12-081-1/+1
| * | | | Added timestamp to merged files WSSAnvilplanetx2014-12-081-62/+62
| * | | | Added timestamp to new files WSSAnvilplanetx2014-12-082-79/+149
| * | | | Added Timestamp info to chunks in WSSAnvilplanetx2014-12-072-87/+47
* | | | | Fixed DungeonRooms edges not generating sometimes.Mattes D2014-12-111-2/+2
* | | | | Merge pull request #1655 from tonibm19/patch-2Mattes D2014-12-101-1/+1
|\ \ \ \ \
| * | | | | Moved NetherOreNeststonibm192014-12-101-1/+1
| * | | | | Added NetherOreNests to nether default generator.tonibm192014-12-081-1/+1
* | | | | | Merge pull request #1623 from p-mcgowan/issue_1253Mattes D2014-12-108-3/+94
|\ \ \ \ \ \
| * | | | | | Changed method call to DoesAllowMultiLogin() instead of IsAllowMultiLogin()Vincent2014-12-101-1/+1
| * | | | | | Fixed return value in CheckMultiLogin()Vincent2014-12-091-1/+2
| * | | | | | Fixed indent problems and added return definitions to CheckMultiLogin().Vincent2014-12-093-7/+8
| * | | | | | Changed DoWithPlayer to auto instead of using iterator.Vincent2014-12-091-2/+2
| * | | | | | Changed CheckMultiLogin() to not have main body wrapped in an if statement.Vincent2014-12-084-21/+28
| * | | | | | created callback in Root and changed CheckMultiLogin() to use the DoWithPlayer function at Root instead of World.Vincent2014-12-082-2/+9
| * | | | | | Fixed compile errorsVincent2014-12-086-18/+14
| * | | | | | removed last space in handlehandshakeVincent2014-12-081-1/+0
| * | | | | | Changed HandleHandshake to return the result of CheckMultiLogin instead of just true since it already returns true if it finds and kicks the current player.Vincent2014-12-081-24/+23
| * | | | | | Moved the check into a new function and just calls that function and a blank FindAndDoWithPlayer added.Vincent2014-12-084-23/+52
| * | | | | | Merge branch 'issue_1253' of https://github.com/p-mcgowan/MCServer into issue_1253Vincent2014-12-071-5/+5
| |\ \ \ \ \ \
| | * | | | | | Changed Kick messagevincentleung12014-11-301-2/+2
| | * | | | | | removed extra space and fixed some formatting in cCallbackvincentleung12014-11-301-3/+3
| * | | | | | | changed from using iterator to auto for server and clienthandleVincent2014-12-072-4/+4
| |/ / / / / /
| * | | | | | removed GetUsernames() from WorldVincent2014-11-302-18/+0
| * | | | | | Uses callback for players already in World.Vincent2014-11-301-5/+12
| * | | | | | fixed naming of strings and changed from i to IVincent2014-11-295-13/+18
| * | | | | | issue 1253 - prevent multiple logins with same usernameVincent2014-11-295-0/+58
* | | | | | | Fixed compiling.Howaner2014-12-091-1/+1
* | | | | | | Moved NaturalPatches in front of PreSimulator and Animals.Mattes D2014-12-081-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #1654 from tonibm19/patch-1Alexander Harkness2014-12-081-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Added NaturalPatches to finisherstonibm192014-12-081-1/+1
|/ / / / /
* | | | | Merge pull request #1563 from mc-server/c++11EventsMattes D2014-12-074-143/+72
|\ \ \ \ \
| * | | | | cMojangAPI: Fixed a possible problem with thread termination order.Mattes D2014-12-071-5/+17
| * | | | | Fixed integer overflow problems.Mattes D2014-12-072-4/+4
| * | | | | Merge remote-tracking branch 'origin/master' into c++11EventsMattes D2014-12-07178-3914/+5859
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Fixed format warning.Mattes D2014-12-071-2/+2
* | | | | | Fixed crash on server stop.Mattes D2014-12-071-0/+9
* | | | | | Fixed c++11 branch issues.Mattes D2014-12-078-45/+59
* | | | | | Merge pull request #1555 from mc-server/c++11Mattes D2014-12-0749-1248/+353
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-12-0637-149/+695
| |\ \ \ \ \ \
| * | | | | | | Tools: Removed unused Timer.* file from CMakeLists.txt.Mattes D2014-12-042-4/+1
| * | | | | | | CheckBasicStyle: Doesn't report false positives ending in a keyword.Mattes D2014-12-041-5/+5
| * | | | | | | Fixed trailing whitespace.Mattes D2014-12-042-6/+6
| * | | | | | | Merged branch 'origin/master' into c++11.Mattes D2014-12-0475-339/+1070
| |\ \ \ \ \ \ \
| * | | | | | | | Fixed indent.Mattes D2014-12-031-2/+2
| * | | | | | | | Server: Fixed a MSVC warning.Mattes D2014-12-031-1/+1
| * | | | | | | | ByteBuffer: Re-added Single-thread access checker.Mattes D2014-12-032-0/+90
| * | | | | | | | Merge remote-tracking branch 'origin-master' into c++11Tiger Wang2014-11-2632-1653/+1688
| * | | | | | | | Removed unnecessary #includesTiger Wang2014-11-232-2/+0
| * | | | | | | | Merge remote-tracking branch 'origin/master' into c++11Tiger Wang2014-11-2399-1589/+7139
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Compilation fixesTiger Wang2014-11-235-15/+11
| * | | | | | | | | Update GCC on TravisTiger Wang2014-11-232-24/+20
| * | | | | | | | | Merged branch 'master' into c++11.Mattes D2014-10-2447-193/+310
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | SuggestionsTiger Wang2014-10-247-10/+50
| * | | | | | | | | Added FastRandom.* back to CMakeLists.txt.Mattes D2014-10-231-0/+2
| * | | | | | | | | Merged branch 'master' into c++11.Mattes D2014-10-2351-526/+819
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Compile fix?Tiger Wang2014-10-213-6/+0
| * | | | | | | | | | Missing EOL.Alexander Harkness2014-10-211-1/+1
| * | | | | | | | | | Alignment.Alexander Harkness2014-10-211-6/+6
| * | | | | | | | | | Missing space.Alexander Harkness2014-10-211-1/+1
| * | | | | | | | | | Missing space fix.Alexander Harkness2014-10-211-1/+1
| * | | | | | | | | | Compile fix?Tiger Wang2014-10-212-4/+2
| * | | | | | | | | | Windows close handlers handles more closesTiger Wang2014-10-211-5/+2
| * | | | | | | | | | Replace &*[0] accesses with .data()Tiger Wang2014-10-213-8/+8
| * | | | | | | | | | En masse NULL -> nullptr replaceTiger Wang2014-10-20211-1439/+1439
| * | | | | | | | | | Use std::recusive_mutexTiger Wang2014-10-203-52/+9
| * | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-10-2036-234/+281
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Migrated cSleep and cTimer to std::chronoTiger Wang2014-10-2018-168/+45
| * | | | | | | | | | | Migrated random generators to std::randomTiger Wang2014-10-1916-556/+102
| * | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-10-1939-496/+260
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use std::threadTiger Wang2014-10-1913-432/+59
* | | | | | | | | | | | | Reduced river heightSTRWarrior2014-12-071-2/+2
* | | | | | | | | | | | | Fixed error message in cFinishGenPassiveMobsSTRWarrior2014-12-071-1/+1
* | | | | | | | | | | | | Replaced most auto_ptr with unique_ptr.Mattes D2014-12-062-62/+62
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1647 from mc-server/SocketThreadsFixMattes D2014-12-061-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixes socket leak in HTTP server.Mattes D2014-12-031-3/+11
* | | | | | | | | | | | FinishGenPassiveMobs: Cosmetic changes.Mattes D2014-12-052-30/+33
* | | | | | | | | | | | Merge pull request #1642 from p-mcgowan/animalTerrainFinisherMattes D2014-12-055-3/+274
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | formatting and default spawn percentagep-mcgowan2014-12-051-1/+2
| * | | | | | | | | | | | Merge branch 'master' of github.com:p-mcgowan/MCServer into animalTerrainFinisherp-mcgowan2014-12-0538-184/+496
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | CheckBasicStyle: Check missing braces for control statements.Mattes D2014-12-051-0/+19
* | | | | | | | | | | | | BasicStyle: Added missing braces to control statements.Mattes D2014-12-0517-54/+241
* | | | | | | | | | | | | CheckBasicStyle: Added a check for parentheses around comparisons.Mattes D2014-12-051-0/+22
* | | | | | | | | | | | | Fixed reported parentheses around comparisons.Mattes D2014-12-0514-83/+99
* | | | | | | | | | | | | Merge pull request #1649 from jonfabe/InfoDumpFixMattes D2014-12-051-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix duplicate commands added to README.mdJonathan Fabian2014-12-051-1/+12
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1648 from mc-server/CraftingLuaFixMattes D2014-12-046-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed the CRAFTING_NO_RECIPE hook call.Mattes D2014-12-046-6/+6
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1638 from p-mcgowan/cactiNoLongerSpawnOnBeachesMattes D2014-12-042-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | conflict resolutionp-mcgowan2014-12-048-40/+79
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1645 from jonfabe/SpectatorModeFixesMattes D2014-12-042-7/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Updated whitespace in comment, changed conditional to logical equivalent due to popular demandJonathan Fabian2014-12-041-2/+2
| * | | | | | | | | | | | Fix Spaces to TabsJonathan Fabian2014-12-031-5/+5
| * | | | | | | | | | | | Add missing IsSpectatorMode() checks in Player.cpp, make sure that player is flying when spawned otherwise it will fall through the world.Jonathan Fabian2014-12-031-6/+11
| * | | | | | | | | | | | Allow Spectator Gamemode as a world default.Jonathan Fabian2014-12-031-1/+1
* | | | | | | | | | | | | Merge pull request #1646 from p-mcgowan/luaCheckstyleWarningsMattes D2014-12-034-34/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | clearing CheckBasicStyle.lua messagesp-mcgowan2014-12-034-34/+34
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1640 from p-mcgowan/mooshroomMobSpawnerRuleMattes D2014-12-031-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | updated mooshroom check for myceliump-mcgowan2014-12-021-1/+1
| * | | | | | | | | | | | extra formatting parenthesesp-mcgowan2014-12-021-2/+2
| * | | | | | | | | | | | added spawning rule to mooshroomp-mcgowan2014-12-021-0/+13
* | | | | | | | | | | | | Merge pull request #1634 from mc-server/DungeonSpawnersMattes D2014-12-021-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fixed forgotten semicolonSTRWarrior2014-12-021-1/+1
| * | | | | | | | | | | | Using IntNoise3DInt instead of IntNoise3DSTRWarrior2014-12-021-1/+1
| * | | | | | | | | | | | Suggestions by xoftSTRWarrior2014-12-021-3/+3
| * | | | | | | | | | | | Using static cast for Dungeon spawnersSTRWarrior2014-12-011-1/+1
| * | | | | | | | | | | | Dungeons spawners now spawn mobsSTRWarrior2014-12-011-1/+22
| | * | | | | | | | | | | reformat for lua and CIp-mcgowan2014-12-022-6/+9
| | * | | | | | | | | | | formatting and commenting fixesp-mcgowan2014-12-022-6/+6
| | * | | | | | | | | | | cacti no longer spawn outside of desert variantsp-mcgowan2014-12-012-1/+16
| |/ / / / / / / / / / / |/| | | | | | | | | | |
| | * | | | | | | | | | reformatp-mcgowan2014-12-051-9/+5
| | * | | | | | | | | | restructure, with logic this timep-mcgowan2014-12-051-5/+13
| | * | | | | | | | | | restructured random animals, added check for desert (update as per wiki)p-mcgowan2014-12-051-19/+17
| | * | | | | | | | | | handle non-vanilla dimensionsp-mcgowan2014-12-051-2/+2
| | * | | | | | | | | | handle non-vanilla dimensionsp-mcgowan2014-12-051-2/+3
| | * | | | | | | | | | formatting fixesp-mcgowan2014-12-051-4/+11
| | * | | | | | | | | | format blocks and randomizingp-mcgowan2014-12-042-9/+9
| | * | | | | | | | | | last doxy fixp-mcgowan2014-12-041-3/+3
| | * | | | | | | | | | added p-mcgowan to contributorsp-mcgowan2014-12-041-0/+1
| | * | | | | | | | | | awful comment fixing, randomizer fixp-mcgowan2014-12-042-19/+32
| | * | | | | | | | | | class description and doxy-commentingp-mcgowan2014-12-032-5/+8
| | * | | | | | | | | | doxy-commentingp-mcgowan2014-12-031-3/+3
| | * | | | | | | | | | forgot generation defaul initp-mcgowan2014-12-031-1/+1
| | * | | | | | | | | | forgot initializerp-mcgowan2014-12-031-1/+5
| | * | | | | | | | | | typos and oversights for lua and CIp-mcgowan2014-12-021-1/+5
| | * | | | | | | | | | fastRandom unusedp-mcgowan2014-12-021-1/+0
| | * | | | | | | | | | indentation, repeatable random, small correctionsp-mcgowan2014-12-021-98/+93
| | * | | | | | | | | | fix comments after replacing spaces with tabsp-mcgowan2014-12-021-4/+4
| | * | | | | | | | | | animal terrain finisherp-mcgowan2014-12-022-187/+187
| | * | | | | | | | | | animal terrain finisherp-mcgowan2014-12-022-0/+241
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #1636 from mc-server/MineshaftSpawnersAlexander Harkness2014-12-011-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Using static cast for MineShaft spawnersSTRWarrior2014-12-011-1/+1
| * | | | | | | | | | Mineshaft spawners now spawn cave spidersSTRWarrior2014-12-011-1/+4
|/ / / / / / / / / /
* | | | | | | | | | Simplefied SoulsandRimsSTRWarrior2014-12-011-36/+6
* | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2014-12-0131-181/+637
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Updated coreHowaner2014-12-011-0/+0
| * | | | | | | | | Reverted bad .gitignore changeHowaner2014-12-011-1/+1
| * | | | | | | | | Merge pull request #1602 from mc-server/MobSpawnerMattes D2014-12-0131-182/+638
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | MobSpawner fixes.Howaner2014-12-017-6/+14
| | * | | | | | | | | Merge branch 'master' into MobSpawnerHowaner2014-12-017-22/+46
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into MobSpawnerHowaner2014-11-3017-13/+134
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Removed old MobType category.Howaner2014-11-291-8/+1
| | * | | | | | | | | | Removed unused imports.Howaner2014-11-292-2/+0
| | * | | | | | | | | | Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes.Howaner2014-11-2913-122/+137
| | * | | | | | | | | | Merge branch 'master' into MobSpawnerHowaner2014-11-2983-2253/+3204
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | Finished mob spawner implementation.Howaner2014-11-1818-124/+78
| | * | | | | | | | | | Merge branch 'master' into MobSpawnerHowaner2014-11-18415-12388/+11874
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed compile errors.Howaner2014-09-272-42/+42
| | * | | | | | | | | | | Merge branch 'master' into MobSpawnerHowaner2014-09-26186-4062/+10585
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Implemented mob spawner.Howaner2014-09-1911-67/+393
| | * | | | | | | | | | | | Merge branch 'master' into MobSpawnerHowaner2014-09-1925-103/+293
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Created MobSpawnerEntity class.Howaner2014-09-174-1/+165
* | | | | | | | | | | | | | | Added better soulsand rimsSTRWarrior2014-12-015-12/+107
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1624 from mc-server/LuaDeprecatingMattes D2014-12-014-20/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removed old StringToMobType() function from Monster.cppHowaner2014-11-301-10/+0
| * | | | | | | | | | | | | | Mark StringToMobType() as deprecated. Use cMonster:StringToMobType() insteadHowaner2014-11-293-10/+40
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | DistortedHeightmap: Added missing initialization.Mattes D2014-12-011-0/+2
* | | | | | | | | | | | | | Noise3D: Fixed missing initialization.Mattes D2014-12-011-1/+3
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Hopefully fixed random build failsSTRWarrior2014-11-301-1/+1
* | | | | | | | | | | | | Fixed a crash in cSpawnPrepare.Mattes D2014-11-301-0/+2
* | | | | | | | | | | | | Fixed nether ceilingSTRWarrior2014-11-301-1/+1
* | | | | | | | | | | | | Fixed compiling on linux.Howaner2014-11-301-0/+1
* | | | | | | | | | | | | Improved comments for cWorld::DoWithPlayer().Mattes D2014-11-302-2/+3
* | | | | | | | | | | | | Merge pull request #1626 from mc-server/StackTraceOnFailureMattes D2014-11-309-7/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed MCADefrag compilation.Mattes D2014-11-291-0/+8
| * | | | | | | | | | | | | Removed unneeded include.Mattes D2014-11-291-1/+0
| * | | | | | | | | | | | | Fixed QtBiomeVisualiser compilation.Mattes D2014-11-292-3/+17
| * | | | | | | | | | | | | Fixed missing files in ProtoProxy.Mattes D2014-11-291-0/+8
| * | | | | | | | | | | | | Added a basic stacktracing for assert and signal failures.Mattes D2014-11-295-4/+73
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1622 from M10360/masterMattes D2014-11-293-2/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added M10360.M103602014-11-291-0/+1
| * | | | | | | | | | | | | Smelting Netherrack not TallGrass gives you NetherBrickItem.M103602014-11-291-1/+1
| * | | | | | | | | | | | | Added missing fuels.M103602014-11-291-0/+19
| * | | | | | | | | | | | | Removed duplicate.M103602014-11-291-1/+0
| |/ / / / / / / / / / / /
* / / / / / / / / / / / / Update coreHowaner2014-11-291-0/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1619 from mc-server/WarningFixesMattes D2014-11-2826-63/+68
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Chunk: Fixed same-name iterators.Mattes D2014-11-271-5/+5
| * | | | | | | | | | | | OctavedNoise: Another unshadowed local variable.Mattes D2014-11-271-9/+11
| * | | | | | | | | | | | Minecart.h: Fixed integral conversion warning.Mattes D2014-11-271-1/+1
| * | | | | | | | | | | | RidgedNoise: Replaced fabs with std::abs().Mattes D2014-11-271-2/+2
| * | | | | | | | | | | | OctavedNoise: Unshadowed a local variable.Mattes D2014-11-271-10/+12
| * | | | | | | | | | | | BlockEntities: Removed the extra semicolon.Mattes D2014-11-2716-24/+25
| * | | | | | | | | | | | Replaced auto_ptr with unique_ptr.Mattes D2014-11-272-6/+6
| * | | | | | | | | | | | CompoGenBiomal: Fixed signed vs unsigned comparison.Mattes D2014-11-271-1/+1
| * | | | | | | | | | | | Fixed BlockStringToType return value.Mattes D2014-11-273-5/+5
|/ / / / / / / / / / / /
* | | | | | | | | | | | CMake: Fixed linux builds.Mattes D2014-11-261-5/+4
* | | | | | | | | | | | cRoot: Fixed a memory leak with cRankManager.Mattes D2014-11-262-3/+5
* | | | | | | | | | | | Windows: Fixed builds with LeakFinder enabled.Mattes D2014-11-262-2/+4
* | | | | | | | | | | | WSSAnvil: Fixed bad code in arrow loading.Mattes D2014-11-261-2/+8
* | | | | | | | | | | | Merge pull request #1617 from mc-server/ReachDistanceMattes D2014-11-251-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ClientHandle: Fixed max block place distance check.Mattes D2014-11-251-4/+10
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1604 from mc-server/GeneratorShapeRefactorMattes D2014-11-2430-1532/+1578
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added TwoHeights shape generator.Mattes D2014-11-235-8/+162
| * | | | | | | | | | | | Noise3D generator: Enlarged averaging to avoid steep beach slopes.Mattes D2014-11-232-4/+4
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactorMattes D2014-11-237-2/+156
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | cWorld: Changed generator defaults.Mattes D2014-11-201-13/+17
| * | | | | | | | | | | | BiomalNoise3D generator: finished all biomes.Mattes D2014-11-201-66/+74
| * | | | | | | | | | | | CompoGenBiomal: Fixed sealevel offset.Mattes D2014-11-201-1/+1
| * | | | | | | | | | | | CompoGenBiomal: Fixed sealevel not generating properly.Mattes D2014-11-201-1/+2
| * | | | | | | | | | | | Generators: Unified SeaLevel into a single variable.Mattes D2014-11-203-70/+3
| * | | | | | | | | | | | Noise3D generators: Changed noise generator to InterpolNoise.Mattes D2014-11-202-10/+10
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into GeneratorShapeRefactorMattes D2014-11-2038-593/+1483
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Mobs: Fixed crash with terrain too high.Mattes D2014-11-152-5/+7
| * | | | | | | | | | | | | Generator: Fixed crash with trees too high.Mattes D2014-11-151-2/+7
| * | | | | | | | | | | | | Snow generator: Fixed failure at top of the world.Mattes D2014-11-151-1/+1
| * | | | | | | | | | | | | ChunkDesc: Fixed comment about indexing.Mattes D2014-11-151-1/+1
| * | | | | | | | | | | | | DungeonRooms: Changed to work with the new shape generators.Mattes D2014-11-151-10/+15
| * | | | | | | | | | | | | Gen refactor: Implemented CompositedHeiGen.Mattes D2014-11-139-217/+141
| * | | | | | | | | | | | | Generator: Shape initial refactoring.Mattes D2014-11-1223-1346/+1356
* | | | | | | | | | | | | | Merge pull request #1611 from mc-server/SpawnPrepareMattes D2014-11-242-120/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Changed back capitalization.Mattes D2014-11-241-3/+3
| * | | | | | | | | | | | | cWorld: Rewritten spawn preparation.Mattes D2014-11-222-120/+113
* | | | | | | | | | | | | | Merge pull request #1612 from p-mcgowan/pigsIntoZombiePigmenOnLightningMattes D2014-11-232-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | formatting - newline at EOF inserted: Pig.cppp-mcgowan2014-11-231-1/+5
| * | | | | | | | | | | | | | pigs turn into pigmen on lightningp-mcgowan2014-11-232-0/+19
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1610 from p-mcgowan/villagersIntoWitchOnLightningMattes D2014-11-221-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | formatter errorp-mcgowan2014-11-221-3/+3
| * | | | | | | | | | | | | | villagers turn into witches on lightningp-mcgowan2014-11-221-2/+4
| * | | | | | | | | | | | | | villagers turn into witches when struck by lightningp-mcgowan2014-11-221-0/+5
| |/ / / / / / / / / / / / /
* / / / / / / / / / / / / / InfoReg: Added a diagnostic for bad Info.lua command info.Mattes D2014-11-221-0/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1594 from mc-server/LargeOakTreeMattes D2014-11-203-2/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Changed commentSTRWarrior2014-11-161-1/+1
| * | | | | | | | | | | | First implementation for the LargeOakTreeSTRWarrior2014-11-133-2/+125
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1603 from mc-server/ImprovedNoiseMattes D2014-11-2028-544/+1282
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | cInterpolNoise: Implemented optimized 2D generating.Mattes D2014-11-193-32/+219
| * | | | | | | | | | | cOctavedNoise: Removed misleading comment, fixed assert texts.Mattes D2014-11-191-3/+3
| * | | | | | | | | | | cOctavedNoise: Added a forgotten comment.Mattes D2014-11-181-1/+1
| * | | | | | | | | | | Added a cInterpolNoise template for faster noise generator.Mattes D2014-11-183-4/+439
| * | | | | | | | | | | Moved all Noise-related files into a separate folder.Mattes D2014-11-1826-80/+56
| * | | | | | | | | | | Refactored cRidgedNoise into a separate template.Mattes D2014-11-185-243/+104
| * | | | | | | | | | | OctavedNoise: linux compilation fixes.Mattes D2014-11-182-2/+3
| * | | | | | | | | | | Added cOctavedNoise template.Mattes D2014-11-173-258/+206
| * | | | | | | | | | | Fixed include path.Mattes D2014-11-171-1/+1
| * | | | | | | | | | | Added cImprovedNoise implementation.Mattes D2014-11-174-46/+376
* | | | | | | | | | | | Merge pull request #1598 from mc-server/SignEditorMattes D2014-11-187-21/+85
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Use cLuaState's stack trace.Howaner2014-11-171-48/+27
| * | | | | | | | | | | Added UpdateSign() method to DeprecatedBindings.cppHowaner2014-11-172-3/+88
| * | | | | | | | | | | Use LastPlacedSign instead of LastPlacedBlock.Howaner2014-11-153-9/+6
| * | | | | | | | | | | Updated APIDumpHowaner2014-11-151-2/+3
| * | | | | | | | | | | Fixed a security problem with signs.Howaner2014-11-155-16/+18
* | | | | | | | | | | | Fixed a wrong assert in cClientHandle::SetViewDistance().Mattes D2014-11-171-4/+8
* | | | | | | | | | | | BiomalNoise3D: Added more biomes.Mattes D2014-11-161-13/+65
* | | | | | | | | | | | Merge pull request #1577 from mc-server/ViewDistanceMattes D2014-11-166-16/+43
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Renamed m_UsedViewDistance to m_CurrentViewDistanceHowaner2014-11-152-11/+11
| * | | | | | | | | | | Renamed m_SetViewDistance to m_RequestedViewDistanceHowaner2014-11-152-7/+7
| * | | | | | | | | | | Renamed GetSettedViewDistance() to GetRequestedViewDistance()Howaner2014-11-153-4/+4
| * | | | | | | | | | | Updated APIDumpHowaner2014-11-141-0/+1
| * | | | | | | | | | | Use m_UsedViewDistance and m_SetViewDistance.Howaner2014-11-143-15/+26
| * | | | | | | | | | | Merge branch 'master' into ViewDistanceHowaner2014-11-1441-547/+4763
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ... in this worldHowaner2014-10-301-1/+1
| * | | | | | | | | | | | Added a MaxViewDistance option.Howaner2014-10-303-1/+16
* | | | | | | | | | | | | APIDump: Fixed example cCompositeChat URLHowaner2014-11-141-1/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Noise3D: Added jungles.Mattes D2014-11-141-0/+2
* | | | | | | | | | | | Noise3D: Added oceans.Mattes D2014-11-131-0/+3
* | | | | | | | | | | | Fixed trailing whitespace.Mattes D2014-11-123-3/+3
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | BiomalNoise3D: Added a few biomes.Mattes D2014-11-101-5/+8
* | | | | | | | | | | TallGrassGenerator: Fixed crash when too highSTRWarrior2014-11-101-0/+5
* | | | | | | | | | | Added BiomalNoise3D shape generator.Mattes D2014-11-104-29/+369
* | | | | | | | | | | Noise3d Generator: Fixed unused function error.Mattes D2014-11-091-1/+1
* | | | | | | | | | | Noise3D generator: rewritten from scratch.Mattes D2014-11-092-78/+145
* | | | | | | | | | | Travis badge uses master branch.Alexander Harkness2014-11-081-1/+1
* | | | | | | | | | | Added gratipay badge.Alexander Harkness2014-11-081-1/+1
* | | | | | | | | | | Noise3D CompoGen: Fixed missing initialization.Mattes D2014-11-061-0/+2
* | | | | | | | | | | Merge branch 'DoWithPlayerByUUID'Mattes D2014-11-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed an extra space.Mattes D2014-11-061-1/+1
| * | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerLukas Pioch2014-11-0517-368/+1024
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/mc-server/MCServerMattes D2014-11-0618-369/+1025
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #1587 from Ambushed91/WebAdminAlexander Harkness2014-11-054-45/+36
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Update V1.0.9Ambushed912014-11-053-44/+36
| | * | | | | | | | | | | Update V1.0.3Ambushed912014-11-052-3/+2
* | | | | | | | | | | | | renamed FindAndDoWithUUID to DoWithPlayerByUUID, fixed style and comments, added description to APIDumpLukas Pioch2014-11-056-10/+13
* | | | | | | | | | | | | Simplified FindAndDoWithUUID, formatted lineLukas Pioch2014-11-022-8/+2
* | | | | | | | | | | | | Added FindAndDoWithUUIDLukas Pioch2014-11-025-0/+46
| | | | | | | | | | | | * cEvent: Changed chrono duration resolution.Mattes D2014-11-041-1/+1
| | | | | | | | | | | | * cEvent: Changed steady_clock to system_clock.Mattes D2014-11-041-2/+2
| | | | | | | | | | | | * Merge branch 'master' into c++11EventsMattes D2014-11-0457-923/+4978
| | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | WebAdmin: Fixed login template destination address.Mattes D2014-11-041-1/+1
| * | | | | | | | | | | | Merge remote-tracking branch 'ambushed/WebAdmin'Mattes D2014-11-0416-293/+703
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Update template.luaArian2014-11-041-70/+81
| | * | | | | | | | | | | Update template.luaArian2014-10-281-6/+5
| | * | | | | | | | | | | Update login_template.htmlArian2014-10-281-110/+62
| | * | | | | | | | | | | Update style.cssArian2014-10-281-4/+4
| | * | | | | | | | | | | Update login.cssArian2014-10-281-4/+4
| | * | | | | | | | | | | Update login.cssArian2014-10-281-1/+1
| | * | | | | | | | | | | Update guest.htmlArian2014-10-281-3/+2
| | * | | | | | | | | | | Update template.luaArian2014-10-281-2/+21
| | * | | | | | | | | | | Update login_template.htmlArian2014-10-271-58/+108
| | * | | | | | | | | | | Update login.cssArian2014-10-271-1/+218
| | * | | | | | | | | | | Update style.cssArian2014-10-271-1/+432
| | * | | | | | | | | | | Update template.luaArian2014-10-271-0/+1
| | * | | | | | | | | | | Update login_template.htmlArian2014-10-271-0/+1
| | * | | | | | | | | | | Update style.cssArian2014-10-271-0/+1
| | * | | | | | | | | | | Update login.cssArian2014-10-271-0/+1
| | * | | | | | | | | | | Update template.luaAmbushed912014-10-271-6/+10
| | * | | | | | | | | | | Update template.luaAmbushed912014-10-271-90/+75
| | * | | | | | | | | | | Update template.htmlAmbushed912014-10-271-125/+136
| | * | | | | | | | | | | Update login_template.htmlAmbushed912014-10-271-58/+61
| | * | | | | | | | | | | Update style.cssAmbushed912014-10-271-1024/+1
| | * | | | | | | | | | | Update login.cssAmbushed912014-10-271-378/+1
| | * | | | | | | | | | | Update login.cssAmbushed912014-10-271-1/+378
| | * | | | | | | | | | | Update temp.htmlAmbushed912014-10-271-99/+0
| | * | | | | | | | | | | Update guest.htmlAmbushed912014-10-271-5/+3
| | * | | | | | | | | | | Update login.cssAmbushed912014-10-231-442/+1
| | * | | | | | | | | | | Update template.luaAmbushed912014-10-231-4/+1
| | * | | | | | | | | | | Update style.cssAmbushed912014-10-231-1/+1
| | * | | | | | | | | | | Update login.cssAmbushed912014-10-231-2/+2
| | * | | | | | | | | | | Update login_template.htmlAmbushed912014-10-231-4/+1
| | * | | | | | | | | | | Update temp.htmlAmbushed912014-10-231-1/+1
| | * | | | | | | | | | | Update login_template.htmlAmbushed912014-10-231-3/+1
| | * | | | | | | | | | | Update (original).htmlAmbushed912014-10-231-4/+4
| | * | | | | | | | | | | Update style.cssAmbushed912014-10-231-1/+1
| | * | | | | | | | | | | Update guest.htmlAmbushed912014-10-231-1/+1
| | * | | | | | | | | | | Update WebAdminAmbushed912014-10-2318-401/+1699
| * | | | | | | | | | | | MinMax heigen: Reduced the number of octaves.Mattes D2014-11-041-2/+0
| * | | | | | | | | | | | Added MinMax height generator.Mattes D2014-11-041-0/+207
| * | | | | | | | | | | | Fixed a missing endline.Mattes D2014-11-031-1/+5
| * | | | | | | | | | | | Added a (disabled) perf test for biome generators.Mattes D2014-11-031-0/+46
| * | | | | | | | | | | | HeiGen: Moved construction to the end of file.Mattes D2014-11-031-75/+75
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1569 from mc-server/GrownBiomesMattes D2014-11-029-78/+3140
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Grown biomes: fixed Linux build.Mattes D2014-11-021-3/+3
| * | | | | | | | | | | | Grown biomes: Unified with GrownProt biomes.Mattes D2014-11-023-159/+595
| * | | | | | | | | | | | GrownProt: Added the rest of rare and M biomes.Mattes D2014-11-012-14/+91
| * | | | | | | | | | | | GrownProt biome gen: Added biome edges.Mattes D2014-11-012-2/+162
| * | | | | | | | | | | | Merge branch 'master' into GrownBiomesMattes D2014-10-314-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | GrownProt biomes: added alterations.Mattes D2014-10-313-130/+192
| * | | | | | | | | | | | | QtBiomeVisualiser: Fixed default zoom selection.Mattes D2014-10-311-5/+1
| * | | | | | | | | | | | | QtBiomeVisualiser: Set start zoom to 25%, just like AMIDST.Mattes D2014-10-301-1/+3
| * | | | | | | | | | | | | QtBiomeVisualiser: Added a prototyping int generator flavor.Mattes D2014-10-306-53/+1256
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into GrownBiomesMattes D2014-10-304-12/+97
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Grown biomes: made biomes smaller, made beaches smaller.Mattes D2014-10-291-11/+8
| * | | | | | | | | | | | | Merged branch 'master' into GrownBiomes.Mattes D2014-10-2827-478/+693
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | cIntGen: Added a virtual destructor.Mattes D2014-10-271-0/+4
| * | | | | | | | | | | | | | Removed too advanced C++11 features.Mattes D2014-10-272-32/+28
| * | | | | | | | | | | | | | IntGen: Attempt at fixing Linux compilation.Mattes D2014-10-261-13/+13
| * | | | | | | | | | | | | | BioGenGrown: Smaller biomes, add land to map center.Mattes D2014-10-262-16/+13
| * | | | | | | | | | | | | | Fixed a copypasta error in cIntGenAddToOcean.Mattes D2014-10-261-4/+4
| * | | | | | | | | | | | | | Added a missing header to CMakeLists.Mattes D2014-10-261-0/+1
| * | | | | | | | | | | | | | Added new biomegen: GrownMattes D2014-10-265-67/+1122
| * | | | | | | | | | | | | | Added IsBiomeVeryCold() and IsBiomeCold() functions.Mattes D2014-10-262-0/+71
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed it yet again.Alexander Harkness2014-11-021-1/+1
* | | | | | | | | | | | | | Files found.Alexander Harkness2014-11-021-1/+1
* | | | | | | | | | | | | | Use screen instaead.Alexander Harkness2014-11-021-2/+2
* | | | | | | | | | | | | | Added nohup.Alexander Harkness2014-11-021-0/+1
* | | | | | | | | | | | | | CMake: Added a C++11 check for VS.Mattes D2014-11-021-0/+15
* | | | | | | | | | | | | | Fixed wrong url.Alexander Harkness2014-11-011-1/+1
* | | | | | | | | | | | | | Added DO easy-installAlexander Harkness2014-11-011-0/+2
* | | | | | | | | | | | | | Merge pull request #1580 from mc-server/doinstallAlexander Harkness2014-11-011-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Create app.ymlAlexander Harkness2014-11-011-0/+10
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | cLuaState: Fixed errors on non-existent callbacks.Mattes D2014-10-311-1/+5
* | | | | | | | | | | | | Fixed missing CS lock in cChunkMap::WakeUpSimulatorsInArea().Mattes D2014-10-311-0/+1
* | | | | | | | | | | | | Update README.mdAlexander Harkness2014-10-311-1/+1
* | | | | | | | | | | | | Fixed m_SentChunks list chunk removing.Howaner2014-10-301-1/+1
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1576 from mc-server/QtBiomeVisualiserThreadedGenMattes D2014-10-302-9/+72
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | QtBiomeVisualiser: Generator uses all machine threads.Mattes D2014-10-292-9/+72
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1575 from mc-server/1.8-ItemMattes D2014-10-292-3/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed 1.8 world item format reading.Howaner2014-10-292-3/+25
|/ / / / / / / / / / /
* | | | | | | | | | | QtBiomeVisualiser: Added quick shutdown to region loaders.Mattes D2014-10-283-1/+18
* | | | | | | | | | | QtBiomeVisualiser: Fixed mouse zoom vs menu zoom.Mattes D2014-10-281-1/+2
* | | | | | | | | | | Merge pull request #1574 from mc-server/QtBiomeVisualiserRegionsMattes D2014-10-2817-439/+568
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | QtBiomeVisualiser: Reduced memory usage.Mattes D2014-10-284-182/+156
| * | | | | | | | | | | QtBiomeVisualiser: Fixed random regions not rendered.Mattes D2014-10-282-0/+4
| * | | | | | | | | | | Merged remote-tracking branch 'origin/master'.Mattes D2014-10-287-33/+65
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | QtBiomeVisualiser: Attempt at fixing Linux compilation.Mattes D2014-10-281-1/+1
| * | | | | | | | | | | | QtBiomeVisualiser: Switched caching to entire regions.Mattes D2014-10-2715-249/+409
* | | | | | | | | | | | | Forgotten m_SendChunksMediumPriority.empty() check.Howaner2014-10-281-1/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | QtBiomeVisualiser: Fixed compilation on Linux.Mattes D2014-10-284-5/+14
* | | | | | | | | | | | Merge pull request #1573 from mc-server/warningfixesMattes D2014-10-286-32/+64
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed compile (typos).Alexander Harkness2014-10-271-2/+2
| * | | | | | | | | | | Comment alignment.Alexander Harkness2014-10-272-8/+8
| * | | | | | | | | | | CheckBasicStyle'dAlexander Harkness2014-10-274-32/+32
| * | | | | | | | | | | Another one.#Alexander Harkness2014-10-271-0/+22
| * | | | | | | | | | | Fixed more warnings.Alexander Harkness2014-10-271-14/+14
| * | | | | | | | | | | Another switch.Alexander Harkness2014-10-271-0/+5
| * | | | | | | | | | | Fix missing biomes in enum.Alexander Harkness2014-10-271-0/+5
| * | | | | | | | | | | Fixed remaining warnings.Alexander Harkness2014-10-271-5/+5
| * | | | | | | | | | | Actually fixed the warning.Alexander Harkness2014-10-271-20/+9
| * | | | | | | | | | | Test warning fix.Alexander Harkness2014-10-271-0/+11
|/ / / / / / / / / / /
* | | | | | | | | | | Fixed typo.Alexander Harkness2014-10-271-1/+1
* | | | | | | | | | | Pocess?Alexander Harkness2014-10-271-2/+2
* | | | | | | | | | | Merge pull request #1568 from mc-server/TypedBlocktypesAlexander Harkness2014-10-261-1/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added type to block type enum.Mattes D2014-10-261-1/+11
|/ / / / / / / / / / /
* | | | | | | | | | | APIDump: Added basic projectile documentation.Mattes D2014-10-251-6/+18
* | | | | | | | | | | shorter easy-install commandAlexander Harkness2014-10-251-1/+1
|/ / / / / / / / / /
| | | | | | | | | * Moved the chrono include into Globals.Mattes D2014-10-242-1/+2
| | | | | | | | | * Added a missing chrono include.Mattes D2014-10-241-0/+1
| | | | | | | | | * Merge branch 'master' into c++11EventsMattes D2014-10-2445-190/+305
| | | | | | | | | |\ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1565 from mc-server/MergedIniFileMattes D2014-10-2435-71/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | IniFile: Removed the problematic printf-like Set function.Mattes D2014-10-242-20/+0
| * | | | | | | | | | Fixed formatstringworktycho2014-10-241-1/+1
| * | | | | | | | | | IniFile: Removed an unused macro.Mattes D2014-10-231-4/+0
| * | | | | | | | | | QtBiomeVisualiser: Moved the IniFile lib.Mattes D2014-10-234-5/+5
| * | | | | | | | | | Removed iniFile library from linux dependencies.Mattes D2014-10-232-2/+2
| * | | | | | | | | | Merged IniFile into main MCS sources.Mattes D2014-10-2329-40/+29
* | | | | | | | | | | OSSupport/CMakeLists.txt: fixed indentationarchshift2014-10-241-3/+3
* | | | | | | | | | | Fixed potential linker errors with mingw, as it isn't MSVC and it isn't APPLE.archshift2014-10-241-4/+4
* | | | | | | | | | | Fix linking on OS X, which does not have librt.archshift2014-10-231-2/+6
* | | | | | | | | | | Re-updated Core.Mattes D2014-10-231-0/+0
* | | | | | | | | | | Merge pull request #1500 from mc-server/ChunkLoaderMattes D2014-10-2311-117/+264
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use 3 priorities.Howaner2014-10-234-7/+45
| * | | | | | | | | | | Merge branch 'master' into ChunkLoaderHowaner2014-10-23240-2086/+2400
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Fixed a crash in redstone simulator.Mattes D2014-10-231-1/+0
| |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into ChunkLoaderHowaner2014-10-2117-539/+474
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | style.Howaner2014-10-211-1/+2
| * | | | | | | | | | | Reverted plugin removeHowaner2014-10-214-0/+0
| * | | | | | | | | | | Fixed submodule downgradesHowaner2014-10-213-0/+0
| * | | | | | | | | | | Use two lists and 2 chunk send prioritys.Howaner2014-10-214-66/+40
| * | | | | | | | | | | New c++11 stuff.Howaner2014-10-211-4/+4
| * | | | | | | | | | | Merge branch 'master' into ChunkLoaderHowaner2014-10-21130-2313/+1951
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added distance check.Howaner2014-10-071-0/+12
| * | | | | | | | | | | | Stream 4 chunks per tick. Added priority.Howaner2014-10-067-29/+58
| * | | | | | | | | | | | Merge branch 'master' into ChunkLoaderHowaner2014-10-0637-645/+1059
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Better StreamNextChunk() methodHowaner2014-10-062-15/+120
| * | | | | | | | | | | | | Optimized chunk loaderHowaner2014-10-027-105/+93
| | | | | | | | | | | | | * Reimplemented cEvent using C++11 primitives.Mattes D2014-10-232-136/+51
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | Removed the "conditional expression is constant" warning.Mattes D2014-10-231-2/+4
* | | | | | | | | | | | | Merge pull request #1562 from mc-server/signplaceMattes D2014-10-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Signs can be placed on wallsigns.Alexander Harkness2014-10-231-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1559 from mc-server/nullptrMattes D2014-10-23211-1746/+1768
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | En masse NULL -> nullptr replaceTiger Wang2014-10-23211-1746/+1768
|/ / / / / / / / / / / /
* | | | | | | | | | | | ComposableGenerator: Removed nullptr initializers.Mattes D2014-10-221-3/+3
* | | | | | | | | | | | Upgraded core.Alexander Harkness2014-10-221-0/+0
* | | | | | | | | | | | LuaState: Projectiles are pushed using their full class.Mattes D2014-10-221-1/+1
* | | | | | | | | | | | APIDump: Added docs for a few projectiles.Mattes D2014-10-221-5/+21
* | | | | | | | | | | | Clearer version indication.Alexander Harkness2014-10-221-1/+1
* | | | | | | | | | | | Added inheritance information to Lua docs for projectiles.Mattes D2014-10-211-6/+41
* | | | | | | | | | | | cItemFrame: Fixed a forgotten rename.Mattes D2014-10-212-2/+2
* | | | | | | | | | | | Merge pull request #1515 from mc-server/BlockFixesMattes D2014-10-215-36/+97
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Reverted hook move.Howaner2014-10-211-5/+5
| * | | | | | | | | | | | Moved tall grass pickups handle.Howaner2014-10-212-9/+37
| * | | | | | | | | | | | Merge branch 'master' into BlockFixesHowaner2014-10-21132-2270/+1819
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Leaves are harvest-able.Howaner2014-10-071-2/+0
| * | | | | | | | | | | | Corrected drops from dead bush, tall grass and cobweb.Howaner2014-10-075-39/+64
| * | | | | | | | | | | | Corrected IsBlockAttachable() in BlockVine.hHowaner2014-10-071-5/+15
* | | | | | | | | | | | | Properly exported cItemFrame and cHangingEntity to Lua.Mattes D2014-10-2110-67/+100
* | | | | | | | | | | | | Fixed trailing whitespace.Mattes D2014-10-212-2/+2
* | | | | | | | | | | | | Exported individual projectile classes to Lua API.Mattes D2014-10-2118-221/+367
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merged branch 'master' of git://github.com/sriehl/MCServerMattes D2014-10-2117-540/+475
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | fix std:min call, include algorithm and compare same typeSteven Riehl2014-10-121-2/+2
| * | | | | | | | | | | refactor an if block to std::minSteven Riehl2014-10-121-4/+1
| * | | | | | | | | | | convert old style casts to fix warningsSteven Riehl2014-10-1217-549/+486
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Updated ProtectionAreasTiger Wang2014-10-211-0/+0
* | | | | | | | | | | cLuaState: cEntity is pushed with specific type.Mattes D2014-10-211-7/+48
* | | | | | | | | | | Updated the Core.Mattes D2014-10-201-0/+0
* | | | | | | | | | | InfoDump: Do not crash if one plugin fails to load.Mattes D2014-10-201-1/+5
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1554 from SphinxC0re/masterAlexander Harkness2014-10-201-6/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed #1550Julian Laubstein2014-10-201-6/+6
|/ / / / / / / / / /
* | | | | | | | | | Fixed a potential crash in cEntity bindings.Mattes D2014-10-201-2/+6
* | | | | | | | | | Merge pull request #1553 from SphinxC0re/workAlexander Harkness2014-10-202-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Found it!Julian Laubstein2014-10-201-1/+1
| * | | | | | | | | | Fix for fix #1552Julian Laubstein2014-10-201-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1552 from SphinxC0re/masterAlexander Harkness2014-10-202-1/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added error messageJulian Laubstein2014-10-202-9/+11
| * | | | | | | | | | Added error handling to load <plugin> commandJulian Laubstein2014-10-201-1/+11
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1549 from SphinxC0re/masterMattes D2014-10-197-16/+86
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed error with non-const functionJulian Laubstein2014-10-192-2/+2
| * | | | | | | | | | Added mechanics placeable on halfslabsJulian Laubstein2014-10-195-14/+84
* | | | | | | | | | | Removed obsolete tr1::shared_ptr.Mattes D2014-10-191-13/+2
* | | | | | | | | | | Fixed minor style issues.Mattes D2014-10-193-3/+3
* | | | | | | | | | | TwoLevel BioGen: fixed swapped inside and outside biomes.Mattes D2014-10-191-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Mountain height gen: Added ditches.Mattes D2014-10-192-8/+16
* | | | | | | | | | Generator: Rewritten to use SharedPtrs.Mattes D2014-10-1921-185/+149
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | cLuaState: cMonster descendants don't push their specific type.Mattes D2014-10-191-1/+10
* | | | | | | | | cLuaState: cBlockEntity descendants are pushed with proper class type.Mattes D2014-10-1917-26/+63
* | | | | | | | | LuaState: Pushing a cEntity pushes the correct class name.Mattes D2014-10-192-6/+8
* | | | | | | | | Bindings: Removed obsolete codegen files.Mattes D2014-10-193-237/+0
* | | | | | | | | Merge pull request #1502 from mc-server/furnacesTiger Wang2014-10-1819-227/+180
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fixed failure for cRankManager to restartTiger Wang2014-10-184-43/+44
| * | | | | | | | Furnaces now update their block entity typeTiger Wang2014-10-182-3/+5
| * | | | | | | | Simpler code.Alexander Harkness2014-10-181-3/+2
| * | | | | | | | Nullptr?Alexander Harkness2014-10-161-2/+2
| * | | | | | | | Fixed a number of stylistic issues.Alexander Harkness2014-10-161-7/+7
| * | | | | | | | Improved furnacesTiger Wang2014-10-0315-180/+131
* | | | | | | | | InfoDump: Fixed trailing whitespace.Mattes D2014-10-181-3/+3
* | | | | | | | | InfoDump: Fixed GH permission export, moved output to plugins.Mattes D2014-10-181-196/+225
* | | | | | | | | cMojangAPI: Don't update data if server is in offline mode.Mattes D2014-10-175-8/+12
* | | | | | | | | LuaChunkStay: Fixed a crash on unused callback.Mattes D2014-10-171-2/+6
* | | | | | | | | Merged branch 'fix_chunks'.Mattes D2014-10-162-3/+35
* | | | | | | | | Merge pull request #1541 from mc-server/VariadicTemplatesMattes D2014-10-161-3/+75
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use universal referencesworktycho2014-10-161-4/+4
| * | | | | | | | | cLuaState::Call() uses variadic templates.Mattes D2014-10-151-3/+75
* | | | | | | | | | Merge pull request #1539 from mc-server/DungeonLootMattes D2014-10-162-6/+34
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into DungeonLootSTRWarrior2014-10-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | BioGen: Fixed a compiler warning.Mattes D2014-10-161-2/+2
* | | | | | | | | | | Merge pull request #1537 from mc-server/GenerationCrashMattes D2014-10-161-1/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed possible crashSTRWarrior2014-10-151-1/+8
|/ / / / / / / / / / /
| * | | | | | | | | | Changed i variable to jSTRWarrior2014-10-161-3/+10
| * | | | | | | | | | Reversed wrong fix for #1517.STRWarrior2014-10-161-8/+2
| * | | | | | | | | | Reversed the order of the lootSTRWarrior2014-10-151-7/+15
| * | | | | | | | | | Added loot to dungeons.STRWarrior2014-10-151-1/+27
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1536 from mc-server/MineshaftBooksMattes D2014-10-153-1/+46
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Using C++11 loopsSTRWarrior2014-10-151-5/+5
| * | | | | | | | | The code now prevents conflicting enchantments.STRWarrior2014-10-151-0/+1
| * | | | | | | | | IntNoise1DInt result gets devided by 7 firstSTRWarrior2014-10-151-1/+1
| * | | | | | | | | Adding enchantments directly instead of first getting the name of it.STRWarrior2014-10-151-1/+1
| * | | | | | | | | Renamed the counter to 'j'STRWarrior2014-10-151-1/+1
| * | | | | | | | | Returned cFastRandom and cEnchantment:GetRandomEnchantmentFromVector to beforeSTRWarrior2014-10-155-16/+36
| * | | | | | | | | Enchanted books generate in MineShafts chestsSTRWarrior2014-10-155-6/+30
* | | | | | | | | | Functions in cPluginManager get references instead of pointers.Mattes D2014-10-1529-181/+220
* | | | | | | | | | Usernames are lowercased before generating offline UUID.Mattes D2014-10-151-1/+4
|/ / / / / / / / /
* | | | | | | | | cWorld: Fixed scheduler.Mattes D2014-10-132-12/+34
* | | | | | | | | Fixed style.Mattes D2014-10-133-4/+7
* | | | | | | | | CheckBasicStyle ignores the Bindings.h generated file.Mattes D2014-10-131-0/+1
* | | | | | | | | Merge pull request #1529 from mc-server/unique_ptrMattes D2014-10-124-42/+45
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Aligned simulatorsworktycho2014-10-121-5/+5
| * | | | | | | | | Fix styleworktycho2014-10-121-2/+2
| * | | | | | | | | Fix spacesworktycho2014-10-121-2/+2
| * | | | | | | | | Update World.cppworktycho2014-10-121-1/+1
| * | | | | | | | | Fix lambda captureworktycho2014-10-111-1/+2
| * | | | | | | | | Moved a few objects to unique_ptrtycho2014-10-104-39/+41
* | | | | | | | | | We only use VS2013 now, thus VS2008 is banished!archshift2014-10-121-3/+2
* | | | | | | | | | Added CLion project directory to .gitignorearchshift2014-10-121-0/+2
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Update README.mdAlexander Harkness2014-10-111-1/+1
* | | | | | | | | The longer URL has https, so we have to use that until the shortener has HTTPS.Alexander Harkness2014-10-111-1/+1
* | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServerAlexander Harkness2014-10-112-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Webadmin: use images already in files/ instead of inline image dataarchshift2014-10-112-5/+5
* | | | | | | | | | Added a guide to the easy install method.Alexander Harkness2014-10-111-3/+10
|/ / / / / / / / /
* | | | | | | | | Added easy installation method for Linux.Alexander Harkness2014-10-111-0/+17
* | | | | | | | | Merge pull request #1261 from mc-server/issue850Mattes D2014-10-112-55/+150
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed compilation.Alexander Harkness2014-10-111-1/+1
| * | | | | | | | | Merge branch 'master' into issue850Alexander Harkness2014-10-11472-18746/+26885
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Reverted submodule changes.Alexander Harkness2014-10-112-0/+0
| * | | | | | | | | | Fixed typo and removed useless right side up slab meta.Alexander Harkness2014-10-111-2/+1
| * | | | | | | | | | Renamed NEWLEAVES and NEWLOG to LEAVES and LOG.archshift2014-07-301-34/+34
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into issue850archshift2014-07-29652-11439/+47867
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Spacing fixes and a few more BLOCK_META constants.narroo2014-07-021-131/+152
| * | | | | | | | | | | Fixed E_META_...Typos in BlockID.hnarroo2014-06-083-90/+80
| * | | | | | | | | | | Fixed some E_META_*** Namesnarroo2014-05-201-71/+67
| * | | | | | | | | | | Fixed Formmatingnarroo2014-04-281-69/+69
| * | | | | | | | | | | Added some E_META_* values to BlockID.hnarroo2014-04-281-20/+120
* | | | | | | | | | | | More README changes.Alexander Harkness2014-10-111-5/+2
* | | | | | | | | | | | Fixes.Alexander Harkness2014-10-111-2/+2
* | | | | | | | | | | | Fixed remaining indent and replaced tiger with webfreak.Alexander Harkness2014-10-111-107/+107
* | | | | | | | | | | | Merge pull request #1531 from win32re/patch-1Alexander Harkness2014-10-111-129/+134
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update template.htmlwin32re2014-10-111-3/+8
| * | | | | | | | | | | Fixed indentation.win32re2014-10-111-130/+131
| * | | | | | | | | | | More template changes.win32re2014-10-111-131/+130
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1528 from kjanku1/masterAlexander Harkness2014-10-111-0/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update strings.xmlKamil Janku2014-10-111-1/+1
| * | | | | | | | | | | Android strings transladed to polishkjanku12014-10-111-0/+13
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #1530 from win32re/patch-1Alexander Harkness2014-10-111-4/+10
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update template.htmlwin32re2014-10-111-4/+10
|/ / / / / / / / / /
* | | | | | | | | | Fixed MSVC compilation.Mattes D2014-10-102-1/+3
* | | | | | | | | | Merge pull request #1376 from mc-server/static_castarchshift2014-10-103-24/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Float/Ciel: If it's going to use C++11, it might as well take advantage of itarchshift2014-10-093-26/+12
| * | | | | | | | | | Use static casts instead of C casts, add floor-cast functionsarchshift2014-10-093-24/+55
|/ / / / / / / / / /
* | | | | | | | | | DistortedHeightmap: Fixed crash on number rounding.Mattes D2014-10-091-4/+5
* | | | | | | | | | Merge pull request #1520 from mc-server/c++11switchMattes D2014-10-091-4/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix flag name in gcc 4.6 and earlierworktycho2014-10-091-8/+32
| * | | | | | | | | | Enabled C++11 in gccworktycho2014-10-091-11/+9
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1519 from mc-server/submodulizeMattes D2014-10-0813-864/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Reordered .gitmodules. Fixes #496Alexander Harkness2014-10-081-6/+6
| * | | | | | | | | | Added MagicCarpetAlexander Harkness2014-10-082-0/+3
| * | | | | | | | | | Removed MagicCarpetAlexander Harkness2014-10-082-178/+0
| * | | | | | | | | | Added Handy.Alexander Harkness2014-10-084-244/+3
| * | | | | | | | | | Added ChatLogAlexander Harkness2014-10-082-3/+6
| * | | | | | | | | | Removed ChatLog.Alexander Harkness2014-10-081-31/+0
| * | | | | | | | | | Added chunkWorx.Alexander Harkness2014-10-082-0/+3
| * | | | | | | | | | Removed ChunkWorxAlexander Harkness2014-10-083-411/+0
* | | | | | | | | | | Merge pull request #1518 from mc-server/AcaciaTreesMattes D2014-10-081-5/+75
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Added comments to the GetAcaciaTreeImage functionSTRWarrior2014-10-081-0/+18
| * | | | | | | | | | Using array with possible directions.STRWarrior2014-10-081-8/+9
| * | | | | | | | | | Added AcaciaTrees for the savanna biomesSTRWarrior2014-10-081-5/+56
| | |_|_|/ / / / / / | |/| | | | | | | |
* / | | | | | | | | Updated Buildserver URLs.Alexander Harkness2014-10-081-2/+2
|/ / / / / / / / /
* | | | | | | | | Removed BlockHaybale.h from CMakeLists.txtHowaner2014-10-071-1/+0
* | | | | | | | | Removed unused cBlockHayBaleHandler.Howaner2014-10-072-24/+1
* | | | | | | | | Merge pull request #1513 from mc-server/MojangAPIRefreshMattes D2014-10-072-19/+132
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | cMojangAPI: Added periodical refreshes.Mattes D2014-10-062-19/+132
* | | | | | | | | Fixed crash in ForEachEntityInBox API.madmaxoft2014-10-063-6/+18
* | | | | | | | | Merge pull request #1509 from WebFreak001/masterMattes D2014-10-064-266/+432
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | added font callbackWebFreak0012014-10-051-1/+1
| * | | | | | | | Removed my license, added me to CONTRIBUTORSWebFreak0012014-10-052-16/+1
| * | | | | | | | Added newlineWebFreak0012014-10-051-2/+1
| * | | | | | | | Added licenseWebFreak0012014-10-051-0/+16
| * | | | | | | | Made WebAdmin design more modernWebFreak0012014-10-053-265/+431
* | | | | | | | | Merge pull request #1510 from mc-server/TimedEventMattes D2014-10-063-1/+52
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update CMakeLists.txtworktycho2014-10-061-1/+1
| * | | | | | | | | Added a cEvent::Wait() with timeout.Mattes D2014-10-052-0/+51
* | | | | | | | | | Fixed a missed value.madmaxoft2014-10-051-1/+1
* | | | | | | | | | Removed obsolete cMonster::eType.madmaxoft2014-10-051-3/+0
* | | | | | | | | | Fixed eMonsterType Lua API mismatch.madmaxoft2014-10-056-54/+25
* | | | | | | | | | Fixed typo.Alexander Harkness2014-10-051-1/+1
* | | | | | | | | | cClientHandle: Added protocol version knowledge.Mattes D2014-10-055-3/+22
* | | | | | | | | | Update README.mdAlexander Harkness2014-10-051-1/+1
|/ / / / / / / / /
* / / / / / / / / Updated Core.Mattes D2014-10-051-0/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #1504 from win32re/masterSTRWarrior2014-10-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes #1503 - No gravel is being generatedwin32re2014-10-041-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #1489 from mc-server/fixesMattes D2014-10-042-71/+54
|\ \ \ \ \ \ \ \
| * | | | | | | | Comment suggestionsTiger Wang2014-10-031-2/+3
| * | | | | | | | Improved torch handlerTiger Wang2014-09-302-70/+52
* | | | | | | | | QtBiomeVisualiser: Added mouse hover info.Mattes D2014-10-037-147/+228
* | | | | | | | | QtBiomeVisualiser: Zoom is now limited and aligned to steps.madmaxoft2014-10-034-59/+169
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Fix spelling of PRISMRAINEAlexander Harkness2014-10-021-1/+1
* | | | | | | | Added parentheses for clarity.Alexander Harkness2014-10-011-1/+1
* | | | | | | | APIDump: Fixed cEntity documentation.madmaxoft2014-10-011-5/+23
* | | | | | | | Fixed broken code.Alexander Harkness2014-10-011-2/+2
* | | | | | | | Merge pull request #1494 from Masy98/blocksMattes D2014-10-013-26/+32
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fixed sortingMasy982014-10-011-2/+2
| * | | | | | | Merge branch 'master' into blocksMasy982014-10-015-42/+71
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1493 from Masy98/blocksMattes D2014-10-013-16/+70
|\ \ \ \ \ \ \ \
* | | | | | | | | APIDump: Added more of the missing documentation.madmaxoft2014-10-011-5/+22
* | | | | | | | | cRoot: Removed useless variable from Lua API.madmaxoft2014-10-011-2/+3
* | | | | | | | | cPlayer: Removed useless functions from the Lua API.madmaxoft2014-10-011-2/+6
* | | | | | | | | Bindings: Fixed binding for cPlayer::PermissionMatches().madmaxoft2014-10-011-10/+4
* | | | | | | | | Unified cRoot broadcast chat documentation.madmaxoft2014-10-012-12/+19
* | | | | | | | | APIDump: Documented missing cIniFile function.madmaxoft2014-10-011-0/+1
* | | | | | | | | APIDump: Documented missing cCompositeChat functions.madmaxoft2014-10-011-4/+6
* | | | | | | | | APIDump: Added missing cClientHandle documentation.madmaxoft2014-10-011-0/+3
* | | | | | | | | cClientHandle: Alpha-sorted the sending functions.madmaxoft2014-10-011-7/+7
| | * | | | | | | Fixed Red Sandstone and Prismarine dropsMasy982014-10-013-24/+30
| |/ / / / / / /
| * | | | | | | Added Daylight Sensors to the "can't push" listMasy982014-10-011-0/+2
| * | | | | | | Fixed ":"Masy982014-10-011-11/+11
| * | | | | | | Added missing 1.8 blocks, E_METAs and soundsMasy982014-10-013-7/+59
|/ / / / / / /
* | | | | | | Merge pull request #1490 from mc-server/removecompactMattes D2014-10-0128-1664/+0
|\ \ \ \ \ \ \
| * | | | | | | Removed WSSCompactTiger Wang2014-09-3028-1664/+0
| |/ / / / / /
* | | | | | | Merge pull request #1487 from mc-server/BlockFixesMattes D2014-09-308-6/+62
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Code improvementsHowaner2014-09-303-3/+7
| * | | | | | Fixed 1.8 dirt typesHowaner2014-09-303-3/+35
| * | | | | | Fixed iron trapdoorsHowaner2014-09-304-2/+9
| * | | | | | Fixed 1.8 doors.Howaner2014-09-301-1/+14
* | | | | | | Merge pull request #1485 from mc-server/PluginMessagesMattes D2014-09-306-118/+242
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed a missing semicolon.madmaxoft2014-09-301-1/+1
| * | | | | | Rewritten plugin messages, vanilla are being parsed directly.madmaxoft2014-09-306-118/+242
* | | | | | | Merge pull request #1427 from mc-server/chestcartsMattes D2014-09-3015-72/+190
|\ \ \ \ \ \ \
| * | | | | | | Compilation fixTiger Wang2014-09-282-4/+4
| * | | | | | | SuggestionsTiger Wang2014-09-276-23/+69
| * | | | | | | Merge remote-tracking branch 'origin/master' into chestcartsTiger Wang2014-09-27235-6583/+12914
| |\ \ \ \ \ \ \
| * | | | | | | | e.t.c. -> etc.Tiger Wang2014-09-131-1/+1
| * | | | | | | | Added newlinesTiger Wang2014-09-131-1/+5
| * | | | | | | | Implemented Chest MinecartsTiger Wang2014-09-1315-94/+161
* | | | | | | | | Merge pull request #1484 from SphinxC0re/masterMattes D2014-09-301-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | IndentationJulian Laubstein2014-09-301-3/+3
| * | | | | | | | Set right indentationJulian Laubstein2014-09-301-3/+3
| * | | | | | | | actual solving of the halfslap+torch problemJulian Laubstein2014-09-301-1/+3
|/ / / / / / / /
* | | | | | | | Updated Core.madmaxoft2014-09-291-0/+0
* | | | | | | | Updated Core.madmaxoft2014-09-291-0/+0
* | | | | | | | RankMgr: GetAllPlayers() returns players sorted by name.madmaxoft2014-09-293-3/+3
* | | | | | | | Updated the Core.madmaxoft2014-09-291-0/+0
* | | | | | | | Style fixes.madmaxoft2014-09-293-10/+13
* | | | | | | | World: Fixed chunk generation by plugins.madmaxoft2014-09-291-1/+1
* | | | | | | | QtBiomeVisualiser: Seed is read properly.madmaxoft2014-09-292-9/+8
* | | | | | | | Fixed codestyle again.Alexander Harkness2014-09-291-1/+1
* | | | | | | | Merge pull request #1472 from mc-server/RanksMattes D2014-09-295-1/+206
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed a typo in the description.madmaxoft2014-09-291-1/+1
| * | | | | | | | Renamed GetAllPlayers() to GetAllPlayerUUIDs()Howaner2014-09-293-7/+7
| * | | | | | | | Merge branch 'master' into RanksHowaner2014-09-2939-4770/+178
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixed SetDefaultRank() return value.Howaner2014-09-281-1/+1
| * | | | | | | | | cRankManager: Added ClearPlayerRanks()Howaner2014-09-284-0/+46
| * | | | | | | | | Updated api documentation.Howaner2014-09-282-1/+3
| * | | | | | | | | cRankManager: Added GetAllPlayers() and GetPlayerName()Howaner2014-09-284-0/+157
* | | | | | | | | | Merge pull request #1480 from w00tc0d3/workAlexander Harkness2014-09-292-3/+14
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | BlockStone.h: fix the codestylew00tc0d32014-09-291-6/+5
| * | | | | | | | | Tabs -> spacesw00tc0d32014-09-291-4/+4
| * | | | | | | | | BlockStone: drop the right cobblestone on onBreak().netchip2014-09-292-3/+15
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1479 from SphinxC0re/masterMattes D2014-09-291-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update BlockTorch.hJulian Laubstein2014-09-291-3/+3
| * | | | | | | | | Added torches placeable on upside-down-halfslapsJulian Laubstein2014-09-291-1/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1473 from mc-server/NewStoneGenerationMattes D2014-09-293-7/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed compilationSTRWarrior2014-09-281-1/+10
| * | | | | | | | | Added Granite, Diorite and Andesite to the NaturalPatches generator.STRWarrior2014-09-283-7/+37
* | | | | | | | | | Merge pull request #1478 from doublej472/masterMattes D2014-09-292-0/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | DerpJonathan Frederick2014-09-291-1/+1
| * | | | | | | | | | Fix commentsJonathan Frederick2014-09-291-2/+2
| * | | | | | | | | | Make endermen take damage in waterJonathan Frederick2014-09-282-0/+21
* | | | | | | | | | | Plugin messages: Vanilla prefixes its payloads with VarInt lengths.madmaxoft2014-09-281-4/+13
|/ / / / / / / / / /
* | | | | | | | | | Revert "1.8: Fixed plugin messages."madmaxoft2014-09-281-1/+3
* | | | | | | | | | Protocol 1.8: Fixed possible crash on malformed packet.madmaxoft2014-09-281-0/+5
* | | | | | | | | | Fixed trailing whitespace.madmaxoft2014-09-281-1/+1
* | | | | | | | | | Merge pull request #1471 from mc-server/redstoneDataMattes D2014-09-284-1/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update Chunk.cppworktycho2014-09-281-1/+1
| * | | | | | | | | | Use factory method to construct redstone simulator dataTycho2014-09-284-1/+13
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1466 from mc-server/endofsupportMattes D2014-09-2827-4757/+24
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Compilation fixTiger Wang2014-09-282-3/+2
| * | | | | | | | | Bug fixTiger Wang2014-09-275-32/+27
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into endofsupportTiger Wang2014-09-278-4/+54
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Dropped support for <1.7.xTiger Wang2014-09-2722-4733/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #1463 from mc-server/sp_docs1.6EoSAlexander Harkness2014-09-282-1/+52
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add Code example.Alexander Harkness2014-09-281-0/+26
| * | | | | | | | changed description to be more readable.Alexander Harkness2014-09-271-3/+2
| * | | | | | | | Copy edit.Alexander Harkness2014-09-271-1/+1
| * | | | | | | | Fixed return value descriptions.Alexander Harkness2014-09-271-1/+3
| * | | | | | | | Fixed typo again.Alexander Harkness2014-09-271-1/+1
| * | | | | | | | Typo fix.Alexander Harkness2014-09-271-1/+1
| * | | | | | | | Fixed line left in.Alexander Harkness2014-09-271-4/+3
| * | | | | | | | Remaining part of fix.Alexander Harkness2014-09-271-0/+1
| * | | | | | | | Hopefully fix #1384Alexander Harkness2014-09-271-0/+24
* | | | | | | | | 1.8: Fixed plugin messages.Howaner2014-09-271-3/+4
* | | | | | | | | QtBiomeVisualiser: fixed compilation.madmaxoft2014-09-271-1/+10
* | | | | | | | | Fixed another redstone crash.madmaxoft2014-09-271-1/+6
* | | | | | | | | Merge pull request #1465 from Masy98/blocksMattes D2014-09-272-3/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Combined conditionsMasy982014-09-271-8/+11
| * | | | | | | | | Added barriers correctlyMasy982014-09-272-0/+6
* | | | | | | | | | BioGen: TwoLevel is now fully settable in INI.madmaxoft2014-09-272-44/+31
* | | | | | | | | | Fixed minor style issues.madmaxoft2014-09-273-3/+3
* | | | | | | | | | Wrapped clang-specific pragma into an #ifdef block.madmaxoft2014-09-271-1/+6
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1461 from mc-server/RedstoneFixTiger Wang2014-09-273-1/+8
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Update creatable.cppworktycho2014-09-271-0/+1
| * | | | | | | | Update IncrementalRedstoneSimulator.incworktycho2014-09-271-1/+1
| * | | | | | | | Update IncrementalRedstoneSimulator.incworktycho2014-09-271-1/+1
| * | | | | | | | Correct method name.worktycho2014-09-271-1/+1
| * | | | | | | | Set chunk dataworktycho2014-09-271-0/+5
| * | | | | | | | Add data accessor.worktycho2014-09-271-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #1459 from Masy98/blocksAlexander Harkness2014-09-273-2/+45
|\| | | | | | |
| * | | | | | | Added default value to switch and spruce gate to fence gate handlerMasy982014-09-272-0/+6
| * | | | | | | Fixed convertToPickups for fence gatesMasy982014-09-271-1/+1
| * | | | | | | Fixed convertToPickups for doorsMasy982014-09-271-1/+38
| |/ / / / / /
* / / / / / / Removed polarSSL makefile. Fixes #591.Alexander Harkness2014-09-272-1/+1
|/ / / / / /
* | | | | | Merge pull request #1456 from Howaner/FixesMattes D2014-09-2616-77/+41
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into FixesHowaner2014-09-26113-3157/+3556
| |\ \ \ \ \ \
| * | | | | | | Fixed players custom name in 1.8Howaner2014-09-2614-66/+30
| * | | | | | | Added type checking to map loading.Howaner2014-09-262-11/+11
* | | | | | | | Fixed UNUSED macro so that it doesn't require type knowledge.madmaxoft2014-09-262-5/+14
* | | | | | | | Updated CoreTiger Wang2014-09-261-0/+0
* | | | | | | | Merge pull request #1415 from Masy98/blocksMattes D2014-09-2613-41/+287
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Moved curly brace to seperate lineMasy982014-09-261-1/+2
| * | | | | | | Re-added 1.8 blocks to the redstone simulatorMasy982014-09-261-9/+46
| * | | | | | | Merge branch 'master' into blocksMasy982014-09-26184-6551/+12716
| |\ \ \ \ \ \ \
| * | | | | | | | Added slime block to slime balls recipeMasy982014-09-121-0/+1
| * | | | | | | | Added Sea Lantern dropsMasy982014-09-122-0/+32
| * | | | | | | | Fixed 1.8 Item stacking and block harvestingMasy982014-09-122-26/+44
| * | | | | | | | Added new doors in ItemDoor.hMasy982014-09-111-1/+15
| * | | | | | | | Fixed mutton name in Sheep.cppMasy982014-09-112-3/+11
| * | | | | | | | Fixed mutton name in ItemHandlerMasy982014-09-111-1/+1
| * | | | | | | | Added barrier blockMasy982014-09-113-1/+7
| * | | | | | | | Added 1.8 food to the food listMasy982014-09-112-2/+5
| * | | | | | | | Added blocks to the fire simulatorMasy982014-09-111-0/+11
| * | | | | | | | Fixed incorrect handlersMasy982014-09-111-3/+3
| * | | | | | | | Added stone slab in BlockSlab.hMasy982014-09-101-1/+3
| * | | | | | | | Fixed typoMasy982014-09-101-1/+1
| * | | | | | | | Added new blocks to the BlockInfoMasy982014-09-103-12/+76
| * | | | | | | | Added new blocks to the BlockHandlerMasy982014-09-101-0/+12
| * | | | | | | | Added iron trapdoor, fence gates and doors to the redstone simulatorMasy982014-09-101-0/+11
| * | | | | | | | Added 1.8 Blocks and ItemsMasy982014-09-101-0/+37
* | | | | | | | | Merge pull request #1455 from mc-server/includesTiger Wang2014-09-2610-22/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Plugin.hworktycho2014-09-261-2/+0
| * | | | | | | | | Removed a few unnessicary includesTycho2014-09-2610-21/+16
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTycho2014-09-263-3/+8
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Fixed issue with castingtycho2014-09-263-3/+8
* | | | | | | | | Removed more unessicary includesTycho2014-09-2649-59/+55
|/ / / / / / / /
* | | | | | | | Merge pull request #1419 from mc-server/redstoneTestsworktycho2014-09-2662-3075/+3480
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into redstoneTestsTycho2014-09-254-23/+42
| |\ \ \ \ \ \ \
| * | | | | | | | Fixed styleTycho2014-09-254-2/+108
| * | | | | | | | Merge branch 'master' into redstoneTestsTycho2014-09-2583-948/+6850
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix accedental c++11Tycho2014-09-171-6/+7
| * | | | | | | | | Merge branch 'master' into redstoneTestsTycho2014-09-1788-2583/+2318
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added first test to show the object can be createdTycho2014-09-1746-456/+681
| * | | | | | | | | | IncrementalRedstoneSimulator now has no dependencies on cChunkTycho2014-09-166-375/+384
| * | | | | | | | | | Don't include IncrementalRedsonteSimulator.inc when in SELF_TEST modeTycho2014-09-111-5/+0
| * | | | | | | | | | Possibly decoupled IncrementalRedstoneSimulator from the rest of the serverTycho2014-09-1122-2339/+2403
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Improved searching for spawn.madmaxoft2014-09-261-3/+14
* | | | | | | | | | cByteBuffer: Simplified ReadPosition().madmaxoft2014-09-251-6/+9
* | | | | | | | | | Protocol 1.8: Fixed plugin message packet.madmaxoft2014-09-251-1/+3
* | | | | | | | | | cByteBuffer: Fixed position reading.madmaxoft2014-09-251-3/+3
* | | | | | | | | | TwoLevel BioGen: reads params from INI file.madmaxoft2014-09-251-9/+26
* | | | | | | | | | Added cByteBuffer::WriteBEUShort().madmaxoft2014-09-253-1/+15
* | | | | | | | | | Merge pull request #1452 from Howaner/FixesMattes D2014-09-257-18/+55
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Comment styleHowaner2014-09-251-1/+1
| * | | | | | | | | | Merge branch 'master' into FixesHowaner2014-09-254-25/+41
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Fixed wrong Surrounding sizeHowaner2014-09-251-3/+3
| * | | | | | | | | | Anvil: Arrow Tile tags are a short in VanillaHowaner2014-09-252-7/+24
| * | | | | | | | | | Use the json writer to write sign texts.Howaner2014-09-251-5/+10
| * | | | | | | | | | Fixed dispender direction bugHowaner2014-09-251-1/+1
| * | | | | | | | | | Fixed hanging direction bugs.Howaner2014-09-253-2/+17
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Protocol 1.8: Handling packet compression properly.madmaxoft2014-09-252-14/+39
* | | | | | | | | | Protocol 1.8: Added checks for values presence.madmaxoft2014-09-251-2/+8
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Redstone: Fixed a crash with repeaters on a chunk border.madmaxoft2014-09-251-13/+22
* | | | | | | | | 1.8 Protocol: Fixed problems with no-payload packets.madmaxoft2014-09-251-6/+7
* | | | | | | | | 1.7 Protocol: fixed potential problems with no-payload packets.madmaxoft2014-09-251-4/+4
* | | | | | | | | HangingEntity: Silenced a crash.madmaxoft2014-09-251-2/+8
|/ / / / / / / /
* | | | | | | | Merge pull request #1449 from mc-server/WorldLoaderMattes D2014-09-243-5/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | derpHowaner2014-09-241-4/+4
| * | | | | | | | Don't create two entity lists.Howaner2014-09-242-7/+14
| * | | | | | | | Merge branch 'master' into WorldLoaderHowaner2014-09-249-14/+33
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | QtBiomeVisualiser: Fixed MSVC path-crossing.madmaxoft2014-09-247-10/+15
* | | | | | | | | Anvil: Wolf collar color is a byte in Vanilla.madmaxoft2014-09-232-4/+18
| * | | | | | | | Merge branch 'master' into WorldLoaderHowaner2014-09-232-5/+5
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Fixed compiler warnings in 1.8 protocol.madmaxoft2014-09-231-2/+2
* | | | | | | | | Fixed a crash in WSSAnvil.madmaxoft2014-09-231-3/+3
| * | | | | | | | MCServer world compatiblity with vanilla and mcedit.Howaner2014-09-233-5/+52
|/ / / / / / / /
* | | | | | | | Merge pull request #1372 from mc-server/EntityCustomNameFranz Reiter2014-09-2320-31/+267
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed SQLiteCpp downgradeHowaner2014-09-231-0/+0
| * | | | | | | | Merge branch 'master' into EntityCustomNameHowaner2014-09-23232-4784/+10892
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | QtBiomeVisualiser: Fixed confusion about Globals.h.madmaxoft2014-09-235-21/+21
* | | | | | | | | Made ExpBottleEntity break on entities.archshift2014-09-232-1/+23
* | | | | | | | | Merge pull request #1447 from cedeel/patch-2worktycho2014-09-235-44/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | A few compiler warning fixesChris Darnell2014-09-235-44/+47
|/ / / / / / / / /
* | | | | | | | | Updated README.mdHowaner2014-09-222-2/+2
* | | | | | | | | Hotfixed 1.8 item reading.Howaner2014-09-222-6/+6
* | | | | | | | | QtBiomeVisualiser: Implemented live-update for the generator setup.madmaxoft2014-09-225-17/+49
* | | | | | | | | QtBiomeVisualiser: generator source is read from generator setup ini.madmaxoft2014-09-223-16/+13
* | | | | | | | | QtBiomeVisualiser: Moved the generator setup into a side-pane.madmaxoft2014-09-225-39/+96
* | | | | | | | | Merge pull request #1398 from mc-server/1.8-ProtocolAlexander Harkness2014-09-2236-680/+4729
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Changed metadata reading again.Howaner2014-09-222-173/+7
| * | | | | | | | | Fixed item nbt reading.Howaner2014-09-222-3/+168
| * | | | | | | | | Code improvements.Howaner2014-09-194-38/+36
| * | | | | | | | | Updated SPAWNING_ENTITY hook description.Howaner2014-09-191-2/+3
| * | | | | | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-1931-360/+648
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | DerpHowaner2014-09-181-1/+1
| * | | | | | | | | Exported player list states to extra functions.Howaner2014-09-1814-531/+837
| * | | | | | | | | 1.8: Simplified item metadata reading.Howaner2014-09-183-27/+3
| * | | | | | | | | Use xofts ReadPosition() code.Howaner2014-09-171-3/+6
| * | | | | | | | | Fixed SQLiteCpp downgradeHowaner2014-09-141-0/+0
| * | | | | | | | | Simplified WriteUUID()Howaner2014-09-141-9/+9
| * | | | | | | | | Fixed warnings.Howaner2014-09-141-3/+3
| * | | | | | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-1458-2270/+1737
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | 1.8: Updated scoreboard packets.Howaner2014-09-131-3/+7
| * | | | | | | | | | Moved chat json creating to the CompositeChat class.Howaner2014-09-136-346/+192
| * | | | | | | | | | 1.8: Fixed maps.Howaner2014-09-1312-45/+43
| * | | | | | | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-1324-104/+185
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-121-1/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 1.8-ProtocolHowaner2014-09-122-0/+17
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 1.8-ProtocolHowaner2014-09-1265-326/+260
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed many right click issues.Howaner2014-09-122-7/+17
| * | | | | | | | | | | | | Fixed wrong buffer length in the 1.8 protocol.Howaner2014-09-121-10/+4
| * | | | | | | | | | | | | 1.8: Fixed ReadItem()Howaner2014-09-122-20/+40
| * | | | | | | | | | | | | 1.8: Added difficulty sendingHowaner2014-09-121-0/+6
| * | | | | | | | | | | | | 1.8: Fixed block entities.Howaner2014-09-121-8/+2
| * | | | | | | | | | | | | 1.8: Fixed eating.Howaner2014-09-121-0/+1
| * | | | | | | | | | | | | 1.8: Fixed workbench, enchanting and anvil window.Howaner2014-09-121-3/+19
| * | | | | | | | | | | | | 1.8: Enderman, byte -> shortHowaner2014-09-121-1/+1
| * | | | | | | | | | | | | 1.8: Fixed enderman spawning.Howaner2014-09-121-1/+1
| * | | | | | | | | | | | | 1.8: Fixed inventory open packet.Howaner2014-09-113-4/+32
| * | | | | | | | | | | | | Removed GetProtocolVersion() from the protocols.Howaner2014-09-117-19/+6
| * | | | | | | | | | | | | 1.8: Fixed sign placing.Howaner2014-09-111-1/+1
| * | | | | | | | | | | | | 1.8: Fixed hangings.Howaner2014-09-114-32/+89
| * | | | | | | | | | | | | 1.8: Added ParticleEffect packet.Howaner2014-09-1119-38/+115
| * | | | | | | | | | | | | 1.8: Added MultiBlockChange packet.Howaner2014-09-094-54/+86
| * | | | | | | | | | | | | Downgrade SQLiteCpp againHowaner2014-09-091-0/+0
| * | | | | | | | | | | | | Added the player list to the 1.8 protocol.Howaner2014-09-0916-31/+108
| * | | | | | | | | | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-0962-850/+1589
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | PlayerSpawn packet: Send the correct uuid.Howaner2014-09-091-5/+1
| * | | | | | | | | | | | | | 1.8: Added new uuid field.Howaner2014-09-093-17/+44
| * | | | | | | | | | | | | | More fixes.Howaner2014-09-083-12/+7
| * | | | | | | | | | | | | | Recoded cProtocol180 class.Howaner2014-09-084-589/+2690
| * | | | | | | | | | | | | | 1.8: Fixed tab complete.Howaner2014-09-083-2/+20
| * | | | | | | | | | | | | | Fixed more 1.8 packets.Howaner2014-09-087-47/+313
| * | | | | | | | | | | | | | Updated chunk sending to 1.8Howaner2014-09-084-26/+22
| * | | | | | | | | | | | | | Added GetProtocolVersion() to cProtocol.Howaner2014-09-088-26/+29
| * | | | | | | | | | | | | | Implemented packet compression.Howaner2014-09-087-35/+117
| * | | | | | | | | | | | | | Fixed client errors.Howaner2014-09-045-52/+79
| * | | | | | | | | | | | | | Added more 1.8 protocol things.Howaner2014-09-046-14/+632
| * | | | | | | | | | | | | | Started implementing of the 1.8 protocol.Howaner2014-09-047-7/+502
* | | | | | | | | | | | | | | Merge pull request #1446 from cedeel/patch-1Alexander Harkness2014-09-226-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Made it compile with clangChris Darnell2014-09-226-11/+11
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | QtBiomeVisualiser: Added the base for INI editting.madmaxoft2014-09-215-20/+266
* | | | | | | | | | | | | | | Fix crash in cLineBlockTracerTiger Wang2014-09-211-8/+7
* | | | | | | | | | | | | | | QtBiomeVisualiser: Added list of vanilla worlds.madmaxoft2014-09-202-7/+145
* | | | | | | | | | | | | | | Fixed cParsedNBT::FindTagByPath().madmaxoft2014-09-201-1/+1
* | | | | | | | | | | | | | | QtBiomeVisualiser: Added support for loading Anvil worlds.madmaxoft2014-09-204-5/+320
* | | | | | | | | | | | | | | Fixed typos in items.ini.madmaxoft2014-09-191-1/+2
* | | | | | | | | | | | | | | Merge pull request #1442 from Masy98/LanguageMattes D2014-09-192-3/+611
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Added german language support, now reallyMasy982014-09-181-0/+603
| * | | | | | | | | | | | | | Added german language supportMasy982014-09-181-3/+8
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | QtBiomeVisualiser: More gcc fixes.madmaxoft2014-09-181-2/+2
* | | | | | | | | | | | | | QtBiomeVisualiser: Fixed linux compilation.madmaxoft2014-09-185-0/+6
* | | | | | | | | | | | | | Fixed minor style issues.madmaxoft2014-09-173-5/+5
* | | | | | | | | | | | | | Voronoi biomegen: Added JitterSize and OddRowOffset.madmaxoft2014-09-173-88/+164
* | | | | | | | | | | | | | Updated SQLiteCpp.madmaxoft2014-09-171-0/+0
* | | | | | | | | | | | | | Merge pull request #1437 from nesco/masterMattes D2014-09-174-5/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Implementing Spectator Modenesco2014-09-171-1/+1
| * | | | | | | | | | | | | | Update World.hnesco2014-09-171-1/+1
| * | | | | | | | | | | | | | Preparing 1.8 updatenesco2014-09-171-5/+15
| * | | | | | | | | | | | | | Preparing 1.8 updatenesco2014-09-161-1/+2
| * | | | | | | | | | | | | | Preparing 1.8 update nesco2014-09-161-0/+3
| * | | | | | | | | | | | | | Pre 1.8 releasenesco2014-09-161-0/+8
| * | | | | | | | | | | | | | Preparing 1.8 changesnesco2014-09-161-0/+3
| * | | | | | | | | | | | | | Pre 1.8 releasenesco2014-09-161-0/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Added an explicit setting for allowing BungeeCord handshake.madmaxoft2014-09-173-1/+16
* | | | | | | | | | | | | | Fixed wrong url in the debuggers pluginHowaner2014-09-171-1/+1
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | BungeeCord compatibility: don't overwrite UUID / properties.madmaxoft2014-09-171-2/+10
* | | | | | | | | | | | | Full BungeeCord compatibility.madmaxoft2014-09-172-1/+17
* | | | | | | | | | | | | Initial BungeeCord support.madmaxoft2014-09-174-1/+43
|/ / / / / / / / / / / /
* | | | | | | | | | | | VoronoiMap: Added Jitter and OddRowOffset params.madmaxoft2014-09-152-11/+55
* | | | | | | | | | | | QtBiomeVisualiser: Fixed colors and read failures.madmaxoft2014-09-151-6/+5
* | | | | | | | | | | | QtBiomeVisualiser: Added reloading.Mattes D2014-09-156-4/+49
* | | | | | | | | | | | QtBiomeVisualiser: removed multithreading.Mattes D2014-09-152-65/+10
* | | | | | | | | | | | QtBiomeVisualiser: Added multithreading.Mattes D2014-09-153-23/+102
* | | | | | | | | | | | QtBiomeVisualiser: Extended zoom down below 100%.Mattes D2014-09-142-16/+80
* | | | | | | | | | | | QtBiomeVisualiser: Added mouse and keyboard view control.Mattes D2014-09-142-4/+137
* | | | | | | | | | | | QtBiomeVisualiser: Removed build-specific variables.Mattes D2014-09-141-3/+0
* | | | | | | | | | | | Removed the unused nightbuild script.madmaxoft2014-09-141-209/+0
* | | | | | | | | | | | Merge pull request #1434 from Masy98/masterAlexander Harkness2014-09-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Added me to the contributors listMasy982014-09-141-0/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Added new Qt-based biome visualiser.Mattes D2014-09-1437-2181/+1482
* | | | | | | | | | | OSSupport: Fixed UNICODE Windows builds.Mattes D2014-09-142-8/+8
* | | | | | | | | | | Improved cBlockHandler::DropBlockTiger Wang2014-09-135-46/+34
* | | | | | | | | | | Entities experience water resistanceTiger Wang2014-09-132-16/+31
* | | | | | | | | | | Merge pull request #1353 from mc-server/EffectsMattes D2014-09-1313-16/+179
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added extra mushroom handler.Howaner2014-09-124-10/+60
| * | | | | | | | | | | Merge branch 'master' into EffectsHowaner2014-09-12133-1375/+2157
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Renamed SetWalkSpeed() to SetRelativeWalkSpeed()Howaner2014-09-024-11/+11
| * | | | | | | | | | | Merge branch 'master' into EffectsHowaner2014-09-0238-405/+954
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Removed SexyMotd linkHowaner2014-08-301-1/+0
| * | | | | | | | | | | | Added GetWalkSpeed() and SetWalkSpeed() documentation.Howaner2014-08-302-0/+3
| * | | | | | | | | | | | Fixed potion removing in creative mode.Howaner2014-08-305-8/+16
| * | | | | | | | | | | | Added slowness effect and added entity support.Howaner2014-08-302-16/+65
| * | | | | | | | | | | | Added SetWalkSpeed() to cMonster.Howaner2014-08-302-0/+9
| * | | | | | | | | | | | Merge branch 'master' into EffectsHowaner2014-08-3012-223/+319
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added speed entity effect.Hownaer2014-08-283-1/+46
* | | | | | | | | | | | | | Gittip is now GratipayAlexander Harkness2014-09-131-1/+1
* | | | | | | | | | | | | | Updated CI Links to new ones.Alexander Harkness2014-09-131-2/+2
| |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Fixed friction being applied whilst airborneTiger Wang2014-09-121-11/+13
* | | | | | | | | | | | | APIDump: Improved command binding documentation.madmaxoft2014-09-121-4/+4
* | | | | | | | | | | | | Merge pull request #1424 from Howaner/FixesMattes D2014-09-1221-85/+169
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Only drop flint or gravel, not both.Howaner2014-09-121-2/+4
| * | | | | | | | | | | | Fixed farmland issues.Howaner2014-09-1211-64/+75
| * | | | | | | | | | | | Only place farmland if no block is upper than dirt/grass.Howaner2014-09-121-1/+6
| * | | | | | | | | | | | Added hoe interact sound.Howaner2014-09-121-0/+1
| * | | | | | | | | | | | Play placesound from the middle of the block.Howaner2014-09-121-1/+1
| * | | | | | | | | | | | Fixed block place sounds.Howaner2014-09-122-15/+27
| * | | | | | | | | | | | Spawn exp if you break a mob spawner.Howaner2014-09-126-4/+50
| * | | | | | | | | | | | Disabled mobspawner itemdrop.Howaner2014-09-121-0/+1
| * | | | | | | | | | | | Players in survival mode are not allowed to break a bedrock.Howaner2014-09-121-0/+6
|/ / / / / / / / / / / /
* | | | | | | / / / / / Fixed iron ore drop.Howaner2014-09-121-1/+2
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | Added flint drop and fence gate meta reset.Howaner2014-09-122-0/+17
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Fixed a redstone sim failure with droppers.Mattes D2014-09-111-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTycho2014-09-102-3/+3
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #1414 from Masy98/CraftingMattes D2014-09-101-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed spacingMasy982014-09-101-1/+1
| | * | | | | | | | | Fixed sign recipeMasy982014-09-101-1/+1
| * | | | | | | | | | Grammar fixes.Alexander Harkness2014-09-101-2/+2
* | | | | | | | | | | Cleaned up flagsTycho2014-09-101-5/+4
|/ / / / / / / / / /
* | | | | | | | | | Added MCServer_ prfix to env vars for versionsTycho2014-09-102-9/+9
* | | | | | | | | | Merge pull request #1413 from mc-server/versionInfoAlexander Harkness2014-09-106-0/+48
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added example for how to use version info to travisTycho2014-09-101-0/+4
| * | | | | | | | | | Added abilty to set build infoTycho2014-09-105-0/+44
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1402 from Masy98/SoundsMattes D2014-09-1050-299/+172
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removed old sound-configuration for SignPostsMasy982014-09-091-6/+0
| * | | | | | | | | | Removed old sound-configuration for RepeatersMasy982014-09-091-6/+0
| * | | | | | | | | | Removed old sound-configuration for TrapdoorsMasy982014-09-091-5/+0
| * | | | | | | | | | Removed old sound-configuration for doorsMasy982014-09-092-10/+0
| * | | | | | | | | | Moved sound-configs into BlockID.h and fixed/ added loads of soundsMasy982014-09-0945-272/+172
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1399 from mc-server/warningsMattes D2014-09-093-17/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Actually set defaultworktycho2014-09-091-0/+1
| * | | | | | | | | | use the correct ASSERTworktycho2014-09-081-2/+2
| * | | | | | | | | | FIxed a couple more warningsTycho2014-09-081-2/+8
| * | | | | | | | | | TimeOfDay does not need to be an Int64Tycho2014-09-083-6/+6
| * | | | | | | | | | Fixed a few compile warningsTycho2014-09-081-9/+14
* | | | | | | | | | | Update Zip2008_PDBs.listAlexander Harkness2014-09-091-1/+2
* | | | | | | | | | | Update Zip2008.listAlexander Harkness2014-09-091-0/+1
| |_|_|_|_|_|/ / / / |/| | | | | | | | |
* | | | | | | | | | capitalisation errorworktycho2014-09-081-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1397 from mc-server/saveSettingMattes D2014-09-081-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | derpworktycho2014-09-081-1/+1
| * | | | | | | | | If server fails init, save any changed or generated settings.worktycho2014-09-081-0/+1
|/ / / / / / / / /
* / / / / / / / / Exported cClientHandle:GetIPString() to Lua API.Mattes D2014-09-072-1/+2
|/ / / / / / / /
* | | | | | | | Webadmin: Added default ports to auto-generated ini file.Mattes D2014-09-071-2/+6
* | | | | | | | WebAdmin: Added HTTPS instructions when cert / key is missing.Mattes D2014-09-071-0/+1
* | | | | | | | Fixed submodules' downgrade from the previous PR merge.Mattes D2014-09-072-0/+0
* | | | | | | | Re-ordered the items.ini and added a few new namesMasy982014-09-061-291/+290
* | | | | | | | Merge branch 'master' into blocksMasy982014-09-0673-990/+1672
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'Masy982014-09-0638-575/+762
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge pull request #1385 from mc-server/clangWarningsMattes D2014-09-062-6/+27
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Update SetFlags.cmakeworktycho2014-09-061-1/+0
| | | * | | | | | | | Added workaround for clang versionTycho2014-09-062-5/+16
| | | * | | | | | | | bumped cmake version min and fixed clang supportTycho2014-09-062-3/+3
| | | * | | | | | | | Wrong cmake varworktycho2014-09-061-2/+2
| | | * | | | | | | | Improve error messageworktycho2014-09-061-2/+2
| | | * | | | | | | | Should now compile in clang 3.0worktycho2014-09-061-5/+16
| | * | | | | | | | | Added missing newline.Mattes D2014-09-061-1/+1
| | * | | | | | | | | Removed chunk's unused Y coord.Mattes D2014-09-062-5/+4
| | * | | | | | | | | Added Y-wise asserts to signs.Mattes D2014-09-063-0/+4
| | * | | | | | | | | Alpha-sorted protocol 1.7 senders.Mattes D2014-09-061-7/+7
| | * | | | | | | | | Fixed player spawning in unknown world.Mattes D2014-09-061-0/+4
| | |/ / / / / / / /
| | * | | | | | | | Win build: put third party licenses into a separate folder.madmaxoft2014-09-066-5/+1
| | * | | | | | | | Anvil: Fixed an off-by-one error in the loader.Mattes D2014-09-061-1/+1
| | * | | | | | | | Fixed scoreboard loader type checks.Mattes D2014-09-061-10/+10
| | * | | | | | | | Removed outdated message sending methods.Alexander Harkness2014-09-061-3/+3
| | * | | | | | | | Merge pull request #1361 from mc-server/WebAdminMattes D2014-09-069-348/+501
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Xoft fixes.Alexander Harkness2014-09-061-1/+1
| | | * | | | | | | | [WebAdmin] Code improvements.Howaner2014-09-022-61/+99
| | | * | | | | | | | Merge branch 'master' into WebAdminHowaner2014-09-0227-293/+770
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |
| | | * | | | | | | | WebAdmin: Exported logo and background.Howaner2014-08-313-3/+3
| | | * | | | | | | | WebAdmin: Stop webadmin if template can't load.Howaner2014-08-311-1/+3
| | | * | | | | | | | WebAdmin: Added favicon to the login template.Howaner2014-08-311-0/+1
| | | * | | | | | | | WebAdmin: Exported favicon.Howaner2014-08-312-4/+4
| | | * | | | | | | | WebAdmin: Exported stylesheet in a own file.Howaner2014-08-312-333/+329
| | | * | | | | | | | WebAdmin: Added login templateHowaner2014-08-312-0/+24
| | | * | | | | | | | WebAdmin: Added "files" folder and load the login template from login_template.htmlHowaner2014-08-312-10/+102
| | * | | | | | | | | WorldStorage no longer queues chunks into generator.Mattes D2014-09-054-51/+17
| | * | | | | | | | | Fixed loading empty chunks.Mattes D2014-09-052-2/+7
| | * | | | | | | | | Rewritten chunk status to specify whether the chunk is in queue.Mattes D2014-09-059-107/+141
| | * | | | | | | | | BiomeMultiCache is not used for simple generators.Mattes D2014-09-051-21/+22
| | * | | | | | | | | Fixed style.Mattes D2014-09-053-9/+13
| | * | | | | | | | | Fixed security: Player cannot spawn in a disabled world.Mattes D2014-09-051-1/+1
| | * | | | | | | | | Anvil: Fixed loading block entities with invalid Y coord.Mattes D2014-09-051-1/+1
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master'Masy982014-09-0548-444/+935
| |\| | | | | | | | |
| | * | | | | | | | | Merge pull request #1375 from mc-server/EntitiesInBoxMattes D2014-09-0413-1/+264
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fixed compilation after chunk Y removal.madmaxoft2014-09-041-1/+1
| | | * | | | | | | | | Merge remote-tracking branch 'origin/master' into EntitiesInBoxmadmaxoft2014-09-0432-262/+376
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Debuggers: Reviewed and fixed the Pickups and Poof commands.madmaxoft2014-09-031-10/+17
| | | * | | | | | | | | | LuaState: Fixed class value-getting off the stack.madmaxoft2014-09-031-4/+4
| | | * | | | | | | | | | LuaState: Fixed referenced function pushing.madmaxoft2014-09-032-1/+9
| | | * | | | | | | | | | Debuggers: Added a test code for ForEachEntityInBox().madmaxoft2014-09-031-0/+49
| | | * | | | | | | | | | Exported ForEachEntityInBox() to Lua API.madmaxoft2014-09-032-0/+71
| | | * | | | | | | | | | Added cWorld::ForEachEntityInBox()madmaxoft2014-09-038-0/+117
| | | * | | | | | | | | | cBoundingBox: Added accessors.madmaxoft2014-09-031-0/+11
| | * | | | | | | | | | | Merge pull request #1371 from DayBr3ak/masterMattes D2014-09-043-2/+92
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | change to linear calculationDayBr3ak2014-09-032-9/+7
| | | * | | | | | | | | | adapting formatDayBr3ak2014-09-033-7/+14
| | | * | | | | | | | | | forgot this oneDayBr3ak2014-09-022-2/+2
| | | * | | | | | | | | | opting for size_tDayBr3ak2014-09-022-5/+5
| | | * | | | | | | | | | fixing memory leakDayBr3ak2014-09-021-4/+5
| | | * | | | | | | | | | changing implem, using vectorsDayBr3ak2014-09-022-98/+23
| | | * | | | | | | | | | adding config file entry #381DayBr3ak2014-09-021-1/+10
| | | * | | | | | | | | | adding the multicache behaviorDayBr3ak2014-09-023-4/+119
| | | * | | | | | | | | | added multicache class definitionDayBr3ak2014-09-011-0/+35
| | * | | | | | | | | | | Anvil: Cleanly refuse to store data that is too large.madmaxoft2014-09-041-1/+7
| | * | | | | | | | | | | Revert "Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etc"archshift2014-09-044-62/+29
| | * | | | | | | | | | | In 1.8, carrots and potatoes yield one less hunger point.archshift2014-09-042-2/+2
| | * | | | | | | | | | | Globals.h: Added Floor and Ciel casting, C++ cast cleanups, etcarchshift2014-09-044-29/+62
| | * | | | | | | | | | | ChunkGenerator: Log world seed when creating a new one.madmaxoft2014-09-031-3/+14
| | * | | | | | | | | | | Added cIniFile::HasValue() function.madmaxoft2014-09-032-0/+23
| | * | | | | | | | | | | Updated SQLiteCpp.madmaxoft2014-09-031-0/+0
| | * | | | | | | | | | | Merge pull request #1351 from LO1ZB/remove-a_RelYMattes D2014-09-0318-230/+237
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | commitLO1ZB2014-09-031-1/+1
| | | * | | | | | | | | | re-add the missing "s" too cChunkCoordsWithBoolListLO1ZB2014-09-033-6/+6
| | | * | | | | | | | | | hopefully the last commit for removing y-coord from chunks. :)LO1ZB2014-09-035-23/+41
| | | * | | | | | | | | | fix possibility of a twice generated chunkLO1ZB2014-09-011-1/+2
| | | * | | | | | | | | | remove orphaned comment.LO1ZB2014-08-301-4/+0
| | | * | | | | | | | | | me being stupidLO1ZB2014-08-291-1/+1
| | | * | | | | | | | | | add commentsLO1ZB2014-08-291-1/+2
| | | * | | | | | | | | | fix chunk regeneratingLO1ZB2014-08-293-9/+9
| | | * | | | | | | | | | remove y-coord from chunksLO1ZB2014-08-2818-217/+208
| | * | | | | | | | | | | Anvil: switched inflate to stream mode.madmaxoft2014-09-033-18/+70
| | * | | | | | | | | | | Fixed style and alpha-sorting.madmaxoft2014-09-036-20/+20
| | * | | | | | | | | | | Quick fix for a preprocessor error with clang on OS Xarchshift2014-09-031-1/+3
| | * | | | | | | | | | | Added mutton, which sheep now drop when killedarchshift2014-09-034-0/+13
| | * | | | | | | | | | | EntityEffect.cpp: Enable 1.8's leaping potionarchshift2014-09-031-1/+1
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Clang wants volatile...madmaxoft2014-09-021-1/+1
| | * | | | | | | | | | Added strict error reporting to chunk loading.madmaxoft2014-09-021-1/+29
| | * | | | | | | | | | Merge pull request #1350 from mc-server/InventoryMattes D2014-09-029-179/+175
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Changed the IsEnchantable() comment again.Howaner2014-09-022-3/+3
| | | * | | | | | | | | Merge branch 'master' into InventoryHowaner2014-09-0256-649/+1452
| | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Changed the IsEnchantable() comment.Howaner2014-08-302-2/+3
| | | * | | | | | | | | APIDump: Added missing cItem things.Hownaer2014-08-282-4/+9
| | | * | | | | | | | | Added comments.Hownaer2014-08-281-1/+3
| | | * | | | | | | | | Fixed bad values in the IsEnchantable() method.Hownaer2014-08-282-5/+17
| | | * | | | | | | | | Fixed crashes and use std::swap.Hownaer2014-08-284-26/+43
| | | * | | | | | | | | Enchanting table improvements.Hownaer2014-08-285-154/+113
| * | | | | | | | | | | Added new recipes!Masy982014-09-021-4/+19
| * | | | | | | | | | | Seperated "custom" names list from the normal list in items.ini!Masy982014-09-022-197/+328
| |/ / / / / / / / / /
* | | | | | | | | | | Fixed typo!Masy982014-09-021-1/+1
* | | | | | | | | | | Added missing recipes!Masy982014-09-021-6/+21
* | | | | | | | | | | Seperated the "custom" names from the normal list!Masy982014-09-021-193/+326
| | | | | | | | * | | Merge branch 'master' into EntityCustomNameHowaner2014-09-027-74/+252
| | | | | | | | |\ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Re-added alternate spellings of darkgraywool.madmaxoft2014-09-021-0/+2
| * | | | | | | | | | Re-updated the Core.madmaxoft2014-09-021-0/+0
| * | | | | | | | | | Merge remote-tracking branch 'masy/blocks'madmaxoft2014-09-024-58/+212
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Added missing leather recipe!Masy982014-09-011-0/+1
* | | | | | | | | | | Merge branch 'master' into blocksMasy982014-09-0124-271/+589
|\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | Fixed spacing and light gray wool name!Masy982014-09-012-38/+40
* | | | | | | | | | | | Added furnace recipes!Masy982014-08-312-17/+30
* | | | | | | | | | | | Added missing mossy stonebrick recipe!Masy982014-08-311-0/+1
* | | | | | | | | | | | Added 1.8 recipes!Masy982014-08-312-8/+80
* | | | | | | | | | | | Added 1.8 blocks and items!Masy982014-08-311-1/+65
| | * | | | | | | | | | Pickups combine only within one chunk.madmaxoft2014-09-011-2/+6
| | * | | | | | | | | | CopyBlocks test: decreased the test size.madmaxoft2014-09-011-2/+2
| | * | | | | | | | | | Fixed off-by-one errors in cChunkDef asserts.madmaxoft2014-09-011-8/+8
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #1368 from mc-server/coverityFixesMattes D2014-09-011-6/+24
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Make sure packets are validworktycho2014-09-011-6/+24
| | | | | | | | * | | Added CustomName saving.Howaner2014-09-023-2/+23
| | | | | | | | * | | Added the new functions to APIDump.Howaner2014-09-023-3/+12
| | | | | | | | * | | Added a custom name test to the debuggers plugin.Howaner2014-09-021-0/+17
| | | | | | | | * | | Added SetCustomName() to players.Howaner2014-09-0215-41/+124
| | | | | | | | * | | Added name tagHowaner2014-09-017-3/+31
| | | | | | | | * | | Added CustomName to cMonster.Howaner2014-09-014-4/+64
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Fixed Bindings regeneration under MSVC.madmaxoft2014-09-011-1/+6
| * | | | | | | | | Fixed previous commit's wrong assumptions.madmaxoft2014-09-011-10/+10
| * | | | | | | | | Fixed MSVC compilation, improved performance.madmaxoft2014-09-011-30/+59
| * | | | | | | | | Fixed MSVC warning.madmaxoft2014-09-011-2/+2
| * | | | | | | | | Merge remote-tracking branch 'Hircine/Enchantments'madmaxoft2014-09-019-22/+323
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed styleJaume Aloy2014-08-313-8/+9
| | * | | | | | | | | Added a_Digger checkJaume Aloy2014-08-302-30/+33
| | * | | | | | | | | More EnchantmentsJaume Aloy2014-08-222-58/+70
| | * | | | | | | | | Protection Enchantments, some fixesJaume Aloy2014-08-214-15/+122
| | * | | | | | | | | Changed if in BlockHandlerJaume Aloy2014-08-192-6/+2
| | * | | | | | | | | FixesJaume Aloy2014-08-196-50/+51
| | * | | | | | | | | Changed if for switchJaume Aloy2014-08-193-15/+25
| | * | | | | | | | | Added more enchantments and some fixesJaume Aloy2014-08-196-23/+101
| | * | | | | | | | | Added some EnchantmentsJaume Aloy2014-08-194-7/+100
| * | | | | | | | | | Avoid false positive in style check.madmaxoft2014-09-011-1/+1
| * | | | | | | | | | Merge pull request #1365 from mc-server/coverityFixesMattes D2014-09-014-9/+9
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Fixed style.madmaxoft2014-09-011-1/+2
| | * | | | | | | | | Removed isDone checkworktycho2014-08-311-2/+2
| | * | | | | | | | | Changed null check to assertworktycho2014-08-311-5/+3
| | * | | | | | | | | Delete the entity before removing from the listworktycho2014-08-311-1/+1
| | * | | | | | | | | Init RankMgr pointer to NULLworktycho2014-08-311-1/+2
| |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge pull request #1363 from mc-server/FurnaceRecipesMattes D2014-09-016-211/+175
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Use std::auto_ptrHowaner2014-08-311-6/+6
| | * | | | | | | | | Fixed compile warnings.Howaner2014-08-312-5/+5
| | * | | | | | | | | Fixed wrong doxy-comment.Howaner2014-08-311-1/+1
| | * | | | | | | | | Rewrited furnace.txtHowaner2014-08-312-49/+53
| | * | | | | | | | | Rewrited furnace.txt loading.Howaner2014-08-314-159/+119
| |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixed ReplaceString() documentation.Howaner2014-09-011-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1357 from mc-server/leafFixMattes D2014-08-311-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Check range of y in HasNearLogworktycho2014-08-311-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #1355 from mc-server/fixesSTRWarrior2014-08-3010-83/+93
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed style.madmaxoft2014-08-302-4/+6
| * | | | | | | | Merge branch 'master' into fixesmadmaxoft2014-08-3010-251/+406
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | WSSAnvil: Removed leftover debugging code.madmaxoft2014-08-301-4/+0
* | | | | | | | | Fixed MSVC2008 compilation.madmaxoft2014-08-301-18/+18
* | | | | | | | | Merge pull request #1340 from Masy98/craftingMattes D2014-08-302-16/+82
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Fixed missing slab name in line 297Masy982014-08-301-1/+1
| * | | | | | | | Merge branch 'master' into craftingMasy982014-08-3088-1562/+4865
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | cChunk: Fixed the Coords param.Mattes D2014-08-291-1/+1
* | | | | | | | | Rewritten block entity loading.Mattes D2014-08-297-215/+308
| * | | | | | | | Fixed slab nameMasy982014-08-211-1/+1
| * | | | | | | | Added missing recipes for stairs and slabs!Masy982014-08-212-4/+5
| * | | | | | | | Added missing recipes for stairs and slabs!Masy982014-08-211-12/+30
| * | | | | | | | Changed new logs from wood to log!Masy982014-08-211-4/+4
| * | | | | | | | Added missing blocks in item.iniMasy982014-08-211-2/+49
| | * | | | | | | Updated CoreTiger Wang2014-08-291-0/+0
| | * | | | | | | A better hotfix for CraftingRecipiesTiger Wang2014-08-291-1/+1
| | * | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-08-29163-2366/+5937
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | VanillaFluidSimulator: Fixed an invalid Y-coord query.Mattes D2014-08-291-1/+1
* | | | | | | | | Fixed conversion warning.Mattes D2014-08-291-1/+1
* | | | | | | | | Fixed spaces.Mattes D2014-08-291-1/+1
* | | | | | | | | Hotfixed recipe.txt loading.Hownaer2014-08-293-5/+8
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Fire can be destroyed with the sword in creative-modeHownaer2014-08-281-1/+2
* | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerHownaer2014-08-2814-41/+197
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #1323 from mc-server/CraftingFixesMattes D2014-08-2813-39/+105
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Final template keyword style fix.Mattes D2014-08-281-2/+2
| | * | | | | | | | More template keyword fixes.Mattes D2014-08-285-16/+16
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into CraftingFixesMattes D2014-08-28125-2173/+5248
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | * | | | | | | | CheckBasicStyle: Added checking for the "template" keyword.Mattes D2014-08-281-1/+2
| | * | | | | | | | Fixed spaces after "template" keyword.Mattes D2014-08-285-14/+14
| | * | | | | | | | Fixed commentsTycho2014-08-131-5/+5
| | * | | | | | | | Added missing headerTycho2014-08-131-0/+1
| | * | | | | | | | Fixed Integer pasing warnings in CraftingRecipies.cppTycho2014-08-132-4/+64
| | * | | | | | | | Fixed type issues in CraftingRecipe.cppTycho2014-08-132-5/+5
| | * | | | | | | | Fixed forgotten error checkingTycho2014-08-131-1/+5
| * | | | | | | | | Fixed a typo.Mattes D2014-08-281-1/+1
| * | | | | | | | | Merge pull request #1324 from ChriPiv/masterMattes D2014-08-281-2/+92
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Change comment formattingChristophe Piveteau2014-08-241-20/+12
| | * | | | | | | | Adjust comment formattingChristophe Piveteau2014-08-181-20/+40
| | * | | | | | | | Added a lot of commentsChristophe Piveteau2014-08-151-30/+36
| | * | | | | | | | Clarify comment messageChristophe Piveteau2014-08-151-2/+2
| | * | | | | | | | End of comment moved away from new lineChristophe Piveteau2014-08-151-2/+1
| | * | | | | | | | Add some commentsChristophe Piveteau2014-08-151-10/+21
| | * | | | | | | | Further changes in coding styleChristophe Piveteau2014-08-141-38/+28
| | * | | | | | | | Further fixing of coding style errorsChristophe Piveteau2014-08-131-26/+22
| | * | | | | | | | Another intendation errorChristophe Piveteau2014-08-131-2/+2
| | * | | | | | | | Fixed braces and intendation errorsChristophe Piveteau2014-08-131-3/+11
| | * | | | | | | | Implement ability to push minecarts on curved railsChristophe Piveteau2014-08-131-2/+70
* | | | | | | | | | Fixed anvil placing.Hownaer2014-08-281-5/+6
|/ / / / / / / / /
* | | | | | | | | Fixed ItemCategory code example.Hownaer2014-08-281-2/+2
* | | | | | | | | Fixed mob burning.reiter2014-08-281-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | DungeonRooms: Fixed an off-by-one error.Mattes D2014-08-271-2/+2
* | | | | | | | Debuggers: Added a testcase for OnProjectileHitBlock.Mattes D2014-08-271-0/+13
* | | | | | | | More basic style fixes.Mattes D2014-08-271-2/+2
* | | | | | | | Fixed basic style violations.Mattes D2014-08-272-13/+11
* | | | | | | | CheckBasicStyle: Relaxed the "space after comma".Mattes D2014-08-271-1/+1
* | | | | | | | Merge pull request #1345 from mc-server/DungeonRoomsFinisherMattes D2014-08-277-7/+359
|\ \ \ \ \ \ \ \
| * | | | | | | | DungeonRooms: Added a height probability distribution function.Mattes D2014-08-273-9/+19
| * | | | | | | | DungeonRooms: Added the spawner in the center of the room.Mattes D2014-08-271-0/+15
| * | | | | | | | DungeonRooms: Chests are never placed next to each other.Mattes D2014-08-261-22/+27
| * | | | | | | | DungeonRooms: Random pattern for floors.Mattes D2014-08-261-1/+32
| * | | | | | | | DungeonRooms: Replaced explicit switch with CanBeTerraformed().Mattes D2014-08-261-11/+3
| * | | | | | | | Merge remote-tracking branch 'origin/master' into DungeonRoomsFinisherMattes D2014-08-2624-694/+3478
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Profiling: Added profiling script for x64 executable.Mattes D2014-08-263-6/+12
| * | | | | | | | | VS Profiling: Shutdown the profiler on error.Mattes D2014-08-261-2/+6
| * | | | | | | | | Added initial dungeon rooms finisher.Mattes D2014-08-264-0/+289
* | | | | | | | | | Merge pull request #1346 from mc-server/AnvilStatsHeightsMattes D2014-08-278-16/+187
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AnvilStats: Fixed thread start race condition.Mattes D2014-08-272-10/+24
| * | | | | | | | | | AnvilStats: Added per-height spawner stats.Mattes D2014-08-272-4/+47
| * | | | | | | | | | AnvilStats: Ignoring output XLS files.Mattes D2014-08-271-0/+1
| * | | | | | | | | | AnvilStats: Added cmake directive for larger executable stack.Mattes D2014-08-271-0/+22
| * | | | | | | | | | AnvilStats: Fixed Win64 compilation.Mattes D2014-08-271-1/+1
| * | | | | | | | | | AnvilStats: initial per-height blocktype implementation (WIP).madmaxoft2014-08-273-5/+96
|/ / / / / / / / / /
* | / / / / / / / / AnvilStats: Rewritten to use CMake.madmaxoft2014-08-274-523/+126
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1290 from mc-server/RanksMattes D2014-08-2624-694/+3478
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | RankMgr: Exported the default-rank functions.Mattes D2014-08-242-6/+69
| * | | | | | | | RankMgr: Default rank is applied to players without any rank.Mattes D2014-08-243-60/+21
| * | | | | | | | RankMgr: Unified function signature comments in the bindings.Mattes D2014-08-232-28/+36
| * | | | | | | | RankMgr: Implemented default rank, added defaults.Mattes D2014-08-233-24/+198
| * | | | | | | | Merge remote-tracking branch 'origin/master' into RanksMattes D2014-08-2284-875/+1044
| |\ \ \ \ \ \ \ \
| * | | | | | | | | cMojangAPI updates cRankManager's playernames.Mattes D2014-08-214-2/+87
| * | | | | | | | | RankMgr: Added cRankManager::RemovePlayerRank().Mattes D2014-08-214-0/+60
| * | | | | | | | | Removed last remnant of cGroup.Mattes D2014-08-211-1/+0
| * | | | | | | | | Removed Group.h from Bindings' dependencies.Mattes D2014-08-211-1/+0
| * | | | | | | | | APIDump: Removed the cGroup and cGroupManager classes.Mattes D2014-08-211-25/+2
| * | | | | | | | | Removed cGroup and cGroupManager.Mattes D2014-08-2110-395/+8
| * | | | | | | | | cMojangAPI: Fixed MakeUUID___() bindings.Mattes D2014-08-212-4/+58
| * | | | | | | | | Updated the Core.Mattes D2014-08-201-0/+0
| * | | | | | | | | Exported cServer:ShouldAuthenticate to Lua API.Mattes D2014-08-202-2/+3
| * | | | | | | | | cPlayer: Exported the LoadRank function to Lua API.Mattes D2014-08-201-2/+2
| * | | | | | | | | APIDump: Added cRankManager documentation.Mattes D2014-08-201-0/+56
| * | | | | | | | | RankMgr bindings: fixed GetRankVisuals return value.Mattes D2014-08-201-18/+22
| * | | | | | | | | RankMgr: Fixed an ignored return value in the API.Mattes D2014-08-201-2/+2
| * | | | | | | | | cPlayer reads ranks from cRankManager.Mattes D2014-08-193-263/+139
| * | | | | | | | | RankMgr: Removed unneeded testing code.madmaxoft2014-08-141-208/+2
| * | | | | | | | | Merge branch 'master' into Ranksmadmaxoft2014-08-1418-77/+91
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | RankMgr: Fixed multithreading issues.madmaxoft2014-08-132-49/+109
| * | | | | | | | | | RankMgr: Initial migration code.madmaxoft2014-08-133-1/+568
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into Ranksmadmaxoft2014-08-1215-81/+181
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed unchecked return values.madmaxoft2014-08-111-3/+6
| * | | | | | | | | | | Merge branch 'master' into Ranksmadmaxoft2014-08-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Debuggers: Disabled UUID and RankMgr tests.madmaxoft2014-08-091-2/+2
| * | | | | | | | | | | | WebAdmin: Manually exported string conversion functions.madmaxoft2014-08-092-6/+64
| * | | | | | | | | | | | WebAdmin: Added GetURLEncodedString().madmaxoft2014-08-092-1/+36
| * | | | | | | | | | | | RankMgr: Added GetRankVisuals() function.madmaxoft2014-08-093-5/+81
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into Ranksmadmaxoft2014-08-0912-28/+127
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Debuggers: Simple cRankManager test case.madmaxoft2014-08-081-0/+13
| * | | | | | | | | | | | | Exported cRankManager to LuaAPI.madmaxoft2014-08-085-1/+894
| * | | | | | | | | | | | | cLuaState: Added GetStackValues() auto-generated templates.madmaxoft2014-08-081-0/+27
| * | | | | | | | | | | | | RankMgr: Finished API implementation.madmaxoft2014-08-082-38/+401
| * | | | | | | | | | | | | RankMgr: Implemented GetXforY and GetAll APIs.madmaxoft2014-08-082-18/+162
| * | | | | | | | | | | | | RankMgr: Implemented the basic API functions.madmaxoft2014-08-082-60/+696
| * | | | | | | | | | | | | RankMgr: Renamed PermissionGroup to Group in API and PermGroup in DB.madmaxoft2014-08-082-28/+36
| * | | | | | | | | | | | | RankMgr: Added SQL integer datatypes.madmaxoft2014-08-051-5/+5
| * | | | | | | | | | | | | RankMgr: More interface.madmaxoft2014-08-051-2/+14
| * | | | | | | | | | | | | RankMgr: Initial interface declaration.madmaxoft2014-08-053-0/+258
* | | | | | | | | | | | | | Type warning fixes.Mattes D2014-08-252-2/+2
* | | | | | | | | | | | | | Fixed a type warning.Mattes D2014-08-251-2/+2
* | | | | | | | | | | | | | Assume POWER is big-endian, so it compiles.Alexander Harkness2014-08-231-1/+1
* | | | | | | | | | | | | | Fixed item drop.Howaner2014-08-221-14/+18
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Fixed a warning in FastRandom.Mattes D2014-08-221-1/+1
* | | | | | | | | | | | | World: Report chunk count for the spawn area.Mattes D2014-08-221-1/+1
* | | | | | | | | | | | | Fixed cPlugin::OnPlayerMoving signature.Mattes D2014-08-223-3/+3
* | | | | | | | | | | | | cLuaState: Fixed Vector3<> names pushed to Lua.Mattes D2014-08-222-5/+44
* | | | | | | | | | | | | ToLua++ lib: Assert when usertype is not known.Mattes D2014-08-221-4/+7
* | | | | | | | | | | | | Added initializers for class members.Mattes D2014-08-2114-9/+54
* | | | | | | | | | | | | cSetChunkData: Added missing initializers.Mattes D2014-08-211-0/+3
* | | | | | | | | | | | | Added cWorld initializers.Mattes D2014-08-211-0/+30
* | | | | | | | | | | | | Fixed 1.7.2 login packet reading.Mattes D2014-08-211-1/+5
* | | | | | | | | | | | | Sorted the generated param count.Mattes D2014-08-211-1/+1
* | | | | | | | | | | | | Fixed a compile-time warning in MSVC.Mattes D2014-08-211-1/+1
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1314 from mc-server/FireMattes D2014-08-212-33/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into FireHowaner2014-08-2078-860/+857
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "Removes the fire if the block under the fire was broken."Howaner2014-08-111-5/+0
| * | | | | | | | | | | | | Removes the fire if the block under the fire was broken.Howaner2014-08-111-0/+5
| * | | | | | | | | | | | | Moved the clicked-through block check to the top of the function.Howaner2014-08-112-41/+17
| * | | | | | | | | | | | | Fixed cancelled fire interact from all directions.Howaner2014-08-111-4/+12
* | | | | | | | | | | | | | Merge pull request #1339 from mc-server/HooksSTRWarrior2014-08-209-42/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Renamed a_Motd to a_ServerDescription.Howaner2014-08-207-14/+14
| * | | | | | | | | | | | | Added a_ClientHandle to the HOOK_SERVER_PING hook.Howaner2014-08-208-10/+14
| * | | | | | | | | | | | | Added "HOOK_SERVER_PING" call to older protocolsHowaner2014-08-201-13/+12
| * | | | | | | | | | | | | Cleaned up code.Howaner2014-08-203-848/+1
| * | | | | | | | | | | | | Added HOOK_SERVER_PINGHowaner2014-08-208-36/+926
| * | | | | | | | | | | | | First implementation of HOOK_SERVER_PING.Howaner2014-08-165-0/+43
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1335 from mc-server/CodeFixesMattes D2014-08-2030-154/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | SwamplandM: Fixed sometimes having no mountains.STRWarrior2014-08-181-1/+1
| |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1329 from mc-server/MoveMattes D2014-08-167-10/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Updated HOOK_PLAYER_MOVING documentation.Howaner2014-08-161-1/+3
| * | | | | | | | | | | | Better OnPlayerMoving hook.Howaner2014-08-166-9/+17
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1308 from mc-server/loggerMattes D2014-08-1524-612/+644
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | 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-1217-439/+418
| * | | | | | | | | | | Fixed Tools to work with new logging frameworkTycho2014-08-108-216/+18
| * | | | | | | | | | | Added forgoten filesTycho2014-08-104-0/+457
| * | | | | | | | | | | First Implementatation of new Loggin frameworkTycho2014-08-1015-398/+51
* | | | | | | | | | | | CheckBasicStyle checks the src folder as well.madmaxoft2014-08-145-14/+20
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #1319 from mc-server/webadminfixesMattes D2014-08-132-30/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1316 from ChriPiv/masterAlexander Harkness2014-08-111-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add entry for bat in monsters.iniChristophe Piveteau2014-08-111-0/+6
|/ / / / / / / / / /
* | | / / / / / / / cProtocol172: Check return values.madmaxoft2014-08-111-4/+9
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1310 from mc-server/ChestFixMattes D2014-08-111-5/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed potential null dereferenceTycho2014-08-101-5/+5
* | | | | | | | | | Merge pull request #1301 from mc-server/OresMattes D2014-08-113-53/+120
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bunch of tweaks:STRWarrior2014-08-103-15/+15
| * | | | | | | | | | Added NaturalPatches generatorSTRWarrior2014-08-101-0/+22
| * | | | | | | | | | Added NetherOreNests.STRWarrior2014-08-101-0/+15
| * | | | | | | | | | Changed cStructGenOreNests to take a list of ores + the block to replace.STRWarrior2014-08-103-53/+83
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1312 from mc-server/unnamed-enumMattes D2014-08-116-12/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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.incTycho2014-08-101-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #1309 from mc-server/coverity_fixesMattes D2014-08-101-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SpacesTycho2014-08-101-1/+1
| * | | | | | | | | | Fixed potential crash in Player.cppTycho2014-08-101-0/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #1299 from mc-server/SlabsMattes D2014-08-101-0/+12
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #1305 from mc-server/FoodMattes D2014-08-101-4/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | 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
* | | | | | | 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 firearchshift2014-08-061-3/+3
| |/ / / / /
* | | | | | Fixed nether wart digging.Howaner2014-08-071-0/+1
* | | | | | Removed debug message.Howaner2014-08-071-1/+0
|/ / / / /
* | | | | Merge pull request #1291 from mc-server/RedstoneCleanUpMattes D2014-08-066-21/+83
|\ \ \ \ \
| * | | | | 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
* | | | | | Merge pull request #1289 from mc-server/LuaAPIFranz Reiter2014-08-052-2/+31
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Made lua clamp() compatible with all number types.Howaner2014-08-051-4/+4
| * | | | | Added api documentation for Clamp()Howaner2014-08-052-4/+5
| * | | | | 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
|\ \ \ \
| * | | | Changed arrow comment.Howaner2014-08-041-1/+1
| * | | | Added arrow consuming on shootingHowaner2014-08-041-0/+10
| | * | | Added new console command with cleanupTiger Wang2014-08-292-28/+45
| | * | | Improved explosion damageTiger Wang2014-08-292-48/+28
| | * | | Removed unused codeTiger Wang2014-08-293-3/+1
| | * | | Improved command block securityTiger Wang2014-08-291-6/+19
| |/ / / |/| | |
* | | | 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
|/ / /
* | | Updated submodulesTiger Wang2014-08-042-0/+0
* | | CheckBasicStyle: multi-level indent change.madmaxoft2014-08-047-13/+33
* | | BasicStyleCheck: Dividers are exactly 80 slashes.madmaxoft2014-08-042-2/+18
* | | Merge pull request #1284 from Howaner/MonsterMattes D2014-08-042-18/+24
|\ \ \
| * \ \ 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.madmaxoft2014-08-047-47/+54
* | | | | Merge pull request #1283 from Howaner/GlobalFixesMattes D2014-08-041-6/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
* | | Debuggers: Added a Name-from-UUID cMojangAPI test.madmaxoft2014-08-031-0/+7
* | | cMojangAPI: Added UUID-to-Name lookup.madmaxoft2014-08-036-71/+530
* | | Trailing whitespace fix.madmaxoft2014-08-031-1/+1
* | | Added cMojangAPI:GetUUIDFromPlayerName().madmaxoft2014-08-033-0/+36
* | | ToLua driver: disabled output buffering.madmaxoft2014-08-031-0/+3
* | | 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
* | | | VillageGen: Fixed a typo in commentSTRWarrior2014-08-031-1/+1
|/ / /
* | | Added proper trees and height for SwamplandM biomeSTRWarrior2014-08-023-2/+4
* | | Merge pull request #1275 from Howaner/BlockEntitysMattes D2014-08-022-1/+18
|\ \ \
| * | | 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
* | | Improved endermen code a littleTiger Wang2014-08-014-21/+57
* | | Merge pull request #1255 from mc-server/NameToUUIDMattes D2014-08-0122-158/+859
|\ \ \
| * \ \ Merged branch 'master' into NameToUUID.madmaxoft2014-07-3171-442/+1568
| |\ \ \
| * | | | Removed trailing whitespace.madmaxoft2014-07-311-2/+2
| * | | | Fixed UUIDs handling in cPlayer.madmaxoft2014-07-312-6/+9
| * | | | MojangAPI: Moved the settings to a separate ini section.madmaxoft2014-07-311-2/+2
| * | | | MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames().madmaxoft2014-07-315-11/+55
| * | | | MojangAPI: Renamed cache file to MojangAPI.sqlite.madmaxoft2014-07-301-2/+2
| * | | | APIDump: Added notes about cache to cMojangAPI.madmaxoft2014-07-301-1/+7
| * | | | MojangAPI: Clarified the UUID conversion code.madmaxoft2014-07-302-4/+17
| * | | | ManualBindings: Fixed alignment.madmaxoft2014-07-301-3/+3
| * | | | APIDump: Fixed UUID-related documentation.madmaxoft2014-07-301-2/+2
| * | | | Debuggers: Updated for the new cMojangAPI changes.madmaxoft2014-07-301-1/+10
| * | | | MojangAPI: Implemented UUID shortening and dashing.madmaxoft2014-07-305-22/+40
| * | | | Exported cMojangAPI to Lua.madmaxoft2014-07-305-6/+46
| * | | | Added a cMojangAPI class for PlayerName -> UUID lookups, with cache.madmaxoft2014-07-309-239/+564
| * | | | Fixed SQLiteCpp include paths for MSVC2010+.Mattes D2014-07-281-1/+1
| * | | | Fixed include directories for SQLiteCpp.madmaxoft2014-07-281-0/+6
| * | | | Added SQLiteCpp library.madmaxoft2014-07-285-0/+33
| * | | | Debuggers: Added an example for cClientHandle:GetUUIDsFromPlayerNames().madmaxoft2014-07-281-0/+31
| * | | | Added cClientHandle:GetUUIDsFromPlayerNames() to Lua API.madmaxoft2014-07-282-3/+63
| * | | | cAuthenticator: Added GetUUIDsFromPlayerNames().madmaxoft2014-07-282-3/+116
* | | | | Merge pull request #1273 from Howaner/GlobalFixesMattes D2014-08-011-6/+14
|\ \ \ \ \
| * | | | | Added missing HOOK_BLOCK_SPREAD call.Howaner2014-08-011-6/+14
|/ / / / /
* | | | | Merge pull request #1272 from Howaner/FoodMattes D2014-08-018-48/+177
|\ \ \ \ \
| * | | | | 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-0128-37/+891
|\ \ \ \ \
| * | | | | Use "default:" in switch.Howaner2014-07-311-3/+6
| * | | | | Updated documentation again.Howaner2014-07-311-4/+4
| * | | | | Renamed "select..." methods to "set..." and better IsValidEffect() function.Howaner2014-07-314-55/+19
| * | | | | Updated documentation.Howaner2014-07-312-8/+8
| * | | | | 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
| * | | | | Added beacon documentation.Howaner2014-07-302-0/+27
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
| * | | | | 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
* | | | | | Merge pull request #1267 from mc-server/RoofedForestTiger Wang2014-07-311-3/+61
|\ \ \ \ \ \
| * | | | | | 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
* | | | | | | Merge pull request #1266 from mc-server/PreSimulatorConfigMattes D2014-07-303-6/+30
|\| | | | | | | |_|/ / / / |/| | | | |
| * | | | | PreSimulator: Added configurations.STRWarrior2014-07-303-6/+30
|/ / / / /
* | | | | 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-303-7/+7
* | | | | | Merge pull request #1262 from mc-server/CanBeTerraformedMattes D2014-07-304-44/+32
|\ \ \ \ \ \
| * | | | | | Added soulsand to the terraformed list.STRWarrior2014-07-291-0/+1
| * | | | | | Added cBlockInfo::CanBeTerraformed and made finishers use itSTRWarrior2014-07-294-44/+31
* | | | | | | Fixed FinishGen.h types.madmaxoft2014-07-301-2/+2
* | | | | | | Entity.h: Moved constants out of some unnamed enumarchshift2014-07-301-14/+14
* | | | | | | Merge pull request #1263 from Howaner/GlobalFixesarchshift2014-07-301-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | 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-2942-236/+673
|\ \ \ \ \
| * | | | | Detrailed whitespaceTiger Wang2014-07-291-3/+3
| * | | | | Merge branch 'master' into portalsTiger Wang2014-07-29123-696/+1749
| |\ \ \ \ \
| * | | | | | 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-22180-1499/+2560
| |\ \ \ \ \ \
| * | | | | | | SuggestionsTiger Wang2014-07-2110-127/+161
| * | | | | | | Bug and crash fixesTiger Wang2014-07-2012-65/+107
| * | | | | | | Fix failed merge and other issuesTiger Wang2014-07-1814-77/+28
| * | | | | | | Merge branch 'master' into portalsTiger Wang2014-07-18382-4731/+7710
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/mc-server/MCServer into portalsTiger Wang2014-06-2420-102/+297
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Conforms to standardsTiger Wang2014-06-221-1/+1
| * | | | | | | | | Merge branch 'master' into portalsTiger Wang2014-06-21103-3457/+5628
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed invalid iteratorsTiger Wang2014-06-217-39/+26
| * | | | | | | | | | More suggestionsTiger Wang2014-06-214-5/+7
| * | | | | | | | | | Implemented PR suggestionsarchshift2014-06-165-8/+6
| * | | | | | | | | | Reverted portal creation codeTiger Wang2014-06-142-103/+0
| * | | | | | | | | | Cauldrons check the heightmapTiger Wang2014-06-143-8/+12
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-1420-492/+791
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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-1220-118/+175
| * | | | | | | | | | | Merge branch 'master' into portalsTiger Wang2014-06-1072-293/+2868
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Portal improvements and suggestionsTiger Wang2014-06-1010-54/+179
| * | | | | | | | | | | | Capitalisingworktycho2014-06-071-1/+1
| * | | | | | | | | | | | Fix reading 64 bit valuesworktycho2014-06-071-2/+5
| * | | | | | | | | | | | Fixed Time of dayworktycho2014-06-071-1/+1
| * | | | | | | | | | | | SuggestionsTiger Wang2014-06-057-14/+36
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | 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-04130-1089/+22541
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Implemented bed homesTiger Wang2014-06-014-16/+42
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Some finishing touchesSTRWarrior2014-07-292-2/+2
| * | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1252 from mc-server/RoughRavinesGenMattes D2014-07-295-3/+451
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Added a missing include for abs(float).madmaxoft2014-07-271-0/+6
| * | | | | | | | | | | | | RoughRavines: Made floor and ceiling settings-adjustable.madmaxoft2014-07-274-20/+99
| * | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Derp.Howaner2014-07-261-1/+1
| * | | | | | | | | | | | | Rename function.Howaner2014-07-264-6/+6
| * | | | | | | | | | | | | Merge branch 'master' into Inventory2Howaner2014-07-26108-663/+952
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix item durability.Howaner2014-07-2316-69/+149
* | | | | | | | | | | | | | | NetherClumpGenerator: Fixed generating stuff on halfslabs and fencesSTRWarrior2014-07-271-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Updated NetherForts' weights.madmaxoft2014-07-271-2/+2
* | | | | | | | | | | | | | Merge pull request #1250 from mc-server/NetherCeilingMattes D2014-07-271-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Merge pull request #1207 from Howaner/InventoryMattes D2014-07-264-10/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Change comment.Howaner2014-07-261-1/+1
| * | | | | | | | | | | | | Merge branch 'master' into InventoryHowaner2014-07-26257-2009/+3248
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Git: Ignore AllFiles.lst (generated by cmake)archshift2014-07-261-0/+1
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Endianness.h: undefined ntohll before redefiningarchshift2014-07-261-0/+1
* | | | | | | | | | | | | Removed the new old-style-cast warning from error treatmentarchshift2014-07-261-1/+1
* | | | | | | | | | | | | Tweaks to NetherClumpFoliageSTRWarrior2014-07-251-34/+6
* | | | | | | | | | | | | Speed up the NetherClumpFoliage finisher.STRWarrior2014-07-251-8/+9
* | | | | | | | | | | | | Merge remote-tracking branch 'origin/master'Tiger Wang2014-07-2484-229/+470
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1235 from mc-server/redundant-semisMattes D2014-07-2475-111/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Made redundant semi not an error, fixed one more.archshift2014-07-242-2/+2
| | * | | | | | | | | | | | | Removed redundant semicolons and re-added warningarchshift2014-07-2474-110/+110
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Added a queue for setting chunk data.madmaxoft2014-07-2411-118/+349
| * | | | | | | | | | | | | Made the cWorld::SpawnMobFinalize function more readable.STRWarrior2014-07-241-0/+10
* | | | | | | | | | | | | | Fixed block dropsTiger Wang2014-07-245-17/+59
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1237 from tonibm19/masterMattes D2014-07-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Moar view distance!tonibm192014-07-231-2/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | 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
* | | | | | | | | | | | | Fixed Bindings generation in MSVC.madmaxoft2014-07-221-2/+2
* | | | | | | | | | | | | Merge pull request #1234 from mc-server/GeneratorTweaksarchshift2014-07-221-13/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Extreme Hills M variant only spawn with grass and stoneSTRWarrior2014-07-221-1/+1
| * | | | | | | | | | | | | ExtremeHillsPlus and ExtremeHills spawn with grass onlySTRWarrior2014-07-211-12/+2
* | | | | | | | | | | | | | Export SendEntityAnimation to ToLuaarchshift2014-07-221-1/+1
* | | | | | | | | | | | | | Fix misguided comment on bits...Tiger Wang2014-07-221-1/+1
* | | | | | | | | | | | | | Export BroadcastEntityAnimation with ToLuaarchshift2014-07-221-1/+1
* | | | | | | | | | | | | | Merge pull request #1216 from mc-server/saplingsandleavesTiger Wang2014-07-2210-141/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into saplingsandleavesTiger Wang2014-07-22111-937/+1094
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | Fixed indentationSTRWarrior2014-07-211-12/+12
| * | | | | | | | | | | | | Changed CubicNoiseXX to IntNoiseXXSTRWarrior2014-07-202-40/+49
| * | | | | | | | | | | | | Renamed cFinishGenFoliage to cFinishGenTallGrassSTRWarrior2014-07-203-17/+34
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | CMake: generates a list of all source files.madmaxoft2014-07-212-0/+21
* | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Revert "Only one instance of server can be started"Tiger Wang2014-07-201-0/+2
* | | | | | | | | | | | | | Line tracer invalid chunk fixTiger Wang2014-07-202-26/+27
| | | * | | | | | | | | | | Merge branch 'master' into saplingsandleavesTiger Wang2014-07-20345-2335/+3502
| | | |\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | NBTChunkSerializer.cpp: Added break after serializing the splash potionarchshift2014-07-201-0/+1
* | | | | | | | | | | | | | Merge pull request #1231 from mc-server/ticks-aliveTiger Wang2014-07-203-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Merge pull request #1227 from mc-server/fixesMattes D2014-07-205-23/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | Code style: Fixed braces on separate lines.madmaxoft2014-07-1914-20/+38
* | | | | | | | | | | | | CheckBasicStyle: Check spaces around commas.madmaxoft2014-07-191-6/+6
* | | | | | | | | | | | | Fixed spaces after commas in protocol data.madmaxoft2014-07-191-7/+7
* | | | | | | | | | | | | Fixed style: spaces after commas.madmaxoft2014-07-1942-101/+100
* | | | | | | | | | | | | Merge pull request #1214 from mc-server/anti-globMattes D2014-07-1916-214/+847
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Merge pull request #1224 from mc-server/fixes-potionsMattes D2014-07-195-14/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Authenticator.cpp: Killed a global destructor warningarchshift2014-07-191-53/+56
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'Inventory2'madmaxoft2014-07-186-4/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Debuggers: Optimized and commented the /rmitem handler.madmaxoft2014-07-181-4/+8
| * | | | | | | | | | | | | APIDump: Documented RemoveItem().madmaxoft2014-07-181-0/+2
| * | | | | | | | | | | | | Clarified RemoveItem()'s comments.madmaxoft2014-07-182-2/+4
| * | | | | | | | | | | | | Added RemoveItem() function to the player inventory.Howaner2014-07-185-4/+93
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | 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
* | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Monster fixesTiger Wang2014-07-188-35/+5
* | | | | | | | | | | | | | MCServer supports Minecraft v1.7.10archshift2014-07-181-1/+1
* | | | | | | | | | | | | | Fixed creative players not being able to drinkarchshift2014-07-181-3/+4
* | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Skeletons should spawn with a bow in the hand.Howaner2014-07-182-0/+17
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Moved ChatColor.h out of defines where it was not neededarchshift2014-07-182-1/+1
* | | | | | | | | | | | | | Merge pull request #1210 from Howaner/APIMattes D2014-07-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removed special character in APIDumpHowaner2014-07-181-1/+1
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1212 from mc-server/never-readMattes D2014-07-181-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | ProtocolRecognizer.cpp: removed unused NumBytesReadarchshift2014-07-181-2/+0
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Generator: removed rnd definitions that are never readarchshift2014-07-182-2/+0
* | | | | | | | | | | | | | Merge pull request #1209 from Howaner/GlobalFixesarchshift2014-07-181-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Added me to the CONTRIBUTORS list. I hope it is ok.Howaner2014-07-181-0/+1
|/ / / / / / / / / / / / /
| | | * | | | | | | | | | Proper comment for DropBlock()Tiger Wang2014-07-201-2/+5
| | | * | | | | | | | | | Fixed issues relating to saplings and leavesTiger Wang2014-07-1710-139/+32
| | |/ / / / / / / / / / | |/| | | | | | | | | |
| | | * | | | | | | | | 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
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #1204 from Howaner/BlocksAlexander Harkness2014-07-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix sapling drop.Howaner2014-07-171-1/+1
| |/ / / / / / / / / /
| * | | | | | | | | | Fixed mob knockbackTiger Wang2014-07-171-23/+8
| * | | | | | | | | | Fixed crash with entities in unloaded chunksTiger Wang2014-07-171-1/+3
* | | | | | | | | | | Initial version of a script to check basic style.madmaxoft2014-07-171-0/+188
* | | | | | | | | | | Normalized comments.madmaxoft2014-07-17173-867/+893
* | | | | | | | | | | Fixed spaces around single-line comments.madmaxoft2014-07-1734-139/+141
* | | | | | | | | | | Fixed basic whitespace problems.madmaxoft2014-07-1752-298/+306
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1183 from Howaner/SoundsTiger Wang2014-07-171-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Derp.Howaner2014-07-151-2/+2
| * | | | | | | | | | Reset meta to zero when the block explode.Howaner2014-07-141-4/+4
* | | | | | | | | | | Merge pull request #1079 from mc-server/potionsMattes D2014-07-1740-119/+1596
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
* | | | | | | | | | | | | Fixed another redstone simulator crashTiger Wang2014-07-161-0/+7
* | | | | | | | | | | | | Merge pull request #1192 from mc-server/skinuuidMattes D2014-07-1611-113/+233
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | SuggestionsTiger Wang2014-07-161-2/+5
| * | | | | | | | | | | | | Function renameTiger Wang2014-07-162-3/+3
| * | | | | | | | | | | | | Unified functionsTiger Wang2014-07-162-34/+28
| * | | | | | | | | | | | | 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 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 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
| * | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | Merge pull request #1188 from mc-server/FindClosestPlayerFixMattes D2014-07-151-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed FindClosestPlayerTycho2014-07-151-3/+6
|/ / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | Restructured cSplashPotionEntity code.madmaxoft2014-07-155-72/+104
| | | | | * | | | | | | | | | Only the cEntityEffect::effXXX constants are Lua-exported.madmaxoft2014-07-152-72/+102
| | | | | * | | | | | | | | | 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-1572-443/+699
| | | | | |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Pass cItem by reference.madmaxoft2014-07-151-1/+1
* | | | | | | | | | | | | | | Added missing member initialization to cGridStructGen.madmaxoft2014-07-151-0/+1
* | | | | | | | | | | | | | | Fixed redstone simulator crashTiger Wang2014-07-152-8/+31
* | | | | | | | | | | | | | | Fixed some meta resetting bugsTiger Wang2014-07-146-27/+28
* | | | | | | | | | | | | | | Maybe improved arrow sinkingTiger Wang2014-07-141-2/+2
* | | | | | | | | | | | | | | Fixed placing liquids over liquidsTiger Wang2014-07-141-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1177 from mc-server/ChestFixMattes D2014-07-141-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ChestFixTycho2014-07-136-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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Added parenthasiesworktycho2014-07-131-1/+1
| * | | | | | | | | | | | | | | | CopyPaste Errorworktycho2014-07-131-1/+1
| * | | | | | | | | | | | | | | | Another COpyPaste Errorworktycho2014-07-131-1/+1
| * | | | | | | | | | | | | | | | Fix CopyPaste error that ment a_MaxRelX wasdn't checkedworktycho2014-07-131-1/+1
| * | | | | | | | | | | | | | | | Check GridSize for 0worktycho2014-06-261-0/+10
| * | | | | | | | | | | | | | | | Add Null check to SendBlockToworktycho2014-06-261-1/+1
* | | | | | | | | | | | | | | | | Tolua driver: Fixed wrong indentation.madmaxoft2014-07-131-15/+15
| |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #1178 from mc-server/projectilefixMattes D2014-07-136-8/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Adjusted calls to CreateProjectile that passed ItemsTycho2014-07-132-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-138-19/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1167 from Howaner/PluginsMattes D2014-07-131-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fixed diamond mover pluginHowaner2014-07-131-3/+5
| * | | | | | | | | | | | | | Merge pull request #1133 from Howaner/SheepMattes D2014-07-134-10/+75
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Changed comments.Howaner2014-07-131-3/+5
| | * | | | | | | | | | | | | | Merge branch 'master' into SheepHowaner2014-07-13117-2034/+2670
| | |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | 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)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
* | | | | | | | | | | | | | Revert failed fix for #31Tiger Wang2014-07-132-31/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-1326-218/+387
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
| * | | | | | | | | | | | | SuggestionsTiger Wang2014-07-113-2/+6
| * | | | | | | | | | | | | SuggestionsTiger Wang2014-07-114-14/+18
| * | | | | | | | | | | | | Improved LinkedPowering speedTiger Wang2014-07-111-15/+15
| * | | | | | | | | | | | | 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
* | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
| | | | | | * | | | | | | | | OnEntityAddEffect.lua: Removed Originator paramarchshift2014-07-141-1/+0
| | | | | | * | | | | | | | | 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-1214-161/+400
| | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | APIDump: Documented cWorld:SetChunkAlwaysTicked.madmaxoft2014-07-101-0/+1
* | | | | | | | | | | | | | | Debuggers: Added forced chunk ticking test.madmaxoft2014-07-101-0/+28
* | | | | | | | | | | | | | | Implemented support for forced chunk ticking.madmaxoft2014-07-106-8/+95
* | | | | | | | | | | | | | | Merge pull request #1159 from mc-server/VectorFloorFixMattes D2014-07-101-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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-10156-5178/+7390
| | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1157 from Howaner/WindowMattes D2014-07-093-41/+237
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1135 from mc-server/fixesTiger Wang2014-07-0919-110/+272
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | Eps comparisonTiger Wang2014-07-042-2/+2
| * | | | | | | | | | | | | | | SuggestionsTiger Wang2014-07-024-19/+31
| * | | | | | | | | | | | | | | Vector clamping fixesTiger Wang2014-07-012-21/+24
| * | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | Some Entity.cpp style improvementsTiger Wang2014-06-222-13/+8
| * | | | | | | | | | | | | | Fixed multiple issues with projectilesTiger Wang2014-06-228-63/+112
* | | | | | | | | | | | | | | Updated generator prefabs to current Gallery contents.madmaxoft2014-07-083-7/+8
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed OpenSSL programs and tests being generated when testing disabled.tycho2014-07-061-2/+2
* | | | | | | | | | | | | | Merge pull request #1144 from mc-server/LuaCodeGenMattes D2014-07-065-624/+227
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | 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 WebAdmin sockets rebinds instantlyTiger Wang2014-07-041-0/+2
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | cPluginManager: Reformatted the switch statement.madmaxoft2014-07-041-7/+34
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/HandleCommand'madmaxoft2014-07-043-32/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removed useless sentence in cPluginManager:ExecuteCommand description.STRWarrior2014-07-041-1/+1
| * | | | | | | | | | | | | | Moved sending error messages to cPluginManager:CallHookChatSTRWarrior2014-07-041-4/+6
| * | | | | | | | | | | | | | Fixed ExecuteCommand description.STRWarrior2014-07-041-1/+1
| * | | | | | | | | | | | | | Fixed doxycommentsSTRWarrior2014-06-281-3/+3
| * | | | | | | | | | | | | | (Force)ExecuteCommand returns the CommandResult enumsSTRWarrior2014-06-183-10/+25
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Fixed c1deda5d8f01811efa5094e9375166acb69d50edTiger Wang2014-07-041-2/+2
* | | | | | | | | | | | | | | Removed world-saving log messages.madmaxoft2014-07-043-35/+5
* | | | | | | | | | | | | | | APIDump: Updated OnWeatherChanging docs after latest code changes.madmaxoft2014-07-031-4/+7
* | | | | | | | | | | | | | | Changed OnWeatherChanging hook to always read the returned weather.madmaxoft2014-07-033-4/+18
* | | | | | | | | | | | | | | CMake: Changed slash format to support MSYS.madmaxoft2014-07-031-1/+1
* | | | | | | | | | | | | | | SetFlags.cmake: don't use ${} expansion on if STREQUALarchshift2014-07-031-1/+2
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1138 from mc-server/enderchestMattes D2014-07-027-113/+78
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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-029-30/+96
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1139 from Howaner/HooksMattes D2014-07-028-28/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Update documentationHowaner2014-07-021-3/+3
| | * | | | | | | | | | | | | | | Removed foodlevel-change possibility. Plugins can cancel the event and use cPlayer:SetFoodLevel()Howaner2014-07-025-6/+6
| | * | | | | | | | | | | | | | | Change documentationHowaner2014-07-011-5/+10
| | * | | | | | | | | | | | | | | Fixes.Howaner2014-06-302-4/+4
| | * | | | | | | | | | | | | | | Add documentation.Howaner2014-06-301-0/+22
| | * | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | Fixed player teleport food drainTiger Wang2014-07-022-1/+14
* | | | | | | | | | | | | | | | | Redstone simulator is alerted to lever unpoweringTiger Wang2014-07-024-1/+6
|/ / / / / / / / / / / / / / / /
* | | | / / / / / / / / / / / / Fixed printf formats for Win buildsmadmaxoft2014-07-012-4/+4
| |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fixed a possibly unused variable.madmaxoft2014-07-011-1/+1
* | | | | | | | | | | | | | | Merge pull request #1122 from mc-server/LuaProxyMattes D2014-07-016-0/+324
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | LuaProxy compilation under MinGW.Mattes D2014-07-011-1/+4
| * | | | | | | | | | | | | | | Merge branch 'master' into LuaProxyMattes D2014-07-0159-1147/+1191
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Added a missing endline.madmaxoft2014-06-241-1/+1
| * | | | | | | | | | | | | | | | Added the Lua Proxy DLL.madmaxoft2014-06-246-0/+321
* | | | | | | | | | | | | | | | | Merge pull request #1141 from Howaner/GlobalFixesMattes D2014-07-012-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Only fixes the server crash.Howaner2014-07-012-7/+1
| * | | | | | | | | | | | | | | | Fix server-crash with non-existing items.Howaner2014-07-012-2/+8
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #1140 from mc-server/FixMingwMattes D2014-07-016-13/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Proper sqlite dependency fix.Mattes D2014-07-011-1/+2
| * | | | | | | | | | | | | | | | Ignore Code:::Blocks project files.Mattes D2014-07-011-0/+1
| * | | | | | | | | | | | | | | | Fixed linking order under MinGW.Mattes D2014-07-012-3/+9
| * | | | | | | | | | | | | | | | typoworktycho2014-06-301-1/+1
| * | | | | | | | | | | | | | | | Added dependecy of tolualib on luaworktycho2014-06-301-0/+1
| * | | | | | | | | | | | | | | | Fixed size_t printfing under MinGW.Mattes D2014-06-301-3/+18
| * | | | | | | | | | | | | | | | Fixed lua compilation under MinGW.Mattes D2014-06-301-8/+4
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Fixed cFile compilation under MinGW.madmaxoft2014-06-301-0/+3
* | | | | | | | | | | | | | | | Fixed tolua linking order.Mattes D2014-06-301-3/+1
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fixed respawningTiger Wang2014-06-2912-19/+19
* | | | | | | | | | | | | | | Fixed offline UUID generator.Mattes D2014-06-291-2/+4
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1136 from Howaner/GlobalFixesMattes D2014-06-292-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Send statistics to the player, when he logged in.Howaner2014-06-292-2/+4
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1132 from mc-server/RemoveMD5Mattes D2014-06-297-499/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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-277-494/+16
* | | | | | | | | | | | | | | Likely fixed too quick food depletionTiger Wang2014-06-281-1/+1
* | | | | | | | | | | | | | | Fixed issue with breaking blocks at -1 coordinatesTiger Wang2014-06-281-6/+1
* | | | | | | | | | | | | | | Implemented tripwire(s) (hooks)Tiger Wang2014-06-289-17/+324
* | | | | | | | | | | | | | | Added more block exceptions to torchesTiger Wang2014-06-281-0/+4
* | | | | | | | | | | | | | | Minor change to buttons and leversTiger Wang2014-06-282-3/+3
* | | | | | | | | | | | | | | Fixed bad water/redstone simulator communicationTiger Wang2014-06-281-32/+22
* | | | | | | | | | | | | | | Fixed server forcing players afloatTiger Wang2014-06-281-1/+4
| |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Added generic entity-collecting.Mattes D2014-06-2717-25/+36
* | | | | | | | | | | | | | Merge pull request #1129 from mc-server/CodeCoverageConditionworktycho2014-06-271-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Added MSVC guardworktycho2014-06-271-4/+6
| * | | | | | | | | | | | | Update SetFlags.cmakeworktycho2014-06-271-1/+1
| * | | | | | | | | | | | | Update SetFlags.cmakeworktycho2014-06-271-1/+1
| * | | | | | | | | | | | | CMake: Added log message for coverage.madmaxoft2014-06-271-0/+1
| * | | | | | | | | | | | | Moved CodeCoverage into a separate cmake condition.madmaxoft2014-06-271-2/+6
* | | | | | | | | | | | | | CMake: pthread is used only on Unix.madmaxoft2014-06-271-4/+8
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merged branch 'howaner/Bow'.Mattes D2014-06-264-23/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add comment.Howaner2014-06-261-0/+1
| * | | | | | | | | | | | | GameMode checkHowaner2014-06-261-1/+1
| * | | | | | | | | | | | | Merge branch 'master' into BowHowaner2014-06-2682-3427/+5264
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | Merged branch 'tonibm19/master'.Mattes D2014-06-262-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Added pig riding.tonibm192014-06-202-0/+14
* | | | | | | | | | | | | | | | Merge pull request #1126 from mc-server/BlockInfoInitMattes D2014-06-252-381/+374
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | BlockInfo is now a proper C++ singleton.madmaxoft2014-06-252-381/+374
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1125 from Howaner/Entitiesworktycho2014-06-242-16/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add entity health saving.Howaner2014-06-242-16/+8
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Fixed BlockInfo initialization.madmaxoft2014-06-241-15/+6
* | | | | | | | | | | | | | Added asserts for cChunk::GetBlockEntity() coords.Mattes D2014-06-241-0/+6
* | | | | | | | | | | | | | Fixed crashes in HopperEntity.Mattes D2014-06-241-19/+58
* | | | | | | | | | | | | | Debuggers: Fixed the Blaze rod query tool.madmaxoft2014-06-241-2/+2
* | | | | | | | | | | | | | VoronoiMap: Added a missing initializer.madmaxoft2014-06-231-1/+3
* | | | | | | | | | | | | | Added a (disabled) block meta mirror / rotate test code.madmaxoft2014-06-231-2/+87
* | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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-225-6/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed missing breakworktycho2014-06-221-0/+1
| * | | | | | | | | | | | | | Fixed invalid iteratorworktycho2014-06-221-2/+3
| * | | | | | | | | | | | | | Added cClientHandle::IsUUIDOnline function.madmaxoft2014-06-213-2/+41
| * | | | | | | | | | | | | | Restored style continuity.Alexander Harkness2014-06-211-2/+2
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed another daylight sensor bugTiger Wang2014-06-221-20/+23
* | | | | | | | | | | | | | Chests don't open if obstructedTiger Wang2014-06-221-0/+13
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2014-06-216-2/+669
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added a TestRails generator.madmaxoft2014-06-215-0/+667
| * | | | | | | | | | | | | Fixed a caching bug in GridStructGen.madmaxoft2014-06-211-2/+2
* | | | | | | | | | | | | | Updated CONTRIBUTORS fileSTRWarrior2014-06-211-0/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | 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
* | | | | | | | | | | | | Fixed the BiomeVisualiser project.madmaxoft2014-06-201-1/+17
* | | | | | | | | | | | | Optimized Voronoi calculation.madmaxoft2014-06-204-21/+81
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1112 from mc-server/danglingptrsMattes D2014-06-1935-18/+75
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Nullify deleted pointers.archshift2014-06-1935-18/+75
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1096 from mc-server/redstonerefactorAlexander Harkness2014-06-183-140/+79
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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-1635-469/+899
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Moved repeater handling to seperate passTycho2014-06-162-97/+64
* | | | | | | | | | | | | Merge pull request #1045 from Howaner/GlobalFixesMattes D2014-06-1812-61/+158
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into GlobalFixesHowaner2014-06-17224-2010/+26942
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | 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
| * | | | | | | | | | | | | 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
| | | | | | | * | | | | | Entity effects: changed User to Creator, removed pawn pass-by-valuearchshift2014-06-176-36/+20
| | | | | | | * | | | | | APIDump: Added OnEntityAddEffect hook documentation.madmaxoft2014-06-171-0/+34
| | | | | | | * | | | | | Added the OnEntityAddEffect hook.madmaxoft2014-06-177-0/+57
| | | | | | | * | | | | | Entity Effects: Clarified user, added it to AddEntityEffectarchshift2014-06-177-15/+32
| | | | | | | * | | | | | 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
| | | | | | | * | | | | | Fixed MSVC compilation.madmaxoft2014-06-173-14/+17
| | | | | | | * | | | | | Pawn: renamed HandleEntityEffects to HandleEntityEffectarchshift2014-06-178-10/+15
| | | | | | | * | | | | | 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
| | | | | | | * | | | | | Implemented milk, added documentation to Pawn.harchshift2014-06-177-5/+86
| | | | | | | * | | | | | Pawn.cpp: fixed effect iterator BAD_ACCESSarchshift2014-06-172-9/+14
| | | | | | | * | | | | | Pawn: Enabled entity effect broadcast, added typedefarchshift2014-06-172-4/+6
| | | | | | | * | | | | | EntityEffect: read-only getters, added user and distance modifier fieldsarchshift2014-06-173-11/+35
| | | | | | | * | | | | | Player: Removed food-poisoning-specific code, set duration to 30 secondsarchshift2014-06-173-27/+3
| | | | | | | * | | | | | Entity effects: Added handlers for entity effectsarchshift2014-06-174-13/+138
| | | | | | | * | | | | | 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.Howaner2014-06-171-2/+1
* | | | | | | | | | | | Merge pull request #1099 from Howaner/BlocksMattes D2014-06-171-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Glass shouldn't drop.Howaner2014-06-161-0/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1102 from Howaner/PressurePlateMattes D2014-06-173-0/+45
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
* | | | | | | | | | | Fixed gcc compilation.madmaxoft2014-06-161-1/+1
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-160-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #1024 from worktycho/AllocationPoolMattes D2014-06-1612-55/+281
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Added overrideTycho2014-06-161-3/+3
| | * | | | | | | | | Changed names of callbacksTycho2014-06-142-10/+10
| | * | | | | | | | | Removed spacesTycho2014-06-141-2/+2
| | * | | | | | | | | Documented starvation callbacksTycho2014-06-141-0/+7
| | * | | | | | | | | Documented cAllocationPoolTycho2014-06-141-0/+5
| | * | | | | | | | | Reformated ChunkMap.hTycho2014-06-142-4/+10
| | * | | | | | | | | Moved m_SectionsTycho2014-06-141-1/+2
| | * | | | | | | | | Added generic Allocation Pool InterfaceTycho2014-06-1412-69/+110
| | * | | | | | | | | reverted accedental android changesTycho2014-06-141-2/+1
| | * | | | | | | | | fixed spacesTycho2014-06-148-14/+16
| | * | | | | | | | | fixed spacesTycho2014-06-148-16/+16
| | * | | | | | | | | fixed compileTycho2014-06-142-2/+10
| | * | | | | | | | | fixed const issueTycho2014-06-141-3/+3
| | * | | | | | | | | Fill with buffer on startupTycho2014-06-141-0/+10
| | * | | | | | | | | Fixed commentsTycho2014-06-142-6/+6
| | * | | | | | | | | Added loggingTycho2014-06-141-3/+12
| | * | | | | | | | | merge masterTycho2014-06-14194-2164/+25270
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed bad mergeTycho2014-05-253-10/+17
| | * | | | | | | | | | Merge branch 'chunksparsing/structs' into AllocationPoolTycho2014-05-2589-1603/+2713
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed bug in freeing NULL pointersTycho2014-05-251-13/+15
| | * | | | | | | | | | | Implemented Allocation Pool use by cChunkDataTycho2014-05-2311-45/+125
| | * | | | | | | | | | | Use placement new to initalise objectsTycho2014-05-231-2/+5
| | * | | | | | | | | | | Merge branch 'chunksparsing/structs' into AllocationPoolTycho2014-05-2316-144/+228
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Added callback for stopping starvation modeTycho2014-05-211-0/+4
| | * | | | | | | | | | | | Implemented Allocation PoolTycho2014-05-211-0/+50
| * | | | | | | | | | | | | 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
| * | | | | | | | | | | | | Merge pull request #1090 from mc-server/saveoncrashMattes D2014-06-152-2/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Players are saved regularlyTiger Wang2014-06-152-2/+22
| * | | | | | | | | | | | | | Fixed bad comparison crashTiger Wang2014-06-151-2/+2
| * | | | | | | | | | | | | | Fixed daylight sensor unpoweringTiger Wang2014-06-151-6/+28
| * | | | | | | | | | | | | | Merge pull request #1019 from mc-server/cPlayerSetSpeedMattes D2014-06-144-31/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | 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-14216-1988/+26550
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Player.h: Moved doxy-comments to Entity.harchshift2014-06-112-3/+10
| | * | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | Both SetSpeed functions are now overridden by cPlayerSTRWarrior2014-05-223-6/+32
* | | | | | | | | | | | | | | | Merge branch 'master' of github.com:mc-server/MCServerTycho2014-06-1635-469/+900
| |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fix a few warningsTycho2014-06-161-3/+3
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1093 from mc-server/BindingsFixMattes D2014-06-143-9/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed bindings generation for Win64 builds.Mattes D2014-06-143-9/+29
| * | | | | | | | | | | | | | 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
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | Reduced cPluginManager code duplicationTiger Wang2014-06-141-286/+178
* | | | | | | | | | | | Fixed ChunkWorx stop button giving an errorSTRWarrior2014-06-131-1/+1
* | | | | | | | | | | | Merge pull request #1089 from mc-server/tolua-autoMattes D2014-06-132-84/+85
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
* | | | | | | | | | | | APIDump: Added the Info.lua article.madmaxoft2014-06-132-0/+247
* | | | | | | | | | | | Typo CorrectionAlexander Harkness2014-06-121-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Fixed two redstone bugsTiger Wang2014-06-121-0/+6
* | | | | | | | | | | Merge pull request #1082 from mc-server/cauldronfixesAlexander Harkness2014-06-124-73/+112
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed constnessworktycho2014-06-113-72/+79
| * | | | | | | | | | | Compile fixTiger Wang2014-06-111-1/+1
| * | | | | | | | | | | Reduced code duplicationTiger Wang2014-06-111-4/+4
| * | | | | | | | | | | IsWeatherSunnyAt does something useful :DTiger Wang2014-06-111-9/+5
| * | | | | | | | | | | Update APIDesc.luaAlexander Harkness2014-06-111-0/+1
| * | | | | | | | | | | Update APIDesc.luaTiger Wang2014-06-111-3/+6
| * | | | | | | | | | | SMICOLOSLAlexander Harkness2014-06-111-4/+4
| * | | | | | | | | | | Updated unnecessary function :/Tiger Wang2014-06-111-1/+5
| * | | | | | | | | | | Add DoxyComments to he weather things. Alexander Harkness2014-06-111-7/+24
| * | | | | | | | | | | Add new IsWeatherWet hook for cauldrons.Alexander Harkness2014-06-111-1/+12
* | | | | | | | | | | | Merge pull request #1086 from qaisjp/patch-1Mattes D2014-06-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix typo in handy_functions.luaQais Patankar2014-06-121-2/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1084 from mc-server/PlankRoadsSTRWarrior2014-06-111-4/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | | - 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
| * | | | | | | | | | | | | - Fixed a bug where I didn't return anything in the GetShootVectorJoannisO2014-06-031-0/+2
| * | | | | | | | | | | | | - Fixed a bug where I used the FireCharge ITEM instead of the ProjectileJoannisO2014-06-031-1/+1
| * | | | | | | | | | | | | - Cleaned up the code massivelyJoannisO2014-06-032-90/+31
| * | | | | | | | | | | | | - Added doxy comments and exported to luaJoannis2014-06-032-22/+64
| * | | | | | | | | | | | | - Changed the name of the ProjectileLookVector method.JoannisO2014-05-312-3/+3
| * | | | | | | | | | | | | - Prefixed all args with "a_"JoannisO2014-05-292-6/+10
| * | | | | | | | | | | | | - Removed breaks. I thought it wouldn't compile without them but theJoannisO2014-05-281-2/+0
| * | | | | | | | | | | | | - Fixed an issue where dispensers would only shoot arrows (appearantlyJoannisO2014-05-281-33/+24
| * | | | | | | | | | | | | - Implemented vertical dispensing for projectiles.Joannis2014-05-282-16/+40
| * | | | | | | | | | | | | - Fixed the ampersands and asterisks to fit the format.Joannis2014-05-272-8/+8
| * | | | | | | | | | | | | - Added support for more types of projectiles in the DispenserJoannisO2014-05-262-38/+51
| * | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | APIDump: Documented cBlockArea:GetCoordRange().madmaxoft2014-06-111-1/+2
* | | | | | | | | | | | | Added cBlockArea:GetCoordRange to Lua API.madmaxoft2014-06-111-0/+32
* | | | | | | | | | | | | Revert "Initial Mesa Bryce implementation."madmaxoft2014-06-114-116/+4
* | | | | | | | | | | | | Added coverity badgeworktycho2014-06-111-1/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Removed assert that is now informed by type systemworktycho2014-06-111-1/+0
* | | | | | | | | | | | Update GETTING-STARTED.mdworktycho2014-06-111-11/+11
* | | | | | | | | | | | Update GETTING-STARTED.mdAlexander Harkness2014-06-111-1/+1
* | | | | | | | | | | | TestAlexander Harkness2014-06-111-1/+0
* | | | | | | | | | | | Removed derpbadge.Alexander Harkness2014-06-111-1/+1
* | | | | | | | | | | | Initial Mesa Bryce implementation.madmaxoft2014-06-104-4/+116
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Fixed clang warnings about abs() in Noise.cpp.madmaxoft2014-06-101-2/+2
* | | | | | | | | | | 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
| |/ / / / / / / / / /
* | | | | | | | | | | docs/Generator: Fixed typo.madmaxoft2014-06-091-1/+1
* | | | | | | | | | | Fixed debugging code in tolua++ driver script.madmaxoft2014-06-091-1/+1
* | | | | | | | | | | ToLua can now be run in pure-lua mode.madmaxoft2014-06-096-8/+127
* | | | | | | | | | | docs/Generator: Added SmallFoliage illlustrations.madmaxoft2014-06-094-0/+4
* | | | | | | | | | | Fixed a crash when creating negative-size blockareas.madmaxoft2014-06-091-0/+8
* | | | | | | | | | | Fixed deadlock when moving players to other worlds.Mattes D2014-06-0832-96/+204
* | | | | | | | | | | Added queue for adding entities to cWorld.Mattes D2014-06-086-7/+42
* | | | | | | | | | | Small change for easier understanding.Alexander Harkness2014-06-081-1/+1
* | | | | | | | | | | Proper fix for long interaction.madmaxoft2014-06-081-7/+14
* | | | | | | | | | | Merge pull request #1077 from mc-server/fuelfixesworktycho2014-06-071-15/+27
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Corrected the furnace fuels. Solves #1071Alexander Harkness2014-06-071-15/+27
|/ / / / / / / / / / /
* | | | | | | | | | | docs/Generator: fixed grass confusion.Mattes D2014-06-071-2/+2
* | | | | | | | | | | docs/Generator: Added the easy Finishers.madmaxoft2014-06-072-3/+130
* | | | | | | | | | | Added RainbowRoads finisher generator.madmaxoft2014-06-075-3/+1594
* | | | | | | | | | | Further improvements on redstone speedTiger Wang2014-06-073-68/+81
* | | | | | | | | | | Fixed mob hitbox sizes, removed TODOsarchshift2014-06-073-5/+2
* | | | | | | | | | | Fixed a typo.Mattes D2014-06-071-1/+1
* | | | | | | | | | | Further reduced redstone idle CPU consumptionTiger Wang2014-06-061-7/+27
* | | | | | | | | | | Grammarworktycho2014-06-061-1/+1
* | | | | | | | | | | Expanded GPU sectionworktycho2014-06-061-1/+2
* | | | | | | | | | | Fixed numbersworktycho2014-06-061-1/+2
* | | | | | | | | | | typoworktycho2014-06-061-1/+1
* | | | | | | | | | | docs/Generator: Added basic terrain composition.madmaxoft2014-06-054-1/+31
* | | | | | | | | | | Typographical errorTiger Wang2014-06-051-1/+1
* | | | | | | | | | | Start of GPU section.worktycho2014-06-051-0/+5
* | | | | | | | | | | docs/Generator: Added the TerrainHeight section.madmaxoft2014-06-054-0/+54
* | | | | | | | | | | Redstone fixes and improvements [SEE DESC]Tiger Wang2014-06-053-61/+96
* | | | | | | | | | | Merge pull request #1011 from SphinxC0re/SomeWarningFixesMattes D2014-06-044-3/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update IncrementalRedstoneSimulator.cppJulian Laubstein2014-06-041-8/+8
| * | | | | | | | | | | Update Globals.hJulian Laubstein2014-06-031-1/+1
| * | | | | | | | | | | 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-192-2/+13
* | | | | | | | | | | | Merge pull request #1060 from Howaner/InventoryMattes D2014-06-041-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix itemframe break.Howaner2014-06-041-1/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1059 from mc-server/coverity_fixesworktycho2014-06-044-4/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
|/ / / / / / / / / / /
* | | | | | | | | | | Fixed buffer overflow in JSON.madmaxoft2014-06-041-1/+1
* | | | | | | | | | | 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
* | | | | | | | | | | docs/Generator: Re-fixed the wording.madmaxoft2014-06-031-1/+1
* | | | | | | | | | | Player permissions aren't logged to console anymore.madmaxoft2014-06-031-7/+0
* | | | | | | | | | | 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
* | | | | | | | | | | | docs/Generator: Updated PerlinRivers with better images.madmaxoft2014-06-035-1/+5
* | | | | | | | | | | | Merge pull request #1028 from mc-server/pistonfixesMattes D2014-06-0315-457/+401
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/pistonfixes'Tiger Wang2014-06-0215-457/+401
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | 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
| | * | | | | | | | | | | | Changed block send queue to use vectorsTiger Wang2014-05-293-21/+29
| | * | | | | | | | | | | | 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
* | | | | | | | | | | | | | docs/Generator: Shrunk the hand-drawn images by 50 %.madmaxoft2014-06-0313-0/+0
* | | | | | | | | | | | | | Merge branch 'GeneratorArticle'madmaxoft2014-06-0327-47/+374
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Generator article: Added TOC with links.madmaxoft2014-06-031-7/+44
| * | | | | | | | | | | | | | Generator article: fixed bad wording.madmaxoft2014-06-021-2/+2
| * | | | | | | | | | | | | | Generator article: Finished the Biome-gen section and images.madmaxoft2014-06-028-14/+25
| * | | | | | | | | | | | | | AnvilStats: Added new biome colors.Mattes D2014-06-012-34/+3
| * | | | | | | | | | | | | | Generator article now has all biome genertors and most their imgs.Mattes D2014-06-0115-8/+156
| * | | | | | | | | | | | | | Hot-fixed AnvilStats compilation for MSVC2013.Mattes D2014-06-013-13/+56
| * | | | | | | | | | | | | | Merge branch 'master' into GeneratorArticleMattes D2014-06-01138-910/+20904
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Initial commit of the Generator article.Mattes D2014-05-301-0/+119
* | | | | | | | | | | | | | | | Merge pull request #1052 from mc-server/UnderwaterBaseGenMattes D2014-06-025-0/+2489
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update UnderwaterBase prefabs.madmaxoft2014-06-011-12/+378
| * | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | cBlockArea reading hotfix.madmaxoft2014-06-021-63/+109
* | | | | | | | | | | | | | | | APIDump: Fixed crashSTRWarrior2014-06-021-1/+1
* | | | | | | | | | | | | | | | Added OnProjectileHitBlock example in DebuggersSTRWarrior2014-06-021-1/+13
* | | | | | | | | | | | | | | | Updated OnProjectileHitBlock documentation.STRWarrior2014-06-021-0/+5
* | | | | | | | | | | | | | | | Merge pull request #844 from mc-server/ProjectileHitBlockMattes D2014-06-016-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | 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
| |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Updated AlchemistVillage prefabs.madmaxoft2014-06-011-103/+105
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1018 from mc-server/VillageGenMattes D2014-05-3125-23/+17115
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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-294-1/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed a crash in message formatter.madmaxoft2014-05-281-1/+2
| * | | | | | | | | | | | | | | Merge branch 'master' into VillageGenmadmaxoft2014-05-2714-79/+157
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | Added Japanese village prefabs.madmaxoft2014-05-245-4/+2442
| * | | | | | | | | | | | | | | Merge branch 'master' into VillageGenMattes D2014-05-2312-19/+177
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Updated plains village prefabs.madmaxoft2014-05-221-186/+171
| * | | | | | | | | | | | | | | | Villages have min and max density setting.madmaxoft2014-05-225-17/+110
| * | | | | | | | | | | | | | | | Updated plains village prefabs.madmaxoft2014-05-221-44/+43
| * | | | | | | | | | | | | | | | 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-1860-328/+1589
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Updated SandVillage prefabs to latest Gallery content.madmaxoft2014-05-181-12/+12
| * | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | 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
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #951 from worktycho/chunksparsing/structsMattes D2014-05-3140-484/+1844
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Reduced the number of cChunkData::CopyBlockTypes() tests, added progress.Mattes D2014-05-301-7/+16
| * | | | | | | | | | | | | | | | Fix bugs in testTycho2014-05-301-3/+5
| * | | | | | | | | | | | | | | | Added a cChunkData::CopyBlockTypes() unit test.Mattes D2014-05-302-0/+68
| * | | | | | | | | | | | | | | | removed NULL assignment to const valueTycho2014-05-301-1/+0
| * | | | | | | | | | | | | | | | removed unneded addressofTycho2014-05-301-7/+11
| * | | | | | | | | | | | | | | | Fixed cChunkData nibble copying.madmaxoft2014-05-302-13/+13
| * | | | | | | | | | | | | | | | 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-302-3/+19
| * | | | | | | | | | | | | | | | Fixed sign comparison.madmaxoft2014-05-301-1/+1
| * | | | | | | | | | | | | | | | Fixed test return values.madmaxoft2014-05-302-38/+41
| * | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | Fixed wrong block sizes for copying / setting.madmaxoft2014-05-293-58/+52
| * | | | | | | | | | | | | | | | Fixed Wrong types in nibble sizeofsworktycho2014-05-291-3/+3
| * | | | | | | | | | | | | | | | Fixed test compilation.madmaxoft2014-05-292-16/+16
| * | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | Fix cmake errors in msvcworktycho2014-05-281-1/+5
| * | | | | | | | | | | | | | | | Fixed test globals to work with precompiled headersTycho2014-05-277-159/+40
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | inject TestGlobals.h correctlyTycho2014-05-243-5/+10
| * | | | | | | | | | | | | | | Moved accessors to cpp fileTycho2014-05-242-216/+241
| * | | | | | | | | | | | | | | Implemented style changesTycho2014-05-249-268/+182
| * | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-2478-1170/+2341
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Ignore CTest filesTycho2014-05-231-0/+1
| * | | | | | | | | | | | | | | 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-2115-87/+87
| | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fixed minor style issuesTycho2014-05-214-7/+7
| * | | | | | | | | | | | | | Fixed issue with types not being defined for an unused parameterTycho2014-05-188-107/+111
| * | | | | | | | | | | | | | derpTycho2014-05-171-1/+1
| * | | | | | | | | | | | | | C++11Tycho2014-05-171-0/+8
| * | | | | | | | | | | | | | fixed assignment bugs and Skylight bugTycho2014-05-172-4/+6
| * | | | | | | | | | | | | | Fix assignment operators testworktycho2014-05-171-3/+3
| * | | | | | | | | | | | | | Fix assignment ops 2worktycho2014-05-171-3/+8
| * | | | | | | | | | | | | | Add test for zerosworktycho2014-05-171-0/+35
| * | | | | | | | | | | | | | Fix assignment operatorsworktycho2014-05-171-10/+14
| * | | | | | | | | | | | | | Add tests for assignment operatorworktycho2014-05-171-0/+11
| * | | | | | | | | | | | | | Rewrote array copies testworktycho2014-05-171-36/+51
| * | | | | | | | | | | | | | excluding tests excludes everythingworktycho2014-05-171-1/+1
| * | | | | | | | | | | | | | test code does not need testingworktycho2014-05-171-1/+1
| * | | | | | | | | | | | | | Don't start mcserver up in coverage buildsworktycho2014-05-171-1/+3
| * | | | | | | | | | | | | | Added some more testsTycho2014-05-112-116/+242
| * | | | | | | | | | | | | | Added several more testsfor arrays and coordinatesTycho2014-05-113-5/+21
| * | | | | | | | | | | | | | Fixed bug that caused Array Setters to always create segmentsTycho2014-05-111-4/+4
| * | | | | | | | | | | | | | test 0 valuesTycho2014-05-111-0/+45
| * | | | | | | | | | | | | | SkyLight defaults to 0xFFTycho2014-05-111-1/+1
| * | | | | | | | | | | | | | Cerated array copy tests for block and skylightTycho2014-05-111-0/+36
| * | | | | | | | | | | | | | Fixed a bug in writting zeros to a non-allocated sectionTycho2014-05-113-93/+134
| * | | | | | | | | | | | | | Coverage builds are called MCServer not MCServer_debugTycho2014-05-101-1/+1
| * | | | | | | | | | | | | | Fixed stupid errorTycho2014-05-101-1/+1
| * | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-102-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fail build on errorTycho2014-05-101-1/+3
| * | | | | | | | | | | | | | | Don't run start test under gcovTycho2014-05-102-2/+2
| * | | | | | | | | | | | | | | quite gcov take 4Tycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | Fixed stupid buffer overflow in array setblocksTycho2014-05-103-13/+13
| * | | | | | | | | | | | | | | Add arries copies testsTycho2014-05-101-0/+53
| * | | | | | | | | | | | | | | Added new testTycho2014-05-101-0/+4
| * | | | | | | | | | | | | | | Added some more testsTycho2014-05-102-6/+100
| * | | | | | | | | | | | | | | Fixed bug in setting metasTycho2014-05-102-19/+7
| * | | | | | | | | | | | | | | quieted gcov 4Tycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | quieted gcov 3Tycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | quieted gcov 2Tycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | Relocate gcda files so gcov can find them 3Tycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | rewrote exclustionsTycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | quieted gcovTycho2014-05-101-1/+1
| * | | | | | | | | | | | | | | Relocate gcda files so gcov can find them take 2Tycho2014-05-101-2/+2
| * | | | | | | | | | | | | | | Relocate gcda files so gcov can find themTycho2014-05-102-0/+4
| * | | | | | | | | | | | | | | Add qutes to scriptsTycho2014-05-102-2/+2
| * | | | | | | | | | | | | | | Fix spaces in bashTycho2014-05-102-2/+2
| * | | | | | | | | | | | | | | Make scripts executableTycho2014-05-102-0/+0
| * | | | | | | | | | | | | | | Fixed missing Dollar signsTycho2014-05-102-2/+2
| * | | | | | | | | | | | | | | Fixed pathsTycho2014-05-101-2/+2
| * | | | | | | | | | | | | | | Fix bash ifsTycho2014-05-103-3/+4
| * | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-10105-940/+2002
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Maybe coverage working?Tycho2014-05-109-33/+409
| * | | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-0336-92/+198
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | cCHunkBuffer that compiles with TestGlobals.hTycho2014-05-037-2/+27
| * | | | | | | | | | | | | | | | | Fixed polarssl programs includedTycho2014-05-011-1/+2
| * | | | | | | | | | | | | | | | | Tests off by default take 2Tycho2014-05-011-1/+1
| * | | | | | | | | | | | | | | | | Disable polarssl tests by defaultTycho2014-05-011-0/+1
| * | | | | | | | | | | | | | | | | Merge branch 'master' into chunksparsing/structsTycho2014-05-01129-2393/+4043
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Added Testing capabilityTycho2014-04-275-2/+30
| * | | | | | | | | | | | | | | | | | 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-27188-4917/+11174
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Implemented Chunk Sparsing with segmentsTycho2014-04-2617-401/+610
* | | | | | | | | | | | | | | | | | | | Fixed bindings for cCompositeChat:SetMessageType().madmaxoft2014-05-301-2/+2
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Cmake system name not System nameworktycho2014-05-281-1/+1
* | | | | | | | | | | | | | | | | | | derpworktycho2014-05-281-1/+1
* | | | | | | | | | | | | | | | | | | FreeBSD requires __POSIX_VISIBLE macro to be definedworktycho2014-05-281-0/+4
* | | | | | | | | | | | | | | | | | | for compiliers other than msvc we need to tell lua that its building as a dllworktycho2014-05-281-0/+6
* | | | | | | | | | | | | | | | | | | Fixed a memory leak in cPrefabPiecePool.madmaxoft2014-05-282-1/+34
| |_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Stuff.Alexander Harkness2014-05-271-1/+1
* | | | | | | | | | | | | | | | | | Merge pull request #1041 from mc-server/fixesMattes D2014-05-271-22/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | ClientHandle.cpp: Process look before posarchshift2014-05-271-1/+1
| * | | | | | | | | | | | | | | | | | ClientHandle.cpp: remove redundant codearchshift2014-05-261-22/+2
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Update main.cssAlexander Harkness2014-05-261-1/+2
* | | | | | | | | | | | | | | | | | Revert "Add more move checks"madmaxoft2014-05-262-59/+17
* | | | | | | | | | | | | | | | | | Minor fixes.Alexander Harkness2014-05-261-3/+3
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-261-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-261-1/+1
* | | | | | | | | | | | | | | | | | Merge pull request #1003 from Howaner/GlobalFixesMattes D2014-05-262-17/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add more move checksHowaner2014-05-162-17/+59
* | | | | | | | | | | | | | | | | | | SEMICOLONS!Alexander Harkness2014-05-251-2/+2
* | | | | | | | | | | | | | | | | | | Update GroupManager.hworktycho2014-05-251-2/+2
* | | | | | | | | | | | | | | | | | | Merge pull request #1030 from mc-server/betterthan950worktycho2014-05-251-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | A fix that is better than #950.Alexander Harkness2014-05-251-5/+15
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-251-0/+2
* | | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-251-1/+1
* | | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-251-1/+1
* | | | | | | | | | | | | | | | | | | Updated the installation instructions in the README.Alexander Harkness2014-05-251-11/+8
* | | | | | | | | | | | | | | | | | | Merge pull request #1013 from mc-server/achievementtranslateMattes D2014-05-256-32/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into achievementtranslateTiger Wang2014-05-2513-22/+163
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | Updated CoreTiger Wang2014-05-251-0/+0
| |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Standardised a badge.Alexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-2/+2
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+1
* | | | | | | | | | | | | | | | | | Update README.mdAlexander Harkness2014-05-241-1/+3
| |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #1022 from mc-server/FixMineshaftsMattes D2014-05-232-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | 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
| |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fixed profiling flags for MSVC.Mattes D2014-05-231-2/+2
* | | | | | | | | | | | | | | | Merge pull request #1015 from mc-server/Statsxdot2014-05-217-15/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed cWither::KilledByandrew2014-05-212-1/+3
| * | | | | | | | | | | | | | | Cleaned up cPlayer::UpdateMovementStats; Wither achievementsandrew2014-05-207-15/+128
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fixed MCADefrag compilation.madmaxoft2014-05-201-0/+15
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1010 from mc-server/cactidamageAlexander Harkness2014-05-193-2/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | DerpAlexander Harkness2014-05-191-1/+1
| * | | | | | | | | | | | | Should have fixed assumptions about entity width.Alexander Harkness2014-05-191-4/+5
| * | | | | | | | | | | | | Fixed clanging errors.Alexander Harkness2014-05-191-5/+5
| * | | | | | | | | | | | | Implemented cacti damageTiger Wang2014-05-183-2/+29
* | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1005 from SphinxC0re/LoadPluginfolderworktycho2014-05-181-1/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1002 from tonibm19/patch-1Mattes D2014-05-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed anvil exp removingtonibm192014-05-161-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #994 from Howaner/GlobalFixesMattes D2014-05-155-36/+125
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | 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
| |/ / / / / / / / / /
* | | | | | | | | | | Added doxy-comment requirementMattes D2014-05-131-1/+1
* | | | | | | | | | | Merge pull request #999 from mc-server/fixesMattes D2014-05-126-54/+80
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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 pull request #972 from mc-server/SslWebAdminMattes D2014-05-1128-174/+637
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into SslWebAdminMattes D2014-05-10131-1841/+2756
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #993 from mc-server/GridStructGenMattes D2014-05-1012-838/+581
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | 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
| * | | | | | | | | | | cWormNestCaves rewritten using cGridStructGen.Mattes D2014-05-092-223/+29
| * | | | | | | | | | | Mineshafts generator rewritten to use GridStructGen.Mattes D2014-05-092-156/+33
| * | | | | | | | | | | Fixed cGridStructGen.Mattes D2014-05-081-18/+6
| * | | | | | | | | | | Merge branch 'master' into GridStructGenMattes D2014-05-0886-347/+1151
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed MSVC 64-bit build warnings.Mattes D2014-05-0847-159/+176
| * | | | | | | | | | | | cNetherFortGen uses cGridStructGen.madmaxoft2014-05-075-264/+42
| * | | | | | | | | | | | Initial cPrefabPiecePool refactoring.madmaxoft2014-05-072-0/+196
| * | | | | | | | | | | | Initial cGridStructGen refactoring.madmaxoft2014-05-062-0/+262
* | | | | | | | | | | | | Fixed the console saying no plugins are loaded.STRWarrior2014-05-101-1/+1
* | | | | | | | | | | | | Merge pull request #995 from mc-server/Portal_PigmanMattes D2014-05-101-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Range Check on schematic sizeworktycho2014-05-091-1/+1
| * | | | | | | | | | | Check the height and width values read.worktycho2014-05-091-0/+8
* | | | | | | | | | | | 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-0947-159/+176
|/ / / / / / / / / / /
* | / / / / / / / / / Initialise m_HasTeleported in both constructorsworktycho2014-05-091-0/+1
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #989 from Howaner/AnvilMattes D2014-05-079-55/+118
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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-0711-4/+53
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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-07274-7330/+16184
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove old importHowaner2014-04-062-3/+2
| * | | | | | | | | | | | Merge branch 'master' into SlabsHowaner2014-04-0656-334/+540
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add CanChangeDirtToGrass function to Block Handlers.Howaner2014-04-069-4/+45
| * | | | | | | | | | | | | Merge branch 'master' into SlabsHowaner2014-04-03335-6807/+18153
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove old functionHowaner2014-04-031-6/+0
| * | | | | | | | | | | | | | Grass now grows under up-side-down slabsHowaner2014-04-031-3/+12
* | | | | | | | | | | | | | | Merge pull request #990 from Howaner/EntitiesTiger Wang2014-05-072-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into fixesTiger Wang2014-05-0621-510/+743
| |\| | | | | | | | | | | |
| * | | | | | | | | | | | | 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-02181-2524/+4641
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | A tiny speed improvement in ApplyFoodExhaustion()Tiger Wang2014-04-271-5/+5
| * | | | | | | | | | | | | | More comments!Tiger Wang2014-04-272-3/+10
| * | | | | | | | | | | | | | Implemented suggestionsTiger Wang2014-04-241-7/+6
| * | | | | | | | | | | | | | Merge branch 'master' into fixesTiger Wang2014-04-2478-565/+3146
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Some change to Entity.cppTiger Wang2014-04-237-123/+105
| * | | | | | | | | | | | | | | Small changesTiger Wang2014-04-234-12/+15
* | | | | | | | | | | | | | | | Changed cPieceGenerator to support pairings.madmaxoft2014-05-053-57/+104
* | | | | | | | | | | | | | | | Prefabs can specify that they don't want flooring.madmaxoft2014-05-051-30/+33
* | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Removed convert-assign operator.madmaxoft2014-05-041-8/+0
| * | | | | | | | | | | | | | | Removed the controversial Vector3::operator <.madmaxoft2014-05-031-6/+0
| * | | | | | | | | | | | | | | Fixed float comparison warnings in Vector3.madmaxoft2014-05-031-5/+23
| * | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | Fixed crash on creating a world during plugin initialisationworktycho2014-05-051-1/+1
* | | | | | | | | | | | | | | | Fixed formattingTiger Wang2014-05-051-4/+5
* | | | | | | | | | | | | | | | Merge pull request #956 from mc-server/redstoneimprovementsTiger Wang2014-05-049-458/+627
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fixed 027efe09ea3d3222c3cbf169643e57773c1614aeTiger Wang2014-05-041-3/+49
| * | | | | | | | | | | | | | | | Merge branch 'master' into redstoneimprovementsTiger Wang2014-05-04145-2323/+4081
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fixed lever and button powering directionTiger Wang2014-05-041-16/+8
| * | | | | | | | | | | | | | | | | Redstone simulator now directly accesses cChunkTiger Wang2014-04-2710-453/+586
* | | | | | | | | | | | | | | | | | Fixed ProtoProxy compilation in MSVC2013.madmaxoft2014-05-041-1/+1
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Fixed pressure plate oversightsTiger Wang2014-05-041-2/+8
* | | | | | | | | | | | | | | | | Fixed portal Z direction loop coding failureTiger Wang2014-05-041-10/+9
* | | | | | | | | | | | | | | | | Hotfixed Chunked transfer encoding in Yggdrasil.madmaxoft2014-05-031-1/+1
* | | | | | | | | | | | | | | | | Fixed connection encryption.madmaxoft2014-05-031-1/+1
* | | | | | | | | | | | | | | | | Fixed vanilla fluid simulator.madmaxoft2014-05-031-4/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Seperate instructions for OSX and Linuxarchshift2014-05-031-3/+38
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fixed vanilla fluid simulator.madmaxoft2014-05-024-14/+20
* | | | | | | | | | | | | | | Fixed a buffer overflow in cChunk:SetLight().madmaxoft2014-05-021-2/+2
* | | | | | | | | | | | | | | Open files in shared mode on windows, so that other tools may read them.madmaxoft2014-05-021-2/+2
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed MagmaCube spawning.madmaxoft2014-05-021-0/+4
* | | | | | | | | | | | | | Added a sanitizer for Spawn egg damage value.madmaxoft2014-05-021-1/+39
* | | | | | | | | | | | | | APIDump: Updated the OnDisconnect hook docs.madmaxoft2014-05-021-7/+17
* | | | | | | | | | | | | | APIDump: Improved error handling in API file loader.madmaxoft2014-05-021-1/+5
* | | | | | | | | | | | | | HOOK_DISCONNECT has cClientHandle as its first parameter.madmaxoft2014-05-026-10/+10
* | | | | | | | | | | | | | Fixed warnings in ManualBindings.madmaxoft2014-05-011-20/+20
* | | | | | | | | | | | | | Fixed warnings in Lua helpers.madmaxoft2014-05-012-3/+3
| | | | | | | * | | | | | | Client cert is not requested.Mattes D2014-05-101-1/+1
| | | | | | | * | | | | | | Fixed cert filename in Linux script.madmaxoft2014-05-072-2/+2
| | | | | | | * | | | | | | Fixed an extra space.madmaxoft2014-05-061-1/+1
| | | | | | | * | | | | | | WebAdmin outputs a log message about HTTP / HTTPS status.madmaxoft2014-05-021-18/+31
| | | | | | | * | | | | | | Made the cert generation script executable on LinuxMattes D2014-05-021-0/+0
| | | | | | | * | | | | | | 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-015-2/+13
| | | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #973 from mc-server/ItemNoCopyConstructorMattes D2014-05-011-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Removed the explicit copy constructor for cItem.madmaxoft2014-05-011-0/+6
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Fixed MSVC2013 compilation.Mattes D2014-05-011-1/+1
* | | | | | | | | | | | | Merge pull request #971 from worktycho/polarssl-localworktycho2014-05-012-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Merged change to enable testing to be disabledTycho2014-05-011-0/+0
| * | | | | | | | | | | | | Changed polarssl repo to point to cloned copy of polarsslTycho2014-05-011-1/+1
* | | | | | | | | | | | | | Anvil saver pads data to 4K boundaries.madmaxoft2014-05-011-0/+5
| | | | | | | | * | | | | | Added a missing return statement.madmaxoft2014-05-011-0/+1
| | | | | | | | * | | | | | cSslContext has virtual destructor now.madmaxoft2014-05-011-1/+1
| | | | | | | | * | | | | | ProtoProxy: Renamed PublicKey to CryptoKey.madmaxoft2014-05-012-4/+4
| | | | | | | | * | | | | | Renamed PublicKey to CryptoKey in CMakeLists.txtMattes D2014-05-011-3/+2
| | | | | | | | * | | | | | Renamed cPublicKey to cCryptoKey.madmaxoft2014-05-019-41/+40
| | | | | | | | * | | | | | Fixed crashes in the SSL HTTP connection.madmaxoft2014-05-019-23/+36
| | | | | | | | * | | | | | Added a mention to run as admin.madmaxoft2014-05-011-0/+2
| | | | | | | | * | | | | | Added scripts for generating HTTPS cert and key.madmaxoft2014-05-012-0/+19
| | | | | | | | * | | | | | Implemented SSL connection for WebAdmin.madmaxoft2014-05-015-2/+195
| | | | | | | | * | | | | | 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
| | | | | | | | * | | | | | 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-3044-874/+2129
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Removed unneeded #includes.madmaxoft2014-04-291-6/+0
| * | | | | | | | | | | | | Moved the rest of the Crypto objects into their own respective files.madmaxoft2014-04-2917-436/+477
| * | | | | | | | | | | | | Moved cPublicKey to its separate file in PolarSSL++.madmaxoft2014-04-298-109/+127
| * | | | | | | | | | | | | Merge branch 'master' into SslWrappersmadmaxoft2014-04-293-12/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Added BiomeToString() API function.madmaxoft2014-04-292-81/+106
| * | | | | | | | | | | | | | Fixed ProtoProxy.madmaxoft2014-04-294-3/+25
| * | | | | | | | | | | | | | 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-28114-1350/+2209
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Added the G1 root cert.madmaxoft2014-04-281-2/+29
| * | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | Declared a SharedPtr that hopefully resolves on all platforms.madmaxoft2014-04-241-1/+9
| * | | | | | | | | | | | | | 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
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "Withers now use the new invulnerable."Howaner2014-04-282-10/+26
| * | | | | | | | | | | | | Revert "Changed the old invulnerable methods from the wither to the new."Howaner2014-04-285-28/+4
| * | | | | | | | | | | | | 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-262-11/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | Fixed unbraced ifsTycho2014-04-281-10/+40
| * | | | | | | | | | | | | | Removed inlines from combinatorsTycho2014-04-281-7/+7
| * | | | | | | | | | | | | | Template MagicTycho2014-04-284-173/+183
| * | | | | | | | | | | | | | Worked around const pointerTycho2014-04-271-2/+3
| * | | | | | | | | | | | | | Fixes to uninitallsed array access in Noise.cppTycho2014-04-271-0/+2
| * | | | | | | | | | | | | | Initalize counter in fastrandomTycho2014-04-271-1/+2
| * | | | | | | | | | | | | | Initialised MetaArrays in BlockAreaTycho2014-04-271-2/+6
| * | | | | | | | | | | | | | Removed unneeded assertTycho2014-04-271-1/+1
* | | | | | | | | | | | | | | Merge pull request #954 from mc-server/projectiles-splitMattes D2014-04-2827-857/+932
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Removed Old AssertsTycho2014-04-271-2/+0
| * | | | | | | | | | | | | | | Removed old unused codeTycho2014-04-271-5/+0
| * | | | | | | | | | | | | | | Fixed OnPluginMessage hook not exiting early.Tycho2014-04-271-1/+1
* | | | | | | | | | | | | | | | Merge pull request #959 from mc-server/fixes-2worktycho2014-04-274-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Revert "Creative players cannot throw ender pearls."archshift2014-04-271-16/+0
| * | | | | | | | | | | | | | | Creative players cannot throw ender pearls.archshift2014-04-271-0/+16
| * | | | | | | | | | | | | | | Added static const, initialized fields.archshift2014-04-274-2/+7
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Update CoverityModel.cppworktycho2014-04-271-3/+15
* | | | | | | | | | | | | | | Create CoverityModel.cppworktycho2014-04-271-0/+5
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #864 from mc-server/StatMattes D2014-04-272-0/+255
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Added some commentsandrew2014-04-272-2/+2
| * | | | | | | | | | | | | | Statistic/Achievement defsandrew2014-04-072-0/+255
* | | | | | | | | | | | | | | Another attempt at #889.madmaxoft2014-04-271-3/+5
* | | | | | | | | | | | | | | Merge pull request #948 from jfhumann/staticFixesMattes D2014-04-275-3/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | More small fixes.archshift2014-04-263-11/+11
| * | | | | | | | | | | | | | Moar alignment.archshift2014-04-261-7/+7
| * | | | | | | | | | | | | | Further refactored, Reverted Minecart changearchshift2014-04-2611-90/+62
| * | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | Removed extraneous switch{} in Start()archshift2014-04-262-17/+3
| * | | | | | | | | | | | | | Moved huge conditional out of InStateChasing(), improving readabilityarchshift2014-04-262-1/+20
| * | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | Refactored SendChat(), placing the message-type formatting into its own function.archshift2014-04-252-84/+81
* | | | | | | | | | | | | | | | Merge pull request #863 from mc-server/chunkysparsingMattes D2014-04-263-67/+166
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | Speed and memory improvementsTiger Wang2014-04-042-62/+15
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into chunkysparsingTiger Wang2014-04-03154-1003/+6127
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fixed some bugsTiger Wang2014-04-031-3/+5
| * | | | | | | | | | | | | | | | Performance improvements and chunk flipping fixedTiger Wang2014-04-021-30/+32
| * | | | | | | | | | | | | | | | Sort of implementation of chunk sparsingTiger Wang2014-03-232-18/+93
* | | | | | | | | | | | | | | | | Merge pull request #936 from archshift/patch-1Mattes D2014-04-261-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Needs the -stdlib linker flag too.archshift2014-04-261-0/+1
| * | | | | | | | | | | | | | | | Move to line 47.archshift2014-04-251-3/+1
| * | | | | | | | | | | | | | | | Use libc++ on OSXarchshift2014-04-251-0/+3
* | | | | | | | | | | | | | | | | Merge pull request #920 from axisd/masterMattes D2014-04-251-7/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | 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-2513-24/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/mc-server/MCServerr.ramazanov2014-04-244-9/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/mc-server/MCServerr.ramazanov2014-04-2358-531/+1259
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining #906r.ramazanov2014-04-231-9/+30
| * | | | | | | | | | | | | | | | | | | | Mobs shouldn't burn when it's Raining #906r.ramazanov2014-04-211-5/+12
* | | | | | | | | | | | | | | | | | | | | Updated MSVC side of CMake files after recent changes.madmaxoft2014-04-251-4/+2
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #935 from archshift/projectile-fixesMattes D2014-04-252-7/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | 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
| | |_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #938 from archshift/xcode-oopsMattes D2014-04-257-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Missed these CMakeLists.archshift2014-04-257-3/+17
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #937 from archshift/xcode-headersworktycho2014-04-2512-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | 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-2411-22/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | / / / / / / / / | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed class capitalization for the cave spider.archshift2014-04-244-7/+7
| * | | | | | | | | | | | | | | Fixed references to renamed files.archshift2014-04-246-9/+9
| * | | | | | | | | | | | | | | Rename mob source files to fit CamelCase.archshift2014-04-246-6/+0
| |/ / / / / / / / / / / / / /
* / / / / / / / / / / / / / / Changed cByteBuffer constructor to take a size_t instead of int.madmaxoft2014-04-242-2/+2
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Updated docs for StringToEnchantmentID.madmaxoft2014-04-232-2/+2
* | | | | | | | | | | | | | Updated NetherFort prefabs to latest Gallery content.madmaxoft2014-04-231-7/+29
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | The new leaves don't decay anymore.STRWarrior2014-04-231-0/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #925 from archshift/masterMattes D2014-04-234-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Renamed getter and setter for IsFireproof.archshift2014-04-233-4/+4
| * | | | | | | | | | | | Declaration that a mob is not fireproof is implicit.archshift2014-04-231-21/+0
| * | | | | | | | | | | | Added IsFireproof hook for monsters.iniarchshift2014-04-232-0/+29
| * | | | | | | | | | | | 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-223-5/+17
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Fixed indentation and changed m_Fireproof to m_IsFireproof.archshift2014-04-222-14/+14
| * | | | | | | | | | | | Fixed capitalization issuesarchshift2014-04-221-2/+2
| * | | | | | | | | | | | Lay foundation for fireproof entities.archshift2014-04-222-3/+15
* | | | | | | | | | | | | Revert moving gcc to g++11 in 18c3b1worktycho2014-04-221-8/+0
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #909 from jfhumann/fixesMattes D2014-04-2248-218/+263
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | 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-1846-811/+2166
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
* | | | | | | | | | | | | 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
* | | | | | | | | | | | Fixed enchanting return values.Mattes D2014-04-211-3/+3
* | | | | | | | | | | | Updated the nightbuild script.madmaxoft2014-04-201-1/+1
* | | | | | | | | | | | Fixed MSVC compilation.madmaxoft2014-04-201-1/+1
* | | | | | | | | | | | Merge pull request #890 from daniel0916/EnchantingMattes D2014-04-2018-9/+1509
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed Codedaniel09162014-04-192-145/+148
| * | | | | | | | | | | | Merge branch 'master' into Enchantingdaniel09162014-04-1910-29/+377
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | APIDump: Added a ChunkStay article.madmaxoft2014-04-193-27/+195
* | | | | | | | | | | | | 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
| * | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | 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-1829-426/+1507
| | | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | 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-1718-330/+457
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Compile fix?Tiger Wang2014-04-172-2/+10
| * | | | | | | | | | | 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
| * | | | | | | | | | | Simplified pickup speed randomisationTiger Wang2014-04-121-4/+3
* | | | | | | | | | | | Added area flooring.madmaxoft2014-04-171-1/+42
* | | | | | | | | | | | Added new AI rulesTiger Wang2014-04-177-55/+67
* | | | | | | | | | | | Added Prefab initializers to SELFTEST code.madmaxoft2014-04-171-1/+13
* | | | | | | | | | | | Prefabs can have per-piece per-placement weights.madmaxoft2014-04-175-32/+752
* | | | | | | | | | | | Merge pull request #896 from axisd/masterMattes D2014-04-171-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Mobs rotationr.ramazanov2014-04-171-4/+6
* | | | | | | | | | | | | Added asserts for proper game state.madmaxoft2014-04-161-5/+131
|/ / / / / / / / / / / /
| | | * | | | | | | | | 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-1624-382/+696
| | | |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | 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
* | | | | | | | | | | | NetherFortPrefabs: Fixed a connector in MidStaircase.madmaxoft2014-04-151-1/+1
* | | | | | | | | | | | Merge pull request #888 from mc-server/Proto176Mattes D2014-04-1516-333/+571
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Implemented the 1.7.6 protocol and authenticator.madmaxoft2014-04-1410-128/+198
| * | | | | | | | | | | | A client UUID is generated when the server is in offline mode.madmaxoft2014-04-143-5/+40
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | | Initial 1.7.6 protocol support.madmaxoft2014-04-144-2/+69
|/ / / / / / / / / / / / /
* | | | | / / / / / / / / ProtoProxy: Fixed weird gcc compilation errors.madmaxoft2014-04-141-16/+22
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | ProtoProxy: Added 1.7.9 compatibility.madmaxoft2014-04-141-0/+29
* | | | | | | | | | | | ChunkStay must be disabled while being deleted.ProtoProxy_1.7.2_001madmaxoft2014-04-123-4/+6
* | | | | | | | | | | | Fixed chunkstays not being removed on auto-delete.madmaxoft2014-04-122-10/+19
|/ / / / / / / / / / /
| | | * | | | | | | | 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
| | | * | | | | | | | 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
| | | * | | | | | | | 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-1212-2057/+3454
| | | |\ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Updated the NetherFort prefabs to current Gallery contents.madmaxoft2014-04-123-1958/+3329
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fixed issues with 64-bit MSVC compilation.madmaxoft2014-04-113-21/+35
|/ / / / / / / / /
* | | | | | | | | Fixed enchantment parsing.madmaxoft2014-04-101-12/+17
* | | | | | | | | InfoReg uses cCompositeChat for subcommand lists.madmaxoft2014-04-101-6/+6
* | | | | | | | | Merge pull request #878 from mc-server/mobexpMattes D2014-04-101-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 loadedTycho2014-04-081-1/+1
* | | | | | | | | | 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 chunkmapTycho2014-04-081-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #870 from wiseoldman95/patch-1Alexander Harkness2014-04-081-10/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Uppercased Zwiseoldman952014-04-081-3/+3
| * | | | | | | | | | Comments: Inverted Z axis.wiseoldman952014-04-081-9/+10
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #869 from wiseoldman95/patch-1Alexander Harkness2014-04-081-9/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added comments regarding latching and orientationwiseoldman952014-04-081-9/+31
|/ / / / / / / / / /
* | | | | | | | | | Fixed the thing properly.Alexander Harkness2014-04-081-8/+8
* | | | | | | | | | Merge pull request #862 from mc-server/redstonefixAlexander Harkness2014-04-081-23/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed #859Tiger Wang2014-04-071-23/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #865 from wiseoldman95/patch-2Alexander Harkness2014-04-071-13/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
|/ / / / / / / / / /
| | | * | | | | | | Fixed Bookshelves Checking (not completly)daniel09162014-04-121-7/+10
| | | * | | | | | | Added complete Enchanting Systemdaniel09162014-04-128-147/+803
| | | * | | | | | | 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-07711-62011/+38666
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | 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 latchingTycho2014-04-062-2/+65
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Fixed HTTP chunked encoding.madmaxoft2014-04-071-1/+1
* | | | | | | | | Added the generated ZBS API file to ignore list.madmaxoft2014-04-061-0/+2
* | | | | | | | | 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
* | | | | | | | | Updated the tolua executable for Windows.madmaxoft2014-04-061-0/+0
* | | | | | | | | Merge remote-tracking branch 'worktycho/override'madmaxoft2014-04-067-1325/+1648
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Added forgoten lua fileTycho2014-04-061-0/+1476
| * | | | | | | | Merge branch 'master' into overrideTycho2014-04-05200-1373/+6707
| |\| | | | | | |
| * | | | | | | | Fixed tolua++ override supportTycho2014-04-025-1319/+164
| * | | | | | | | Added override specifier to functions declared in cWorldTycho2014-03-221-8/+8
| * | | | | | | | FIrst attempt at adding override support to toluaTycho2014-03-221-5/+6
* | | | | | | | | Updated cWorld::CreateProjectile() documentationTiger Wang2014-04-061-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Fixed Endiannes conversion routines for floats and doubles.madmaxoft2014-04-052-3/+3
* | | | | | | | Fixed double projectile spawning.madmaxoft2014-04-051-1/+0
* | | | | | | | Removed debugging log from entity physics handling.madmaxoft2014-04-051-1/+2
* | | | | | | | Added more API documentation to cCompositeChat.madmaxoft2014-04-051-1/+17
* | | | | | | | Added cPlayer:SendRotation() API function.madmaxoft2014-04-052-0/+17
* | | | | | | | Merge pull request #840 from Howaner/NewBlocksMattes D2014-04-043-5/+152
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
| * | | | | | | | door -> flowerHowaner2014-03-281-1/+1
| * | | | | | | | Add tall flower handler.Howaner2014-03-282-0/+99
* | | | | | | | | Merge branch 'master' into HTTPSizeTmadmaxoft2014-04-0439-581/+359
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
| * | | | | | | | | ProtoProxy: Fixed a few Clang and MSVC warnings.madmaxoft2014-04-042-4/+8
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | APIDump: Added angular specifics.madmaxoft2014-04-031-2/+2
| * | | | | | | | Documented the units and range for entity rotations.madmaxoft2014-04-032-10/+10
| * | | | | | | | 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
| * | | | | | | Merge pull request #849 from mc-server/minorfixesMattes D2014-04-026-48/+34
| |\ \ \ \ \ \ \
| | * | | | | | | 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-0224-30/+45
|\| | | | | | | |
| * | | | | | | | 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-0219-19/+21
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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-2516-15/+20
| | * | | | | | | | 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-0214-18/+375
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into globalsTycho2014-04-02178-4454/+11512
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pull request #831 from mc-server/WitherMattes D2014-04-025-3/+153
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fixed clang compilationandrew2014-03-252-14/+17
| | | * | | | | | | | | Fixed wither summoningandrew2014-03-253-3/+37
| | | * | | | | | | | | Protocol: Wither metadataandrew2014-03-255-3/+116
| | * | | | | | | | | | Debuggers: Added a Base64 API roundtrip test.madmaxoft2014-04-021-4/+23
| | * | | | | | | | | | 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-013-1/+52
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | APIDump: Gave msDifference it's own table.STRWarrior2014-04-011-9/+21
| | | * | | | | | | | | | Added extra table which should make it more clear what msDifference does.STRWarrior2014-03-311-1/+3
| | | * | | | | | | | | | Fixed typoSTRWarrior2014-03-311-1/+1
| | | * | | | | | | | | | Documented msDifferenceSTRWarrior2014-03-311-6/+8
| | | * | | | | | | | | | Added new merge strategy "msDifference"STRWarrior2014-03-312-0/+35
| | * | | | | | | | | | | cBlockArea: Added the msMask merge strategy.madmaxoft2014-04-013-3/+59
| * | | | | | | | | | | | Merge branch 'master' into globalsTycho2014-03-1511-40/+146
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into globalsTycho2014-03-144-11/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Disable global constructors and exit-time destructors warningsTycho2014-03-141-2/+2
* | | | | | | | | | | | | | | 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
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Removed the exit-time-destructors flag from clang.madmaxoft2014-04-011-1/+1
* | | | | | | | | | | | | | More cFile warning fixes.madmaxoft2014-04-011-1/+1
* | | | | | | | | | | | | | Merge branch 'RemoveClangFlags'madmaxoft2014-04-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Attempt at disabling the useless clang warnings.madmaxoft2014-04-011-0/+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
* | | | | | | | | | | | | | | 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-016-24/+81
* | | | | | | | | | | | | | APIDump: Documented the cCompositeChat support in logging functions.madmaxoft2014-03-311-5/+25
* | | | | | | | | | | | | | Console logging supports cCompositeChat as its parameters.madmaxoft2014-03-315-34/+78
* | | | | | | | | | | | | | APIDump: Added code completion support file to ZBS tutorial.madmaxoft2014-03-311-1/+2
* | | | | | | | | | | | | | APIDump: Renamed the ZBS API dump file to mcserver_api.lua.madmaxoft2014-03-311-2/+2
* | | | | | | | | | | | | | cCompositeChat has a MessageType param in the constructor.madmaxoft2014-03-312-3/+3
* | | | | | | | | | | | | | 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-3012-26/+3248
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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
| * | | | | | | | | | | | Merge branch 'master' into NetherFortGenmadmaxoft2014-03-2917-27/+285
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | NetherFortGen: Added several more prefabs.madmaxoft2014-03-282-2/+783
| * | | | | | | | | | | | | 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-284-13/+68
| * | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | Merge branch 'master' into NetherFortGenmadmaxoft2014-03-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Initial NetherFortGen import.madmaxoft2014-03-288-15/+713
* | | | | | | | | | | | | | | APIDump: Added article: Setting up ZeroBrane Studio.madmaxoft2014-03-304-0/+46
* | | | | | | | | | | | | | | Merge pull request #845 from mc-server/LicenseAlexander Harkness2014-03-301-1/+196
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Apache licenseandrew2014-03-301-1/+196
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #834 from narroo/issue503Mattes D2014-03-3023-121/+372
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | Implemented lilypad placementTiger Wang2014-03-234-8/+98
* | | | | | | | | | | | | | | | cPrefab now uses a struct for block type definition in CharMap.madmaxoft2014-03-292-10/+102
* | | | | | | | | | | | | | | | Merge pull request #842 from mc-server/ProjectileHooksMattes D2014-03-2910-1/+167
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed the OnProjectileHitBlock hook not stopping projectiles.STRWarrior2014-03-291-1/+1
| * | | | | | | | | | | | | | | Documented both hooks.STRWarrior2014-03-292-0/+49
| * | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | Updated the android filesSTRWarrior2014-03-291-12/+12
* | | | | | | | | | | | | | | Fixed players not updating after world changeTiger Wang2014-03-291-4/+2
* | | | | | | | | | | | | | | 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-2814-6/+132
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add missing ChunkDesc import.Howaner2014-03-281-1/+1
| * | | | | | | | | | | | Fix merge conflictsHowaner2014-03-271-7/+0
| * | | | | | | | | | | | Change documentation textHowaner2014-03-272-4/+4
| * | | | | | | | | | | | Change SpreadSource documentationHowaner2014-03-272-6/+6
| * | | | | | | | | | | | Change SpreadSource prefix to ssHowaner2014-03-274-8/+8
| * | | | | | | | | | | | Wrong if in BlockLeavesHowaner2014-03-271-1/+1
| * | | | | | | | | | | | Add documentation for new Block spreadHowaner2014-03-272-0/+49
| * | | | | | | | | | | | 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
* | | | | | | | | | | | | Debuggers: Deactivated the chunk generator callback.madmaxoft2014-03-281-1/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | cPrefab can draw itself into a cChunkDesc.madmaxoft2014-03-272-6/+9
* | | | | | | | | | | | Fixed chunk neighbor-getting for long distances.madmaxoft2014-03-271-0/+11
* | | | | | | | | | | | Prefabs support connectors, rotations and merge strategy.madmaxoft2014-03-262-3/+72
* | | | | | | | | | | | Ignoring the default GalExports folder.madmaxoft2014-03-251-0/+1
* | | | | | | | | | | | Removed unused constants.madmaxoft2014-03-252-7/+1
* | | | | | | | | | | | Added a basic cPrefab class.madmaxoft2014-03-252-0/+222
* | | | | | | | | | | | 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
* | | | | | | | | | | | InfoReg updated for multi-verb console commands.madmaxoft2014-03-251-12/+39
* | | | | | | | | | | | Merge pull request #833 from mc-server/EnderCrystalMattes D2014-03-257-11/+137
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Ender crystalsandrew2014-03-257-11/+137
* | | | | | | | | | | | Merge pull request #828 from mc-server/WitherMattes D2014-03-259-15/+109
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | 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.Howaner2014-03-241-1/+7
* | | | | | | | | | | Fixed bad cmake document interpretationTiger Wang2014-03-231-1/+1
* | | | | | | | | | | Updated the ToLua windows executable.madmaxoft2014-03-231-0/+0
* | | | | | | | | | | Merge pull request #826 from worktycho/xxd_checkMattes D2014-03-231-6/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Added Additonal check for xxd existanceTycho2014-03-221-6/+9
* | | | | | | | | | | Merge pull request #810 from worktycho/size_t_luaMattes D2014-03-222-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into size_t_luaTycho2014-03-2275-3909/+5072
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Implemented faster upscaling using templates.madmaxoft2014-03-216-36/+38
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | Updated the tolua++ executable for Win builds.madmaxoft2014-03-201-0/+0
* | | | | | | | | | Merge branch 'unreachable'madmaxoft2014-03-2019-2762/+3656
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixed enum checking functions not being called in generated codeTycho2014-03-208-2569/+2572
| * | | | | | | | | Fixed bugs in patched tolua outputTycho2014-03-1910-2211/+2531
| * | | | | | | | | Merge branch 'master' into unreachableTycho2014-03-196-459/+420
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added unreachable lines backit prtected by preprocessor guardsTycho2014-03-192-0/+10
| * | | | | | | | | | Fixed tolua emitting isnumber insteand of is<Enum>Tycho2014-03-194-449/+462
| * | | | | | | | | | Fixed type error in lua bindingsTycho2014-03-192-162/+163
| * | | | | | | | | | Fixed =~ bugTycho2014-03-172-2/+2
| * | | | | | | | | | Merge branch 'master' into unreachableTycho2014-03-1740-246/+878
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Made buffers static constTycho2014-03-164-6/+6
* | | | | | | | | | | | Plugins can set flying speed.madmaxoft2014-03-204-80/+124
* | | | | | | | | | | | APIDump: Fixed wrong escaped strings.madmaxoft2014-03-201-5/+5
* | | | | | | | | | | | Rewritten player speeds to be relative unit-less.madmaxoft2014-03-205-17/+22
* | | | | | | | | | | | ProtoProxy: Fixed MSVC compilation.madmaxoft2014-03-201-2/+4
* | | | | | | | | | | | 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
* | | | | | | | | | | | Merge pull request #790 from mc-server/awesometntMattes D2014-03-209-217/+258
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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-18135-1116/+3244
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added levels of shrapnelTiger Wang2014-03-183-8/+18
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into awesometntTiger Wang2014-03-1032-213/+802
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into awesometntTiger Wang2014-03-1088-626/+2146
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Shrapnel now configurableTiger Wang2014-03-103-3/+8
| * | | | | | | | | | | | | | | Added extra awesomeness to TNTTiger Wang2014-03-057-209/+232
* | | | | | | | | | | | | | | | Errors in Lua don't include the error handler in the stack trace.madmaxoft2014-03-192-7/+7
* | | | | | | | | | | | | | | | APIDump: Updated comments to reflect current code.madmaxoft2014-03-191-1/+4
* | | | | | | | | | | | | | | | APIDump: Added ZeroBraneStudio API export.madmaxoft2014-03-191-5/+128
| |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | APIDump: Reformatted the plugin to avoid all ZBS Analyzer issues.madmaxoft2014-03-191-443/+404
* | | | | | | | | | | | | | | LuaChunkStay: Removed a debugging output.madmaxoft2014-03-191-3/+0
| |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed chunkmap tree block replacing.madmaxoft2014-03-181-8/+2
* | | | | | | | | | | | | | Debuggers: Using binary file mode for .schematics.madmaxoft2014-03-181-2/+2
* | | | | | | | | | | | | | Fixed cGZipFile::ReadRestOfFile returning incorrect value.madmaxoft2014-03-181-1/+4
* | | | | | | | | | | | | | Fixed a crash in firework rockets.madmaxoft2014-03-171-2/+8
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | 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 #811 from mc-server/DumpInfoMattes D2014-03-161-0/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Only check for "Info.lua" with capital ISTRWarrior2014-03-161-1/+1
| * | | | | | | | | | | | | Created a small plugin for InfoDumpSTRWarrior2014-03-151-0/+49
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #782 from mc-server/bedsMattes D2014-03-165-17/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed VERIFYTiger Wang2014-03-091-1/+1
| * | | | | | | | | | | | | Beds now work properly fixes #707Tiger Wang2014-03-095-17/+94
* | | | | | | | | | | | | | Merge pull request #809 from Howaner/BlockEntitysMattes D2014-03-1619-99/+512
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | 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-15139-1288/+3421
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | Fixed InfoReg.lua's handling of multi-level commands.madmaxoft2014-03-161-2/+2
* | | | | | | | | | | | | | | | Removed the @EnableMobDebug.lua file.madmaxoft2014-03-161-29/+0
* | | | | | | | | | | | | | | | Added common eMessageType aliases.madmaxoft2014-03-161-10/+16
* | | | | | | | | | | | | | | | Merge pull request #814 from Howaner/CakeMattes D2014-03-164-0/+101
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Change if-clause in BlockCake.hHowaner2014-03-161-1/+1
| * | | | | | | | | | | | | | Add cakeHowaner2014-03-164-0/+101
|/ / / / / / / / / / / / / /
| | | | | | | | * / / / / / Patched tolua to understand size_tTycho2014-03-152-1/+4
| | | | | | | |/ / / / / /
| | | | | | | * | | | | | Fix indentationTycho2014-03-151-1/+1
| | | | | | | * | | | | | Fixed unessicary returnTycho2014-03-151-1/+0
| | | | | | | * | | | | | Merge branch 'master' into unreachableTycho2014-03-1511-38/+143
| | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Debuggers: Added a test for WE selection API.madmaxoft2014-03-151-1/+39
* | | | | | | | | | | | | APIDump: Documented a forgotten cCuboid constructor.madmaxoft2014-03-151-1/+2
* | | | | | | | | | | | | 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.madmaxoft2014-03-121-1/+1
* | | | | | | | | | | | | | APIDump: Fixed missing return statement.madmaxoft2014-03-151-0/+1
* | | | | | | | | | | | | | Added cCuboid:Assign(OtherCuboid) API function.madmaxoft2014-03-153-2/+21
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Ignoring all config and SQLite files in the output folder.madmaxoft2014-03-141-4/+2
* | | | | | | | | | | | | APIDump: Trigger the dump manually.madmaxoft2014-03-141-26/+64
* | | | | | | | | | | | | Merge pull request #808 from worktycho/noreturnMattes D2014-03-144-3/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into noreturnTycho2014-03-144-11/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Added Noreturn attribtes to a couple of functions and made a missing noreturn an errorTycho2014-03-144-5/+12
| * | | | | | | | | | | | Added NORETURN macroTycho2014-03-141-0/+4
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | | | | | | | * | | | Patched tolua to emit range checks for enumsTycho2014-03-158-1747/+2303
| | | | | | | | * | | | Fixed a couple of unneeded returns in ProtoProxyTycho2014-03-141-4/+0
| | | | | | | | * | | | Merge branch 'master' into unreachableTycho2014-03-144-11/+3
| | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #805 from worktycho/undefMattes D2014-03-144-11/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed a couple of missing defsTycho2014-03-144-11/+3
* | | | | | | | | | | | | Merge pull request #798 from worktycho/warningsworktycho2014-03-1445-202/+224
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | | | | | | | | * | | | Made unreachable code an errorTycho2014-03-141-1/+1
| | | | | | | | | * | | | 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
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into warningsTycho2014-03-142-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / /
* | | | | | | | | | | cPlugin:BindConsoleCommand can be called statically.madmaxoft2014-03-141-1/+4
* | | | | | | | | | | Fixed a warning.madmaxoft2014-03-141-3/+3
| * | | | | | | | | | Fixed xofts issuesTycho2014-03-1410-23/+24
| * | | | | | | | | | Merge branch 'master' into warningsTycho2014-03-143-15/+17
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #793 from xdot/masterMattes D2014-03-141-9/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Vector3: More castsandrew2014-03-121-9/+9
* | | | | | | | | | | | cPluginManager:Bind[Console]Command returns true on success.madmaxoft2014-03-142-6/+8
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| | * | | | | | | | | 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-1246-657/+675
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fixed printf format compatabiltyTycho2014-03-122-5/+9
| | | * | | | | | | | | Merge branch 'master' into WerrorTycho2014-03-1245-649/+663
| | | |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | 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
| |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Moved Lua API registering into a separate function.madmaxoft2014-03-124-2/+17
* | | | | | | | | | | 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
* | | | | | | | | | | | APIDump: Removed old documentation, documented some new functions.madmaxoft2014-03-112-6/+17
* | | | | | | | | | | | Merge pull request #786 from mc-server/cBlockArea_OffsetMattes D2014-03-124-1/+56
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | APIDump: Updated WEOffset-related docs.madmaxoft2014-03-121-7/+7
| * | | | | | | | | | | Renamed cBlockArea Offset to WEOffset.madmaxoft2014-03-123-8/+9
| * | | | | | | | | | | Merge branch 'master' into cBlockArea_Offsetmadmaxoft2014-03-1283-505/+2609
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fixed APIDumpSTRWarrior2014-03-111-1/+1
| * | | | | | | | | | | Documented the functions.STRWarrior2014-03-111-0/+6
| * | | | | | | | | | | 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-122-3/+3
| | * | | | | | | | | Added macros support to toolsTycho2014-03-112-2/+10
| | * | | | | | | | | made format-nonliteral an errorTycho2014-03-111-1/+0
| | * | | | | | | | | 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
| | |/ / / / / / / /
| | * | | | | | | | Rollback submodule changeTycho2014-03-111-0/+0
| | * | | | | | | | Fixed Chunkdef warningsTycho2014-03-111-2/+2
| | * | | | | | | | Move commentTycho2014-03-111-1/+1
| | * | | | | | | | Fixed Warnings in PieceGeneratorTycho2014-03-112-9/+9
| | * | | | | | | | Merge branch 'master' into WerrorTycho2014-03-1111-36/+1364
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #791 from mc-server/PieceGeneratorMattes D2014-03-1011-30/+1358
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removed debugging output.madmaxoft2014-03-101-1/+3
| * | | | | | | | | | POCPieces: Added height.madmaxoft2014-03-101-17/+20
| * | | | | | | | | | 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
| * | | | | | | | | | 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
| * | | | | | | | | | | | 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
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | | | | * | | | | | | Merge branch 'master' into WerrorTycho2014-03-103-3/+18
| | | | | |\ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #767 from worktycho/envmatrixMattes D2014-03-103-3/+18
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Prepended Travis to env varsTycho2014-03-102-9/+11
| * | | | | | | | | | | | Move env code part 2worktycho2014-03-071-0/+9
| * | | | | | | | | | | | Fixed wrong path in debug modeworktycho2014-03-071-5/+5
| * | | | | | | | | | | | Move env code part 1worktycho2014-03-071-10/+0
| * | | | | | | | | | | | Added travis support for multiple build typesTycho2014-03-071-1/+7
| * | | | | | | | | | | | Added support to overide CMake build type with env varsTycho2014-03-071-0/+8
| | | | | | * | | | | | | Merge branch 'master' into WerrorTycho2014-03-100-0/+0
| | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Revert "Fixed some warnings"madmaxoft2014-03-101-10/+7
| | | | | | * | | | | | | Fixed xofts issuesTycho2014-03-105-21/+15
| | | | | | * | | | | | | Fixed test assertsTycho2014-03-104-37/+37
| | | | | | * | | | | | | Fixed assertTycho2014-03-101-14/+17
| | | | | | * | | | | | | Fixed Issues in ProtoProxyTycho2014-03-102-9/+9
| | | | | | * | | | | | | Merge branch 'master' into WerrorTycho2014-03-101-7/+19
| | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #779 from mc-server/tntburnexplodeAlexander Harkness2014-03-101-7/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge pull request #788 from worktycho/warningsAlexander Harkness2014-03-101-7/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | Enable error on cast-align and unused macrosTycho2014-03-101-1/+0
| | | | | | | | * | | | | | 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-1031-206/+792
| | | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Fixed MSVC2008 compilation.madmaxoft2014-03-101-4/+4
* | | | | | | | | | | | | | Merge pull request #768 from Howaner/BlockEntitysTiger Wang2014-03-0913-31/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Change tnt documentation to ticksHowaner2014-03-081-3/+3
| * | | | | | | | | | | | | Merge branch 'master' into BlockEntitysHowaner2014-03-0826-67/+682
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Change TNT Fuse to ticksHowaner2014-03-089-21/+20
| * | | | | | | | | | | | | | Add new tnt documentationHowaner2014-03-081-2/+3
| * | | | | | | | | | | | | | Add TNT Save/Load and add Netbeans projects to .gitignoreHowaner2014-03-087-18/+79
* | | | | | | | | | | | | | | Merge pull request #731 from mc-server/ballisticmissilesTiger Wang2014-03-0921-174/+699
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | != FACE_NONETiger Wang2014-03-091-1/+1
| * | | | | | | | | | | | | | | Merge branch 'master' into ballisticmissilesTiger Wang2014-03-09134-1380/+3944
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | Added extra dye rules to crafting.txtTiger Wang2014-03-091-1/+8
| * | | | | | | | | | | | | | | | Improved formatting of username tabcompleteTiger Wang2014-03-091-7/+7
| * | | | | | | | | | | | | | | | Moved firework handler to separate functionTiger Wang2014-03-092-48/+48
| * | | | | | | | | | | | | | | | 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-2715-87/+637
* | | | | | | | | | | | | | | | | Mentiod that we use some c++11 exstensionsworktycho2014-03-091-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| | | | | | | | | | | | * | | | Be more parinoid about int sizesTycho2014-03-093-5/+18
| | | | | | | | | | | | * | | | Fixed Mesannine twister to use UInt32Tycho2014-03-095-4/+6
| | | | | | | | | | | | * | | | Merge branch 'master' into WerrorTycho2014-03-0922-184/+302
| | | | | | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Updated CoreTiger Wang2014-03-091-0/+0
| |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Slight plugin messaging changesTiger Wang2014-03-091-0/+13
* | | | | | | | | | | | Added switch case indent noticeMattes D2014-03-081-0/+2
* | | | | | | | | | | | Merge pull request #729 from worktycho/MetaRotateMattes D2014-03-0813-151/+202
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | 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-0132-172/+595
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
| | | | | | | | | * | | | Only enable -Werror in gcc because gcc doesn't let you suppress enum missmatch warningsTycho2014-03-091-2/+2
| | | | | | | | | * | | | Treat enum missmatches as warnings for now as there is such a large number of them.Tycho2014-03-091-1/+1
| | | | | | | | | * | | | Globals.h is now warnings free again.Tycho2014-03-093-11/+25
| | | | | | | | | * | | | 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
| | | | | | | | | * | | | Lots more warningsTycho2014-03-091-0/+9
| | | | | | | | | * | | | Merge branch 'warnings' into WerrorTycho2014-03-091-7/+10
| | | | | | | | | |\ \ \ \ | | | | | | | | |_|/ / / / | | | | | | | |/| | | | |
| | | | | | | * | | | | | Fixed some warningsTycho2014-03-091-7/+10
| | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | | | | | | * | | | Enabled loads of clang warningsTycho2014-03-091-0/+2
| | | | | | | | * | | | Merge branch 'warnings' into WerrorTycho2014-03-091-1/+1
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | FIxed int in testTycho2014-03-091-1/+1
| | | | | | | | * | | | Merge branch 'warnings' into WerrorTycho2014-03-0910-37/+45
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | 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
| | | | | | | | * | | | Turned off Wunused-parameterTycho2014-03-091-1/+1
| | | | | | | | * | | | Merge branch 'warnings' into WerrorTycho2014-03-081-3/+3
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Actually Fixed ByteBufferTycho2014-03-081-3/+3
| | | | | | | | * | | | Merge branch 'warnings' into WerrorTycho2014-03-080-0/+0
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Disable -Werror on this branchworktycho2014-03-081-1/+1
| | | | | | | | * | | | Merge branch 'warnings' into WerrorTycho2014-03-0810-25/+108
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch 'master' into warningsTycho2014-03-0810-25/+108
| | | |\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #770 from xdot/masterAlexander Harkness2014-03-083-11/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | cBlockInfo-related changes from #723andrew2014-03-083-11/+21
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #764 from xdot/masterMattes D2014-03-073-4/+74
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added some commentsandrew2014-03-072-1/+6
| * | | | | | | | | | | Fixed water/lava interactionandrew2014-03-073-4/+69
* | | | | | | | | | | | Fixed cBlockArea schematic string saving signature.madmaxoft2014-03-074-10/+13
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| | | | | | | * | | | Turned on WerrorTycho2014-03-071-1/+1
| | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | WarningsTycho2014-03-072-1/+3
| | | | * | | | | | WarningsTycho2014-03-0711-29/+42
| | | | * | | | | | Fixed warningsTycho2014-03-072-3/+21
| | | | * | | | | | Fixed warningsTycho2014-03-074-2/+6
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #765 from worktycho/fastmathMattes D2014-03-071-2/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed clang compileworktycho2014-03-071-1/+6
| * | | | | | | | | Only use fast-math in exesworktycho2014-03-071-6/+3
| * | | | | | | | | Enabled -ffast-mathworktycho2014-03-071-1/+6
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #763 from Howaner/BlockEntitysMattes D2014-03-0722-101/+435
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Link cItem in the documentationHowaner2014-03-072-3/+3
| * | | | | | | | Add missing documentation filesHowaner2014-03-072-0/+16
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | 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
* | | | | | | | | Rewound PolarSSL to master branch.madmaxoft2014-03-071-0/+0
* | | | | | | | | Debuggers: Added a test of the cBlockArea string-serialization.madmaxoft2014-03-071-0/+38
* | | | | | | | | APIDump: Documented cBlockArea string-serialization functions.madmaxoft2014-03-071-0/+2
* | | | | | | | | Added cBlockArea serialization to string.madmaxoft2014-03-073-38/+202
* | | | | | | | | Merge remote-tracking branch 'xdot/master'madmaxoft2014-03-066-17/+238
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Implemented vanilla-like fluid simulatorandrew2014-03-056-17/+238
* | | | | | | | | Merge pull request #747 from mc-server/InfoDump_GithubMattes D2014-03-061-19/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | The APIDump generates a list of all the permissions again.STRWarrior2014-03-051-7/+7
| * | | | | | | | | Fixed typoSTRWarrior2014-03-021-1/+1
| * | | | | | | | | Simplified and more clearer infodump for Github.STRWarrior2014-03-021-14/+7
* | | | | | | | | | APIDump: Documented the cCompositeChat class.madmaxoft2014-03-051-0/+52
* | | | | | | | | | APIDump: Ignoring classes by exact match.madmaxoft2014-03-051-10/+10
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Fixed some gcc warnings in Defines.h.madmaxoft2014-03-041-3/+3
* | | | | | | | | Debuggers: Added simple test for cCompositeChat.madmaxoft2014-03-041-0/+15
* | | | | | | | | Manually exported cCompositeChat modifiers.madmaxoft2014-03-042-7/+268
* | | | | | | | | cLuaState: Made public the GetStackValue() functions.madmaxoft2014-03-042-54/+61
* | | | | | | | | Fixed an assert in map-loading.madmaxoft2014-03-041-3/+1
* | | | | | | | | Fixed previous weather changes.madmaxoft2014-03-032-4/+5
* | | | | | | | | Merge pull request #746 from Howaner/SlabsMattes D2014-03-034-19/+96
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | 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
* | | | | | | | Merge pull request #748 from xdot/masterMattes D2014-03-0211-73/+67
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | 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-0241-503/+1045
|\ \ \ \ \ \ \
| * | | | | | | GetById => Getandrew2014-03-024-32/+32
| * | | | | | | APIDump: ID -> Typeandrew2014-03-021-10/+10
| * | | | | | | Removed g_BlockXXX arraysandrew2014-03-024-440/+4
| * | | | | | | Manually exported g_Block tablesandrew2014-03-024-0/+445
| * | | | | | | Exported cBlockInfoandrew2014-03-023-3/+41
| * | | | | | | g_BlockXXX => cBlockInfo::XXXandrew2014-03-0133-73/+91
| * | | | | | | Refactored global block property arraysandrew2014-03-012-0/+477
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #745 from tonibm19/masterMattes D2014-03-022-10/+34
|\ \ \ \ \ \ \
| * | | | | | | Creeper fixestonibm192014-03-022-10/+34
|/ / / / / / /
* | | | | | | Merge pull request #733 from Howaner/SlabsMattes D2014-03-023-13/+35
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Use switch in GetStepSoundHowaner2014-02-282-8/+6
| * | | | | | Merge branch 'master' into SlabsHowaner2014-02-2815-42/+171
| |\ \ \ \ \ \
| * | | | | | | 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
* | | | | | | Ignoring all plugin subfolders.madmaxoft2014-03-011-0/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #735 from xdot/masterMattes D2014-03-017-107/+292
|\ \ \ \ \ \
| * | | | | | APIDump: Fixed cScoreboard enumsandrew2014-03-011-17/+17
| * | | | | | Exported cScoreboard::ForEachTeamandrew2014-03-014-1/+35
| * | | | | | Shortened enumsandrew2014-03-014-58/+58
| * | | | | | Exported cScoreboard::ForEachObjectiveandrew2014-03-014-4/+44
| * | | | | | Exported and documented cScoreboardandrew2014-03-015-49/+160
* | | | | | | Merge pull request #737 from mc-server/InfoDump_SourceLocationMattes D2014-03-011-1/+4
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Using comma instead of string concatenation.STRWarrior2014-03-011-1/+1
| * | | | | | If there is a SourceLocation available the InfoDump will note it in the forum version.STRWarrior2014-03-011-1/+4
* | | | | | | DoxyFile: Updated after all the folder renaming.madmaxoft2014-03-011-3/+1
|/ / / / / /
* / / / / / APIDump: Documented cRoot:CreateAndInitializeWorld.STRWarrior2014-03-011-0/+1
|/ / / / /
* | | | | Forgotten changes to cChunkInterface.madmaxoft2014-03-011-2/+2
* | | | | Removed cBlockHandler forward declaration from cChunkInterface.madmaxoft2014-03-011-9/+22
* | | | | 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-282-4/+7
* | | | | Moved common cGroupManager code to a separate function.madmaxoft2014-02-283-12/+30
| |/ / / |/| | |
* | | | Merge pull request #709 from Howaner/GlobalFixesMattes D2014-02-288-24/+112
|\ \ \ \
| * | | | 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
* | | | | Added a MobDebug enabler script.madmaxoft2014-02-281-0/+29
* | | | | Better fix for the 32-bit float reading.madmaxoft2014-02-281-4/+5
* | | | | Fixed compatibility with ZeroBraneStudio and LuaRocks.madmaxoft2014-02-282-1/+5
* | | | | Merge pull request #730 from tonibm19/masterAlexander Harkness2014-02-271-0/+2
|\ \ \ \ \
| * | | | | added mooshroom to cow conversiontonibm192014-02-271-0/+2
* | | | | | Added a "nooutbuf" cmdline param.madmaxoft2014-02-272-13/+18
| |_|/ / / |/| | | |
* | | | | Fixed crash and some warnings in map handling.madmaxoft2014-02-272-3/+5
| |_|/ / |/| | |
* | | | Fixed a gcc warning in FastNBT.h.madmaxoft2014-02-261-2/+11
* | | | Attempted fix for several GCC warnings.madmaxoft2014-02-263-3/+15
|/ / /
* | | APIDump: Added Geometry file to project.madmaxoft2014-02-261-0/+3
* | | APIDump: Documented new cCuboid functions.madmaxoft2014-02-261-1/+6
* | | APIDump: Separated out Geometry-related classes to their own file.madmaxoft2014-02-262-301/+320
* | | Added more utility functions to cCuboid.madmaxoft2014-02-262-4/+105
* | | InfoReg: Subcommand aliases are handled properly.madmaxoft2014-02-251-1/+15
* | | Added useful parameter overloads to cBlockArea Lua API.madmaxoft2014-02-243-6/+164
* | | Fixed tolua export for Byte.madmaxoft2014-02-241-0/+7
* | | Fixed compilation in MSVC (forward class definitions).madmaxoft2014-02-242-0/+2
* | | Merge pull request #724 from worktycho/warningfixesMattes D2014-02-246-3/+11
|\ \ \
| * | | BlockEntities is warnings freeTycho2014-02-246-3/+11
|/ / /
* | | Merge pull request #710 from TheJumper/masterMattes D2014-02-2428-39/+517
|\ \ \
| * | | Fixed Formatting, added compiler warning suppressing methods, fixed commentsTheJumper2014-02-245-3/+6
| * | | Merge remote-tracking branch 'origin/master'TheJumper2014-02-230-0/+0
| |\ \ \
| | * \ \ Merge branch 'master' of http://github.com/TheJumper/MCServerTheJumper2014-02-230-0/+0
| | |\ \ \
| | | * | | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to MonstersTheJumper2014-02-234-10/+17
| | | * | | Fixed Compiling IssuesTheJumper2014-02-233-10/+31
| | | * | | Fixed Formatting, Added DropChance attributes to MonstersTheJumper2014-02-2310-35/+248
| | | * | | Finally corrected the Enchantment constants.TheJumper2014-02-2318-50/+17
| | | * | | Changed formatting againTheJumper2014-02-221-1/+1
| | | * | | Changed formatting, encapsuled armor drop, introduced better static Enchantment IDsTheJumper2014-02-2210-56/+80
| | | * | | Fixed Looting segment fault - a_Killer can be NULLTheJumper2014-02-2217-19/+83
| | | * | | Mooshroom.cpp: Added right click interactionTheJumper2014-02-222-1/+38
| | | * | | Monster.h: Added doxy-comments for drop methodsTheJumper2014-02-221-0/+3
| | | * | | Monster.cpp: Fixed Formatting in AddRandomUncommonDropItemTheJumper2014-02-221-1/+1
| | | * | | Changed killer detection by using cEntity methodsTheJumper2014-02-223-3/+3
| | * | | | Fixed Formatting, Added DropChances and CanPickUpLoot attributes to MonstersTheJumper2014-02-2325-81/+417
| | |/ / /
| | * | | Added static Enchantment Constants, Replaced cryptic Looting IDTheJumper2014-02-2218-17/+49
| | * | | Fixed Mob Drops, Add Rare and Uncommon Drops, Looting inflicts DropsTheJumper2014-02-2123-37/+144
| * | | | 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
| * | | | APIDump: Fixed cBlockArea:GetRelBlockType() return types.madmaxoft2014-02-231-1/+1
| * | | | Fixed bindings for cBlockArea:Get(Rel)BlockTypeMeta().madmaxoft2014-02-232-29/+110
| * | | | 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
* | | | | Merge pull request #722 from mc-server/CompileFix_C++03Mattes D2014-02-243-12/+12
|\ \ \ \ \
| * | | | | 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-2430-12/+1936
|\ \ \ \ \
| * | | | | Maps: Improvementsandrew2014-02-238-15/+28
| * | | | | Manually exported DoWithMapandrew2014-02-235-3/+12
| * | | | | Documented and exported cMapManagerandrew2014-02-233-3/+20
| * | | | | Documented and exported cMapandrew2014-02-224-9/+102
| * | | | | 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-20106-684/+4203
| |\ \ \ \ \
| * | | | | | 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-144-5/+53
| * | | | | | 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
* | | | | | | Fixed a possible crash in cWorld::WakeUpSimulatorsInArea().madmaxoft2014-02-241-0/+4
* | | | | | | Merge pull request #716 from Howaner/BreakFixMattes D2014-02-231-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Use the ItemCategorie::IsSword() Method.Howaner2014-02-232-20/+1
| * | | | | | | No Sword Block Destroying in Creative ModeHowaner2014-02-232-0/+29
* | | | | | | | Merge pull request #717 from worktycho/warningfixesMattes D2014-02-233-2/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Undid changing coreTycho2014-02-231-0/+0
| * | | | | | | fixed globals.h warningsTycho2014-02-234-2/+11
|/ / / / / / /
* | | | | | | Updated CONTRIBUTING file with formatting and essential rules.Mattes D2014-02-231-17/+21
* | | | | | | Documented cBlockArea:GetOrigin(), :GetSize() and :GetVolume().madmaxoft2014-02-231-0/+3
* | | | | | | 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
* | | | | | | APIDump: Documented cClientHandle:HasPluginChannel.madmaxoft2014-02-201-0/+1
* | | | | | | cClientHandle manages the client-registered plugin channels.madmaxoft2014-02-202-36/+123
* | | | | | | Removed problematic utf8.madmaxoft2014-02-201-2/+2
* | | | | | | Merge pull request #704 from Howaner/GlobalFixesMattes D2014-02-206-29/+81
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | 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 space at if statementTheJumper2014-02-201-1/+1
| * | | | | | BlockBed.cpp: Fixed Multiple people in one bed.TheJumper2014-02-201-7/+18
| | |_|/ / / | |/| | | |
* | | | | | Disabled the leak finder.madmaxoft2014-02-202-2/+6
| |/ / / / |/| | | |
* | | | | Merge pull request #700 from Howaner/GlobalFixesMattes D2014-02-207-8/+84
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add BlockNewLeaves.h and rename Darkoac to DarkoakHowaner2014-02-195-15/+57
| * | | | Add new Trees (without Generator)Howaner2014-02-196-0/+34
| | |/ / | |/| |
* | | | APIDump: Fixed cBlockArea:GetRelBlockType() return types.madmaxoft2014-02-201-1/+1
* | | | Fixed bindings for cBlockArea:Get(Rel)BlockTypeMeta().madmaxoft2014-02-202-29/+110
* | | | Merge pull request #697 from Howaner/SkullMattes D2014-02-1921-6/+501
|\ \ \ \ | |/ / / |/| | |
| * | | 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 pull request #694 from mc-server/itemframesMattes D2014-02-187-2/+237
|\ \ \ \
| * \ \ \ Merge branch 'master' into itemframesTiger Wang2014-02-1830-13/+502
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #696 from mc-server/paintingsMattes D2014-02-1818-3/+249
|\ \ \ \ \
| * | | | | Properly exported and documented paintingsTiger Wang2014-02-184-2/+22
| * | | | | Comments & new BLOCK_FACE constantsTiger Wang2014-02-181-7/+10
| * | | | | Implemented paintings, fixes #689Tiger Wang2014-02-1815-3/+226
* | | | | | ProtoProxy: ignoring PolarSSL build files.madmaxoft2014-02-181-0/+1
* | | | | | APIDump: Documented missing cWorld functions.madmaxoft2014-02-181-0/+8
* | | | | | The cuboid for cWorld::SetAreaBiome() doesn't need sorting.madmaxoft2014-02-182-2/+7
* | | | | | Debuggers: Added a test for the cWorld:SetAreaBiome() function.madmaxoft2014-02-181-0/+40
* | | | | | Added cWorld:SetAreaBiome() API function.madmaxoft2014-02-186-3/+164
* | | | | | Added a bit more documentation to cForEachChunkProvider.madmaxoft2014-02-182-5/+33
* | | | | | Updated CoreTiger Wang2014-02-181-0/+0
* | | | | | Merge pull request #695 from narroo/Issue673Mattes D2014-02-182-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed Chunkworx, Issue 673.narroo2014-02-181-1/+1
| * | | | | Issue #673 Fix, Chunkworx now uses QueueUnloadUnusedChunks instead of UnloadUnusedChunks.narroo2014-02-181-1/+1
| | * | | | 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
| | * | | | | Added a braceTiger Wang2014-02-181-0/+2
| | |/ / / /
| | * / / / Implemented item frames, a part of #689Tiger Wang2014-02-187-2/+233
| |/ / / / |/| | | |
* | | | | Merge pull request #684 from narroo/Bug402Mattes D2014-02-172-1/+39
|\| | | |
| * | | | Fixed comment typonarroo2014-02-171-1/+1
| * | | | Fixed Comment Typo.narroo2014-02-171-1/+1
| * | | | Fixed the tab spacing.narroo2014-02-171-22/+22
| * | | | Fixed Tab spacing of cases.narroo2014-02-171-10/+10
| * | | | Reworked RemoveBom to use unsigned chars and reverted the logic changes in WriteFile. Should work fine now.narroo2014-02-161-82/+96
| * | | | Changed unsigned char[] back to char[].narroo2014-02-161-1/+1
| * | | | Changed char[] to unsigned char[] in cIniFile::RemoveBomnarroo2014-02-161-1/+1
| * | | | Addressed Issue #402. cIniFile can now process UTF-8 files that have anarroo2014-02-162-67/+91
* | | | | Added the InfoReg plugin library file.madmaxoft2014-02-171-0/+157
* | | | | Documented the cPluginManager:GetPluginsPath() API function.madmaxoft2014-02-171-0/+1
* | | | | 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
* | | | | Merge pull request #690 from tonibm19/masterAlexander Harkness2014-02-171-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Improved formattingtonibm192014-02-171-2/+2
| * | | | Now mobs can't escape from fences.tonibm192014-02-161-2/+2
* | | | | Merge pull request #688 from worktycho/FlagsAlexander Harkness2014-02-171-1/+1
|\ \ \ \ \
| * | | | | Added -WextraTycho2014-02-161-1/+1
| |/ / / /
* | | | | Merge pull request #692 from mc-server/wolfcleanupAlexander Harkness2014-02-171-30/+15
|\ \ \ \ \
| * | | | | 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
* | | | | | Implemented cCompositeChat::ParseText(), incl. self-test.madmaxoft2014-02-162-1/+211
* | | | | | Fixed cBoundingBox self-test code-style.madmaxoft2014-02-161-10/+10
* | | | | | Merge pull request #683 from mc-server/redstoneimprovementsMattes D2014-02-165-94/+167
|\ \ \ \ \ \
| * | | | | | Fixed a glaring bug with chunk cross-simulatingTiger Wang2014-02-161-9/+17
| * | | | | | Added a 'default:' for SimChunk()'s switchTiger Wang2014-02-151-0/+1
| * | | | | | A fix and an improvementTiger Wang2014-02-152-23/+43
| * | | | | | Fixed TNT fizzing everywhereTiger Wang2014-02-152-2/+2
| * | | | | | Sizeable speed improvements to redstoneTiger Wang2014-02-153-83/+127
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #691 from MuhammadWang/masterworktycho2014-02-162-1/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Added files for eclipse and debug, fix a mistakeMuhammadWang2014-02-162-1/+5
|/ / / / /
* | | | | Merge pull request #687 from worktycho/FlagsMattes D2014-02-168-324/+243
|\ \ \ \ \
| * | | | | Fixed commentTycho2014-02-161-1/+1
| * | | | | Build cmake built tools in travisTycho2014-02-161-1/+1
| * | | | | FogotTycho2014-02-161-0/+5
| * | | | | can Now build ProtoProxy alongside MCServerTycho2014-02-161-1/+2
| * | | | | Now uses setflags for flagsTycho2014-02-161-55/+4
| * | | | | COnverted ProtoProxy to use library CMakeListsTycho2014-02-162-18/+5
| * | | | | Allow building MCADefrag at the same time as MCServerTycho2014-02-164-119/+105
| * | | | | CHange MCADefrag CMakelist to use zlib CMakeListTycho2014-02-161-9/+4
| * | | | | rewrote MCADefrag CMakelist to use SetflagsTycho2014-02-161-56/+16
| * | | | | Added a seperate module for Setting flagsTycho2014-02-163-180/+216
* | | | | | Merge pull request #686 from Howaner/GlobalFixesMattes D2014-02-165-3/+11
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add Locale to ClientHandleHowaner2014-02-165-3/+11
* | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-02-161-2/+2
|\ \ \ \ \ \
| * | | | | | Fixed cmake invocation textMattes D2014-02-161-2/+2
* | | | | | | Fixed minor formatting issues from #682Tiger Wang2014-02-163-16/+3
|/ / / / / /
* | | | | | Merge pull request #685 from MuhammadWang/patch-1Alexander Harkness2014-02-161-2/+2
|\ \ \ \ \ \
| * | | | | | Fixed a minor errorMuhammad Wang2014-02-161-2/+2
* | | | | | | Merge pull request #682 from Howaner/GlobalFixesAlexander Harkness2014-02-165-3/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | 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
* | | | | Debuggers: Added code to test cCompositeChat functionality.madmaxoft2014-02-151-0/+23
* | | | | Implemented cCompositeChat.madmaxoft2014-02-1518-21/+671
* | | | | Merge pull request #679 from mc-server/NotchDeathAlexander Harkness2014-02-151-0/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | If a player is called "Notch" he drops an apple. http://minecraft.gamepedia.com/NotchSTRWarrior2014-02-151-0/+6
* | | | | Updated Plugin articleTiger Wang2014-02-151-14/+15
* | | | | Debuggers: Added a WebAdmin StressTest page.madmaxoft2014-02-151-13/+76
* | | | | 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
|\ \ \ \ \
| * | | | | 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
| * | | | | 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
| * | | | | Fixed #190Tiger Wang2014-02-111-2/+67
| * | | | | Fixed #627Tiger Wang2014-02-115-21/+12
| * | | | | Fixed #612Tiger Wang2014-02-112-0/+16
* | | | | | Merge pull request #677 from mc-server/BroadcastParticleEffectAlexander Harkness2014-02-152-1/+2
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | Documented BroadcastParticleEffectSTRWarrior2014-02-151-0/+1
| * | | | Exported cWorld::BroadcastParticleEffect.STRWarrior2014-02-151-1/+1
* | | | | Updated Core.madmaxoft2014-02-131-0/+0
* | | | | Merged branch 'narroo/master'.madmaxoft2014-02-135-2/+37
|\ \ \ \ \
| * | | | | Fixed formatting issue in APIDesc.luanarroo2014-02-131-1/+1
| * | | | | Fixed location of QueueUnloadUnusedChunks entry in APIDesc dump. Now is lexographically listed in cWorld, not cRoot.narroo2014-02-121-2/+2
| * | | | | Fixed formatting. Moved UnloadUnusedChunks from public to private.narroo2014-02-112-4/+10
| * | | | | Alpha-Sorted List.narroo2014-02-111-1/+1
| * | | | | Changed console.lua in core plugin.narroo2014-02-111-0/+0
| * | | | | Updated APIDesc.lua to replace 'UnloadUnusedChunks' with 'QueueUnloadUnusedChunks'.narroo2014-02-111-1/+1
| * | | | | Fixed formatting of previous commit.narroo2014-02-112-2/+7
| * | | | | Fixed bug #385. UnloadUnusedChunks now has the same interface asnarroo2014-02-113-1/+25
| * | | | | Typo Fix in console.luanarroo2014-02-101-0/+0
* | | | | | MCADefrag: Implemented recompression.madmaxoft2014-02-132-5/+136
* | | | | | MCADefrag: Fixed bugs, now produces valid MCA files.madmaxoft2014-02-132-3/+22
* | | | | | MCADefrag: Initial implementation.madmaxoft2014-02-136-0/+799
| |_|_|/ / |/| | | |
* | | | | Updated COMPILING instructions for out-of-source build.Mattes D2014-02-131-8/+22
* | | | | Merge pull request #668 from tonibm19/patch-1Mattes D2014-02-121-22/+22
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Decreased mobs attack rangetonibm192014-02-121-22/+22
|/ / / /
* | | | Fixed #573STRWarrior2014-02-121-4/+4
* | | | Updated Core.madmaxoft2014-02-121-0/+0
* | | | cWorld:ChunkStay() accepts nils as callbacks.madmaxoft2014-02-111-5/+3
* | | | Added cLuaState::CheckParamFunctionOrNil().madmaxoft2014-02-112-2/+37
| |/ / |/| |
* | | More gcc warnings fixed.madmaxoft2014-02-112-4/+5
* | | Made cChunkStay's destructor virtual.madmaxoft2014-02-111-1/+1
* | | Fixed *nix attribs.Mattes D2014-02-112-0/+0
* | | Fixed gcc warnings in Item.h.madmaxoft2014-02-111-21/+21
* | | Merge pull request #662 from mc-server/ChunkStayMattes D2014-02-1121-459/+1106
|\ \ \
| * | | Debuggers: Updated messaging functionsmadmaxoft2014-02-111-4/+9
| * | | Fixed nested plugin function calls.madmaxoft2014-02-111-6/+9
| * | | Merge branch 'master' into ChunkStaymadmaxoft2014-02-114-25/+5
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #660 from worktycho/boatsFixMattes D2014-02-111-2/+1
|\ \ \ \
| * | | | Added additional parenthasiesworktycho2014-02-101-2/+1
| * | | | Merge branch 'master' into boatsFixTycho2014-02-101-0/+1
| |\ \ \ \
| * | | | | Fixed stupid mistax in conditionalworktycho2014-02-101-2/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-02-101-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #659 from tonibm19/masterAlexander Harkness2014-02-101-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Maybe fixed boat placingtonibm192014-02-101-1/+1
| |/ / /
* / / / Updated MagicCarpet and CoreTiger Wang2014-02-103-23/+4
|/ / /
| * | APIDump: Documented cWorld:ChunkStay().madmaxoft2014-02-111-0/+1
| * | Added LuaChunkStay to Bindings sources.madmaxoft2014-02-101-36/+47
| * | Debuggers: Updated to reflect the new API.madmaxoft2014-02-101-15/+9
| * | Rewritten Lua ChunkStay API into a single function, cWorld:ChunkStay().madmaxoft2014-02-109-87/+213
| * | cLuaState: Stack traces don't include ghost 0-th element.madmaxoft2014-02-101-1/+1
| * | Added cPluginLua::cOperation.madmaxoft2014-02-101-1/+27
| * | Debuggers: Added a cLuaChunkStay test code.madmaxoft2014-02-091-0/+72
| * | First working version of cLuaChunkStay.madmaxoft2014-02-094-17/+92
| * | Debuggers: Disabled testing plugin calls.madmaxoft2014-02-091-1/+1
| * | Initial Lua cChunkStay export.madmaxoft2014-02-094-1/+123
| * | cLuaState::cRef can be unbound and re-bound.madmaxoft2014-02-092-9/+60
| * | Added AllToLua.pkg to MSVC project files.madmaxoft2014-02-091-0/+2
| * | Added air, farmland and tilleddirt to items.ini.madmaxoft2014-02-091-0/+3
| * | Merge remote-tracking branch 'origin/master' into ChunkStaymadmaxoft2014-02-0936-157/+374
| |\ \ | |/ / |/| |
* | | Merge branch 'master' into playerimprovementsmadmaxoft2014-02-091-0/+0
|\ \ \
| * | | Updated CoreTiger Wang2014-02-091-0/+0
* | | | Fixed compile and some warnings in MSVSTiger Wang2014-02-097-17/+6
* | | | Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-0938-1904/+2327
|\| | |
| * | | Merge pull request #656 from mc-server/ReloadGroupsMattes D2014-02-091-0/+11
| |\ \ \
| | * | | "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-0996-217/+354
|\ \ \ \ \
* | | | | | 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
* | | | | | Removed some unexported documentation.Tiger Wang2014-02-071-11/+5
* | | | | | Improved chat messaging functionsTiger Wang2014-02-0710-114/+179
* | | | | | 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
* | | | | | Updated Core & PolarSSLTiger Wang2014-02-052-0/+0
* | | | | | Fixed explosions bugTiger Wang2014-02-053-32/+13
* | | | | | Fixed annoying creative on fire bugTiger Wang2014-02-052-0/+20
* | | | | | Fixed a bunch of MSVS warningsTiger Wang2014-02-056-7/+8
* | | | | | Added more SendMessageXXX() functionsTiger Wang2014-02-043-47/+62
* | | | | | Pickup constructor no longer exportedTiger Wang2014-02-033-4/+8
* | | | | | Added SendMessageXXX() to cPlayerTiger Wang2014-02-032-1/+72
* | | | | | 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 issues with farmlandTiger Wang2014-02-032-1/+3
* | | | | | | Server now handles join messages alsoTiger Wang2014-02-035-27/+35
| | | | | * | 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
| | | |\| |
| | | | * | 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
| | | * | | Fixed cWorld:TryGetHeight() API.madmaxoft2014-02-081-1/+5
| | | |/ /
| | | * | WebAdmin is stopped properly on server shutdown / restart.madmaxoft2014-02-073-36/+55
| | | * | Fixed wiki link in auto-generated settings.ini.madmaxoft2014-02-071-1/+2
| | | * | InfoDump: Added github output.madmaxoft2014-02-051-5/+228
| | | * | Merge pull request #648 from worktycho/runMCServerMattes D2014-02-051-9/+27
| | | |\ \
| | | | * | 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
| | | * | | | Merge pull request #649 from mc-server/GroupsPermissionsMattes D2014-02-054-36/+1
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Removed deprecated HasCommand functionSTRWarrior2014-02-054-36/+1
| | | * | | | Merge pull request #645 from mc-server/GroupsPermissionsMattes D2014-02-056-18/+69
| | | |\| | |
| | | | * | | Forgot extra lines.STRWarrior2014-02-051-0/+4
| | | | * | | Improvements:STRWarrior2014-02-056-22/+69
| | | * | | | Merge pull request #647 from worktycho/runMCServerMattes D2014-02-052-1/+5
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Simplified shutdownTycho2014-02-052-5/+1
| | | | * | | Revert "Added Self Test Plugin"Tycho2014-02-051-20/+0
| | | | * | | Added support to start up MCServer and then immediatly sut it down in travisTycho2014-02-053-1/+9
| | | | * | | Added Self Test PluginTycho2014-02-051-0/+20
| | | * | | | Merge pull request #646 from worktycho/warningfixesAlexander Harkness2014-02-0510-27/+27
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | 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-052-1/+13
| | | * | | | InfoDump: Git-Ignoring all generated files.madmaxoft2014-02-051-0/+2
| | | * | | | Explicitly make chars signed at the compiler-level.madmaxoft2014-02-041-0/+3
| | | * | | | 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
| | * | | | Removed a useless check in cLuaState.madmaxoft2014-02-041-3/+1
| | * | | | Fixed a warning in cItem in gcc.madmaxoft2014-02-041-1/+1
| | * | | | Protocol 1.7 uses char for blockface.madmaxoft2014-02-041-2/+2
| | * | | | Merge pull request #644 from worktycho/warningfixesMattes D2014-02-0477-178/+200
| | |\| | |
| | | * | | Fix gcc not having operator ++ on enumsTycho2014-02-041-6/+7
| | | * | | Ensure -Wall is enabledTycho2014-02-041-0/+1
| | | * | | Improved Type safety of eBlockFaceTycho2014-02-0476-174/+194
| | * | | | Fixed chest placement.madmaxoft2014-02-041-2/+4
| | * | | | Fixed indent from previous commits.madmaxoft2014-02-041-1/+1
| | * | | | Merge pull request #635 from tonibm19/masterMattes D2014-02-046-4/+19
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fixed indentationtonibm192014-02-041-1/+1
| | | * | | Blank lines and indentation.tonibm192014-02-042-1/+4
| | | * | | Not exporting FindClosestPlayertonibm192014-02-031-1/+1
| | | * | | Fixed compilationtonibm192014-02-031-1/+0
| | | * | | Added documentationtonibm192014-02-031-1/+4
| | | * | | 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
| | * | | Improved error resistance in cPluginManager:CallPlugin().madmaxoft2014-02-041-0/+8
| | * | | InfoDump: Fixed export for undeclared command param combinations.madmaxoft2014-02-041-2/+2
| | * | | Greatly improved TNT propulsion chancesTiger Wang2014-02-031-1/+1
| | * | | Merge pull request #636 from worktycho/warningfixesMattes D2014-02-0310-19/+32
| | |\ \ \
| | | * | | Fogot to save BiogenTycho2014-02-031-4/+4
| | | * | | Fixed Compile errorsTycho2014-02-034-7/+7
| | | * | | Removed unused lookupsTycho2014-02-031-2/+0
| | | * | | Increased Type safety of BiomesTycho2014-02-039-17/+32
| | |/ / / | |/| | |
| | * | | Merge pull request #633 from mc-server/More_Sideways_BlocksMattes D2014-02-034-5/+80
| |/| | | | | |/ /
| | * | Named the different quartz block.STRWarrior2014-02-032-1/+6
| | * | Fixed some issues.STRWarrior2014-02-031-1/+2
| | * | 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
| |\ \ \ | | |/ / | |/| |
| | * | Inversed conditionTiger Wang2014-02-031-25/+28
| | * | Uncommented pickup spawner codeTiger Wang2014-02-021-3/+7
| | * | TNT improvementsTiger Wang2014-02-022-37/+116
| * | | 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
| * | | Merge pull request #602 from mc-server/improvementsandfixesMattes D2014-02-037-22/+61
|/| | |
| * | | Added IsBlockWaterOrIce()Tiger Wang2014-02-022-10/+12
| * | | Revert "Added LOGREPLACELINE for line replacement"Tiger Wang2014-02-025-94/+16
| * | | Revert "Improved code"Tiger Wang2014-02-024-19/+13
| * | | Revert "Added a comment"Tiger Wang2014-02-021-1/+1
| * | | Revert "Properly initialised variables"Tiger Wang2014-02-024-13/+10
| * | | Revert "Fixed issues with insufficient console space"Tiger Wang2014-02-023-114/+29
| * | | Revert "A newline issue is resolved"Tiger Wang2014-02-022-1/+3
| * | | Revert "Fixed Linux compile"Tiger Wang2014-02-021-2/+1
| * | | Revert "Another Linux fix"Tiger Wang2014-02-021-6/+0
| * | | Revert "Again improved LogReplaceLine"Tiger Wang2014-02-022-80/+77
| * | | 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
| * | | Added checks for ice into IsBlockWater()Tiger Wang2014-02-012-3/+10
| * | | 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
| * | | 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
* | | | Merge branch 'master' of https://github.com/mc-server/MCServerTiger Wang2014-02-0281-552/+741
|\ \ \ \
| * \ \ \ Merge pull request #622 from worktycho/registerfixMattes D2014-02-021-26/+26
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into registerfixTycho2014-02-0246-63/+235
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fixed dark oak and acacia placement.madmaxoft2014-02-021-0/+1
| * | | | | Merge pull request #615 from worktycho/GeneratingBenchmark2Mattes D2014-02-0280-526/+714
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Added missing filesTycho2014-02-023-0/+39
| | * | | | Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-0213-3/+96
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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
| | |/ / /
| | * | | Changed pointers to referencesTycho2014-02-0160-249/+247
| | * | | Merge branch 'master' into GeneratingBenchmark2Tycho2014-02-0146-217/+925
| | |\ \ \
| | * | | | Changed signitures of Several BLockHandler MethodsTycho2014-02-0155-196/+209
| | * | | | Changed it so std was actually set to c++11 in clang not gcc on OS XTycho2014-01-261-2/+11
| | * | | | Removed cWorld IncludeTycho2014-01-263-3/+0
| | * | | | Refactored GetPlacementBlockTypeMetaTycho2014-01-267-11/+12
| | * | | | Merge branch 'master' into GeneratingBenchmark2Tycho2014-01-26279-49498/+2596
| | |\ \ \ \
| | * | | | | 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
* | | | | | Merge pull request #617 from UltraCoderRU/masterMattes D2014-02-025-4/+20
|\ \ \ \ \ \
| * | | | | | 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-012-1/+2
| * | | | | | 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-017-0/+70
|\ \ \ \ \ \
| * | | | | | Added PlayerDestroyedHook Documentationdaniel09162014-02-011-0/+23
| * | | | | | Removed "player destroying" hookdaniel09162014-02-016-48/+1
| * | | | | | Added "player destroying" and "player destroyed" hooksdaniel09162014-01-256-0/+94
* | | | | | | Merge pull request #613 from UltraCoderRU/masterMattes D2014-02-011-0/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master'Kirill Kirilenko2014-01-311-13/+18
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Contributors now match real life, and are alpha-sorted.Alexander Harkness2014-01-311-13/+18
| * | | | | | 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
|\ \ \ \ \ \
| * | | | | | 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
* | | | | | | Added cChunkDest::UpdateHeightmap()madmaxoft2014-01-312-17/+48
* | | | | | | Fixed some more.Alexander Harkness2014-01-311-4/+3
* | | | | | | Fixed at least a little of the plugin guide.Alexander Harkness2014-01-301-15/+7
* | | | | | | Update CoreAlexander Harkness2014-01-301-0/+0
* | | | | | | Merge pull request #605 from tonibm19/patch-1Mattes D2014-01-301-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Attempt at implementing #563tonibm192014-01-301-2/+1
|/ / / / / / /
* | | | | / / Lua: Fixed an error in table-functions callbacks.madmaxoft2014-01-291-1/+5
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #599 from tonibm19/masterMattes D2014-01-2912-9/+31
|\ \ \ \ \ \
| * | | | | | Did what xoft saidtonibm192014-01-294-5/+3
| * | | | | | Rewritten code.tonibm192014-01-2912-152/+25
| * | | | | | 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
* | | | | | | Added instructions for ZIP source downloads.Mattes D2014-01-291-1/+3
|/ / / / / /
* | | | | | Limited sign lines to 15 chars.madmaxoft2014-01-291-4/+5
* | | | | | Plugin files are loaded in alphabetical order.madmaxoft2014-01-291-17/+35
|/ / / / /
* | | | | Documented cFloater.STRWarrior2014-01-291-0/+14
* | | | | 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
* | | | | ProtoProxy: Added encryption support.madmaxoft2014-01-281-2/+19
* | | | | Protocol 1.7: Forced encryption on all connections.madmaxoft2014-01-284-15/+120
* | | | | 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
|\ \ \ \ \
| * | | | | 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
| * | | | | 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
| * | | | | 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
|\ \ \ \ \
| * | | | | 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
* | | | | | Updated polarsslTiger Wang2014-01-271-0/+0
* | | | | | SIGABRT exits with failure.Tiger Wang2014-01-271-0/+1
|/ / / / /
* | | | | Fixed client packet parsing.madmaxoft2014-01-262-15/+56
* | | | | 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
* | | | | Added SIGABRT to catchers listTiger Wang2014-01-261-1/+6
|/ / / /
* | | | Merge pull request #589 from mc-server/minecartimprovementsMattes D2014-01-265-110/+438
|\ \ \ \
| * | | | 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
| * | | | Minecart improvements and fixesTiger Wang2014-01-191-33/+43
| * | | | 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-1985-332/+1238
| |\ \ \ \
| * | | | | Minecart collision and general improvementsTiger Wang2014-01-182-70/+242
* | | | | | Merge pull request #590 from mc-server/Wolf_FixMattes D2014-01-261-7/+31
|\ \ \ \ \ \
| * | | | | | 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
* | | | | | | Fixed segmentation fault on villager damageTiger Wang2014-01-261-1/+1
* | | | | | | Merge pull request #575 from worktycho/GeneratingBenchmarkMattes D2014-01-2511-189/+317
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | 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-2230-276/+2255
| |\ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \
| | * | | | | | Seperated BlockArea From WorldTycho2014-01-204-14/+20
| * | | | | | | Merge branch 'master' into GeneratingBenchmarkTycho2014-01-2089-19110/+1520
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| * | | | | | Added Inifile and OSSupport LinkingTycho2014-01-191-0/+2
| * | | | | | First attempt at Compiling Generator seperatlyTycho2014-01-193-0/+23
* | | | | | | Merge pull request #588 from mc-server/Sheep_EatingMattes D2014-01-252-1/+41
|\ \ \ \ \ \ \
| * | | | | | | Implemented sheeps eating grass.STRWarrior2014-01-252-1/+41
* | | | | | | | Merge pull request #587 from mc-server/mobimprovementsMattes D2014-01-2529-564/+717
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
| * | | | | | | | Attack() is no longer always calledTiger Wang2014-01-251-1/+1
| * | | | | | | | Implemented pickup combiningTiger Wang2014-01-251-0/+55
| * | | | | | | | Mob bugfixesTiger Wang2014-01-256-26/+54
| * | | | | | | | All mobs now drown (fixes #54)Tiger Wang2014-01-256-127/+137
| * | | | | | | | 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
| * | | | | | | | Fixed mobs too close to player not tickingTiger Wang2014-01-241-2/+2
| * | | | | | | | Implemented creeper abilitiesTiger Wang2014-01-243-3/+51
| * | | | | | | | Removed unused ReferenceManagerTiger Wang2014-01-244-122/+1
* | | | | | | | | Merge pull request #583 from mc-server/ChangeToPolarSSLMattes D2014-01-25217-48397/+733
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ProtoProxy: Modified to use PolarSSL.madmaxoft2014-01-256-60/+45
| * | | | | | | | | Added RSA encryption to crypto wrappers.madmaxoft2014-01-252-0/+39
| * | | | | | | | | Merged branch 'master' into ChangeToPolarSSL.madmaxoft2014-01-2521-183/+333
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removed unnecessary defineTiger Wang2014-01-241-7/+0
| * | | | | | | | | | 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
| * | | | | | | | | | | Removed CryptoPP files.madmaxoft2014-01-22194-48168/+0
| * | | | | | | | | | | Replacing CryptoPP with PolarSSL.madmaxoft2014-01-222-2/+7
| * | | | | | | | | | | Added PolarSSL as a submodule.madmaxoft2014-01-222-0/+3
* | | | | | | | | | | | Merge pull request #581 from worktycho/strerrorMattes D2014-01-257-65/+76
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | 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
* | | | | | | | | | | | Protocol17: Comm logging shows the data left over from previous parse.madmaxoft2014-01-251-2/+15
* | | | | | | | | | | | Ignoring the Comm Logs.madmaxoft2014-01-251-0/+1
* | | | | | | | | | | | Merge pull request #586 from worktycho/BindingsMoveAlexander Harkness2014-01-252-83/+71
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Simplified .gitignoreTycho2014-01-251-55/+5
| * | | | | | | | | | | Added dependecy output to Bindings/BindingsDependencies.txtTycho2014-01-252-0/+8
| * | | | | | | | | | | 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
* | | | | | | | | | | | Fixed a possible deadlock on client disconnect.madmaxoft2014-01-241-9/+0
* | | | | | | | | | | | Fixed a failure in cSquid.madmaxoft2014-01-241-1/+2
* | | | | | | | | | | | Updated CoreTiger Wang2014-01-241-0/+0
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | ProtoProxy: Fixed connection on *nix.madmaxoft2014-01-241-1/+2
* | | | | | | | | | | Fixed Win nightbuilds not producing PDBs.madmaxoft2014-01-242-7/+8
* | | | | | | | | | | 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
* | | | | | | | | | | APIDump: Fixed indent after merge.madmaxoft2014-01-241-2/+2
* | | | | | | | | | | Merge remote-tracking branch 'MikeHunsinger/master'madmaxoft2014-01-245-52/+93
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed indentation once and for all.Mike Hunsinger2014-01-242-46/+46
| * | | | | | | | | | | Fixed indentation and doxygen comments... For real this time.Mike Hunsinger2014-01-243-17/+17
| * | | | | | | | | | | Fixed spacing and doxycomments.Mike Hunsinger2014-01-244-20/+18
| * | | | | | | | | | | Removed extra lineMike Hunsinger2014-01-231-2/+0
| * | | | | | | | | | | Split TossItem into three Toss functions (Held, Equipped and Pickup)Mike Hunsinger2014-01-235-60/+105
* | | | | | | | | | | | 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 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
* | | | | | | | | | | | Merge pull request #582 from worktycho/BindingsMoveAlexander Harkness2014-01-232-25/+57
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | / / / / / / / / | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Command block fixes 2andrew2014-01-236-40/+104
* | | | | | | | | Authenticator: Reduced logging levels.madmaxoft2014-01-221-4/+4
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge pull request #574 from tonibm19/patch-1STRWarrior2014-01-221-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fixed compilation on VC2008tonibm192014-01-221-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #566 from xdot/masterMattes D2014-01-2220-9/+1571
|\ \ \ \ \ \ \
| * | | | | | | cWorld now saves/loads the scoreboardandrew2014-01-224-15/+44
| * | | | | | | Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-2174-19104/+836
| |\| | | | | |
| * | | | | | | 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
* | | | | | | | InfoDump: Can dump a single plugin without LFS.madmaxoft2014-01-221-47/+65
* | | | | | | | InfoDump: Dump all referenced permissions.madmaxoft2014-01-221-4/+112
* | | | | | | | Implemented cPluginManager:CallPlugin() API.madmaxoft2014-01-219-216/+507
| |/ / / / / / |/| | | | | |
* | | | | | | 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
| |_|_|_|/ |/| | | |
* | | | | APIDump: Added notes about objects across cWorld's task execution.madmaxoft2014-01-191-2/+2
* | | | | APIDump: Updated cWorld:ScheduleTask()'s description.madmaxoft2014-01-191-1/+1
* | | | | Changed the cWorld::ScheduleTask() signature.madmaxoft2014-01-194-151/+221
* | | | | cLuaState can now check function params.madmaxoft2014-01-192-0/+37
* | | | | Merge pull request #569 from worktycho/EnchantmentsFixMattes D2014-01-198-88/+120
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Switched EnchantmentSerilizer to namespaceTycho2014-01-197-17/+23
| * | | | Spilt Writing of Enchantments to seperate classTycho2014-01-198-90/+116
* | | | | Merge pull request #565 from mc-server/commandblockfixesMattes D2014-01-1912-6/+165
|\ \ \ \ \
| * | | | | Removed unneeded paramtersTiger Wang2014-01-199-15/+23
| * | | | | Changed SendBlockEntity format slightlyTiger Wang2014-01-199-42/+55
| * | | | | Implemented MC|Brand responseTiger Wang2014-01-191-3/+9
| * | | | | ProtoProxy: UpdateBlockEntity NBT is writtenTiger Wang2014-01-191-1/+14
| * | | | | Improved command blocksTiger Wang2014-01-1911-5/+124
* | | | | | Rewritten SocketThreads for proper shutdown scenario.madmaxoft2014-01-198-178/+189
* | | | | | Added graph of SocketThreads state transitions.madmaxoft2014-01-193-4/+101
* | | | | | Merge pull request #551 from worktycho/schedularMattes D2014-01-191-6/+2
|\ \ \ \ \ \
| * | | | | | 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
* | | | | | | Updated Core.madmaxoft2014-01-191-0/+0
* | | | | | | Removed obsolete MSVC project files.madmaxoft2014-01-1937-18619/+0
* | | | | | | SocketThreads: Removed unused code.madmaxoft2014-01-192-53/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | Updated coreTiger Wang2014-01-191-0/+0
| |_|_|/ / |/| | | |
* | | | | Merge pull request #559 from mc-server/SpawnMobParticlesMattes D2014-01-191-3/+0
|\ \ \ \ \
| * | | | | 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-182-3/+11
| |_|/ / / |/| | | |
* | | | | Merge pull request #557 from xdot/masterMattes D2014-01-1820-62/+593
|\ \ \ \ \
| * | | | | Command block fixesandrew2014-01-183-43/+17
| * | | | | Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-184-5/+152
| |\| | | |
| * | | | | 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-1812-33/+396
| | |_|/ / | |/| | |
* | | | | HTTP connections aren't kept alive unless explicitly enabled.madmaxoft2014-01-184-37/+58
| |/ / / |/| | |
* | | | 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
| * | | | 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
* | | | | Fix bad nested headings.Alexander Harkness2014-01-181-2/+2
| |/ / / |/| | |
* | | | Merge pull request #552 from worktycho/c++11Mattes D2014-01-172-4/+1
|\ \ \ \
| * | | | Changed std to c++11 in clang to fix va_copy issuesTycho2014-01-172-4/+1
| | |/ / | |/| |
* | | | Merge pull request #554 from worktycho/compressionAlexander Harkness2014-01-1710-22/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Added user setting compression factorTycho2014-01-1710-22/+33
|/ / /
* | | APIDump: Updated cPluginManager:GetAllPlugins().madmaxoft2014-01-171-1/+1
* | | ProtoProxy: Compiles under Linux.madmaxoft2014-01-174-28/+43
* | | ProtoProxy: Fixed inversed typedef.madmaxoft2014-01-171-1/+1
* | | ProtoProxy: Fixed compilation in Windows and in Linux.madmaxoft2014-01-173-16/+21
* | | ProtoProxy: Fixed #include filename case.madmaxoft2014-01-171-4/+4
* | | Updated core to the latest version and edited the submodules file to allow greater compatibility on restricted networks.Alexander Harkness2014-01-172-3/+3
* | | Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-177-11/+62
|\ \ \
| * | | 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-1613-83/+112
| |\ \ \ \
| * | | | | OBSOLETE'd obsolete functionsTiger Wang2014-01-151-2/+2
| * | | | | Implemented custom names and loreTiger Wang2014-01-154-35/+107
| * | | | | Implemented Ctrl-Q drop stackTiger Wang2014-01-153-3/+20
* | | | | | Protocol 1.7: More output on unknown packets / protocol states.madmaxoft2014-01-171-4/+21
* | | | | | Ignoring MSVC2010+ build folders.Mattes D2014-01-171-0/+2
* | | | | | CMake: Fixed Lua output folder for MSVC2010+.Mattes D2014-01-171-2/+13
| |_|_|_|/ |/| | | |
* | | | | 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-162-2/+16
| |/ / / |/| | |
* | | | Merge pull request #548 from worktycho/documentionAlexander Harkness2014-01-162-0/+10
|\ \ \ \
| * | | | Documented the SchedualeTask functionTycho2014-01-161-0/+1
| * | | | documented CROSSCOMPILING flagTycho2014-01-161-0/+9
* | | | | CMake: Fixed output paths for all MSVC versions.madmaxoft2014-01-162-11/+19
* | | | | Added packet diagnostics to 1.7 protocol.madmaxoft2014-01-162-30/+40
* | | | | Yet another attempt at VarArgs.madmaxoft2014-01-161-10/+15
* | | | | Another VarArgs fix.madmaxoft2014-01-167-43/+39
| |/ / / |/| | |
* | | | Merge pull request #545 from mc-server/VarArgsMattes D2014-01-158-36/+54
|\ \ \ \
| * | | | Fixed ProtoProxy compilation.madmaxoft2014-01-151-4/+8
| * | | | Using a 2nd argument instead of va_copy().madmaxoft2014-01-157-32/+46
* | | | | ProtoProxy: use CMake to generate the MSVC project files.madmaxoft2014-01-154-308/+156
* | | | | APIDump: Explicitly listed static cPlayer functions.madmaxoft2014-01-151-2/+2
|/ / / /
* | | | Fixed varargs modification.madmaxoft2014-01-151-1/+5
* | | | Merge pull request #543 from mc-server/Furnace_MinecartsMattes D2014-01-152-3/+42
|\ \ \ \
| * | | | Furnace minecarts now stop being active after a while.STRWarrior2014-01-152-2/+19
| * | | | First implementation for furnace minecarts.STRWarrior2014-01-152-1/+23
* | | | | Updated Core! ±±±___±±±Tiger Wang2014-01-151-0/+0
* | | | | Update COMPILING.mdMattes D2014-01-151-9/+64
* | | | | CMake: MSVC release builds use LTCG.madmaxoft2014-01-151-2/+8
|/ / / /
* | | | CMake: Removed SCL warnings from Lua and ZLib.madmaxoft2014-01-152-0/+9
* | | | CMake: MSVC builds use static CRT.madmaxoft2014-01-151-0/+9
* | | | Merge pull request #542 from worktycho/schedularMattes D2014-01-153-4/+121
|\ \ \ \
| * | | | added cWorld::ScheduleTask FunctionTycho2014-01-143-4/+121
* | | | | Merge pull request #538 from mc-server/minecartsMattes D2014-01-1513-208/+503
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Yes newline at end of file :DTiger Wang2014-01-141-1/+5
| * | | | Final improvements to MinecartsTiger Wang2014-01-133-93/+292
| * | | | Detaching improvementsTiger Wang2014-01-134-4/+34
| * | | | Fixed wire, rail, and pressure plate unpoweringTiger Wang2014-01-131-3/+4
| * | | | Fixed settings plugin generation after IniFileTiger Wang2014-01-121-3/+3
| * | | | Fixed VS2013 compile and updated CoreTiger Wang2014-01-124-32/+34
| * | | | Multiple enhancements and fixes to minecartsTiger Wang2014-01-124-132/+191
* | | | | Updated GETTING-STARTED.md to remove completed issuesworktycho2014-01-141-3/+3
| |/ / / |/| | |
* | | | CMake: Release profile build inherits from Release, not Debug.madmaxoft2014-01-141-5/+13
* | | | Moved profiling scripts into the MCServer folder.madmaxoft2014-01-144-146/+101
* | | | CMake: Added postfix for profiled exemadmaxoft2014-01-141-0/+4
* | | | APIDump: Wrapped example code so that it displays well on small screens.madmaxoft2014-01-131-3/+8
* | | | Renamed unused source files from zlib.madmaxoft2014-01-132-0/+0
* | | | The VS2008 nightbuild uses CMake.madmaxoft2014-01-131-1/+11
* | | | Removed shutdown() from socket closing.madmaxoft2014-01-131-4/+0
* | | | Added handshake processing to protocol 1.7.madmaxoft2014-01-132-2/+29
* | | | ProtoProxy: Fixed login kick packet direction.madmaxoft2014-01-131-1/+1
* | | | Generating the bindings outputs a message at the end.madmaxoft2014-01-131-0/+8
* | | | APIDump: Added OnPluginMessage.lua file to Decoda project.madmaxoft2014-01-131-0/+3
* | | | APIDump: Added missing bits of documentation.madmaxoft2014-01-131-0/+15
* | | | APIDump: Documented the plugin messaging hook and function.madmaxoft2014-01-132-0/+26
* | | | Merge pull request #536 from worktycho/nativearchMattes D2014-01-131-1/+6
|\ \ \ \
| * | | | Added -march=native to linux targetsTycho2014-01-131-1/+6
|/ / / /
* | | | cCreeper is no longer available in API.madmaxoft2014-01-133-14/+1
* | | | 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
* | | | CMake: Lua DLL is built in the correct folder.madmaxoft2014-01-131-0/+11
* | | | Moved the win resources into a separate subfolder.madmaxoft2014-01-1210-29/+7
* | | | 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
|\ \ \ | |/ / |/| |
| * | 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
| * | Renamed g_TorchPlaceable...Tiger Wang2014-01-116-71/+71
| * | Fixed doors, fixes #453Tiger Wang2014-01-101-38/+8
| * | Major refactoring of redstoneTiger Wang2014-01-104-186/+181
* | | Merge pull request #533 from mc-server/CmakeMultiConfigMattes D2014-01-122-46/+109
|\ \ \
| * | | Ignore Win32 .idb files.madmaxoft2014-01-121-0/+1
| * | | Merge branch master into CmakeMultiConfig.madmaxoft2014-01-12156-2755/+2980
| |\ \ \ | |/ / / |/| | |
* | | | Disabled a useless MSVC warning in Bindings.cpp.madmaxoft2014-01-121-0/+6
* | | | Merge pull request #532 from mc-server/LuaStateErrorHandlerMattes D2014-01-126-256/+130
|\ \ \ \
| * | | | Lua errors display stack trace.madmaxoft2014-01-112-3/+27
| * | | | Removed internal methods from public cLuaState interface.madmaxoft2014-01-113-119/+103
| * | | | Removed an unused file.madmaxoft2014-01-113-134/+0
* | | | | Merge pull request #526 from mc-server/IniFileFixMattes D2014-01-123-48/+81
|\ \ \ \ \
| * | | | | Fixed reading the files.madmaxoft2014-01-111-1/+1
| * | | | | Documented the cIniFile:AddValue* functions.madmaxoft2014-01-111-0/+4
| * | | | | IniFile: Split SetValue() into AddValue() and SetValue().madmaxoft2014-01-112-39/+76
| * | | | | Merge branch 'master' into IniFileFixmadmaxoft2014-01-114-2/+20
| |\ \ \ \ \
| * | | | | | Fixed cIniFile's SetValue().madmaxoft2014-01-101-9/+1
* | | | | | | Merge pull request #527 from derouinw/biomessplitMattes D2014-01-1110-223/+252
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Globals.h needs to be first includeBill Derouin2014-01-101-1/+1
| * | | | | | Include Biome enum in ChunkDefBill Derouin2014-01-101-2/+1
| * | | | | | Added newlines at ends of filesBill Derouin2014-01-102-2/+2
| * | | | | | Added files to VC2013 project fileBill Derouin2014-01-101-0/+2
| * | | | | | Fixed missing externalsBill Derouin2014-01-102-1/+6
| * | | | | | Move biome definition to separate filesBill Derouin2014-01-099-223/+246
* | | | | | | Removed unused variables.madmaxoft2014-01-111-2/+0
* | | | | | | Fixed the warning in CryptoPP.madmaxoft2014-01-111-1/+1
* | | | | | | Merge pull request #530 from mc-server/GeneratorDecoupleMattes D2014-01-1110-50/+188
|\ \ \ \ \ \ \
| * | | | | | | Decoupled cChunkGenerator from cWorld and cRoot.madmaxoft2014-01-1010-50/+188
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #531 from xdot/masterMattes D2014-01-111-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fixed glowstone drop countandrew2014-01-111-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #522 from mc-server/LuaDlFixMattes D2014-01-102-1/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Using dlopen() on all platforms except WIN32.madmaxoft2014-01-101-5/+1
| * | | | | | Fixed a typo in the TestLuaRocks test plugin.madmaxoft2014-01-091-1/+1
| * | | | | | Specified the dynamic loader Lua should use.madmaxoft2014-01-091-0/+9
| | |_|_|/ / | |/| | | |
* | | | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | 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
* | | | | BiomeVisualiser: Added zooming using the 1 - 8 keys.Matyas Dolak2014-01-106-20/+76
| |_|/ / |/| | |
* | | | Debuggers: Test code for WECUI plugin messaging.madmaxoft2014-01-091-0/+17
* | | | 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
* | | | Composition generator creating moved to a separate function.madmaxoft2014-01-092-61/+83
* | | | Height generator creating moved info HeiGen.cpp.madmaxoft2014-01-093-54/+82
* | | | Windows nightbuild updated to generate .example.ini files.madmaxoft2014-01-093-7/+51
* | | | Merge pull request #517 from derouinw/masterMattes D2014-01-091-0/+13
|\ \ \ \ | |_|/ / |/| | |
| * | | A couple touchupsBill Derouin2014-01-081-2/+3
| * | | Add missing plugin errorBill Derouin2014-01-071-0/+12
* | | | Added a known working favicon.madmaxoft2014-01-081-0/+0
* | | | ProtoProxy: Fixed favicon relaying.madmaxoft2014-01-081-2/+2
| |/ / |/| |
* | | Fixed AppendVPrintf() handling for large strings.madmaxoft2014-01-081-6/+4
* | | Merge pull request #519 from mc-server/sigtermMattes D2014-01-082-0/+5
|\ \ \ | |/ / |/| |
| * | Updated CoreTiger Wang2014-01-071-0/+0
| * | Graceful shutdown on SIGTERMTiger Wang2014-01-071-0/+5
* | | Removed bitdeli badge - we have GitHub analytics now.Alexander Harkness2014-01-071-3/+0
|/ /
* | Updated submodulesTiger Wang2014-01-072-0/+0
* | Merge pull request #516 from mc-server/faviconAlexander Harkness2014-01-074-18/+8
|\ \
| * | Fixed faviconsTiger Wang2014-01-074-18/+8
* | | Plugin messages are received and handed to plugins.madmaxoft2014-01-079-25/+80
|/ /
* | Merge pull request #514 from derouinw/masterMattes D2014-01-073-0/+20
|\ \
| * | 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
* | | Disabled an unneeded MSVC warning.madmaxoft2014-01-071-4/+7
* | | 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
* | | Merge pull request #513 from worktycho/FreeBSDDynamicLinkMattes D2014-01-074-343/+13
|\ \ \
| * | | Fixed FreeBSD compilitionTycho2014-01-073-2/+13
| * | | Merge branch 'master' of github.com:mc-server/MCServerTycho2014-01-0733-97/+662
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:mc-server/MCServerTycho2014-01-047-140/+216
| |\ \ \ \
| * | | | | removed tolua++ makefile which is overwritten by cmakeTycho2014-01-031-338/+0
* | | | | | Update CONTRIBUTING.mdMattes D2014-01-071-2/+3
* | | | | | Regenerated VS2013 filesTiger Wang2014-01-076-38/+47
* | | | | | 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
* | | | | 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.madmaxoft2014-01-061-1/+1
* | | | | Merge pull request #509 from Diusrex/masterMattes D2014-01-068-6/+89
|\ \ \ \ \
| * | | | | Undid the changes to cryptlib.cpp.Diusrex2014-01-062-11/+2
| * | | | | 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
| * | | | | Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.hDiusrex2014-01-056-3/+78
| * | | | | Making all of the useful level 4 warnings be active.Diusrex2014-01-051-1/+13
* | | | | | Exported cWorld::BroadcastBlockAction().madmaxoft2014-01-061-1/+1
* | | | | | InfoDump: Removes indent and parses ParameterCombinations.madmaxoft2014-01-061-8/+27
| |/ / / / |/| | | |
* | | | | Fixed wrong enqueueing.madmaxoft2014-01-061-2/+9
|/ / / /
* | | | Fixed cPluginManager:AddHook() binding.madmaxoft2014-01-055-11/+37
* | | | Fixed a race condition in the cQueue class.madmaxoft2014-01-052-59/+90
* | | | InfoDump: Removed an unneeded function.madmaxoft2014-01-051-28/+0
* | | | Fix #506Alexander Harkness2014-01-051-1/+1
* | | | InfoDump: All reasonable strings are forumized.madmaxoft2014-01-041-5/+5
* | | | Added forum output for commands' DetailedHelp array.madmaxoft2014-01-041-2/+31
* | | | InfoDump: Implemented list and formatting Forumizing.madmaxoft2014-01-041-1/+6
* | | | added supported protocolAlexander Harkness2014-01-041-0/+2
* | | | InfoDump: added AdditionalInfo to forum dumps.madmaxoft2014-01-041-4/+47
* | | | Added an InfoDump script for dumping all plugins' Info.lua into forum description.madmaxoft2014-01-042-0/+299
| |/ / |/| |
* | | Merge pull request #494 from worktycho/threadsafequeueMattes D2014-01-047-140/+215
|\ \ \
| * | | Fixed DocumentationTycho2014-01-031-4/+2
| * | | derpTycho2014-01-032-1/+4
| * | | 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-0210-315/+231
| |\| |
| * | | 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-3114-980/+190
| |\ \ \
| * | | | 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-3122-95/+70
| |\ \ \ \
| * | | | | refactored chunk Queue to seperate classTycho Bickerstaff2013-12-317-124/+162
| * | | | | added link dependency between WorldStorage and OSSupportTycho Bickerstaff2013-12-221-0/+2
| * | | | | added mergetool files to gitignoreTycho Bickerstaff2013-12-221-0/+1
| * | | | | Merge branch 'master' into threadsafequeueTycho Bickerstaff2013-12-2225-83/+92
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into threadsafequeueTycho Bickerstaff2013-12-2295-485/+2920
| |\ \ \ \ \ \
| * | | | | | | basic threadsafe queue interfaceTycho Bickerstaff2013-12-212-0/+34
* | | | | | | | Merge pull request #502 from bitdeli-chef/masterAlexander Harkness2014-01-041-0/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Add a Bitdeli badge to READMEBitdeli Chef2014-01-041-0/+4
|/ / / / / / /
* | | | | | | Merge remote-tracking branch 'origin/master'Tau2014-01-021-2/+6
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #499 from worktycho/masterMattes D2014-01-021-2/+6
| |\ \ \ \ \ \ \
| | * | | | | | | fixed compiler warnings not being enabled in clangTycho Bickerstaff2014-01-021-2/+6
| | | |_|_|_|/ / | | |/| | | | |
* | / | | | | | [Handy] updated for new API, fixed bugs, added warnings. Now v2.Tau2014-01-022-284/+145
|/ / / / / / /
* | | | | | | Merge pull request #479 from mc-server/cmake-winMattes D2014-01-022-18/+30
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into cmake-winmadmaxoft2013-12-2810-169/+304
| |\ \ \ \ \ \ \
| * | | | | | | | Added support for out-of-source builds.madmaxoft2013-12-282-18/+30
* | | | | | | | | More memory alignment fixes.madmaxoft2014-01-022-6/+6
* | | | | | | | | Fixed unaligned memory access in FastNBT.madmaxoft2014-01-023-5/+44
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #484 from worktycho/cmake-fixesAlexander Harkness2014-01-014-953/+41
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ merged changes from upstreamTycho Bickerstaff2013-12-3112-29/+181
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'FishingHook'madmaxoft2014-01-0110-1/+151
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Little more documentation for OnPlayerFishing.STRWarrior2014-01-011-1/+1
| * | | | | | | | | Using documentation Xoft recommended.STRWarrior2014-01-011-1/+1
| * | | | | | | | | OnPlayerFishing doesn't have a const cItems anymoreSTRWarrior2014-01-015-5/+5
| * | | | | | | | | Fixed typo's in the documentation.STRWarrior2014-01-012-4/+4
| * | | | | | | | | implemented the recommendations Xoft gave.STRWarrior2013-12-317-12/+25
| * | | | | | | | | Documented OnPlayerFished and OnPlayerFishing.STRWarrior2013-12-312-0/+41
| * | | | | | | | | Implented OnPlayerFishing and OnPlayerFished.STRWarrior2013-12-306-1/+97
* | | | | | | | | | Merge pull request #497 from xdot/masterAlexander Harkness2014-01-011-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed GetPhysicalRAMUsage on Linuxandrew2014-01-011-2/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #480 from mc-server/CmakeNonMixedMattes D2013-12-311-26/+29
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| | | * | | | | | | Merge branch 'master' into cmake-fixesTycho Bickerstaff2013-12-3115-16/+57
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | 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
* | | | | | | | | | Merge pull request #488 from Diusrex/masterMattes D2013-12-312-2/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure.Morgan Redshaw2013-12-312-2/+3
|/ / / / / / / / /
| | * | | | | | | fixed bad mergeTycho Bickerstaff2013-12-221-4/+0
| | * | | | | | | merged in more warning fixesTycho Bickerstaff2013-12-222-3/+2
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Fixed compilation in VC2008.madmaxoft2013-12-307-79/+13
| |_|_|_|_|_|/ / |/| | | | | | |
| | * | | | | | merged in changesTycho Bickerstaff2013-12-223-2/+12
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | converted commneted paramater names to the unused macroTycho Bickerstaff2013-12-2217-93/+100
* | | | | | | | Merge branch 'master' of github.com:mc-server/MCServerTycho Bickerstaff2013-12-2295-485/+2920
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Chunk is now warnings cleanTycho Bickerstaff2013-12-214-6/+5
* | | | | | | | fixed hidden bug with furnaces ignoring time burntTycho Bickerstaff2013-12-211-1/+1
* | | | | | | | 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
| |_|_|_|_|/ / |/| | | | | |
| | | * | | | merged in warnings changesTycho Bickerstaff2013-12-2227-97/+94
| | | * | | | removed lua makefileTycho Bickerstaff2013-12-221-944/+0
| | | * | | | 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-224-62/+33
| | | * | | | fixes for mac os xTycho Bickerstaff2013-12-221-4/+8
| | |/ / / / | |/| | | |
| * | | | | Update GETTING-STARTED.mdAlexander Harkness2013-12-301-0/+2
| * | | | | Create GETTING-STARTED.mdAlexander Harkness2013-12-301-0/+119
| * | | | | APIDump: Fixed a factual error in OnPluginsLoaded description.madmaxoft2013-12-291-2/+2
| * | | | | APIDump: Static files overwrite their destination.madmaxoft2013-12-291-5/+13
| * | | | | APIDump: The PRE html tag has tab width set to 2 spaces.madmaxoft2013-12-291-0/+5
| * | | | | APIDump: Documented OnPluginsLoaded.madmaxoft2013-12-291-0/+79
| * | | | | Added HOOK_PLUGINS_LOADED.madmaxoft2013-12-297-3/+73
| * | | | | Merge pull request #481 from MikeHunsinger/masterMattes D2013-12-292-3/+49
| |\ \ \ \ \
| | * | | | | 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
| |/ / / /
| | | | * Fixed Linux configuration.madmaxoft2013-12-291-1/+1
| | | | * Ignore profile build folders created by MSVC build.madmaxoft2013-12-281-0/+22
| | | | * CMake: profiling builds get correct commandlines in MSVC.madmaxoft2013-12-281-64/+80
| | | | * Added custom configurations for MSVC projects.madmaxoft2013-12-281-19/+43
| | | |/ | | |/|
| | * | CMake: Fixed mismatching library vs app builds.madmaxoft2013-12-281-26/+29
| |/ /
| * | Fixed the Windows script for uploading Lua API to an FTP server.madmaxoft2013-12-282-1/+2
| * | APIDump: Added the SettingUpDecoda article.madmaxoft2013-12-275-0/+50
| * | APIDump: Articles eplicitly declare being UTF-8.madmaxoft2013-12-272-0/+2
| * | APIDump: Added quick links to index to each class and hook file.madmaxoft2013-12-271-2/+14
| * | APIDump: Added a quick-nav menu to hook descriptions.madmaxoft2013-12-271-7/+22
| * | APIDump: Added a quick-nav menu to class descriptions.madmaxoft2013-12-271-6/+22
| * | APIDump: Split the huge DumpAPIHtml function into smaller ones.madmaxoft2013-12-271-47/+61
| * | APIDump: Extra pages renamed to articles and moved to front.madmaxoft2013-12-271-24/+39
| * | APIDump: Fixed the WritingPlugin article.madmaxoft2013-12-271-98/+107
| * | APIDump: Added the WritingPlugin article to the exported pages.madmaxoft2013-12-271-0/+1
| * | APIDump: Fixed bad for-loop.madmaxoft2013-12-271-3/+3
| * | Merge pull request #477 from mc-server/cmake-winMattes D2013-12-279-78/+156
| |\|
| | * Lua is built statically on *nix.madmaxoft2013-12-271-1/+6
| | * Fixed unix Lua dependencies.madmaxoft2013-12-271-1/+1
| | * Merge branch 'master' into cmake-winmadmaxoft2013-12-275-53/+366
| | |\ | | |/ | |/|
| * | Merge pull request #476 from mc-server/apidump-writingpluginAlexander Harkness2013-12-263-49/+310
| |\ \
| | * | Writing a plugin APIDump article (#382)Tiger Wang2013-12-263-49/+310
| |/ /
| * | Merge pull request #474 from mc-server/deathmessagesMattes D2013-12-261-0/+16
| |\ \
| | * | 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
| |\ \
| | * | 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-278-35/+72
| | | * Added proper precompiled headers for MSVC.madmaxoft2013-12-261-48/+47
| | | * Added cmake output folders (VC2008) to gitignore.madmaxoft2013-12-261-0/+37
| | |/ | |/|
| * | cBlockArea: Fixed writing full-height areas.madmaxoft2013-12-261-2/+2
| * | Merge pull request #461 from mc-server/repeatersMattes D2013-12-267-47/+314
| |\ \ | | |/ | |/|
| | * 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
| | * 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
| | * 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
| |\ \
| | * | 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-253-9/+65
| |\ \ \
| | * | | (Hopefully) fixed if conditionstonibm192013-12-251-4/+1
| | * | | Implemented xoft suggestion (partly)tonibm192013-12-251-25/+29
| | * | | 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
| | * | | Added myself to contributorstonibm192013-12-241-0/+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
| | * | | Some fixes (SEE DESC)tonibm192013-12-231-0/+6
| | * | | You can now spawn iron golems.tonibm192013-12-231-3/+20
| * | | | Fixed block area height check.madmaxoft2013-12-251-2/+2
| * | | | Merge pull request #470 from mc-server/mobileentitysavingAlexander Harkness2013-12-254-13/+790
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Preliminary mobile entity savingTiger Wang2013-12-254-13/+790
| |/ / /
| * | | Merge pull request #469 from mc-server/Android_UpdateTiger Wang2013-12-245-23/+34
| |\ \ \
| | * | | Removed unneeded include.STRWarrior2013-12-241-1/+0
| | * | | Fixed getting configure button going to port 0.STRWarrior2013-12-243-7/+12
| | * | | Added the list_item.xmlSTRWarrior2013-12-241-0/+7
| | * | | Just a quick update for the files you need to compile for Android.STRWarrior2013-12-232-20/+20
| | |/ /
| * | | Merge pull request #468 from mc-server/colourchangeAlexander Harkness2013-12-245-27/+15
| |\ \ \
| | * | | removed the function def alsoAlexander Harkness2013-12-241-1/+0
| | * | | Finally removed the function.Alexander Harkness2013-12-241-6/+0
| | * | | Removed documentation for cChatColour:MakeColor()Alexander Harkness2013-12-241-7/+3
| | * | | 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
| |/ / /
| * | | Merge pull request #466 from Sxw1212/masterAlexander Harkness2013-12-242-2/+6
| |\ \ \
| | * | | Add myself to CONTRIBUTORS to comply with the Apache LicenseSam Mauldin2013-12-241-0/+1
| | * | | Store plugin in a local variable to fix error on disableSam Mauldin2013-12-241-2/+5
| |/ / /
| * / / Replaced esCreeper with esMonster.madmaxoft2013-12-233-4/+7
| |/ /
| * | 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
| * | Merge pull request #462 from mc-server/1.7_FishingMattes D2013-12-2220-15/+167
| |\ \
| | * | 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
| * | Merge pull request #460 from mc-server/Fishing_ItemsAlexander Harkness2013-12-211-2/+108
| |\ \
| | * | You are now able to get different items from fishing.STRWarrior2013-12-211-2/+108
| |/ /
| * | Fixed a typo in .gitignore.madmaxoft2013-12-211-1/+1
| * | Bindings regen script updated.madmaxoft2013-12-211-11/+6
| * | Further updates for the win nightbuild script.madmaxoft2013-12-211-25/+25
| * | Floater now dissapears when the player doesn't have an fishing rod equipped.STRWarrior2013-12-212-0/+32
| * | Fixed a file name.Alexander Harkness2013-12-211-0/+0
| * | Update COMPILINGworktycho2013-12-211-2/+2
| * | Added info about 32 bit mode.Alexander Harkness2013-12-211-0/+9
| * | Merge pull request #457 from worktycho/masterAlexander Harkness2013-12-212-1/+16
| |\ \ | |/ / |/| |
* | | added FORCE_32 optionTycho Bickerstaff2013-12-211-1/+15
* | | hide lua shared libraryTycho Bickerstaff2013-12-211-0/+1
| * | Update README.mdAlexander Harkness2013-12-211-1/+1
| * | Merge pull request #456 from mc-server/uselessfilesAlexander Harkness2013-12-218-50/+12
| |\ \
| | * | Moved some files.Alexander Harkness2013-12-215-0/+0
| | * | Marked stats.cmd as executable so it can be run on linuxAlexander Harkness2013-12-211-0/+0
| | * | Update cloc-exclude.txtAlexander Harkness2013-12-211-25/+11
| | * | Updated the stats.cmd file.Alexander Harkness2013-12-211-1/+1
| | * | Delete clean.batAlexander Harkness2013-12-211-24/+0
| * | | Update COMPILINGAlexander Harkness2013-12-211-5/+15
|/ / /
* | | Merge pull request #446 from worktycho/cmakeAlexander Harkness2013-12-2137-32566/+10155
|\ \ \
| * | | fixed lua dynamic libraryTycho Bickerstaff2013-12-211-2/+2
| * | | finished up final build flags for linuxTycho Bickerstaff2013-12-211-2/+19
| * | | Merge branch 'cmake' of github.com:worktycho/MCServer into cmakeTycho Bickerstaff2013-12-213-5/+27
| |\ \ \
| | * | | added precompiled headerstycho2013-12-201-13/+24
| | * | | fixed include of math on windowstycho2013-12-203-1/+12
| * | | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-2129-181/+238
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master', remote-tracking branch 'upstream/master'Tycho Bickerstaff2013-12-210-0/+0
| |/ / / |/| | |
* | | | 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
* | | | Updated the win nightbuild script with recent information.madmaxoft2013-12-211-6/+9
* | | | Merge pull request #454 from mc-server/repeatersMattes D2013-12-213-12/+41
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Fixed repeaters delay, maybeTiger Wang2013-12-203-12/+41
|/ /
* | Merge branch 'master' of https://github.com/mc-server/MCServerSTRWarrior2013-12-2010-98/+94
|\ \
| * | Fixed the rest of constructor reorders.madmaxoft2013-12-209-97/+92
| * | Or not. Fixes #384Alexander Harkness2013-12-201-1/+2
* | | 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
* | Merge pull request #452 from mc-server/apidumpeAlexander Harkness2013-12-202-1/+7
|\ \
| * | done... finallyAlexander Harkness2013-12-201-2/+2
| * | fix the issues xoft pointed outAlexander Harkness2013-12-201-5/+4
| * | @madmaxoft now?Alexander Harkness2013-12-201-3/+3
| * | Possibly fixes #384Alexander Harkness2013-12-201-0/+6
| * | Create a static folder for adding static files.Alexander Harkness2013-12-201-0/+1
* | | 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
| * made LUA shared unless STATIC_LUA is setTycho Bickerstaff2013-12-201-0/+4
| * fixed lua dependency on libmTycho Bickerstaff2013-12-201-0/+1
| * added profile builds as an optionTycho Bickerstaff2013-12-201-13/+51
| * possable fix of typoTycho Bickerstaff2013-12-201-1/+1
| * Revert "fixed bad reference to math library"Tycho Bickerstaff2013-12-201-2/+1
| * Revert "fixed bad reference to math library"Tycho Bickerstaff2013-12-201-2/+2
| * fixed bad reference to math libraryTycho Bickerstaff2013-12-201-2/+2
| * fixed bad reference to math libraryTycho Bickerstaff2013-12-201-1/+2
| * Merge branch 'cmake' of github.com:worktycho/MCServer into cmakeTycho Bickerstaff2013-12-194-9/+30
| |\
| | * fixed include paths on windows and added build dir to gitignoretycho2013-12-202-0/+3
| | * fixed compile errors with headers and math librarytycho2013-12-202-7/+20
| | * Merge branch 'cmake' of github.com:worktycho/MCServer into cmaketycho2013-12-200-0/+0
| | |\
| | * \ Merge branch 'master' into cmaketycho2013-12-2018-31/+310
| | |\ \
| | * | | fixed D9025tycho2013-12-201-2/+3
| | * | | fixed multiprocessing on windows and removed redundend compile of headerstycho2013-12-202-1/+5
| * | | | modified travis CI file for cmakeTycho Bickerstaff2013-12-191-1/+1
| * | | | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-194-21/+29
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
* | | | Fixed clang warnings in Noise.cpp.madmaxoft2013-12-201-20/+20
* | | | Merge pull request #451 from mc-server/dirtupdatefixAlexander Harkness2013-12-203-1/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed assertion during dirt block OnUpdate()Tiger Wang2013-12-203-1/+9
|/ / /
| * | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-1918-31/+310
| |\ \ | |/ / |/| / | |/
* | Merge pull request #450 from mc-server/redstonefixesMattes D2013-12-196-26/+94
|\ \
| * | 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
* | | Merge pull request #449 from mc-server/Fishing_RodMattes D2013-12-198-0/+194
|\ \ \
| * | | 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
| * | | Added the Floater files to MCServer.vcprojSTRWarrior2013-12-191-0/+12
| * | | 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
* | | | Merge pull request #448 from mc-server/testbranchAlexander Harkness2013-12-191-2/+4
|\ \ \ \
| * | | | just a little change for travis ci testAlexander Harkness2013-12-191-2/+4
* | | | | take advantage of 1.5 cores given by travis with parallelization!Alexander Harkness2013-12-191-1/+1
|/ / / /
* | | | explicitly defined email notificationsAlexander Harkness2013-12-191-1/+7
* | | | update readme with travis infoAlexander Harkness2013-12-191-0/+2
* | | | Update submodule URLs so people without SSH can get them.Alexander Harkness2013-12-191-3/+3
* | | | Create .travis.ymlAlexander Harkness2013-12-191-0/+6
* | | | Test commit.Alexander Harkness2013-12-191-0/+1
|/ / /
| | * fixed visual studio compile flagstycho2013-12-191-4/+14
| | * fixed a number of windows issuestycho2013-12-192-13/+35
| | * added md5 as a dependency for bindingsTycho Bickerstaff2013-12-193-1/+14
| | * added expat as lua bindings dependincyTycho Bickerstaff2013-12-197-22/+72
| | * compiling sqliteTycho Bickerstaff2013-12-192-0/+15
| | * 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-194-14/+45
| | |\ | |_|/ |/| |
* | | Update Contributing.md Alexander Harkness2013-12-191-0/+4
* | | Merge pull request #443 from mc-server/messagesAlexander Harkness2013-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
| * | 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
|/ /
| * fixed bindings generationTycho Bickerstaff2013-12-199-8044/+1092
| * Revert "Removed unused ToLua files." to allow the new cmake system to build on tolua++ on linuxTycho Bickerstaff2013-12-197-0/+16336
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 17:07:19 +0200