Perttu Ahola
|
0ccc0ac927
|
Merge remote-tracking branch 'darkrose/master'
|
2011-09-26 11:57:28 +03:00 |
|
celeron55
|
63eca0feb2
|
Merge pull request #10 from joshbeck/master
Fixed null pointer dereference errors found by cppcheck
|
2011-09-24 00:55:05 -07:00 |
|
Joshua Beck
|
ae561d705f
|
Fixed null pointer dereference errors found by cppcheck
|
2011-09-24 02:11:43 -05:00 |
|
Mark Holmquist
|
bc01ae4cbd
|
Fixed merge issues with saplings, ready to pull now!
|
2011-09-23 18:19:47 -07:00 |
|
Mark Holmquist
|
319f43e6d2
|
Fixed saplings growing into trees (thanks so much, Kahrl!)
Put the random interval back to 1 in 50 chance. It's not as rare as rats, but rarer than grass.
|
2011-09-23 18:14:35 -07:00 |
|
Mark Holmquist
|
f19919546d
|
Adding sapling texture
|
2011-09-23 18:13:53 -07:00 |
|
Mark Holmquist
|
85f119e1e6
|
Adding (most) of the sapling functionality. It has yet to work, since MEET_OTHER was not implemented at the time of this commit. Hopefully it will work when merged with celeron's latest.
|
2011-09-23 18:13:53 -07:00 |
|
darkrose
|
8b875d71d1
|
remove content_* things from map.cpp
|
2011-09-23 18:04:48 +10:00 |
|
Perttu Ahola
|
789c88509c
|
Move PLATFORM_LIBS around to make sqlite3 link with libdl on some distros
|
2011-09-23 08:48:58 +03:00 |
|
Perttu Ahola
|
bdf54908aa
|
Make client report a newer version number to the server than 2011-07-31 does and make the server enforce it
0.2.20110922_1
|
2011-09-22 20:47:47 +03:00 |
|
Perttu Ahola
|
7244f09111
|
Oh well, let's call it just 0.2.20110922
0.2.20110922
|
2011-09-22 18:22:04 +03:00 |
|
Perttu Ahola
|
ca748ad44c
|
Update changelog and version to 0.2.20110922_rc1
|
2011-09-22 18:15:05 +03:00 |
|
darkrose
|
79cb754358
|
added locking chest texture
|
2011-09-22 19:12:17 +10:00 |
|
darkrose
|
582e450bad
|
added locking chests - clean patch
|
2011-09-22 19:11:48 +10:00 |
|
Perttu Ahola
|
ae6d83a41e
|
Better apple tree generation
|
2011-09-21 23:31:55 +03:00 |
|
Kahrl
|
3e012122d1
|
Simplistic wielded tool lighting, added setMeshVerticesColor to utility.h and refactored some other code into calls of that
|
2011-09-21 18:37:29 +02:00 |
|
Kahrl
|
a4a2c34831
|
reduce view bobbing slightly
|
2011-09-21 15:54:06 +02:00 |
|
Kahrl
|
36af9bb027
|
Create a separate scene manager for the wielded tool. This fixes the glitchyness in large map coordinates and some depth buffer problems. (The tool doesn't bob anymore when walking, this will be fixed later.) Fix MSVC build (thanks to dannydark).
|
2011-09-21 01:42:52 +02:00 |
|
Kahrl
|
6599002149
|
fix a numerical problem, but tool is still jittery
|
2011-09-20 18:25:29 +02:00 |
|
Kahrl
|
cbd2bcf102
|
Fix jittery view bobbing at large map coordinates again. Wielded tool still has problems there
|
2011-09-20 18:19:26 +02:00 |
|
Kahrl
|
01f3ae1c50
|
Digging animation
|
2011-09-20 11:06:16 +02:00 |
|
Kahrl
|
eaff4616ad
|
fix some normals
|
2011-09-19 17:11:53 +02:00 |
|
Kahrl
|
ab42549b1e
|
Wielded tool updates, leaves and glass work now
|
2011-09-19 17:08:42 +02:00 |
|
Kahrl
|
02726f0003
|
Convert any inventory item into a mesh, bring back InventoryItem::getImageRay(), some const-correctness fixes
|
2011-09-19 06:37:24 +02:00 |
|
Kahrl
|
36bcbca9ac
|
Added sprite extruder
|
2011-09-19 03:01:11 +02:00 |
|
Kahrl
|
4ed837bcfa
|
trying some view bobbing changes
|
2011-09-18 17:02:30 +02:00 |
|
Kahrl
|
54f3796f91
|
Oops, up vector is needed.
|
2011-09-18 02:24:43 +02:00 |
|
Kahrl
|
ae66d611f2
|
This looks more like MC view bobbing, but still not even close
|
2011-09-18 02:17:39 +02:00 |
|
Perttu Ahola
|
b22cb69a15
|
Merge remote-tracking branch 'sfan5/apple-trees'
|
2011-09-16 19:09:13 +03:00 |
|
Kahrl
|
40707e3c5b
|
SQLite needs to be linked with -ldl on some Linux distros.
|
2011-09-16 19:06:45 +03:00 |
|
Kahrl
|
acfb2bb8bc
|
Revert some changes that could lead to slower map transfer and increaed network load.
|
2011-09-16 18:03:58 +02:00 |
|
JacobF
|
7f51bccf47
|
update minetestmapper so it can read the database also
|
2011-09-16 18:59:33 +03:00 |
|
Perttu Ahola
|
bfa5ad483f
|
Update changelog
|
2011-09-16 18:59:17 +03:00 |
|
Kahrl
|
ae89aa55b9
|
Updated colors.txt (which is used by minetestmapper)
|
2011-09-15 23:09:00 +02:00 |
|
Kahrl
|
63266928a5
|
Made wielded tool move slightly (and smoothly) during view bobbing. Making the tool be a child node of an empty scene node instead of the camera scene node seemingly fixed the uncontrollable tool jitter, too.
|
2011-09-15 01:53:42 +02:00 |
|
Kahrl
|
fc92da4324
|
View bobbing is slower in the water.
|
2011-09-15 01:53:42 +02:00 |
|
sfan5
|
88dc8c694e
|
Added Iron Apple which heals 4 Hearts
|
2011-09-12 20:10:17 +02:00 |
|
sfan5
|
785a2fd23a
|
Changed the Heal Amount of Apples from 6 to 2
|
2011-09-12 19:44:26 +02:00 |
|
sfan5
|
4328a6442b
|
Fixed duplication bug
|
2011-09-11 19:17:14 +02:00 |
|
sfan5
|
6496b1cf1f
|
Removed Spaces
|
2011-09-11 18:16:07 +02:00 |
|
sfan5
|
c0caedc373
|
Added Apple Trees
|
2011-09-11 17:50:44 +02:00 |
|
Kahrl
|
524cf237b8
|
inventory displays tool breakage bar again
|
2011-09-08 17:45:39 +02:00 |
|
Kahrl
|
e4cb004460
|
trying something else... also replaced M_PI by PI everywhere
|
2011-09-08 16:10:44 +02:00 |
|
Kahrl
|
71418639d3
|
attempting to merge Queatz/the-wielded-tool and kahrl/viewbobbing, something doesn't work right yet
|
2011-09-08 14:21:56 +02:00 |
|
Kahrl
|
f2ec226521
|
minor view bobbing improvements
|
2011-09-08 13:34:28 +02:00 |
|
Kahrl
|
0931d4b7ff
|
make it slightly less annoying :o)
|
2011-09-08 13:14:59 +02:00 |
|
Kahrl
|
ccadebabba
|
Implemented view bobbing (testing simple lemniscate shape)
|
2011-09-08 13:03:55 +02:00 |
|
Kahrl
|
18771a39cf
|
Commented out debug statements again
|
2011-09-08 01:24:47 +02:00 |
|
Kahrl
|
baf7da9d4a
|
Collected and moved existing camera infrastructure from game.cpp to camera.cpp and camera.h. Introduced configuration settings 'fov' which chooses the camera's (vertical) field of view and 'view_bobbing' which currently does nothing. Other code refactored to not expect the FOV to be a build time constant.
|
2011-09-08 01:08:47 +02:00 |
|
Kahrl
|
c0b35fa429
|
Removed unused camera_position and camera_direction fields from Client. Moved ClientEnvironment::drawPostFx to ClientMap::renderPostFx -- this will make the camera management classes easier to write, as ClientMap already knows the camera position but ClientEnvironment doesn't and has to be told about it. This also eliminates the need for Client::getEnv(). Made the post effect color a content feature defined in content_mapnode.h.
|
2011-09-07 19:21:28 +02:00 |
|