1
0
Commit Graph

1588 Commits

Author SHA1 Message Date
madmaxoft
113343d336 NetherFort: Added BalconyTee2 prefab. 2014-03-28 17:35:05 +01:00
madmaxoft
3c84a995a9 Fixed a memory leak in NetherFortGen. 2014-03-28 17:09:47 +01:00
madmaxoft
ae0954f1d4 Sponged the netherfort balcony prefab.
This is a preparation for the msSpongePrint merge strategy, used for imprinting most prefabs. It will carve out even air, but will ignore sponge blocks.
2014-03-28 17:05:43 +01:00
madmaxoft
d032f7ac1a Merge branch 'master' into NetherFortGen 2014-03-28 16:46:10 +01:00
madmaxoft
1802234b4a Fixed compilation after last PR merge. 2014-03-28 16:44:12 +01:00
madmaxoft
5b7215ec24 Initial NetherFortGen import.
Simple fortresses of 2 different rooms will generate.
2014-03-28 16:42:32 +01:00
madmaxoft
173fd0dd92 Merge branch 'howaner/GlobalFixes'. 2014-03-28 16:39:32 +01:00
madmaxoft
910e770a18 Fixed Prefab's rotations. 2014-03-28 16:36:33 +01:00
Howaner
a2c4def518 Add missing ChunkDesc import. 2014-03-28 14:59:40 +01:00
Howaner
8301f479bb Fix merge conflicts 2014-03-27 23:21:04 +01:00
Howaner
9c46112486 Change SpreadSource prefix to ss 2014-03-27 23:20:28 +01:00
Howaner
09794e65bb Wrong if in BlockLeaves 2014-03-27 23:20:28 +01:00
Howaner
3774b1be64 Add SpreadSource 2014-03-27 23:20:28 +01:00
Howaner
c4a8336e84 Add HOOK_BLOCK_SPREAD 2014-03-27 23:20:28 +01:00
Howaner
7089c5e267 Add new leaves to all classes. 2014-03-27 23:20:28 +01:00
madmaxoft
7b585290fc cPrefab can draw itself into a cChunkDesc. 2014-03-27 23:03:57 +01:00
madmaxoft
bbebb3a2cd Fixed chunk neighbor-getting for long distances.
This fixes a server hang when teleporting to coords too far away.
2014-03-27 18:13:52 +01:00
madmaxoft
8c2c4f2463 Prefabs support connectors, rotations and merge strategy. 2014-03-26 22:01:01 +01:00
narroo
6553c8ff44 Altered the rotates for cBlockSignHandler. The functions as a whole is still unfinished though; no wall sign or mirroring support yet. 2014-03-26 13:25:10 -04:00
narroo
90415ff798 Fixed Minor typos. 2014-03-26 08:54:17 -04:00
madmaxoft
9032ff96c7 Removed unused constants.
DeadlockDetect reads the value from the ini file, and world lighting has a separate queue now.
2014-03-25 23:35:50 +01:00
narroo
d5c7fc6bd6 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....) 2014-03-25 17:35:48 -04:00
narroo
3df4f8609d Fixed spelling; Rotater to Rotator. 2014-03-25 17:26:13 -04:00
narroo
e1285eb84f Changed Rotater to Rotator. Added partial sign post rotation support. 2014-03-25 17:17:05 -04:00
madmaxoft
37778e5f82 Added a basic cPrefab class.
Can be defined in the source by GalExport's cpp output.
2014-03-25 22:10:53 +01:00
madmaxoft
87de596078 BlockArea: Create() can take the size as Vector3i, too. 2014-03-25 22:05:45 +01:00
madmaxoft
87e0bd54b4 BlockArea: Switched internal coords to Vector3i. 2014-03-25 21:59:41 +01:00
madmaxoft
0984cf9deb Added Vector3::Move(const Vector3 &). 2014-03-25 21:59:41 +01:00
Mattes D
cac5149974 Merge pull request #833 from mc-server/EnderCrystal
Ender crystals
2014-03-25 21:02:23 +01:00
andrew
2e28c09770 Ender crystals 2014-03-25 20:59:33 +02:00
Samuel Barney
eb3cc729d4 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.
Also had to undefine TOLUA_TEMPLATE_BIND a couple of times.
2014-03-25 11:15:05 -06:00
Samuel Barney
71e9133e49 Added one more missing newline. 2014-03-25 10:34:31 -06:00
Samuel Barney
d77a6417f6 Added newlines. Without them, the files would not compile. 2014-03-25 10:33:52 -06:00
andrew
c8445cd934 Fixed clang compilation 2014-03-25 11:40:54 +02:00
andrew
ba42166411 Fixed wither summoning 2014-03-25 11:13:27 +02:00
andrew
0fe1e50ffc Protocol: Wither metadata 2014-03-25 10:32:58 +02:00
Mattes D
c6186acf58 Merge pull request #828 from mc-server/Wither
Wither invulnerability
2014-03-25 08:54:13 +01:00
andrew
4f3377bbbf Minor fixes 2014-03-25 09:10:55 +02:00
Mattes D
9226b8480e Merge pull request #829 from Howaner/Cake
Add log pickups.
2014-03-24 22:13:25 +01:00
Howaner
a6414d3348 Add log pickups. 2014-03-24 19:52:35 +01:00
andrew
6b77dc74ad Wither invulnerability 2014-03-24 12:29:19 +02:00
narroo
2343b0dfbe Added MetaRotate/Mirror Support for a number of classes. 2014-03-23 22:11:01 -04:00
Tiger Wang
f622f4317c Implemented lilypad placement 2014-03-23 22:32:45 +00:00
madmaxoft
fd8e5bf551 Updated the ToLua windows executable. 2014-03-23 20:54:37 +01:00
Tycho
5653997bcc Added override specifier to functions declared in cWorld 2014-03-22 08:43:54 -07:00
madmaxoft
c9163d39f7 Implemented faster upscaling using templates.
Fixes #819.
2014-03-21 22:53:46 +01:00
madmaxoft
20fc7d6aea Updated the tolua++ executable for Win builds. 2014-03-20 22:41:12 +01:00
madmaxoft
62f84d968a Merge branch 'unreachable' 2014-03-20 22:36:24 +01:00
madmaxoft
b370cacf0c Plugins can set flying speed. 2014-03-20 16:14:40 +01:00
madmaxoft
64d9390069 Rewritten player speeds to be relative unit-less.
Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
2014-03-20 15:45:42 +01:00
madmaxoft
b1ad3322e5 Fixed code style after recent merge. 2014-03-20 09:28:29 +01:00
madmaxoft
964647a900 Made pushing plain pointer to Lua a valid operation, with a warning.
This is used for exotic explosions, and the NORETURNDEBUG macro caused MSVC warnings across the entire cLuaState class (MSVC marked ALL Push() function overloads as non-returning)
2014-03-20 09:16:47 +01:00
Mattes D
fe6c03595f Merge pull request #790 from mc-server/awesometnt
TNT Shrapnel
2014-03-20 09:05:53 +01:00
Tiger Wang
3e49cada80 Added braces 2014-03-19 23:07:58 +00:00
Tiger Wang
a0720a65d6 Minor Entity.cpp cleanup 2014-03-19 23:07:16 +00:00
Tiger Wang
0524d70774 ENUMified shrapnel level 2014-03-19 23:06:39 +00:00
madmaxoft
74b7f51b89 Errors in Lua don't include the error handler in the stack trace.
Fixes #817.
2014-03-19 22:55:47 +01:00
Tycho
1635c696de Merge branch 'master' into unreachable 2014-03-19 12:13:05 -07:00
Tycho
363c92ed53 Added unreachable lines backit prtected by preprocessor guards 2014-03-19 12:06:12 -07:00
madmaxoft
4a67114f56 LuaChunkStay: Removed a debugging output. 2014-03-19 13:57:06 +01:00
Tiger Wang
b8fe024f9d Merge branch 'master' into awesometnt
Conflicts:
	src/ChunkMap.cpp
2014-03-18 20:49:08 +00:00
Tiger Wang
23ffaa19b7 Added levels of shrapnel 2014-03-18 20:45:10 +00:00
madmaxoft
91f64da2a6 Fixed chunkmap tree block replacing. 2014-03-18 15:45:16 +01:00
madmaxoft
4dc5650023 Fixed cGZipFile::ReadRestOfFile returning incorrect value. 2014-03-18 13:54:17 +01:00
madmaxoft
9447cd20f3 Fixed a crash in firework rockets.
Fixes #816.
2014-03-17 22:12:02 +01:00
Tycho
90ab055eab Merge branch 'master' into unreachable 2014-03-17 09:44:34 -07:00
madmaxoft
89027cb675 Fixed double to float conversions. 2014-03-16 22:00:28 +01:00
madmaxoft
260d13c7a4 Added override specifier where appropriate in cWorld. 2014-03-16 21:56:27 +01:00
Mattes D
4ec402e6f9 Merge pull request #782 from mc-server/beds
Beds now work properly, fixes #707
2014-03-16 21:47:34 +01:00
Mattes D
dc77cbfdc4 Merge pull request #809 from Howaner/BlockEntitys
More entity saving.
2014-03-16 21:43:33 +01:00
Howaner
c5740c27a9 Wrong if in BlockLeaves 2014-03-16 21:39:01 +01:00
Howaner
b9fce71bf6 Add new leaves to all classes. 2014-03-16 21:38:57 +01:00
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
Howaner
527f358510 Merge branch 'master' into BlockEntitys 2014-03-08 12:29:45 +01:00
Howaner
b37966fd21 Change TNT Fuse to ticks 2014-03-08 12:24:33 +01:00
andrew
6679641b9e cBlockInfo-related changes from #723 2014-03-08 12:53:15 +02:00
Howaner
f5e374be41 Add TNT Save/Load and add Netbeans projects to .gitignore 2014-03-08 10:25:46 +01:00
Mattes D
ae84cdf242 Merge pull request #764 from xdot/master
Fixed water/lava interaction
2014-03-07 21:33:22 +01:00
madmaxoft
ffdf5f2022 Fixed cBlockArea schematic string saving signature. 2014-03-07 21:28:52 +01:00
worktycho
6b153a5014 Move env code part 1 2014-03-07 19:59:49 +00:00
Tycho
72697cfb4f Added support to overide CMake build type with env vars 2014-03-07 11:23:28 -08:00
Tycho
21e85b0745 Warnings 2014-03-07 11:15:04 -08:00
Tycho
d33d72f0dc Warnings 2014-03-07 11:04:25 -08:00
andrew
d86fc1af06 Added some comments 2014-03-07 20:49:40 +02:00
Tycho
7f389522ef Fixed warnings 2014-03-07 10:42:13 -08:00
Tycho
b480148116 Fixed warnings 2014-03-07 10:26:07 -08:00
Mattes D
f72c747b50 Merge pull request #763 from Howaner/BlockEntitys
Add Flower Pots
2014-03-07 17:54:10 +01:00
madmaxoft
fd4eda7d24 Fixed a typo. 2014-03-07 17:43:19 +01:00
Mattes D
c1977035cf Merge pull request #760 from Howaner/GlobalFixes
Add data backsending, when the Client interacts a Block and the Interact...
2014-03-07 14:45:45 +01:00
andrew
8808523942 Fixed water/lava interaction 2014-03-07 15:42:03 +02:00
Howaner
c2090c0d11 Add Lua Bindings for FlowerPotEntity.h and add documentation. 2014-03-07 11:44:16 +01:00
madmaxoft
97d803e34f Added cBlockArea serialization to string.
Fixes #665.
2014-03-07 09:17:13 +01:00
Howaner
787a71929c Add Flower Pots 2014-03-07 01:30:34 +01:00
Howaner
1c7a580e52 Fix comment 2014-03-06 13:35:53 +01:00
madmaxoft
3e80e63665 Merge remote-tracking branch 'xdot/master' 2014-03-06 13:24:28 +01:00
Howaner
99b9e6dce5 Broadcast the Equipped Item, if the Slot is changed. 2014-03-06 11:08:47 +01:00
Tiger Wang
53231bebd6 Added extra awesomeness to TNT
+ TNT now has a chance of flinging FallingBlock entities around
* Improved TNT damage
* Improved TNT spawning visuals
* Possible fix for 'SetSwimState failure' messages in debug
2014-03-05 22:12:48 +00:00
Howaner
594ddd86a0 Add SendBlockTo to cWorldInterface 2014-03-05 19:33:43 +01:00
Howaner
ee1ba3e0b0 Set tnt step sound to step.grass 2014-03-05 15:14:20 +01:00
Howaner
d4a5b16c52 Add data backsending, when the Client interacts a Block and the Interact is cancelled. 2014-03-05 15:10:20 +01:00
andrew
1ea17c0a75 Implemented vanilla-like fluid simulator 2014-03-05 15:54:38 +02:00