minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity
3,849 Commits 6 Branches 63 Tags 345 MiB
Commit Graph

3849 Commits

Author SHA1 Message Date
Luke Puchner-Hardman 64d046d03d Merge branch 'master' of https://github.com/LUKK3/minetest 
Conflicts:
	doc/lua_api.txt
 2014-10-07 00:58:29 +02:00
Luke Puchner-Hardman dc9546a684 Added "[sheet" to the texture special commands. 
"[sheet:WxH:X,Y" assumes the base image is a tilesheet with W*H tiles on it and crops to the tile at position X,Y.
Basically it works like "[verticalframe" but in 2d.
For testing, I combined the four default_chest images into one.
 2014-10-07 00:56:56 +02:00
Luke Puchner-Hardman da05d94709 Changed syntax and added documentation for texture special command "[sheet". 2014-10-07 00:54:42 +02:00
Luke Puchner-Hardman 56120b2da2 Added "[sheet" to the texture special commands. 
"[sheet:W:H:X:Y" assumes the base image is a tilesheet with W*H tiles on it and crops to the tile at position X,Y.
Basically it works like "[verticalframe" but in 2d.
For testing, I combined the four default_chest images into one.
 2014-10-07 00:53:04 +02:00
Luke Puchner-Hardman 1656ba4d73 Merge branch 'master' of https://github.com/minetest/minetest 
Conflicts:
	doc/lua_api.txt
	src/tile.cpp
 2014-10-07 00:24:40 +02:00
Luke Puchner-Hardman 1c4e4aac40 Merge branch 'master' of https://github.com/LUKK3/minetest 2014-10-06 23:58:54 +02:00
Luke Puchner-Hardman 7c0747b323 Added "[sheet" to the texture special commands. 
"[sheet:WxH:X,Y" assumes the base image is a tilesheet with W*H tiles on it and crops to the tile at position X,Y.
Basically it works like "[verticalframe" but in 2d.
For testing, I combined the four default_chest images into one.
 2014-10-06 23:56:17 +02:00
BlockMen 28438bba27 Add [colorize modifier 2014-10-05 16:49:52 +02:00
kwolekr 173beeee65 Fix special tile backspace culling 2014-10-03 11:20:29 -04:00
RealBadAngel b9cb196d49 Bugfix: dont highlight (0,0,0) when theres no node pointed. 2014-10-03 16:03:14 +02:00
RealBadAngel 0920f55eb4 Fix broken plantlike drawtype. 2014-10-03 15:33:32 +02:00
kwolekr 37d3c3d328 Fix misc. style issues 2014-10-03 03:49:06 -04:00
kwolekr 01ce57ade5 Clean up nodedef.cpp 2014-10-03 03:21:08 -04:00
Diego Martínez 5baf379f40 Add better documentation for alternate drop definition to lua_api.txt. 2014-10-02 16:49:33 -04:00
BlockMen f48f686930 Add optional framed glasslike drawtype 2014-10-02 11:35:15 +02:00
ShadowNinja e9c9b66ae9 Make players check inventory modification properly 2014-10-01 18:44:36 -04:00
ShadowNinja 8b3135a643 Only set player dirty flag if values change 2014-10-01 18:44:36 -04:00
ShadowNinja cd0df0d5e7 Simplify player modification checks 2014-10-01 18:44:36 -04:00
sapier b37bff72f1 Fix android build using hardcoded path for data instead of using the one fetched by android api on init. 
Fix android missing version information
 2014-10-01 22:18:29 +02:00
Diego Martínez 47abe25fe7 updatepo.sh: Find all files 2014-09-30 13:25:26 -04:00
SmallJoker db5aff832b Use round if falling node is misplaced 
Fixes: http://i.imgur.com/arAWw1i.png (middle-right)
 2014-09-28 13:33:39 +02:00
BlockMen 61ed56f916 Standardize tooltip row detection 2014-09-28 10:10:43 +02:00
BlockMen b75e7148c2 Fix multilined description in tooltips (fixes #1688) 2014-09-28 08:44:05 +02:00
sapier 121e8cc2a1 Fix totally messed up 3d modes interlaced/topbottom/sidebyside 2014-09-25 20:37:06 +02:00
sapier 15c7460eda Fix chat lines not word wrapped correct 2014-09-25 19:54:02 +02:00
Luke Puchner-Hardman 1dcbd7add8 Changed syntax and added documentation for texture special command "[sheet". 2014-09-23 16:20:00 +02:00
Luke Puchner-Hardman d0d45fcd78 Added "[sheet" to the texture special commands. 
"[sheet:W:H:X:Y" assumes the base image is a tilesheet with W*H tiles on it and crops to the tile at position X,Y.
Basically it works like "[verticalframe" but in 2d.
For testing, I combined the four default_chest images into one.
 2014-09-23 14:39:34 +02:00
Kahrl 5ca5630a11 Fix command line parsing 
Broken by 6bc4cad0ed, e.g.
  minetest --worldname world
would be parsed as
  minetest --worldname --worldname
 2014-09-22 11:02:26 +02:00
ShadowNinja 56195dc2e4 Fix build with redis 
Broken by 6bc4cad0ed because database-redis.h
depended on settings.h to include filesys.h.
 2014-09-21 21:02:49 -04:00
TriBlade9 9a685a4f2e Add firelike drawtype 2014-09-21 15:50:27 -04:00
ShadowNinja b5a6bf2068 Update default of preload_item_visuals in minetest.conf.example 2014-09-21 15:50:27 -04:00
ShadowNinja 3e7e65885a Make dump's output prettier 
Changes:
  * Indentation with tabs by default.
  * Array keys dumped without "[i] = " prefix.
  * String keys that are valid identifiers aren't enclosed in '[""]'.
  * Basic support for multiple references (as specified in the comment).
 2014-09-21 15:24:00 -04:00
ShadowNinja fb35cfb2dc Fix GCC reorder warning 
Caused by a020d1b653.
 2014-09-21 15:23:36 -04:00
sruz25 f6321e277b Add inventory right click drag and drop 2014-09-21 15:23:27 -04:00
Rui914 2c16a11527 Update ja/minetest.po 2014-09-21 15:07:22 -04:00
ShadowNinja d790acaaa7 Revert the icon name in minetest.desktop 
This reverts commit 7993696fc4, which broke the
icon on most distributions.
 2014-09-21 14:39:36 -04:00
ShadowNinja c061bdd37f Fix locking bugs and make inventory deserialization errors more specific 2014-09-21 14:39:36 -04:00
ShadowNinja 6bc4cad0ed Split settings into seperate source and header files 
This also cleans up settings a bit
 2014-09-21 14:39:35 -04:00
ShadowNinja 2ae5d3f3ab Fix Settings locking 2014-09-21 14:39:35 -04:00
ShadowNinja cd64a92a8c Use const references for Settings methods 
Also check for (this == &other) before locking mutexes.
 2014-09-21 14:39:35 -04:00
Craig Robbins b97c9c6577 Make getters of the Settings class const 
Also removed 2 unused functions.
 2014-09-21 14:39:35 -04:00
BlockMen a020d1b653 Allow taking screenshots of formspecs and move message to chat 2014-09-21 19:15:48 +02:00
sfan5 2b7a1ca572 Update .mailmap 2014-09-21 19:01:43 +02:00
SmallJoker 44a1d0c192 Fix wrong video_driver setting when changing in mainmenu 
Fixes issue with direct3d(8|9)
 2014-09-21 16:27:58 +02:00
ShadowNinja 406ed5efac Add compression API 2014-09-20 14:02:54 -04:00
Mikaela Suomalainen d6e28c19b5 .travis.yml: fix possible issues 
* use `pool.sks-keyservers.net` as keyserver as it's often more reliable
than `keyserver.ubuntu.com` as you can see with Google.
* put script to multiple lines
    * build out-of-source
    * use two CPUs
        * make seems to fail if $(nproc) is used unlike WeeChat. ZNC has
          same issue.
* mark build as failed if one job fails immediately without waiting for
all builds to finish.
    * this doesn't stop jobs that didn't finish before build was marked
    failed.
 2014-09-20 13:13:11 -04:00
Kahrl e9d62950e3 Revert "Small changes to French translation (Petites modifications mineures)" 
This reverts commit 4432e98261.

Exception: "Nom / Mot de Passe" --> "Nom / Mot de passe"
 2014-09-20 14:02:00 +02:00
kilbith 821b26884a Fixed french vocabulary/grammar errors 
Notes (in french) :

72 msgstr "Ok" : OK est un acronyme, pas un nom, donc majuscules.
193 msgstr "Feuilles transparentes" : quel type de feuilles ? Trop vague.
213 msgstr "Filtrage anisotropique" : oxymore.
229 msgstr "Précharger les visuels d'objets" : doit être écourté (dépasse trop la bordure grisée)
 2014-09-20 12:17:54 +02:00
mimilus 4432e98261 Small changes to French translation (Petites modifications mineures) 2014-09-20 12:15:13 +02:00
Stefan Beller adfba207a6 Add a .mailmap file 
So I was checking out minetest and wondered how many developers there are
and how they development community is setup and such, so I decided to have
a look at the git shortlog. There were lot of double entries for some
persons, so it was harder to estimate the number of people involved.

By adding a .mailmap file, the overview of the authors is much improved
For details on the .mailmap file, see
https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html

Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
 2014-09-20 11:36:35 +02:00