flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
9,329 Commits 1 Branch 0 Tags 92 MiB
d2af54992d
Commit Graph

4677 Commits

Author SHA1 Message Date
Hax52
9f1d1c058f Buttons no longer click on when already on. Buttons now play sound when clicking off. 2015-06-24 13:52:56 -05:00
Mattes D
c1780366b0 Merge pull request #2288 from cuberite/melonFix 
Call Neighbour changed handlers when a melon is created
 2015-06-24 14:59:47 +02:00
Mattes D
4f8e2f180d Added a forgotten break in cHangingEntity constructor. 
This had caused loading the cHangingEntity to fail in debug builds.
 2015-06-24 13:39:11 +02:00
tycho
b02b262a7c Call Neighbour changed handlers when a melon is created 
Should prevent cascading farmland updates on breaking melons
 2015-06-23 21:27:37 +01:00
worktycho
c0d8a4933e Merge pull request #2284 from cuberite/FixBiomeGen 
Generate biomes when pregenerating heights through CompositedHeiGen.
 2015-06-23 17:26:39 +01:00
Mattes D
2daa9c5854 Fixed melon metadata when growing from stem. 2015-06-23 17:23:35 +02:00
Mattes D
55a5f11b1b Fixed right-click with bonemeal. 
The client would send invalid right-click events with Y set to 0x7ff, which would crash the server. Only process bonemeal for valid clicks (valid blockface).
 2015-06-23 15:23:11 +02:00
Mattes D
6cd71a1e73 Generate biomes when pregenerating heights through CompositedHeiGen. 
Fixes #2283.
 2015-06-23 14:45:35 +02:00
Tiger Wang
33fc1474d9 Fixed minor errors in Tycho's code 
Everything should work now :)
 2015-06-22 21:27:13 +01:00
Samuel Barney
e70e2b8ecc Rebased version of Code 2015-06-22 11:29:38 -06:00
Mattes D
3889b2cac2 Refactored block placement workflow. 
Multi-blocks can now use the default OnPlayerPlaced() callback in cItemHandler.
 2015-06-21 19:49:22 +02:00
Mattes D
e06dd8f20e Added basic support for loading village prefabs from files. 2015-06-20 15:37:41 +02:00
worktycho
33d68572a6 Merge pull request #2255 from cuberite/LoadablePieces 
Loadable pieces
 2015-06-19 19:41:28 +01:00
Mattes D
8df31067d4 Externalized cPrefabPiecePool self-test. 2015-06-19 16:15:59 +02:00
Mattes D
ae16689420 PrefabPiecePool: Added loading from cubeset file. 2015-06-18 23:32:43 +02:00
Tiger Wang
6920e468ad Check the return value of InflateString 
Fixes #2256
 2015-06-18 11:19:41 +01:00
Mattes D
c6012a95bd LuaState: Added support for config-style usage. 
Globals and table values can be queried from the Lua state easily.
Use perfect forwarding.
 2015-06-17 17:13:45 +02:00
Tiger Wang
813ca04676 Fixes #2245 
Whoops :/
 2015-06-17 00:27:50 +01:00
tycho
6687ed03a1 Removed version 29 serilization 
This has been unused since support for <1.7 has been dropped.
 2015-06-16 10:24:06 +01:00
tycho
b259ab53fb Fixed override 
This was causing a compile error in clang 3.6
 2015-06-15 18:03:54 +01:00
Tiger Wang
f8c7efdcd7 Merge pull request #2244 from martindev2/#2092-TNT-Fire 
Fix block placement over fire
 2015-06-14 22:01:09 +01:00
worktycho
0cd64ab90b Fixed tigers format string 2015-06-14 13:18:01 +01:00
Martin McArthur
d8865339f5 implemented DoesIgnoreBuildCollision on BlockFire to allow blocks to be placed on top 2015-06-14 12:53:09 +01:00
Tiger Wang
882f7c70c0 Fixed log files' timestamps 
Also made Release mode log less technical information about the world
storage threads.
 2015-06-14 11:23:14 +01:00
Lane Kolbly
9d620a20a0 Work on NetherPortalScanner. Setup portal scanner to reset PortalCooldown. Changed where player is spawned. Added a_InitSpawn flag to CreateAndInitializeWorld. 2015-06-13 16:09:43 -05:00
worktycho
d961693020 Merge pull request #2237 from lkolbly/master 
Fixing how village doors are generated in 1.8.
 2015-06-13 21:55:36 +01:00
NiLSPACE
8ecd545857 Merge pull request #2240 from cuberite/UpdatedPrefabs 
Updated prefabs from the Gallery server.
 2015-06-13 18:29:46 +02:00
Mattes D
ec4bd42dd8 Updated prefabs from the Gallery server. 2015-06-13 18:14:09 +02:00
Lane Kolbly
dafdded7d9 Fixed typo in BlockDoor.h 2015-06-13 08:00:20 -05:00
Nounours Heureux
d79f601d5a Added HOOK_KILLED 2015-06-13 10:00:31 +02:00
Mattes D
f0ee0b8ce8 NetherPortalScanner: Fixed type conversion warnings. 2015-06-13 08:46:05 +02:00
Alexander Harkness
ee3082a3c5 If defined, not just if. 2015-06-12 12:37:22 +01:00
Alexander Harkness
070801d561 Fixed build error on Linux 2015-06-12 11:57:34 +01:00
Mattes D
d390214929 SelfTests are registered and executed after logging framework init. 
Fixes #2228.
 2015-06-11 22:20:04 +02:00
Tiger Wang
dd4b415051 Reinstate "Chunk queue collapsing" 
This reinstates commit f36acb6835
     and reverts commit adfbc42c02.
 2015-06-10 15:16:05 +01:00
Mattes D
d436a71cbc Merge pull request #2162 from lkolbly/master 
Nether Portal Jumping & Creation Code
 2015-06-10 08:00:50 +02:00
Lane Kolbly
73b6a44d5f Implemented nether portal scanning code. 2015-06-09 18:23:57 -05:00
Alexander Harkness
1e77f27191 Merge pull request #2144 from mc-server/comparators 
Redstone improvements [SEE DESC]
 2015-06-09 09:15:08 +01:00
Mattes D
db863422b8 cBlockArea: Added CountSpecificBlocks() API function. 2015-06-08 21:52:13 +02:00
worktycho
adfbc42c02 Revert "Chunk queue collapsing" 2015-06-07 20:45:47 +01:00
Alexander Harkness
f1a3535d6e Merge pull request #2210 from nounoursheureux/bucket-craft 
Cake crafting now give back the bucket
 2015-06-07 14:43:16 +01:00
Alexander Harkness
e2c4a0a595 Merge pull request #2211 from jan64/master 
Fix incorrent experience sending for 1.7 clients
 2015-06-07 14:41:27 +01:00
Nounours Heureux
24210cbd6f Fixed style 2015-06-07 15:22:47 +02:00
jan64
be4a5a0803 Fix incorrent experience sending for 1.7 clients 2015-06-07 15:21:18 +02:00
Nounours Heureux
1a7e8f3e4f Cake crafting now give back the bucket 2015-06-07 15:03:47 +02:00
Tiger Wang
061866616d Added moar comments 2015-06-07 12:54:07 +01:00
Tiger Wang
f44d123ba8 Vector hasher is now a separate class 2015-06-07 12:53:59 +01:00
Tiger Wang
ed6c37febc Use emplace to construct structures 2015-06-06 12:30:08 +01:00
Tiger Wang
a6983ec3c9 Improved link unpowering speed 
Also fixed compile errors
 2015-06-06 12:21:22 +01:00
Tiger Wang
171c59a01b Changed appropriate containers to unordered_map 
Thanks to @worktycho for guidance!

* Potential speed improvements
 2015-06-06 12:21:21 +01:00
Tiger Wang
6a831c0b6f Improved link power behaviour 2015-06-06 12:21:21 +01:00
Tiger Wang
bef7cce5ed Improved wires and repeaters 
* Fixed repeater cross-chunk power detection
+ Re-implemented horizontal wire cut-off checking
 2015-06-06 12:21:20 +01:00
Tiger Wang
151fe0fc59 Fixed wire consuming much resources 2015-06-06 12:21:19 +01:00
Tiger Wang
84534dfeb2 Redstone wire and trapdoor fixes 
* Fixes #1887
* Fixes #1763
* Fixes #1083
 2015-06-06 12:21:19 +01:00
Tiger Wang
bd48475085 Provides improvements to redstone wire 
Intermediary commit that fixes #1763.
 2015-06-06 12:21:18 +01:00
Tiger Wang
de5b1401f8 Comparators 2015-06-06 12:21:09 +01:00
Tiger Wang
f36acb6835 Merge pull request #2179 from mc-server/ChunkQueueCollapsing 
Chunk queue collapsing
 2015-06-06 10:55:12 +01:00
worktycho
54c1926a3a Merge pull request #2205 from birkett/master 
Daemon support on Linux
 2015-06-05 22:33:49 +01:00
tycho
ffbe5f6a2f Fix iterating 2015-06-05 22:31:22 +01:00
tycho
9ebbe969c8 Made the list of chunks to stream an unordered_set 
This should increase performance of chunk streaming
 2015-06-05 22:31:22 +01:00
tycho
bfe52277b4 Rewrote ChunkSending queue for significantly improved performance 2015-06-05 22:31:21 +01:00
tycho
19c95ee564 Moved Chunk Broadcasts over to the regular queue 2015-06-05 22:31:21 +01:00
Anthony Birkett
9dac390247 Daemon support on Linux. 
Added null console log listener, avoid printf() when stdout is closed.
 2015-06-05 15:47:47 +01:00
worktycho
519fd1d36d Merge pull request #2206 from mc-server/APIDumpTimeStamp 
APIDump time stamp
 2015-06-05 13:04:28 +01:00
Mattes D
1ec9665118 Fixed overshoot in cLineBlockTracer. 
Fixes #2161.
 2015-06-05 11:29:54 +02:00
Mattes D
99b182b4be Added Build info to the cRoot API. 2015-06-05 10:34:13 +02:00
Mattes D
649921f4a8 Provide some BuildInfo even for non-CI builds. 
Ref.: #2204
 2015-06-05 10:19:58 +02:00
Mattes D
5267285529 Merge pull request #2069 from HaoTNN/master 
Fixes lit furnace issue in #2051
 2015-06-05 10:12:10 +02:00
worktycho
c9ad1ecd3e Merge pull request #2203 from jan64/master 
Change SendChatType behavior for < 1.8 clients, update docs
 2015-06-04 11:28:43 +01:00
Cengiz Can
c967698b2d Skip unknown cflag for Apple clang & remove cSemaphore 2015-06-04 11:48:56 +03:00
jan64
fd964200b2 Changed SendAboveActionBarMessage / SendSystemMessage to be a noop for < 1.8 clients 2015-06-03 18:11:12 +02:00
HaoTNN
6f1a3cb6dd Merge remote-tracking branch 'upstream/master' 2015-06-03 02:57:07 -07:00
HaoTNN
e82cd6e4eb Fixes multiple furnace issues, including from loading world storage 2015-06-03 02:19:22 -07:00
Mattes D
1f2c9b226c Merge pull request #2199 from jan64/master 
Added system and above action bar chat messages
 2015-06-03 09:49:28 +02:00
HaoTNN
3142598dee Merge branch 'master' of https://github.com/mc-server/MCServer 2015-06-02 16:08:57 -07:00
jan64
d37e0eb72b Added system and above action bar chat messages 2015-06-02 19:59:46 +02:00
Mattes D
a0a8e78c0d Added cmdline params for crashdump detailness. 
Win32-only, also fixed the call scripts.
Fixes #2184.
 2015-06-02 15:19:13 +02:00
Mattes D
a42daecd0b Merge pull request #2182 from birkett/master 
Use the new style command line parameters for Windows Service support.
 2015-06-02 15:05:05 +02:00
Mattes D
48c153bf53 Fixed warnings in MSVC. 
It complained about undefined return values or using uninitialized variables.
 2015-06-02 12:51:43 +02:00
Anthony Birkett
65a62601dc Use the new style command line parameters for Windows Service support. 
Ignore invalid or malformed command line parameters, prevent unhandled exceptions.
NOTE: Users will need to reinstall the service, now uses "-d" instead of "/service" in the start parameters.
 2015-06-01 14:41:06 +01:00
Mattes D
a54fa15bc6 Merge pull request #2172 from mc-server/LightingCallbacks 
Made cLightingThread own its callbacks
 2015-06-01 15:02:42 +02:00
Mattes D
25e83bc1d9 Fixed crafting recipe matching. 
Fixes #2096.
 2015-05-31 21:21:57 +02:00
Mattes D
98df75d5ab ManualBindings: Fixed DoWithXYZ and ForEachInChunk signatures. 
Fixes forum report http://forum.mc-server.org/showthread.php?tid=1993
 2015-05-31 19:44:08 +02:00
tycho
9b798ff9dd Merge branch 'master' of github.com:mc-server/MCServer 2015-05-30 13:34:08 +01:00
tycho
bca13d9187 Fixed minor cast warning 2015-05-30 12:31:05 +01:00
Alexander Harkness
28bab37425 Fixed wrong indent. 2015-05-30 11:22:49 +01:00
Alexander Harkness
97ee861c20 Merge pull request #2171 from SafwatHalaby/fence 
PF - Handle all fencetypes
 2015-05-30 11:13:59 +01:00
tycho
06a74e45e2 Made cLightingThread own its callbacks 2015-05-30 11:11:17 +01:00
worktycho
b371208526 Merge pull request #2163 from mc-server/SimplifySpawn 
Clean up Spawn Prepare
 2015-05-30 10:59:52 +01:00
SafwatHalaby
5f7455bc19 PF - Handle all fencetypes 2015-05-30 12:49:49 +03:00
worktycho
2ce405883a Merge pull request #2169 from linnemannr/master 
Fix FreeBSD/clang errors caused by -Werror
 2015-05-30 10:32:35 +01:00
worktycho
2b51958c85 Merge pull request #2167 from SafwatHalaby/diags 
PF - Fixed diagonal cutting
 2015-05-30 10:28:37 +01:00
linnemannr
ee34e7131a Fix FreeBSD/clang errors caused by -Werror 
With FreeBSD/clang, -Werror combined with the configured warning flags yields
some fatal errors, specifically related to signed conversion, 64 to 32 bit
conversion, and tautological compares.

CONTRIBUTORS

	Add myself to the contributor list

src/Generating/FinishGen.cpp

	In cFinishGenPassiveMobs::GetRandomMob(), change the type of RandMob
	from size_t to the difference_type of the ListOfSpawnables iterator
	MobIter. Using size_t triggers a 64 bit to 32 bit conversion if the
	difference_type of the iterator class is 64 bit

	Also explicitly cast the noise expression to unsigned long so we don't
	get a signed conversion warning from the modulo against
	ListOfSpawnables.size()

src/OSSupport/StackTrace.cpp

	FreeBSD 10 and above includes a non glibc implementation of benchmark()
	for which size_t, not int, is the return type. To account for this and
	prevent a signed conversion warning, abstract the type for numItems with
	a macro btsize

src/StringUtils.h

	In StringToInteger(), correct a tautological compare warning for
	unsigned types with the template. If T is unsigned, comparing
	std::numeric_limits<T>::min() to the unsigned result is always
	false. That control can enter this branch in an evaluated template with
	an unsigned type T may also permit a signed number to be parsed and
	erroneously stripped of its signedness at runtime. To guard against this
	and avoid the warning in the case that the number parsed from the string
	is non-positive, return false and don't try to parse if T is unsigned
	and control enters the non-positive branch
 2015-05-30 02:23:57 -06:00
SafwatHalaby
d9f5d3c858 PF - Fixed diagonal cutting 2015-05-30 10:50:04 +03:00
Safwat Halaby
054d2cd451 Merge pull request #2166 from SafwatHalaby/squid 
Disabled squid and Guardian Pathfinding
 2015-05-30 10:31:26 +03:00
SafwatHalaby
a0f4e182b1 Disabled squid and Guardian Pathfinding 2015-05-30 10:04:27 +03:00
SafwatHalaby
9c6c6af75a Fixed creeper explosions 2015-05-30 09:54:32 +03:00
Tiger Wang
291370e367 Fix Destroy() calling behaviour 
* Fixes Core/#142
 2015-05-30 00:23:34 +01:00
tycho
4feccaa64a Clean up Spawn Prepare 
Made cSpawnPrepare execute on the same thread since it is a syncronous operation, and most of the code happens on the lighting thread.
Also moved cSpawnPrepare into its own file
 2015-05-30 00:19:20 +01:00
Lane Kolbly
1dfc7bbce2 Fixed reversed logic in StringToDimension. 2015-05-30 00:02:43 +01:00
Julian Laubstein
1e6f02437e Merge pull request #2070 from mc-server/PreventNewWarnings 
Fixed a lot of warnings
 2015-05-29 11:08:32 +02:00
b33duck
022348645e Fix for the way connecting clients receive player lists and broadcast chat 2015-05-28 19:43:16 -07:00
tycho
4956e8700d Merge branch 'master' into PreventNewWarnings 
Conflicts:
	src/Entities/ArrowEntity.cpp
 2015-05-29 00:12:56 +01:00
SafwatHalaby
f1540173da AI - Sane Skeleton 2015-05-28 19:19:56 +03:00
Tiger Wang
20b7152572 Potential crash fixes 
* Potentially addresses my comment in #1969
* Probably fixes #2145
 2015-05-28 13:03:28 +01:00
tycho
b2fa71a32a Fix comments 2015-05-28 12:54:04 +01:00
tycho
e19693e529 Merge branch 'master' into PreventNewWarnings 
Conflicts:
	src/Inventory.cpp
 2015-05-28 11:05:41 +01:00
SafwatHalaby
b936781f93 AI - Tweaked wolf speed and teleport threshold 2015-05-28 08:31:17 +03:00
worktycho
7c028b87bc Merge pull request #2148 from SafwatHalaby/easy 
AI - Saner Livestock
 2015-05-27 17:46:11 +01:00
SafwatHalaby
52fcbb5c65 AI - Saner Livestock 2015-05-27 19:26:08 +03:00
Alexander Harkness
da4a76bb50 Merge pull request #2061 from mc-server/fixes 
Fixes
 2015-05-27 12:21:17 +01:00
tycho
31b95afd79 Fixed ClientHandle not getting properly removed from the world 
when socket is closed whilst the client is being added to the world
Fixes #1969
 2015-05-26 10:34:14 +01:00
Mattes D
c3c30a78e1 Merge pull request #1848 from scottwillmoore/ImplementTitleCommand 
Implement backend for /title command
 2015-05-26 08:46:16 +02:00
Mattes D
35c40bd9eb Merge pull request #2138 from Seadragon91/server_uptime 
Added method to get the uptime of the server in seconds.
 2015-05-26 07:59:10 +02:00
Lukas Pioch
c3b872ad93 Added method to get the uptime of the server in seconds. Implements #1650. 2015-05-26 05:36:46 +02:00
worktycho
6735b0d534 Only add default plugins if there are not any plugins 
Fixes #2082
 2015-05-25 18:43:18 +01:00
Alexander Harkness
150024265e Merge pull request #2135 from linnemannr/master 
Support building on FreeBSD
 2015-05-25 07:07:18 +01:00
linnemannr
5049fd0fbf Support building on FreeBSD 
SetFlags.cmake

	Add -lexecinfo to linker flags for FreeBSD to resolve backtrace()

lib/sqlite/CMakeLists.txt

	Define _XOPEN_SOURCE to 600 instead of __POSIX_VISIBLE to 200112 for
	POSIX 1-2001 support. For POSIX standards, the _XOPEN_SOURCE define
	controls the eventual value of __POSIX_VISIBLE. _XOPEN_SOURCE is defined
	to 500 in sqlite.c if not already defined, which sets up _POSIX_C_SOURCE
	and __POSIX_VISIBLE to the 199506 for POSIX.1c

lib/tolua++/CMakeLists.txt
src/CMakeLists.txt

	Add /usr/local/lib to the library search path for FreeBSD builds

src/OSSupport/Errors.cpp

	Correct the strerror_r() implementation determination to check whether
	_GNU_SOURCE is defined, not what it evaluates to
 2015-05-24 20:07:31 -06:00
tycho
d1c9122340 Fix warnings in cPath 2015-05-24 17:47:15 +01:00
tycho
a6ccee5948 Merge branch 'master' into PreventNewWarnings 2015-05-24 17:27:05 +01:00
tycho
5ab650e4bb Fix bearbins comments 2015-05-24 15:25:52 +01:00
tycho
76a3165f09 Fix comments 2015-05-24 14:58:24 +01:00
tycho
95b81b3ef1 Disable -Werror for warnings in tests. 2015-05-24 14:16:05 +01:00
worktycho
bd95d7bf7b Merge pull request #2091 from Rakete1111/master 
Placing buckets up to 25 blocks away #2059
 2015-05-24 13:44:34 +01:00
Tiger Wang
10c9e66aad Fixes #2041 2015-05-24 13:37:36 +01:00
tycho
dae9e5792a Made -Weverything an error. 2015-05-24 12:56:56 +01:00
worktycho
d86e8fae79 Merge pull request #2122 from SafwatHalaby/bounding 
Pathfinder - Bounding boxes and some tweaks
 2015-05-24 12:51:15 +01:00
Safwat Halaby
79c3e11a31 Merge pull request #2118 from mc-server/login-gamemode 
Fix gamemode not changing properly.
 2015-05-24 09:52:45 +03:00
Alexander Harkness
45012b72e7 Wolves don't spawn in rivers. 2015-05-24 07:28:17 +01:00
HaoTNN
2578afb244 Merge remote-tracking branch 'upstream/master' 2015-05-23 14:06:37 -07:00
SafwatHalaby
7021547e99 Pathfinder - Bounding boxes and some tweaks 2015-05-23 22:16:19 +03:00
Safwat Halaby
042c08d7e3 Merge pull request #2107 from mc-server/cow-waterspawn 
Cows no longer spawn over water.
 2015-05-23 22:11:34 +03:00
Alexander Harkness
febc8529b1 Fix gamemode not changing properly. 
Should fix #604
 2015-05-23 19:31:33 +01:00
tycho
81c0116cf1 Merge branch 'master' into PreventNewWarnings 2015-05-23 07:33:52 -07:00
worktycho
7e0dc0f9bc Merge pull request #2117 from Seadragon91/clang_errors 
Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher.
 2015-05-23 15:31:49 +01:00
Lukas Pioch
e30b2ed487 Fixed missing overrides and added a ignore flag for reserved macro for clang version 3.6 and higher. 2015-05-23 16:28:37 +02:00
tycho
b29ae54d91 Merge branch 'master' into PreventNewWarnings 2015-05-23 06:50:28 -07:00
tycho
a5624debcb Fix tests 2015-05-23 13:21:02 +01:00
Mattes D
dbf5fed2bc Merge pull request #2065 from mc-server/OldArgs 
Move some of the old arguments over to TCLAP
 2015-05-23 13:05:16 +02:00
Alexander Harkness
3a27fabbab Merge pull request #2103 from beeduck/Issue1980 
Fixed players head visible when in spectator mode
 2015-05-23 11:56:39 +01:00
tycho
1577a080ee Merge branch 'master' into PreventNewWarnings 2015-05-23 11:31:03 +01:00
worktycho
26c9c34780 Fixed wrong copy/paste 
Fixes CID 110962
 2015-05-23 11:30:15 +01:00
Alexander Harkness
abf6ac3148 Cows and rabbits no longer spawn over water. 
Fixes #2080
 2015-05-23 10:38:57 +01:00
Alexander Harkness
de5e056a88 TryGetHeight returns a bool 
should fix #2099
 2015-05-23 10:37:50 +01:00
Alexander Harkness
e0fd3ce95b Merge pull request #2101 from mc-server/EquifaxCerts 
Close Ssl Socket on destroy
 2015-05-23 07:28:36 +01:00
Alexander Harkness
31f66fd812 Merge pull request #2104 from beeduck/Issue2053 
Fix for players falling through world when loading in as spectator
 2015-05-23 07:27:04 +01:00
SafwatHalaby
f983bb6234 Fixed creeper not exploding when 1 block higher than player 2015-05-23 09:06:00 +03:00
b33duck
afb96c5bd6 Added a fix for players falling through the world when connecting in spectator mode 2015-05-22 16:33:11 -07:00
Tiger Wang
8f6788b2ef Close Ssl Socket on destroy 
* Fixes #2072
 2015-05-22 23:54:32 +01:00
b33duck
906288c6eb Fixed players head visible when in spectator mode 2015-05-22 12:25:16 -07:00
Blitz Rakete
e512b7bf8e Fixes #2059 2015-05-21 19:03:51 +02:00
Mattes D
6bafff0560 Merge pull request #2086 from Seadragon91/master 
Renamed hook HOOK_ENTITY_CHANGE_WORLD
 2015-05-21 12:57:25 +02:00
Lukas Pioch
bc838e5bd2 Renamed hook HOOK_ENTITY_CHANGE_WORLD 2015-05-21 12:27:54 +02:00
Mattes D
90ab8a338b Added Equifax root CA. 
Fixes #2076.
Closes #2081.
Ref.: #2072.
 2015-05-21 10:26:45 +02:00
worktycho
c0d7b4d569 Merge pull request #2030 from beeduck/master 
Issue #1868 and Issue #1984
 2015-05-21 07:50:30 +01:00
Alexander Harkness
6202fdafe7 Merge pull request #2084 from mc-server/patch-2050 
Added missing fencetypes to torchhandler
 2015-05-21 07:02:10 +01:00
b33duck
ed3c0b771f Added open/close and sound effects for all door types 2015-05-20 16:24:16 -07:00
b33duck
a511db78ca Added thunder sound effect to CastThunderbolt() 2015-05-20 16:23:56 -07:00
Julian Laubstein
48b7874099 Added missing fencetypes to torchhandler 2015-05-20 23:18:21 +02:00
SafwatHalaby
8436e5d8bd Path recalculation improvements 2015-05-20 20:42:35 +03:00
worktycho
eaedd5f19d Merge pull request #2074 from SafwatHalaby/rmUnique 
Removed UniquePTR from PathFinder
 2015-05-20 13:06:51 +01:00
tycho
d9d4adc2a5 Moved no buffering command line argument to tclap 2015-05-20 01:50:04 +01:00
tycho
7c196ffde6 Move commlog arguments over to TCLAP 2015-05-20 01:50:04 +01:00
HaoTNN
ac1bfd9671 Merge remote-tracking branch 'upstream/master' 2015-05-19 14:22:27 -07:00
worktycho
8026133078 Don't verify certificate 
Temporary Hot-fix for #2072
 2015-05-19 21:25:38 +01:00
SafwatHalaby
395f3d9c4c newlines 2015-05-19 22:47:48 +03:00
tycho
813c95d4b0 Merge branch 'master' into PreventNewWarnings 2015-05-19 19:40:39 +01:00
tycho
77f1f58c0a Make -Werror disabling file only 
Ad fix a load of warnings
 2015-05-19 19:32:10 +01:00
SafwatHalaby
0741ad3526 Removed UniquePTR from PathFinder 2015-05-19 21:07:05 +03:00
Alexander Harkness
0c06ec6abd Merge pull request #2057 from Seadragon91/master 
Fix the health of animals
 2015-05-19 18:02:43 +01:00
tycho
480052c058 Added LuaState support for all integral types 
All so added error handling for out of range values
 2015-05-19 17:09:05 +01:00
tycho
2bb25b8afa Fixed some more warnings 2015-05-19 15:21:29 +01:00
tycho
050a014106 Finish fixing windows 2015-05-19 14:02:02 +01:00
tycho
03c75943ea More fixed warnings 2015-05-19 13:34:52 +01:00
tycho
6cccd2aabb Properly fix cFile Warnings 2015-05-19 13:33:34 +01:00
tycho
fa4fb75e03 Fixed compile and a few more warnings 2015-05-19 12:28:31 +01:00
tycho
95e06ab93f Merge branch 'master' into PreventNewWarnings 
Conflicts:
	src/Blocks/BlockLeaves.h
 2015-05-19 11:55:23 +01:00
tycho
f2689c4887 Fixed a lot of warnings 2015-05-19 11:50:59 +01:00
Alexander Harkness
fff5efedc3 Merge pull request #2019 from mc-server/OverrideArgs 
Initial Implementation of command line arguments
 2015-05-19 10:53:44 +01:00
Alexander Harkness
2c0a11a8af Merge pull request #2060 from mc-server/more-leafimprove 
Improved leaves a bit more.
 2015-05-19 09:32:14 +01:00
Alexander Harkness
d852209f8d Manual merge of #2066 2015-05-19 09:29:27 +01:00
Alexander Harkness
b50135e78f Merge pull request #2064 from Seadragon91/hook_entity_change_world 
Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLD
 2015-05-19 09:24:50 +01:00
haotnn
6128e3f7cd Fixes lit furnace issue in #2051 2015-05-18 23:19:03 -07:00
Lukas Pioch
4d4d1e9c69 Added hooks HOOK_ENTITY_CHANGE_WORLD and HOOK_ENTITY_CHANGED_WORLD 
Fixes #1435.
 2015-05-18 22:29:39 +02:00
tycho
2e98bfc4e9 Add support for setting ports through command line 2015-05-18 17:26:12 +01:00
tycho
c2303ac4cf Fix max slots logic to only override if acctually present. 2015-05-18 15:43:26 +01:00
Tiger Wang
1632d5f8f1 Fixes #2003 2015-05-18 15:43:24 +01:00
Tiger Wang
0dbba305b6 Fixes #2052 2015-05-18 14:30:16 +01:00
Alexander Harkness
aedf9d05cb Improved leaves a bit more. 
Should fix #2058.
 2015-05-18 13:43:00 +01:00
STRWarrior
007bac638b Merge branch 'master' of https://github.com/mc-server/MCServer 2015-05-18 09:30:43 +02:00
Safwat Halaby
75d2f1a61b Merge pull request #2049 from mc-server/sapling-probability 
Fix sapling probability.
 2015-05-18 08:20:00 +03:00
Lukas Pioch
a75106aea7 Fix the health of animals 2015-05-18 06:36:52 +02:00
Safwat Halaby
b7b088494c Merge pull request #2037 from SafwatHalaby/aprox 
Pathfinder - approximated paths when original destination unreachable
 2015-05-17 23:21:52 +03:00
STRWarrior
b9481dafeb Updated the defaults for the overworld world generator 2015-05-17 19:36:18 +02:00
SafwatHalaby
29e31c5be9 Pathfinder - approximated paths when original destination unreachable 2015-05-17 19:36:52 +03:00
Alexander Harkness
1049d5b706 properly this time? 2015-05-17 16:30:13 +01:00
Alexander Harkness
adecdc2f07 Fixed typo. 2015-05-17 16:10:55 +01:00
Alexander Harkness
d48825fa81 Fix sapling probability. 
Probability is 5% of leaves drop a sapling.

This should really be different for jungle leaves (2.5%) and the Fortune enchantment should increase the probability.
 2015-05-17 14:23:16 +01:00
worktycho
c94134ec5e Fix FastRandom seeding 
Fixes #1815
Fixes #2021
 2015-05-17 13:16:18 +01:00
Mattes D
f3d6da29f7 Fixed inventory handling. 
Fixes #2035.
 2015-05-16 23:22:50 +02:00
Safwat Halaby
4ace226dcd Merge pull request #2033 from mc-server/BreakIntoDebugger 
Lua: Break into ZBS debugger on API errors.
 2015-05-16 22:59:42 +03:00
Alexander Harkness
c9880b9cb5 Fixed bad logic. 2015-05-16 16:58:43 +01:00
Alexander Harkness
bda9b3e342 Should Fix sign flipping. 
Fixes #1118
 2015-05-16 16:49:47 +01:00
Mattes D
1240c76cb4 Lua: Break into ZBS debugger on API errors. 2015-05-16 16:19:18 +02:00
Mattes D
0b536701b4 Merge pull request #2029 from mc-server/bedPatch 
Bed uses bottom two bits for direction not three
 2015-05-16 14:11:56 +02:00
tycho
36fe8ee5f5 Added deoxy comments 2015-05-16 12:46:43 +01:00
worktycho
6350e4f279 Bed uses bottom two bits for direction not three 2015-05-16 12:07:38 +01:00
worktycho
0da8c7392e Fix service Main 2015-05-16 10:47:04 +01:00
tycho
c96849f431 Move make_unique into a namespace to avoid ADL issues 
this prevents VS finding std::make_unique for constructors that take types from std
 2015-05-16 10:47:04 +01:00
tycho
b9efa02c80 Initial implementation of IniFile overloading 2015-05-16 10:46:51 +01:00
SafwatHalaby
4ffc6621a9 PathFinder uses UniquePtr for cell map. 2015-05-16 10:38:58 +02:00
worktycho
5c3a85fba1 Revert "PathFinder - smart pointers" 2015-05-15 18:54:45 +01:00
SafwatHalaby
a8878dd2b6 uniquePTR 2015-05-15 20:25:44 +03:00
Mattes D
163aebf8ca Fixed cPluginManager:ForEachCommand() and ForEachConsoleCommand() 
The functions would leak one value on the Lua stack for each enumerated command.
Fixes #2017.
 2015-05-14 19:46:18 +02:00
Mattes D
c3804f08c8 Merge pull request #2018 from mc-server/ProbDif 
Fixed possible crash in cProbabDistrib
 2015-05-14 17:23:23 +02:00
STRWarrior
67b6b71a5b Fixed possible crash in cProbabDistrib 
It could divide through 0 which causes a crash
 2015-05-14 16:49:13 +02:00
Mattes D
80f2e1eb66 Merge pull request #2010 from TwiddleStick/patch-2 
Update World.cpp
 2015-05-14 13:41:22 +02:00
Mattes D
43fecf48e3 Merge pull request #2006 from mc-server/ManualBindingsWorld 
Moved cWorld manual bindings out into a separate file.
 2015-05-14 08:15:40 +02:00
Martin Fahy
8f0f421ae4 Update World.cpp 
Fixed minor typos in comments, simply trying to understand the code base to fix issue regarding no sound when lighting is produced, no change to actual code.
 2015-05-13 23:05:44 -04:00
Mattes D
2cdc2a16e4 Fixed chat message manipulation by plugins. 
Plugins, in their OnChat hook, can change the chat message sent by a player.
 2015-05-13 18:45:29 +02:00
Mattes D
f36b00f4d4 All in-game commands go through the OnExecuteCommand hook. 
Everything that has a slash at the beginning, doesn't matter if it is a registered command or not.
 2015-05-13 18:31:01 +02:00
Mattes D
15771e4759 Moved cWorld manual bindings out into a separate file. 2015-05-13 11:30:57 +02:00
Mattes D
0686b55901 Merge pull request #2001 from mc-server/BindingsCleanup 
Bindings cleanup
 2015-05-12 10:29:55 +02:00
Mattes D
4b97569b3a ToLua now generates cLuaState::Push() and GetStackValue() 
For classes exported through ToLua it generates the cLuaState::Push() and cLuaState::GetStackValue() functions, as well as the supporting forward declarations and typedefs.
Renamed virtual_method_hooks.lua to BindingsProcessor.lua since it no longer provides virtual method hooks and instead does additional processing when generating the bindings.
 2015-05-12 09:20:54 +02:00
Tiger Wang
c10e83c02d Fixed creative click-outside 
* Fixes #1995
 2015-05-11 23:21:46 +01:00
Tiger Wang
30b17bcb97 Improved hoppers 
* Fixes #1994
 2015-05-11 22:58:27 +01:00
Mattes D
4083bc7005 AllToLua: Removed unneeded virtual method hooks. 2015-05-11 16:11:53 +02:00
Mattes D
dd10ffb63a OnExecuteCommand hook can override the command result (crXXX). 2015-05-10 23:11:30 +02:00
Mattes D
693ffb689c Exported cPluginManager:ExecuteConsoleCommand() to Lua API. 
Fixes #1999.
 2015-05-10 22:51:16 +02:00
Mattes D
6c53abed23 Call HOOK_EXECUTE_COMMAND even for unknown console commands. 
This allows plugins such as Aliases to intercept even unknown commands.
 2015-05-10 21:46:25 +02:00
Mattes D
b356419a07 StringUtils: Fixed StringSplitWithQuotes(). 
The function would crash when given a string that started with the delimiter.
 2015-05-10 21:39:14 +02:00
Mattes D
cbb1eff17a Added the EntireCommand parameter to HOOK_EXECUTE_COMMAND. 
Fixes #1996.
 2015-05-10 21:37:46 +02:00
Tiger Wang
9c490293b8 Merge remote-tracking branch 'origin/master' into warnings 
Conflicts:
	src/Mobs/Monster.cpp
	src/Vector3.h
 2015-05-10 12:16:20 +01:00
Tiger Wang
11ef1fd24a Fixed some warnings and logic errors in Monster.cpp 2015-05-10 12:14:55 +01:00
wiseoldman95
8a576a0a35 PF - Less calcs per tick 2015-05-10 09:08:42 +03:00
Mattes D
756d310318 Added check against "Type const &" and "Type const *". 2015-05-09 12:58:56 +02:00
Mattes D
846d16315a CheckBasicStyle: checks spaces around * and &. 2015-05-09 12:58:55 +02:00
Mattes D
c13b1931ff More style checking. 
Spaces around some operators are checked.
 2015-05-09 12:58:54 +02:00
jammet
61300ab9ef Rabbit and cooked rabbit now stackable 
And corrected the alphabetical ordering.
 2015-05-09 12:56:23 +02:00
Mattes D
92b8cd2f2a Merge pull request #1956 from Tri125/master 
Fixed Magma cube sound and spawn size
 2015-05-09 12:44:57 +02:00
worktycho
e2e206d81b Fixed remaing pragmas 2015-05-09 10:59:08 +01:00
worktycho
4dcd9a9924 clang diagnostic not diagnostics 
fixed clang pragmas
 2015-05-09 10:55:40 +01:00
Alexander Harkness
049ff67416 Merge pull request #1973 from Tri125/QuartzStack 
Fixed #1893 : Quartz can now stack
 2015-05-09 06:58:29 +01:00
Tristan
4642a50d62 GetSizeName of cSlime and cMagmaCube is now static 2015-05-08 20:50:05 -04:00
worktycho
523db778d9 Merge pull request #1972 from Woazboat/CodeCleanup_refactored 
Fixed compiler warning overrides in Vector3.h
 2015-05-09 00:25:38 +01:00
Woazboat
eaba777a0e Fixed compiler warning overrides in Vector3.h 2015-05-09 01:15:45 +02:00
Tiger Wang
218010cd96 Fixed some Visual Studio warnings 2015-05-08 23:32:02 +01:00
worktycho
1cef39cb73 Move chunk position accesses after the chunk validity checks 2015-05-08 23:20:22 +01:00
Mattes D
9329c2c2cb Merge pull request #1945 from Woazboat/CodeCleanup_refactored 
Small code cleanup - clean version
 2015-05-08 21:52:41 +02:00
wiseoldman95
290bc2e377 Spaces in cPath 2015-05-08 17:08:15 +03:00