1
0
Commit Graph

1150 Commits

Author SHA1 Message Date
madmaxoft@gmail.com
cf87169737 Refactored cInventory to use cItemGrid for the actual Storage
This makes the API more orthogonal and is easier to use in the plugins. Also changes in the inventory are now propagated to the needed places (armor updates to BroadcastEntityEquipment etc.) even when the inventory is changed by a plugin.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1503 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-24 07:30:39 +00:00
madmaxoft@gmail.com
3b429a9bdf Added ItemCategory::IsArmor()
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1502 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-24 07:20:16 +00:00
madmaxoft@gmail.com
a4d903aa15 Fixed linking error from rev 1498
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1501 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-21 12:58:21 +00:00
keyboard.osh@gmail.com
8519ff4db9 Entity: Switched detection of ground to use g_BlockIsSolid global variable.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1499 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-21 05:51:38 +00:00
keyboard.osh@gmail.com
088a79211b Added basic functions for width and height for Entities
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1498 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-21 05:49:56 +00:00
madmaxoft@gmail.com
e475c61a44 Stairs placement fix (patch contributed by Simi)
http://forum.mc-server.org/showthread.php?tid=503&pid=8159#pid8159

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1497 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-20 19:48:05 +00:00
madmaxoft@gmail.com
aa9e0c5aa0 Fixed linux compilation
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1496 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-19 18:42:42 +00:00
madmaxoft@gmail.com
5d3ade0267 Inventory changes made by plugins are now propagated to the client
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1495 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-19 18:41:16 +00:00
madmaxoft@gmail.com
90c398a392 Inventory code cleanup, players can now see each other's armor
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1493 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-19 18:22:37 +00:00
madmaxoft@gmail.com
e32cffbbdd Fixed cWorld:ForEachEntity()
Fix for FS #374.
The function was processing only one chunkmap layer object, due to an inverse condition.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1491 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-19 15:44:21 +00:00
madmaxoft@gmail.com
950d7f5f2d Empty permission is always granted
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1490 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-19 15:06:28 +00:00
madmaxoft@gmail.com
34fa53ca3a Fixed entity chunking.
Sand simulator was off, sand in negative coords wouldn't fall properly

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1489 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-19 11:49:01 +00:00
madmaxoft@gmail.com
b7041c1bd2 Removed pickup logging
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1487 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-17 14:30:18 +00:00
madmaxoft@gmail.com
bd910e78e2 DistortedHeightmap: Rewritten to use the optimized cPerlinNoise and linear upscaling
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1486 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-16 13:14:25 +00:00
madmaxoft@gmail.com
e7238456db Moved noise debugging into the Noise.* files
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1485 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-15 17:09:38 +00:00
madmaxoft@gmail.com
1118ae3033 Fixed 2D linear upscale to compile on Linux, added a test for it.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1484 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-15 15:55:04 +00:00
madmaxoft@gmail.com
7c094ee220 Pickup: fixed logging parameters causing a crash.
http://forum.mc-server.org/showthread.php?tid=434&pid=8059#pid8059

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1483 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-15 14:52:56 +00:00
madmaxoft@gmail.com
464dcc3764 Noise3D generator is now using linear upscaling
Measured 30% performance increase.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1482 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-14 21:11:40 +00:00
madmaxoft@gmail.com
07cfe8ee35 Added more logging to pickup collection code.
Hoping to fix irresponsive pickups, http://forum.mc-server.org/showthread.php?tid=434&pid=8019#pid8019

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1481 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-13 20:29:52 +00:00
madmaxoft@gmail.com
fd26595b56 Added logging to pickup collection when a player is near and when collecting.
This should help fix the inactive pickups bug, http://forum.mc-server.org/showthread.php?tid=434&pid=8019#pid8019 )

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1480 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-13 20:26:45 +00:00
madmaxoft@gmail.com
0a08ae14f6 LinearUpscale: postfixed with InPlace to differentiate from a future src/dst version
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1479 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-12 21:11:25 +00:00
madmaxoft@gmail.com
59eb312291 Temporarily set all pickups to spawn in the middle of the block from which they fall.
(Additional fix for FS #338)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1478 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-12 21:00:21 +00:00
madmaxoft@gmail.com
2038da8681 Noise3D: cleanup
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1477 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-12 20:45:29 +00:00
madmaxoft@gmail.com
b1bd1001f7 DistortedHeightmap: Deserts are now covered with sand and mushroom islands with mycelium (patch contributed by STR_Warrior)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1476 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-12 20:04:07 +00:00
madmaxoft@gmail.com
1927095d25 Renamed linear interpolation from Noise.h to a more proper LinearUpscale and moved it to a separate file.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1475 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-12 17:55:49 +00:00
madmaxoft@gmail.com
d851c47acd cWorld: Temporary fix for FS #338
The pickups get spawned with zero speed, not to mess up their physics simulation. Marked as temporary, remove when physics are completed.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1474 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-12 16:23:49 +00:00
madmaxoft@gmail.com
4553886d64 DistortedHeightmap: Added info comment about the parameters table
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1473 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-12 16:15:21 +00:00
madmaxoft@gmail.com
25cda4e8b4 cItems: Added runtime bounds-checking to avoid server crashes with badly written plugins.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1472 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-12 15:58:29 +00:00
madmaxoft@gmail.com
8f2920a090 Converted the Noise3D generator to optimized noise and lerp
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1471 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-11 21:09:39 +00:00
madmaxoft@gmail.com
2bd03871c7 Added generic LinearInterpolation in 1D, 2D and 3D.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1470 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-11 21:08:20 +00:00
madmaxoft@gmail.com
8d0b607feb Noise: Fixed optimized Cubic noise calculation
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1469 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-11 21:06:03 +00:00
madmaxoft@gmail.com
4ac29d4cc5 Tiny formatting fix of rev 1463
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1467 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-09 19:09:27 +00:00
madmaxoft@gmail.com
6c66e19f94 Noise: Added an efficient 3D cubic noise generation
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1466 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-09 19:07:09 +00:00
madmaxoft@gmail.com
7e02ec87b9 Fixed a few out-of-bounds reads
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1465 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-09 19:06:16 +00:00
nielsbreu@gmail.com
7dc9b2ce8d Fixed error while compiling.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1464 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-09 15:08:20 +00:00
nielsbreu@gmail.com
4e44c4b33a function SpawnItemPickups is now exported to Lua. Lua is able to create a Items object.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1463 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-09 14:32:27 +00:00
madmaxoft@gmail.com
da85eb9db2 Added 1.5.2 compatibility.
FS #372

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1461 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-08 11:10:55 +00:00
madmaxoft@gmail.com
7cbf36bf17 Refactored window clicking code to use different click actions
First part of solving FS #371; should fix #370.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1459 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-08 09:45:07 +00:00
madmaxoft@gmail.com
a3717ba324 Please keep the lists alpha-sorted
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1458 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-07 20:27:43 +00:00
faketruth
3d9362d1a3 Sand can fall through snow.
Patch courtesy of InHavk

git-svn-id: http://mc-server.googlecode.com/svn/trunk@1457 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-07 20:02:04 +00:00
madmaxoft@gmail.com
3292a0118f Replaced MIN / MAX with std::min and std::max (pt 2)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1456 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-07 19:59:45 +00:00
madmaxoft@gmail.com
959797dbcf Replaced MIN / MAX with std::min and std::max
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1455 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-07 19:59:17 +00:00
madmaxoft@gmail.com
8aa88e7815 Protocol132: Replaced magic numbers with symbolic packet names
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1454 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-07 08:24:06 +00:00
madmaxoft@gmail.com
5d4591de47 Fixed player teleporting too far away ("Entity lost")
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1452 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-06 18:32:22 +00:00
madmaxoft@gmail.com
205ee49c79 DistortedHeightmap: Optimized by linear interpolation
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1451 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-06 16:46:48 +00:00
madmaxoft@gmail.com
7004622e8b DistortedHeightmap: Small optimizations, memory leak fix.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1449 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-06 12:20:25 +00:00
madmaxoft@gmail.com
27d0e01160 DistortedHeightmap: Slight speed increase
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1448 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-06 07:59:59 +00:00
madmaxoft@gmail.com
e88cdf8da7 Re-worked generator subobject ownership, added a cache for the CompositionGen
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1447 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-05 19:56:45 +00:00
madmaxoft@gmail.com
6b35c64658 Fixed Biomal CompoGen to set heightmap correctly when underwater
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1446 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-05 16:33:58 +00:00
madmaxoft@gmail.com
270560a198 Added the DistortedHeightmap height and composition generator.
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1445 0a769ca7-a7f5-676a-18bf-c427514a06d6
2013-05-05 16:27:08 +00:00