| Commit message (Collapse) | Author | Age |
|\
| |
| |
| |
| |
| | |
Conflicts:
data/oerkki1.png
src/client.cpp
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into upstream_merge
Conflicts:
.gitignore
CMakeLists.txt
data/heart.png
src/CMakeLists.txt
src/game.cpp
src/guiMainMenu.cpp
src/inventory.cpp
src/map.cpp
src/mapblock.cpp
src/mapnode.cpp
src/mapnode.h
src/materials.cpp
src/server.cpp
Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
|
| |
| |
| |
| | |
(import from temporary git repo)
|
| |
| |
| |
| | |
high)
|
| | |
|
|/
|
|
|
| |
--HG--
extra : rebase_source : 7260636295d9068fbeeddf4143c89f2b8a91446c
|
|
|
|
|
| |
--HG--
extra : rebase_source : e8ec407f60711d42d33be4811b2880088f617b5b
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
spikes
|
|
|
|
| |
frametime spikes
|
| |
|
| |
|
| |
|
|
|
|
| |
Also made client mutex-free to allow easier adding of new stuff.
|
|
|
|
| |
being a messy object oriented cludge, it now is a messy cludge with separate parameters.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|