madmaxoft
ef50e73a9c
Added common eMessageType aliases.
2014-03-16 21:37:33 +01:00
Howaner
96d80f981e
Change if-clause in BlockCake.h
2014-03-16 20:57:23 +01:00
Howaner
4ec5a95a7a
Add cake
2014-03-16 20:26:13 +01:00
Howaner
568038ab52
Fix anvil pickups.
2014-03-16 19:25:00 +01:00
Howaner
4e0edc9fa7
Add anvil direction.
2014-03-16 17:42:23 +01:00
Tycho
04f1d58561
Fixed unessicary return
2014-03-15 07:08:09 -07:00
Tycho
fbd4d53dac
Merge branch 'master' into unreachable
...
Conflicts:
SetFlags.cmake
2014-03-15 06:47:56 -07:00
Tycho
2e9fe777e4
Patched tolua to emit range checks for enums
2014-03-15 06:45:26 -07:00
Howaner
d6edd5f24e
Remove old debug messages.
2014-03-15 11:53:55 +01:00
Mattes D
50b53ff3e8
Merge pull request #800 from mc-server/EntireCommandError
...
The entire unknown command is echoed back to the user on error.
2014-03-15 07:52:37 +01:00
madmaxoft
0442c41c87
Added cCuboid:Assign(OtherCuboid) API function.
2014-03-15 07:50:39 +01:00
Howaner
8316ae330e
Merge branch 'master' into BlockEntitys
2014-03-15 02:46:18 +01:00
Howaner
7ac7304c91
Add item frame saving.
2014-03-15 02:45:25 +01:00
Howaner
cf13739288
Add health and age load to pickup's.
2014-03-15 00:43:38 +01:00
Howaner
28898f710b
Add ExpOrb saving.
2014-03-15 00:32:49 +01:00
Howaner
ccc29c7c6c
Add fireball interact
2014-03-14 23:52:51 +01:00
Tycho
693e59c6a4
Merge branch 'master' into noreturn
...
Conflicts:
SetFlags.cmake
2014-03-14 08:04:48 -07:00
Tycho
8e11c270fc
Added Noreturn attribtes to a couple of functions and made a missing noreturn an error
2014-03-14 07:59:25 -07:00
Tycho
c51a9b5fc2
Merge branch 'master' into unreachable
...
Conflicts:
SetFlags.cmake
2014-03-14 07:46:33 -07:00
Mattes D
adf5a60746
Merge pull request #805 from worktycho/undef
...
Fixed a couple of missing defs
2014-03-14 15:37:01 +01:00
Tycho
2f81c1d7fb
Added NORETURN macro
2014-03-14 07:33:47 -07:00
Tycho
b829c9b14e
Fixed a few unneeded breaks
2014-03-14 07:12:00 -07:00
Tycho
58fa8b40bf
Removed missiterperatable malfunctioning error handling code
2014-03-14 07:02:57 -07:00
Tycho
e61810e1bf
Removed invalid block face handling code
...
The code for handling invalid block faces is removed by gcc and clang as it is undefined behavior for a enum
to contain a value that is not part of the enum. Since the only way that the line can be executed is through
undefined behavior clang and gcc remove it so the function fits in the caches better.
2014-03-14 06:52:49 -07:00
Tycho
8b83c1a653
Merge branch 'master' into warnings
2014-03-14 06:46:20 -07:00
Tycho
22cdbe99b4
Fixed a couple of missing defs
2014-03-14 06:44:04 -07:00
madmaxoft
9b63156447
cPlugin:BindConsoleCommand can be called statically.
...
This has been documented before it was written.
2014-03-14 14:37:39 +01:00
madmaxoft
35fe96b07d
Fixed a warning.
2014-03-14 14:36:44 +01:00
Tycho
cd6ab5617c
Fixed xofts issues
2014-03-14 06:11:49 -07:00
Tycho
692cf5bb70
Merge branch 'master' into warnings
2014-03-14 06:01:45 -07:00
Mattes D
1259844084
Merge pull request #793 from xdot/master
...
Unified Vector classes
2014-03-14 11:52:15 +01:00
madmaxoft
bba090ebdd
cPluginManager:Bind[Console]Command returns true on success.
...
Fixes #801 .
2014-03-14 11:18:14 +01:00
Tycho
9a28d1bbe1
Fixed comma
2014-03-12 11:56:24 -07:00
Tycho
862e219443
Added additional macros to support the MSVC size_t format and changed all formats to use the macros
2014-03-12 10:34:50 -07:00
Tycho
d904e89712
Merge branch 'Werror' into warnings
...
Conflicts:
src/Globals.h
2014-03-12 10:12:13 -07:00
Tycho
a584b7b3bc
Fixed printf format compatabilty
2014-03-12 10:09:08 -07:00
Tycho
3caa4a38b9
Merge branch 'master' into Werror
...
Conflicts:
src/Generating/PieceGenerator.cpp
2014-03-12 09:59:10 -07:00
Tycho
ef58b0eb54
Fixed comments an assert
2014-03-12 09:49:37 -07:00
madmaxoft
d545be9614
Fixed missing comment terminator.
2014-03-12 15:33:28 +01:00
andrew
4a883be428
Vector3: More casts
2014-03-12 16:30:57 +02:00
madmaxoft
ec23e2591e
Merge remote-tracking branch 'xdot/master'
2014-03-12 15:20:33 +01:00
andrew
6f2bb0ad44
M_PI MSVC Fix
2014-03-12 16:13:03 +02:00
madmaxoft
f2df33f746
Merge remote-tracking branch 'xdot/master'
2014-03-12 14:42:04 +01:00
andrew
a3a94436dc
Vector3: Length() should always return a float
2014-03-12 15:13:19 +02:00
madmaxoft
5d7df54e35
Fixed Lua string return values.
...
Fixes #773 .
2014-03-12 14:11:28 +01:00
madmaxoft
a7f9df24d4
The entire unknown command is echoed back to the user on error.
2014-03-12 13:11:34 +01:00
madmaxoft
0c15fdf7b0
Moved Lua API registering into a separate function.
...
This will allow us to use Lua as lite-config files as well, should we want to.
2014-03-12 13:05:28 +01:00
madmaxoft
392fb7923b
Merge remote-tracking branch 'origin/SnowBall'
2014-03-12 08:41:33 +01:00
Tycho
7e6ee7ef81
Fixed more Format issues
2014-03-11 14:43:14 -07:00
Tycho
16b27c4b7a
Fixed a load of format string errors
2014-03-11 14:16:08 -07:00
Tycho
a19f5fc484
Move Format issues
2014-03-11 13:51:56 -07:00
Tycho
f64f879027
Fixed format errors in protocol
2014-03-11 13:46:32 -07:00
Tycho
53faac10c5
Added macros to follow format string checking through wrappers
2014-03-11 13:41:15 -07:00
andrew
abf4effaaf
Matrix4: Removed enum
2014-03-11 21:58:50 +02:00
Tycho
80cc824c0c
Fixed Chunkdef warnings
2014-03-11 12:41:18 -07:00
Tycho
728870ed9d
Fixed Warnings in PieceGenerator
2014-03-11 12:35:44 -07:00
Tycho
80d7c88e00
Merge branch 'master' into Werror
...
Conflicts:
src/ChunkDef.h
2014-03-11 12:33:26 -07:00
andrew
9810d57a39
Unified Matrix4 code
2014-03-11 18:33:31 +02:00
andrew
d64db443c2
LineCoeff Doc
2014-03-11 18:10:15 +02:00
STRWarrior
ef3c5a97a4
TakeDamage now has the cThrownSnowballEntity instead of the creator's object.
2014-03-11 16:24:05 +01:00
STRWarrior
deafec874d
Snowballs now actualy hurt other entities.
...
3 damage for blazes and 1 for the ender dragon. Otherwise 0
2014-03-11 15:14:47 +01:00
andrew
b4bf13aa4f
Unified Vector classes
2014-03-11 16:02:25 +02:00
STRWarrior
541175d8a0
Using ``const Vector3i &``
2014-03-11 14:44:21 +01:00
madmaxoft
950614da7e
Renamed cBlockArea Offset to WEOffset.
...
Even in getters / setters.
2014-03-12 07:46:14 +01:00
madmaxoft
3e9f265a36
Merge branch 'master' into cBlockArea_Offset
2014-03-12 07:39:39 +01:00
STRWarrior
e213e5f9fc
Renamed m_Offset to m_WEOffset
2014-03-11 18:23:21 +01:00
Mattes D
b72661681c
Merge pull request #791 from mc-server/PieceGenerator
...
Piece generator
2014-03-10 23:13:08 +01:00
Tycho
f5f7c6b38b
Merge branch 'master' into Werror
2014-03-10 13:56:16 -07:00
Mattes D
b3d0e878b3
Merge pull request #767 from worktycho/envmatrix
...
Added support to control build type with env vars
2014-03-10 21:54:17 +01:00
Tycho
98e15a34a4
Fixed xofts issues
2014-03-10 13:18:53 -07:00
madmaxoft
26d7ed6612
Removed debugging output.
...
Kept it commented-out for later revisions, if needed.
2014-03-10 21:16:13 +01:00
Tycho
e9e2852ce1
Fixed test asserts
2014-03-10 13:12:43 -07:00
madmaxoft
4ed68916d8
Revert "Fixed some warnings"
...
This reverts commit 4cb0b82d1d
2014-03-10 20:52:53 +01:00
Tycho
bb28f0d1e3
Fixed assert
2014-03-10 12:36:01 -07:00
Tiger Wang
e672988577
Merge remote-tracking branch 'origin/master' into awesometnt
...
Conflicts:
src/Items/ItemLighter.h
src/Simulator/IncrementalRedstoneSimulator.cpp
2014-03-10 18:59:11 +00:00
Tycho
d6050275fb
Merge branch 'master' into Werror
2014-03-10 11:58:32 -07:00
Alexander Harkness
411c4ddd79
Merge pull request #779 from mc-server/tntburnexplode
...
TNT explodes when consumed by fire
2014-03-10 18:57:12 +00:00
Tycho
b78c729880
Fixed Alignment issue in ByteBuffer
2014-03-10 11:56:23 -07:00
Tiger Wang
cc2d805238
Merge branch 'master' into awesometnt
2014-03-10 18:36:55 +00:00
Tiger Wang
462829e23d
Shrapnel now configurable
2014-03-10 18:35:02 +00:00
Tycho
2eca30aebc
Removed Some unnessicary macros
2014-03-10 11:34:20 -07:00
Tycho
8947f80294
Use string.reserve to avoid the need to do inplace byteswap
2014-03-10 11:24:12 -07:00
Tiger Wang
b2733fad22
Fixed compile
2014-03-10 18:23:12 +00:00
Tycho
cff6631513
Removed unused macro from WSSCompact
2014-03-10 11:14:34 -07:00
Tycho
8864e7d8ca
Fixed alignment issues in Fireworks Serializer
2014-03-10 11:13:07 -07:00
Tycho
7c974b27b1
Removed unused macro
2014-03-10 10:49:03 -07:00
Tycho
e2e7f2184f
Fixed cast to type with different alignment in BlockingTCPLink
2014-03-10 10:48:50 -07:00
Alexander Harkness
61b68bd519
Merge pull request #788 from worktycho/warnings
...
Fixed some warnings
2014-03-10 17:44:08 +00:00
Tycho
8665233522
Fixed cast between types of different alignment in cSocket
2014-03-10 10:32:51 -07:00
Tycho
30353cd228
Fixed MTRand warnings
2014-03-10 10:24:44 -07:00
Tycho
0a509ab85e
Merge branch 'master' into Werror
2014-03-10 10:17:28 -07:00
STRWarrior
0cce0478d8
This allows a blockarea to have an Offset.
2014-03-10 17:07:46 +01:00
madmaxoft
6c48075561
POCPieces: Added height.
...
Now the pieces connect in different heights, too, creating a true 3D maze.
2014-03-10 08:38:40 +01:00
madmaxoft
0b9763fc5a
Fixed MSVC2008 compilation.
2014-03-10 07:55:47 +01:00
Tiger Wang
0f412a0a02
Removed uneeded meta obtain
2014-03-09 21:48:18 +00:00
Tiger Wang
09c5542123
Merge pull request #768 from Howaner/BlockEntitys
...
Add TNT load/save
2014-03-09 21:44:32 +00:00
Tiger Wang
1985a9c33e
Merge pull request #731 from mc-server/ballisticmissiles
...
Ballistic firework missiles
2014-03-09 21:43:15 +00:00
madmaxoft
0e985293b5
A working POCPiece generator.
2014-03-09 22:04:29 +01:00
madmaxoft
dacb6cef1d
Hardened cCuboid with asserts for its assumptions.
2014-03-09 22:02:08 +01:00
madmaxoft
81bf846e64
ChunkDef: Replaced enums with static const ints.
...
This makes them easier to use in std::min et al.
2014-03-09 21:58:12 +01:00
madmaxoft
8889d3b733
Added cCuboid::Engulf().
2014-03-09 19:54:27 +01:00
Tycho
1bf99b5fd2
Be more parinoid about int sizes
2014-03-09 11:47:22 -07:00
madmaxoft
1fdeabcf78
cPieceGenerator: New connectors are added to the free pool.
2014-03-09 19:30:38 +01:00
Tycho
9825dbfd34
Fixed Mesannine twister to use UInt32
2014-03-09 11:21:42 -07:00
Tycho
b5e33c5424
Merge branch 'master' into Werror
2014-03-09 11:02:30 -07:00
Tycho
e5fc3c63f2
Fix IsThread destructor
2014-03-09 10:52:12 -07:00
Tiger Wang
3aff0b44bc
Fixed #778 - stack overflow.com
2014-03-09 17:51:02 +00:00
Tycho
676dcfd1c7
Globals.h is now warnings free again.
...
Also turned off Wpadded as it is indicates potental performance issues rather than potential bugs
2014-03-09 10:32:56 -07:00
Tycho
430aba9f1d
Its a const not a macro
2014-03-09 10:10:36 -07:00
Tycho
02afa78b68
Take 5
2014-03-09 10:04:07 -07:00
madmaxoft
e214bd7666
Merge branch 'master' into PieceGenerator
2014-03-09 17:58:38 +01:00
madmaxoft
5c4c147e48
Silenced useless MSVC warnings in cMetaRotater.
2014-03-09 17:58:01 +01:00
Tycho
167ef3b7a1
Take 4
2014-03-09 09:52:49 -07:00
madmaxoft
dd39a677c7
Merge branch 'master' into PieceGenerator
2014-03-09 17:50:05 +01:00
madmaxoft
b8cd0b0897
Hotfix for MSVC compilation.
2014-03-09 17:48:17 +01:00
Tycho
ebf163b77a
Unsigned types take 3
2014-03-09 09:45:59 -07:00
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
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
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
4cb0b82d1d
Fixed some warnings
2014-03-09 05:05:37 -07:00
Tycho
14c2f620d1
FIxed int in test
2014-03-09 04:43:22 -07:00
Jan-Fabian Humann
f74ee8fb51
Adjusted style of switch/case
2014-03-09 10:55:06 +01: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
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
9b47366d03
Actually Fixed ByteBuffer
2014-03-08 07:36:52 -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
