Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Saner block modification flag operation for not saving everything always | Perttu Ahola | 2011-10-12 | 3 | -6/+11 | |
| | ||||||
* | Merge remote-tracking branch 'marktraceur/master' | Perttu Ahola | 2011-09-26 | 9 | -3/+155 | |
|\ | ||||||
| * | Fixed merge issues with saplings, ready to pull now! | Mark Holmquist | 2011-09-23 | 2 | -2/+2 | |
| | | ||||||
| * | Fixed saplings growing into trees (thanks so much, Kahrl!) | Mark Holmquist | 2011-09-23 | 1 | -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 Holmquist | 2011-09-23 | 8 | -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 accordingly | Perttu Ahola | 2011-09-26 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'view_bobbing_and_vielded_tool' | Perttu Ahola | 2011-09-26 | 23 | -490/+1406 | |
|\ \ | ||||||
| * | | Fix single-frame lag in camera yaw/pitch, tune view bobbing and add wielded ↵ | Perttu Ahola | 2011-09-26 | 2 | -57/+99 | |
| | | | | | | | | | | | | tool movement when walking and tweak stuff a bit | |||||
| * | | Simplistic wielded tool lighting, added setMeshVerticesColor to utility.h ↵ | Kahrl | 2011-09-21 | 8 | -145/+66 | |
| | | | | | | | | | | | | and refactored some other code into calls of that | |||||
| * | | reduce view bobbing slightly | Kahrl | 2011-09-21 | 1 | -3/+3 | |
| | | | ||||||
| * | | Create a separate scene manager for the wielded tool. This fixes the ↵ | Kahrl | 2011-09-21 | 3 | -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 jittery | Kahrl | 2011-09-20 | 2 | -5/+9 | |
| | | | ||||||
| * | | Fix jittery view bobbing at large map coordinates again. Wielded tool still ↵ | Kahrl | 2011-09-20 | 1 | -5/+4 | |
| | | | | | | | | | | | | has problems there | |||||
| * | | Digging animation | Kahrl | 2011-09-20 | 3 | -35/+85 | |
| | | | ||||||
| * | | fix some normals | Kahrl | 2011-09-19 | 1 | -4/+4 | |
| | | | ||||||
| * | | Wielded tool updates, leaves and glass work now | Kahrl | 2011-09-19 | 3 | -16/+21 | |
| | | | ||||||
| * | | Convert any inventory item into a mesh, bring back ↵ | Kahrl | 2011-09-19 | 5 | -43/+141 | |
| | | | | | | | | | | | | InventoryItem::getImageRay(), some const-correctness fixes | |||||
| * | | Added sprite extruder | Kahrl | 2011-09-19 | 8 | -103/+425 | |
| | | | ||||||
| * | | trying some view bobbing changes | Kahrl | 2011-09-18 | 1 | -4/+19 | |
| | | | ||||||
| * | | Oops, up vector is needed. | Kahrl | 2011-09-18 | 1 | -1/+8 | |
| | | | ||||||
| * | | This looks more like MC view bobbing, but still not even close | Kahrl | 2011-09-18 | 2 | -24/+30 | |
| | | | ||||||
| * | | Revert some changes that could lead to slower map transfer and increaed ↵ | Kahrl | 2011-09-16 | 1 | -1/+4 | |
| | | | | | | | | | | | | network load. | |||||
| * | | Made wielded tool move slightly (and smoothly) during view bobbing. Making ↵ | Kahrl | 2011-09-15 | 3 | -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. | Kahrl | 2011-09-15 | 2 | -6/+9 | |
| | | | ||||||
| * | | inventory displays tool breakage bar again | Kahrl | 2011-09-08 | 1 | -2/+0 | |
| | | | ||||||
| * | | trying something else... also replaced M_PI by PI everywhere | Kahrl | 2011-09-08 | 4 | -9/+10 | |
| | | | ||||||
| * | | attempting to merge Queatz/the-wielded-tool and kahrl/viewbobbing, something ↵ | Kahrl | 2011-09-08 | 6 | -20/+124 | |
| |\ \ | | | | | | | | | | | | | doesn't work right yet | |||||
| | * | | Display which tool the player is holding | JacobF | 2011-09-07 | 6 | -21/+128 | |
| | | | | | | | | | | | | | | | | And some simple animation when trying to dig... | |||||
| * | | | minor view bobbing improvements | Kahrl | 2011-09-08 | 1 | -14/+21 | |
| | | | | ||||||
| * | | | make it slightly less annoying :o) | Kahrl | 2011-09-08 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Implemented view bobbing (testing simple lemniscate shape) | Kahrl | 2011-09-08 | 3 | -30/+72 | |
| | | | | ||||||
| * | | | Commented out debug statements again | Kahrl | 2011-09-08 | 1 | -12/+12 | |
| | | | | ||||||
| * | | | Collected and moved existing camera infrastructure from game.cpp to ↵ | Kahrl | 2011-09-08 | 13 | -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. ↵ | Kahrl | 2011-09-07 | 9 | -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 option | Perttu Ahola | 2011-09-26 | 2 | -9/+20 | |
| | | | | ||||||
* | | | | Merge remote-tracking branch 'darkrose/master' | Perttu Ahola | 2011-09-26 | 10 | -5/+171 | |
|\ \ \ \ | ||||||
| * | | | | remove content_* things from map.cpp | darkrose | 2011-09-23 | 3 | -16/+6 | |
| | | | | | ||||||
| * | | | | added locking chests - clean patch | darkrose | 2011-09-22 | 9 | -5/+181 | |
| | | | | | ||||||
* | | | | | Fixed null pointer dereference errors found by cppcheck | Joshua Beck | 2011-09-24 | 2 | -4/+5 | |
| |_|_|/ |/| | | | ||||||
* | | | | Move PLATFORM_LIBS around to make sqlite3 link with libdl on some distros | Perttu Ahola | 2011-09-23 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Make client report a newer version number to the server than 2011-07-31 does ↵ | Perttu Ahola | 2011-09-22 | 2 | -1/+9 | |
|/ / / | | | | | | | | | | and make the server enforce it | |||||
* | | | Better apple tree generation | Perttu Ahola | 2011-09-21 | 1 | -9/+13 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'sfan5/apple-trees' | Perttu Ahola | 2011-09-16 | 6 | -2/+114 | |
|\ \ \ | ||||||
| * | | | Added Iron Apple which heals 4 Hearts | sfan5 | 2011-09-12 | 2 | -0/+20 | |
| | | | | ||||||
| * | | | Changed the Heal Amount of Apples from 6 to 2 | sfan5 | 2011-09-12 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fixed duplication bug | sfan5 | 2011-09-11 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Removed Spaces | sfan5 | 2011-09-11 | 5 | -5/+5 | |
| | | | | ||||||
| * | | | Added Apple Trees | sfan5 | 2011-09-11 | 5 | -8/+100 | |
| |/ / | ||||||
* / / | SQLite needs to be linked with -ldl on some Linux distros. | Kahrl | 2011-09-16 | 1 | -1/+1 | |
|/ / | ||||||
* | | Note about texture atlas | Perttu Ahola | 2011-09-07 | 1 | -2/+10 | |
| | |