aboutsummaryrefslogtreecommitdiff
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fixed merge issues with saplings, ready to pull now!Mark Holmquist2011-09-232-2/+2
| |
| * Fixed saplings growing into trees (thanks so much, Kahrl!)Mark Holmquist2011-09-231-3/+16
| | | | | | | | Put the random interval back to 1 in 50 chance. It's not as rare as rats, but rarer than grass.
| * Adding (most) of the sapling functionality. It has yet to work, since ↵Mark Holmquist2011-09-238-2/+141
| | | | | | | | MEET_OTHER was not implemented at the time of this commit. Hopefully it will work when merged with celeron's latest.
* | Rotate wielded tool the right way and modify axe graphics accordinglyPerttu Ahola2011-09-261-2/+2
| |
* | Merge branch 'view_bobbing_and_vielded_tool'Perttu Ahola2011-09-2623-490/+1406
|\ \
| * | Fix single-frame lag in camera yaw/pitch, tune view bobbing and add wielded ↵Perttu Ahola2011-09-262-57/+99
| | | | | | | | | | | | tool movement when walking and tweak stuff a bit
| * | Simplistic wielded tool lighting, added setMeshVerticesColor to utility.h ↵Kahrl2011-09-218-145/+66
| | | | | | | | | | | | and refactored some other code into calls of that
| * | reduce view bobbing slightlyKahrl2011-09-211-3/+3
| | |
| * | Create a separate scene manager for the wielded tool. This fixes the ↵Kahrl2011-09-213-13/+49
| | | | | | | | | | | | 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).
| * | fix a numerical problem, but tool is still jitteryKahrl2011-09-202-5/+9
| | |
| * | Fix jittery view bobbing at large map coordinates again. Wielded tool still ↵Kahrl2011-09-201-5/+4
| | | | | | | | | | | | has problems there
| * | Digging animationKahrl2011-09-203-35/+85
| | |
| * | fix some normalsKahrl2011-09-191-4/+4
| | |
| * | Wielded tool updates, leaves and glass work nowKahrl2011-09-193-16/+21
| | |
| * | Convert any inventory item into a mesh, bring back ↵Kahrl2011-09-195-43/+141
| | | | | | | | | | | | InventoryItem::getImageRay(), some const-correctness fixes
| * | Added sprite extruderKahrl2011-09-198-103/+425
| | |
| * | trying some view bobbing changesKahrl2011-09-181-4/+19
| | |
| * | Oops, up vector is needed.Kahrl2011-09-181-1/+8
| | |
| * | This looks more like MC view bobbing, but still not even closeKahrl2011-09-182-24/+30
| | |
| * | Revert some changes that could lead to slower map transfer and increaed ↵Kahrl2011-09-161-1/+4
| | | | | | | | | | | | network load.
| * | Made wielded tool move slightly (and smoothly) during view bobbing. Making ↵Kahrl2011-09-153-17/+43
| | | | | | | | | | | | the tool be a child node of an empty scene node instead of the camera scene node seemingly fixed the uncontrollable tool jitter, too.
| * | View bobbing is slower in the water.Kahrl2011-09-152-6/+9
| | |
| * | inventory displays tool breakage bar againKahrl2011-09-081-2/+0
| | |
| * | trying something else... also replaced M_PI by PI everywhereKahrl2011-09-084-9/+10
| | |
| * | attempting to merge Queatz/the-wielded-tool and kahrl/viewbobbing, something ↵Kahrl2011-09-086-20/+124
| |\ \ | | | | | | | | | | | | doesn't work right yet
| | * | Display which tool the player is holdingJacobF2011-09-076-21/+128
| | | | | | | | | | | | | | | | And some simple animation when trying to dig...
| * | | minor view bobbing improvementsKahrl2011-09-081-14/+21
| | | |
| * | | make it slightly less annoying :o)Kahrl2011-09-081-1/+1
| | | |
| * | | Implemented view bobbing (testing simple lemniscate shape)Kahrl2011-09-083-30/+72
| | | |
| * | | Commented out debug statements againKahrl2011-09-081-12/+12
| | | |
| * | | Collected and moved existing camera infrastructure from game.cpp to ↵Kahrl2011-09-0813-209/+428
| | | | | | | | | | | | | | | | 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.
| * | | Removed unused camera_position and camera_direction fields from Client. ↵Kahrl2011-09-079-53/+61
| | | | | | | | | | | | | | | | 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.
* | | | Server user limit configuration optionPerttu Ahola2011-09-262-9/+20
| | | |
* | | | Merge remote-tracking branch 'darkrose/master'Perttu Ahola2011-09-2610-5/+171
|\ \ \ \
| * | | | remove content_* things from map.cppdarkrose2011-09-233-16/+6
| | | | |
| * | | | added locking chests - clean patchdarkrose2011-09-229-5/+181
| | | | |
* | | | | Fixed null pointer dereference errors found by cppcheckJoshua Beck2011-09-242-4/+5
| |_|_|/ |/| | |
* | | | Move PLATFORM_LIBS around to make sqlite3 link with libdl on some distrosPerttu Ahola2011-09-231-3/+3
| | | |
* | | | Make client report a newer version number to the server than 2011-07-31 does ↵Perttu Ahola2011-09-222-1/+9
|/ / / | | | | | | | | | and make the server enforce it
* | | Better apple tree generationPerttu Ahola2011-09-211-9/+13
| | |
* | | Merge remote-tracking branch 'sfan5/apple-trees'Perttu Ahola2011-09-166-2/+114
|\ \ \
| * | | Added Iron Apple which heals 4 Heartssfan52011-09-122-0/+20
| | | |
| * | | Changed the Heal Amount of Apples from 6 to 2sfan52011-09-121-1/+1
| | | |
| * | | Fixed duplication bugsfan52011-09-111-1/+1
| | | |
| * | | Removed Spacessfan52011-09-115-5/+5
| | | |
| * | | Added Apple Treessfan52011-09-115-8/+100
| |/ /
* / / SQLite needs to be linked with -ldl on some Linux distros.Kahrl2011-09-161-1/+1
|/ /
* | Note about texture atlasPerttu Ahola2011-09-071-2/+10
| |
* | Add note about trans_table_19.Perttu Ahola2011-09-071-0/+5
|/
* Remove block file from disk when saved to databasePerttu Ahola2011-09-061-0/+3
|