Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | small fix | Sebastian Rühl | 2011-06-26 | 2 | -0/+731 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵ | Sebastian Rühl | 2011-06-26 | 13 | -41/+603 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | |||||
| | | * | | | | | | | | + rail block bounding box | Nils Dagsson Moskopp | 2011-06-08 | 1 | -0/+37 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | + rail | Nils Dagsson Moskopp | 2011-06-07 | 5 | -0/+138 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | * point out setInventoryTextureCube() is broken with a FIXME | Nils Dagsson Moskopp | 2011-06-03 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | + paper, book, bookshelf | Nils Dagsson Moskopp | 2011-06-03 | 6 | -0/+67 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | + papyrus | Nils Dagsson Moskopp | 2011-06-03 | 7 | -2/+97 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | added new submenu for key assignment | teddydestodes | 2011-06-01 | 8 | -103/+913 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configwriting/saving isn't complete and will break your config if you use fancy keys | |||||
| | | * | | | | | | | | Merge remote-tracking branch 'bucket-t/master' | teddydestodes | 2011-06-01 | 1 | -3/+20 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | MacOSX build support | MrLoom | 2011-06-01 | 1 | -3/+20 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' | teddydestodes | 2011-06-01 | 7 | -9/+115 | |
| | | |\| | | | | | | | | ||||||
| | | | * | | | | | | | | * clay is rarer now | Nils Dagsson Moskopp | 2011-06-01 | 1 | -2/+2 | |
| | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | + clay and associated items | Nils Dagsson Moskopp | 2011-06-01 | 7 | -3/+61 | |
| | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | + brick | Nils Dagsson Moskopp | 2011-05-31 | 5 | -0/+12 | |
| | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | + fence inventory icon | Nils Dagsson Moskopp | 2011-05-31 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | * improved fence dimensions (cuboid side lengths now multiples of 2, ↵ | Nils Dagsson Moskopp | 2011-05-31 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures should fit better) | |||||
| | | | * | | | | | | | | + cactii | Nils Dagsson Moskopp | 2011-05-30 | 6 | -7/+42 | |
| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | * improved fence dimensions (cuboid side lengths now multiples of 2, ↵ | Nils Dagsson Moskopp | 2011-06-01 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures should fit better) | |||||
| | | * | | | | | | | | | fast_move and free_move can now be toggled | teddydestodes | 2011-05-29 | 2 | -0/+24 | |
| | | |/ / / / / / / / | ||||||
| | | * | | | | | | | | + sandstone | Nils Dagsson Moskopp | 2011-05-29 | 5 | -0/+27 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Fixed farmesh to such that it was a long time ago. | Perttu Ahola | 2011-08-03 | 4 | -12/+15 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | added TODO in main.cpp | Perttu Ahola | 2011-08-01 | 1 | -0/+3 | |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
* | | | | | | | | | | Fixes a bug that made the server to deny non-empty passwords from players ↵ | Perttu Ahola | 2011-07-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connecting the first time. | |||||
* | | | | | | | | | | Fixed problem of server always receiving an empty password from the client | Perttu Ahola | 2011-07-31 | 3 | -4/+12 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Made stricter handling for old clients because now they are not compatible ↵ | Perttu Ahola | 2011-07-31 | 1 | -7/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | at all. | |||||
* | | | | | | | | | | Added MaterialItem conversion from old content type namespace to new | Perttu Ahola | 2011-07-31 | 5 | -33/+62 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | changelog update and disable motd by default | Perttu Ahola | 2011-07-31 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | updated CMakeList.txts a bit | Perttu Ahola | 2011-07-31 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | added windows icon | Perttu Ahola | 2011-07-31 | 2 | -0/+11 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Fixed handling of inventory in creative mode (normal inventory is not ↵ | Perttu Ahola | 2011-07-30 | 7 | -3/+89 | |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | trashed anymore), fixed mese pick speed, added some forgotten stuff | |||||
* | | | | | | | | | fix to the former | Perttu Ahola | 2011-07-30 | 2 | -5/+13 | |
| | | | | | | | | | ||||||
* | | | | | | | | | easier notice on old version | Perttu Ahola | 2011-07-30 | 1 | -2/+3 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Added network protocol version number in protocol | Perttu Ahola | 2011-07-30 | 3 | -4/+26 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Server configuration is now written when "/#setting whatever = whatever" is ↵ | Perttu Ahola | 2011-07-30 | 7 | -14/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issued. | |||||
* | | | | | | | | | Added message of the day and made it properly configurable using /#setting ↵ | Perttu Ahola | 2011-07-30 | 5 | -3/+65 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (not saved to config file yet) | |||||
* | | | | | | | | | Made picking items up in creative mode delete them (because they usually are ↵ | Perttu Ahola | 2011-07-30 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the inventory already anyway) | |||||
* | | | | | | | | | updated pause menu text a bit | Perttu Ahola | 2011-07-30 | 1 | -3/+3 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Rats are now eatable. Also made their selection box move smoothly. | Perttu Ahola | 2011-07-30 | 10 | -55/+138 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Made rats cookable and made them spawn near trees | Perttu Ahola | 2011-07-30 | 4 | -6/+50 | |
| | | | | | | | | | ||||||
* | | | | | | | | | made more things burnable in furnace | Perttu Ahola | 2011-07-30 | 1 | -0/+49 | |
| | | | | | | | | | ||||||
* | | | | | | | | | quick fix to it not building with gettext on my visual studio environment | Perttu Ahola | 2011-07-30 | 2 | -2/+2 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Removed remaining -delta references | Perttu Ahola | 2011-07-30 | 3 | -3/+3 | |
| | | | | | | | | | ||||||
* | | | | | | | | | fix server build | Perttu Ahola | 2011-07-25 | 1 | -0/+2 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | Lowered default viewing range minimum to such that it allows fairly good ↵ | Perttu Ahola | 2011-07-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | framerate in jungles with sucky hardware. Almost all computers stick to the minimum with the current farmesh range that someone has set up without asking from me, but farmesh is not used as default anyway so those that use it can raise the lower limit in their configuration as they wish. | |||||
* | | | | | | | | Updated the texture atlas a bit | Perttu Ahola | 2011-07-24 | 1 | -4/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | and now fixed a bug in removing that debug output | Perttu Ahola | 2011-07-24 | 1 | -0/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | removed a remaining debug print | Perttu Ahola | 2011-07-24 | 1 | -2/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Added a mapblock analyzing function for debugging use and fixed remaining ↵ | Perttu Ahola | 2011-07-24 | 5 | -19/+179 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mapgen bugs | |||||
* | | | | | | | | changed jungletree/junglegrass content ids to extended range | Perttu Ahola | 2011-07-24 | 1 | -2/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | merged fix to decapitated trees; other bugs now exists | Perttu Ahola | 2011-07-24 | 2 | -18/+63 | |
|\ \ \ \ \ \ \ \ |