1
0
Commit Graph

4751 Commits

Author SHA1 Message Date
Tycho
e73caf30f0 Fix gcc error attempt 2 2014-03-09 09:33:40 -07:00
Tycho
f4201e0b82 Fixed gcc error 2014-03-09 09:25:16 -07:00
Tycho
c5436e1ae7 Lots more warnings 2014-03-09 09:16:15 -07:00
Tiger Wang
888c3f1af7 Fixed VERIFY 2014-03-09 15:53:03 +00:00
Tiger Wang
b64e9fb7f5 Beds now work properly fixes #707
Also fixes FS392

Conflicts:
	src/Blocks/WorldInterface.h
	src/ClientHandle.cpp
2014-03-09 15:32:34 +00:00
Tiger Wang
77787fb719 != FACE_NONE 2014-03-09 14:55:47 +00:00
madmaxoft
b9190fc04e PieceGenerator can connect two connectors of the same type.
Also added extensive debugging output and a test.
2014-03-09 15:24:12 +01:00
madmaxoft
5be983e775 Added BlockFaceToString() translation function. 2014-03-09 15:24:11 +01:00
madmaxoft
93f0de521a Added Vector3i::Move(). 2014-03-09 15:24:11 +01:00
madmaxoft
e6305d29a5 Added the first skeleton code for PieceGenerator.
This is a WIP and won't work / isn't used at all.
2014-03-09 15:24:11 +01:00
Mattes D
d3c38c40e4 Merge pull request #777 from jfhumann/issue317
Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
2014-03-09 15:13:27 +01:00
Mattes D
8a715db41f Merge pull request #775 from worktycho/warnings
Fixed a few warnings
2014-03-09 15:04:12 +01:00
Tiger Wang
c2978a3457 Merge branch 'master' into ballisticmissiles
Conflicts:
	src/ClientHandle.cpp
2014-03-09 12:53:50 +00:00
Tiger Wang
76bf7ad813 Hexified colours 2014-03-09 12:49:00 +00:00
Tiger Wang
a2fb28dd08 Fixed data length issues 2014-03-09 12:48:59 +00:00
Tiger Wang
124fc8bc66 Demonstrated issues with GetDataLength() 2014-03-09 12:48:58 +00:00
Tiger Wang
d5180ef230 Added extra dye rules to crafting.txt 2014-03-09 12:48:56 +00:00
Tiger Wang
8f134adb6d Improved formatting of username tabcomplete 2014-03-09 12:48:55 +00:00
Tiger Wang
217aaca699 Moved firework handler to separate function
* Also simplified and improved readability of code
2014-03-09 12:48:53 +00:00
Tiger Wang
c05a1db88d CheckBlockInteractionsRate() fixed & enabled 2014-03-09 12:48:52 +00:00
Tiger Wang
e2cbebe522 Fix Linux compile 2014-03-09 12:48:49 +00:00
Tycho
90cb04c5b6 Merge branch 'warnings' into Werror 2014-03-09 05:05:59 -07:00
Tycho
4cb0b82d1d Fixed some warnings 2014-03-09 05:05:37 -07:00
Tycho
59d42ec5b2 Enabled loads of clang warnings 2014-03-09 04:58:08 -07:00
Tycho
ebdbac9b38 Merge branch 'warnings' into Werror 2014-03-09 04:44:52 -07:00
Tycho
14c2f620d1 FIxed int in test 2014-03-09 04:43:22 -07:00
Tycho
b2929c9e6e Merge branch 'warnings' into Werror 2014-03-09 04:38:04 -07:00
Tycho
b4e3d0aa4e Turned off Wunused-parameter 2014-03-09 04:37:36 -07:00
Jan-Fabian Humann
f74ee8fb51 Adjusted style of switch/case 2014-03-09 10:55:06 +01:00
Tiger Wang
d872f2e41d Updated Core 2014-03-09 01:49:32 +00:00
Tiger Wang
ff186f9735 TNT explodes when consumed by fire
Fixed FS#406
2014-03-09 01:23:55 +00:00
Tiger Wang
8d2ebf8e19 Slight plugin messaging changes
- Clients are not allowed to register duplicate channels
- Clients are not allowed to use channels that were not registered
2014-03-09 00:36:02 +00:00
Mattes D
17f27d1750 Added switch case indent notice 2014-03-08 21:14:59 +01:00
Tycho
6b530bde75 Added static 2014-03-08 11:53:37 -08:00
Tycho
a6ed75c1fb Added tons more asserts to bytebuffer 2014-03-08 11:18:51 -08:00
Tycho
27fa2b72ba Enabled self test of bytebuffer 2014-03-08 11:05:37 -08:00
Jan-Fabian Humann
72f9c8b069 Changed if-else to switch-case 2014-03-08 19:26:32 +01:00
Mattes D
3a6499b192 Merge pull request #729 from worktycho/MetaRotate
Alternitive solution to #503
2014-03-08 18:27:24 +01:00
Jan-Fabian Humann
66970fe943 Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting. 2014-03-08 17:55:53 +01:00
Tycho
307fad0f25 Fixed issues with int vs size_t and a few other warnings 2014-03-08 08:33:38 -08:00
Tycho
38ba8684f8 Merge branch 'warnings' into Werror 2014-03-08 07:37:33 -08:00
Tycho
9b47366d03 Actually Fixed ByteBuffer 2014-03-08 07:36:52 -08:00
Tycho
085fd3b053 Merge branch 'warnings' into Werror
Conflicts:
	SetFlags.cmake
2014-03-08 07:23:19 -08:00
worktycho
10a973abbc Disable -Werror on this branch 2014-03-08 15:21:09 +00:00
Tycho
c4c58c71fb Merge branch 'warnings' into Werror 2014-03-08 07:14:22 -08:00
Tycho
c3758112cc Merge branch 'master' into warnings 2014-03-08 07:13:45 -08:00
worktycho
16ebbca35b Moved returns 2014-03-08 14:23:00 +00:00
Alexander Harkness
4638d8f5e2 Merge pull request #770 from xdot/master
cBlockInfo-related changes from #723
2014-03-08 11:44:16 +00:00
Howaner
60091bcba3 Change tnt documentation to ticks 2014-03-08 12:31:20 +01:00
Howaner
527f358510 Merge branch 'master' into BlockEntitys 2014-03-08 12:29:45 +01:00