flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
5,294 Commits 1 Branch 0 Tags 92 MiB
4d704255de
Commit Graph

1775 Commits

Author SHA1 Message Date
madmaxoft
22d56d1a3f Fixed enchantment parsing. 
Fixes #880. Enchantment parsing now reports in detail which value failed to parse
 2014-04-10 19:09:37 +02:00
Alexander Harkness
9ad87f670b Fixed GitHuB WebEdit fail. 2014-04-10 15:52:00 +01:00
Alexander Harkness
2d02ff1df8 Update Monster.cpp 2014-04-10 15:50:43 +01:00
Mattes D
e08a31daf5 Merge pull request #871 from worktycho/worldstorage 
Removed check for enqueuing a chunk that is already enqueued to be loaded
 2014-04-08 19:55:50 +02:00
Tiger Wang
c3fcc5b132 cRedstoneSimulator.cpp style improvements 2014-04-08 18:49:53 +01:00
Alexander Harkness
ea17441e8a Merge pull request #872 from worktycho/bugfix 
Fixed missing - that caused all neighbour lookups to go to the chunkmap
 2014-04-08 17:03:20 +01:00
Tycho
18793ca568 Fixed missing - that caused all neighbour lookups to go to the chunkmap 2014-04-08 08:59:50 -07:00
Tycho
10e72a122c Removed check for enqueuing a chunk that is already enqueued to be loaded 
This remaval is safe as cWorldStorage checks for duplicate chunks when dequeuing
and removes an expensive iteration whilst holding the queue lock
 2014-04-08 08:43:28 -07:00
wiseoldman95
6a0c122dfb Uppercased Z 
Minor, no code changed.
 2014-04-08 17:59:42 +03:00
wiseoldman95
fb90afd651 Comments: Inverted Z axis. 
-Comments fix, No code has been changed.
-Inverted the Z axis in the comments and changed all dependent comments accordingly.
-Added NORTH/SOUTH/EAST/WEST in addition to LEFT/RIGHT/UP/DOWN.
 2014-04-08 17:55:03 +03:00
wiseoldman95
506f5def04 Added comments regarding latching and orientation 
No real code was changed.
 2014-04-08 17:14:23 +03:00
Alexander Harkness
4d32f41b8b Fixed the thing properly. 2014-04-08 14:48:24 +01:00
Alexander Harkness
8d251601cf Merge pull request #862 from mc-server/redstonefix 
Fixed #859
 2014-04-08 07:37:26 +01:00
Tiger Wang
f13cf1a021 Maybe speed improvements? 
* Use a single index to determine from when to begin copying data
* Use heightmap to determine first nonair block
 2014-04-07 20:57:14 +01:00
daniel0916
427924fbb0 Modified comment 2014-04-07 20:41:47 +02:00
daniel0916
1dfd2b1c5f Fixed Errors 2014-04-07 20:25:30 +02:00
daniel0916
296d0acbff Added deleted things for merging 2014-04-07 20:13:45 +02:00
daniel0916
2e9754ac1c Merge remote-tracking branch 'upstream/master' into Enchanting 2014-04-07 20:12:17 +02:00
daniel0916
93a7494e4b Fixed merge conflict 2014-04-07 20:11:43 +02:00
wiseoldman95
dab01b27c6 Fixed IsOn 2014-04-07 21:04:06 +03:00
daniel0916
af566d5a79 Added Enchantment-Slot-Level generating 2014-04-07 19:52:35 +02:00
wiseoldman95
011123726b Removed stray IsLocked 2014-04-07 20:26:23 +03:00
wiseoldman95
45eb539a17 Removed unneeded spacings 2014-04-07 20:00:38 +03:00
wiseoldman95
4f8f686292 Slight cleanup 
It is more efficient and readable if we do nothing unless we're not locked.
 2014-04-07 19:55:17 +03:00
Alexander Harkness
57a474ba01 Fixed some more minor issues with the redstone simulator. 2014-04-07 17:37:53 +01:00
Alexander Harkness
5374730753 Improved the speed a little more. 2014-04-07 17:28:16 +01:00
Alexander Harkness
634c4d6770 Fixed the redstone simulator. 2014-04-07 17:12:06 +01:00
andrew
c79ba3494c Statistic/Achievement defs 2014-04-07 16:31:15 +03:00
Tiger Wang
74c4789c6f Attempt to fix errors 2014-04-07 12:43:43 +01:00
Tiger Wang
440b74af6c Fixed #859 2014-04-07 12:02:41 +01:00
Alexander Harkness
4082adbbad Fix some of the comments in the PR tycho just did. 2014-04-07 11:35:37 +01:00
Alexander Harkness
76b321a0f4 Merge pull request #861 from worktycho/simulator 
Added support for redstone latching
 2014-04-07 11:32:57 +01:00
madmaxoft
f9b2c2956e Fixed HTTP chunked encoding. 
Fixes #858.
 2014-04-07 08:11:56 +02:00
Tiger Wang
a42d1f8517 Blocklight and skylight now compressed 2014-04-06 23:30:21 +01:00
madmaxoft
95fb90eaa6 Fixed 1.6.4 client crash on composite chat messages. 2014-04-06 22:28:41 +02:00
madmaxoft
de3df0a71f Fixed crash in protocols sending 64-bit ints. 
Fixes #855.
 2014-04-06 22:15:49 +02:00
madmaxoft
7119dd293a Updated the tolua executable for Windows. 2014-04-06 22:05:44 +02:00
Tycho
f5cb81eb1b Added support for redstone latching 
fixes #856
 2014-04-06 11:09:33 -07:00
Tycho
23395a5ce1 Merge branch 'master' into override 
Conflicts:
	lib/tolua++/CMakeLists.txt
 2014-04-05 14:12:17 -07:00
madmaxoft
143a5e61fc Fixed Endiannes conversion routines for floats and doubles. 
This bug has been introduced in 8825d30aab.
This change fixes #854.
 2014-04-05 22:34:05 +02:00
madmaxoft
22794e7208 Fixed double projectile spawning. 
Two spawn packets were sent per projectile.
 2014-04-05 22:26:10 +02:00
madmaxoft
d43c5a9c47 Removed debugging log from entity physics handling. 2014-04-05 22:25:40 +02:00
madmaxoft
1cab52f867 Added cPlayer:SendRotation() API function. 2014-04-05 12:09:30 +02:00
Tiger Wang
3201d1bf16 Nibbletypes are compressed 
+ Added nibble compression
* Fixed an off by one
 2014-04-04 23:16:52 +01:00
Mattes D
2e789b63d3 Merge pull request #840 from Howaner/NewBlocks 
Add tall flower handler.
 2014-04-04 15:06:54 +02:00
Tiger Wang
15a0ceec26 Speed and memory improvements 
* Changed array to be continuous, so no more layer splitting
 2014-04-04 13:01:05 +01:00
madmaxoft
d77ca77086 Merge branch 'master' into HTTPSizeT 2014-04-04 13:29:48 +02:00
madmaxoft
87f39e9e28 Explicit change record size. 2014-04-04 13:19:25 +02:00
madmaxoft
4b4c3f2a20 Changed cNoise seed to signed. 2014-04-04 12:28:38 +02:00
madmaxoft
bc227299d0 Fixed format string mismatch. 2014-04-04 12:08:14 +02:00
madmaxoft
4be894f060 More Clang warning fixes in the protocols. 2014-04-04 11:47:46 +02:00
madmaxoft
3590f97e00 Fixed CreateHexDump's format string. 2014-04-04 11:19:57 +02:00
madmaxoft
e1f75ab6d0 Fixed CreateHexDump's signedness. 2014-04-04 10:42:17 +02:00
madmaxoft
5dee19648d More Clang warning fixes in the protocols. 2014-04-04 10:31:50 +02:00
madmaxoft
396abb5db6 Fixed silly Clang's warnings in FastNBT. 2014-04-04 10:19:21 +02:00
madmaxoft
8825d30aab Fixed some Clang warnings in protocols. 2014-04-04 10:13:25 +02:00
madmaxoft
402d85d896 Fixed Clang warnings in itemhandlers. 2014-04-04 09:56:57 +02:00
Howaner
0fb40da877 Change CanBeAt() from big flower 2014-04-03 21:53:18 +02:00
madmaxoft
e304bd08a2 Documented the units and range for entity rotations. 2014-04-03 21:44:03 +02:00
Tiger Wang
e1ba51e6ca Merge remote-tracking branch 'origin/master' into chunkysparsing 2014-04-03 19:18:34 +01:00
Tiger Wang
d5faf5a38e Fixed some bugs 
* Fixed undefined behaviour
* Fixed compression failure
 2014-04-03 19:17:04 +01:00
madmaxoft
1b78bef4b3 Removed unneeded asserts. 2014-04-03 09:38:29 +02:00
Mattes D
25529ba62f Fixed a few MSVC type warnings. 2014-04-03 09:27:17 +02:00
Mattes D
12b82de502 Removed the bindings to set old g_BlockXXX arrays. 
Those were supposed to be read-only; there's no point in writing to them anyway.
Also fixed MSVC type warnings in the code.
 2014-04-03 09:26:44 +02:00
Tiger Wang
357411a489 Performance improvements and chunk flipping fixed 2014-04-02 22:53:03 +01:00
Mattes D
e7b8e17746 Merge pull request #849 from mc-server/minorfixes 
Minor fixes
 2014-04-02 21:26:45 +02:00
Tiger Wang
da267649a1 With eXtra line! 2014-04-02 20:04:41 +01:00
Tiger Wang
43af11ee38 Removed extra brackets 2014-04-02 20:03:42 +01:00
Tycho
0075b2f72e Merge branch 'master' into HTTPSizeT 
Conflicts:
	src/HTTPServer/EnvelopeParser.h
	src/HTTPServer/HTTPFormParser.h
	src/HTTPServer/MultipartParser.h
 2014-04-02 07:51:48 -07:00
madmaxoft
5c6d474599 Fixed boat placement code. 2014-04-02 16:40:28 +02:00
madmaxoft
26c3bc4076 Fixed more virtual destructors for interfaces. 2014-04-02 16:40:27 +02:00
Tycho
b449ad8613 Merge branch 'MacFixes' 
Conflicts:
	src/DeadlockDetect.cpp
	src/World.cpp
 2014-04-02 06:54:57 -07:00
Tycho
741a64c250 Merge branch 'master' into HTTPSizeT 2014-04-02 06:37:24 -07:00
Tycho
1f5a4a39f2 Fixed All signedness warnings in HTTPServer.cpp 2014-04-02 06:36:25 -07:00
Tycho
7ece0cc836 Fixed format string in HTTPConnection 2014-04-02 05:10:08 -07:00
Tycho
93bb5369a8 Fixed Comparison to -1 in HTTPMessage.h 2014-04-02 05:06:38 -07:00
Mattes D
01c38505fd Merge pull request #831 from mc-server/Wither 
Wither
 2014-04-02 12:00:26 +02:00
madmaxoft
bcd7f9669b Added schematic string serializer self-test. 2014-04-02 11:56:27 +02:00
madmaxoft
3301c5be1f Fixed StringCompression's GZIP handling for larger strings. 2014-04-02 11:56:10 +02:00
madmaxoft
bcf5021feb Exported the Base64 encoding and decoding functions to Lua API. 2014-04-01 22:47:39 +02:00
madmaxoft
e7e65b5005 Merged branch 'msDifference'. 2014-04-01 21:21:11 +02:00
madmaxoft
1229795ff0 cBlockArea: Added the msMask merge strategy. 2014-04-01 20:50:10 +02:00
madmaxoft
1795cca552 Rewritten HTTPServer to use size_t for data lengths. 2014-04-01 16:36:00 +02:00
madmaxoft
2672b14c03 More cFile warning fixes. 2014-04-01 16:00:20 +02:00
madmaxoft
b9a090d835 Fixed clang warnings in cGZipFile. 2014-04-01 15:00:30 +02:00
madmaxoft
42e30b6513 Fixed clang warnings in BlockHandlers. 2014-04-01 14:58:17 +02:00
madmaxoft
45150e9754 Fixed clang warnings in cFile. 
We only support 32-bit filesizes (files < 2 GiB).
 2014-04-01 14:58:05 +02:00
madmaxoft
aa7552309a Simplified the anvil placement code. 2014-04-01 14:23:11 +02:00
madmaxoft
7cc322332b Removed an unneeded code branch. 2014-04-01 13:38:40 +02:00
madmaxoft
7aa6a3b866 LOG() API reads the LogLevel from the cCompositeChat's MessageType. 2014-04-01 09:32:14 +02:00
Tiger Wang
ef48b30baa Final realisation of suggestions 2014-03-31 22:37:05 +01:00
madmaxoft
8126d9e66e Console logging supports cCompositeChat as its parameters. 2014-03-31 22:51:14 +02:00
Tiger Wang
fc940b6da4 Realised suggestions 2014-03-31 21:36:19 +01:00
Tiger Wang
ee07b7ae3e Simplified and fixed slabs, fixes #835 2014-03-31 20:34:11 +01:00
Tiger Wang
0836fe9a84 Fixed a few Y too high/low asserts 2014-03-31 20:33:33 +01:00
STRWarrior
c4e07631c8 Added new merge strategy "msDifference" 2014-03-31 19:47:18 +02:00
madmaxoft
43844fc0f0 cCompositeChat has a MessageType param in the constructor. 
This should make it easier to use.
 2014-03-31 13:28:38 +02:00
madmaxoft
8288e53c0b Fixed a few Clang warnings in BlockHandlers. 2014-03-30 23:13:13 +02:00
madmaxoft
a5c0600e6c Fixed a few clang warnings. 2014-03-30 20:02:30 +02:00
madmaxoft
1bda9b0424 Merge branch 'NetherFortGen'. 2014-03-30 19:17:33 +02:00
Mattes D
e474f40ac9 Merge pull request #834 from narroo/issue503 
Issue503 pull Request
 2014-03-30 16:58:42 +02:00
worktycho
5260146f3c Merge pull request #838 from mc-server/lilypads 
Lilypads
 2014-03-30 15:17:35 +01:00
Tiger Wang
a87bd5788f Another curly 2014-03-30 13:07:28 +01:00
madmaxoft
ceabb372f0 Added all current NetherFort prefabs. 2014-03-30 00:33:59 +01:00
madmaxoft
3eb531a8c8 Added asserts for critical data in cPrefab. 2014-03-30 00:20:28 +01:00
madmaxoft
6b29edc158 Re-fixed nether fort piece count check. 2014-03-30 00:20:06 +01:00
madmaxoft
475fc4b1ab Fixed chest rotator. 2014-03-30 00:12:54 +01:00
madmaxoft
597bdd9f80 NetherForts have a minimum number of pieces. 
The fort will generate a different image if it has less than the minimum; the max depth affects the minimum number of pieces.
 2014-03-30 00:12:19 +01:00
madmaxoft
47a427d3dc Merge branch 'master' into NetherFortGen 2014-03-29 23:05:17 +01:00
madmaxoft
d64d9145d1 cPrefab now uses a struct for block type definition in CharMap. 
As suggested by worktycho in 7b585290fc, instead of packing the two values into a single int, they're packed into a struct.
Also added a test code for the prefab parsing in SELF_TEST.
 2014-03-29 22:56:48 +01:00
Mattes D
37812813d3 Merge pull request #842 from mc-server/ProjectileHooks 
Projectile hooks
 2014-03-29 22:32:50 +01:00
madmaxoft
782c111b81 Renamed lua dll for tolua++.exe. 
Fixes #843.
 2014-03-29 22:29:34 +01:00
STRWarrior
98a12127ce Fixed the OnProjectileHitBlock hook not stopping projectiles. 2014-03-29 17:05:24 +01:00
STRWarrior
ec4638a228 Added HOOK_PROJECTILE_HIT_BLOCK. 2014-03-29 16:00:45 +01:00
STRWarrior
a6ef40cb6e Fixed error when the hook gets called. 2014-03-29 15:43:03 +01:00
STRWarrior
339d555111 Added HOOK_PROJECTILE_HIT_ENTITY 2014-03-29 15:26:41 +01:00
narroo
4492bd58f1 Added in MetaMirrorXY and MetaMirrorYZ to cBlockSignHandler. 2014-03-29 10:00:44 -04:00
Tiger Wang
515e4bdb13 Compare for inequality in FACE_NONE checks 2014-03-29 13:18:26 +00:00
Howaner
736c7950a2 Add "a_RelY < cChunkDef::Height" to BlockBigFlower 2014-03-29 13:11:49 +01:00
Tiger Wang
aefabfcafa Removed leftover clienthandle code 2014-03-29 10:25:40 +00:00
Tiger Wang
fb16554322 Fixed players not updating after world change 
Addendum to 6dea7993f2
 2014-03-29 01:21:56 +00:00
Tiger Wang
519bd0b989 Curly brackets 2014-03-28 23:51:52 +00:00
Tiger Wang
6dea7993f2 Fixed #721 and FS439 2014-03-28 23:25:11 +00:00
Tiger Wang
6eacf1aa92 Fixed a minor ini key duplication bug 2014-03-28 23:07:50 +00:00
Tiger Wang
79aa082b04 Fixed infinite minecart items 2014-03-28 22:52:23 +00:00
Tiger Wang
aee1f8f9d1 Fixed block interaction rate check 2014-03-28 22:52:04 +00:00
Tiger Wang
8ece214920 Fixed a potential crash 2014-03-28 22:51:39 +00:00
Tiger Wang
283a66bcae Some fixes to lilypads 
* Fixed placement on lava
* Fixed placement on side of blocks
* Fixed placement through blocks
+ Added washing-away of pads
+ Added ice as a block that fully occupies its voxel
 2014-03-28 22:51:30 +00:00
madmaxoft
76f0d167b1 NetherFortGen: Added several more prefabs. 
Also extended the defauls MaxDepth value to 12.
 2014-03-28 23:39:40 +01:00
Howaner
a78bacac3c Add tallgrass drop to big flowers. 
Add tallgrass drop, when a players break a tallgrass with the shear.
 2014-03-28 23:14:58 +01:00
Howaner
f2f6096ee5 door -> flower 2014-03-28 22:24:54 +01:00
Howaner
efc89b2c43 Add tall flower handler. 2014-03-28 22:22:29 +01:00
madmaxoft
0f1087b7d5 Added Prefabs to *nix builds. 2014-03-28 22:04:59 +01:00
madmaxoft
18dad36189 Merge branch 'master' into NetherFortGen 2014-03-28 21:37:31 +01:00
madmaxoft
773ce7fde6 Fixed non-virtual destructors warnings. 2014-03-28 21:35:45 +01:00
madmaxoft
8557549cfa Implemented the msSpongePrint merge strategy. 
Similar to msImprint, but allows prefabs to carve out air pockets, too. The sponge block is used as the NOP block.
 2014-03-28 18:03:37 +01:00
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
Tiger Wang
945631ba06 Sort of implementation of chunk sparsing 
Issues:
* Chunks are flipped
* Slow/inefficient/badly coded
* Only blocktypes are 'compressed'
 2014-03-23 14:34:19 +00: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