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

822 Commits

Author SHA1 Message Date
q66 f6ed45fc20 Proper placement of binary files. 2011-08-11 11:19:33 +02:00
q66 43b6ca0d14 Prevent threadid_t from losing precision when casted on 64bit systems 2011-08-11 10:52:27 +02:00
Giuseppe Bilotta 34492ce480 Respect base virtual functions' signatures 2011-08-08 16:15:53 +02:00
Giuseppe Bilotta 163c38e175 Always return from non-void functions 
This quiets a warning in Clang.
 2011-08-08 16:13:48 +02:00
Giuseppe Bilotta 11be390110 Keys should be s32, not u32 
At least two reasons for this:
* activeKey is treated as signed (check for sign, assign -1, etc)
* the ID retrieved from Irrlicht's events are signed
 2011-08-08 16:12:15 +02:00
Giuseppe Bilotta ea26a9f543 Remove spurious assignment 2011-08-08 16:11:37 +02:00
Giuseppe Bilotta f9e1b0cd97 InventoryAction is a struct, not a class 2011-08-08 15:38:20 +02:00
Giuseppe Bilotta 805564dcf2 Clang doesn't like -Wno-unused-but-set-variable 
The release versions of CMake don't yet properly support flag checking
in Clang, so we need to exclude it explicitly for the time being.
 2011-08-11 10:08:58 +02:00
Giuseppe Bilotta 76fb792544 Project uses C++, so use CHECK_CXX_COMPILER_FLAG 
Although this doesn't change much for our specific case, it can make a
difference for some flags, so use the appropriate macro.
 2011-08-11 10:06:48 +02:00
Dmitry Marakasov ff35014eff Fix data paths for FreeBSD 2011-08-02 02:50:16 +04:00
Dmitry Marakasov de868d24c1 Fix "integer constant is too large for 'long' type" error 2011-08-02 02:49:15 +04:00
Dmitry Marakasov 318a730c45 Check whether -Wno-unused-but-set-variable is supported before using 
it. It seems to only be available on recent (>=4.6) versions of gcc.
 2011-08-01 22:17:32 +04:00
Perttu Ahola 9017c51e7f the zlib error print function now prints to dstream (debug.txt) 2011-08-08 12:11:41 +03:00
Perttu Ahola 64a6da3e45 merged delta and c55 2011-08-05 11:22:13 +03:00
Giuseppe Bilotta 59c58f230e Some obvious errors in the new fluid flow management 2011-08-05 08:45:15 +02:00
Giuseppe Bilotta f79069f5b3 MapNode is a struct, not a class 2011-08-05 08:45:15 +02:00
Constantin Wenger 7361f29527 fixed some error :/ 2011-08-05 08:45:15 +02:00
Constantin Wenger 4ab4e33450 marked strings as translation 
now translated if set to a button
 2011-08-05 08:45:15 +02:00
Constantin Wenger 0cfca69b42 fixed displaying special chars in the keychange menu 2011-08-05 08:45:15 +02:00
Perttu Ahola 0b37f98e16 * fix for broken water 2011-08-03 19:00:25 +02:00
Perttu Ahola 5f8809e425 Fixed farmesh to such that it was a long time ago. 2011-08-03 13:03:30 +03:00
Giuseppe Bilotta 1d1aec9631 Use wgettext 2011-08-02 10:11:40 +02:00
Giuseppe Bilotta 817180bd55 Introduce wgettext 
All usages of gettext() are converted to wchars, so let's factor this
into a single inline.
 2011-08-02 10:11:40 +02:00
Giuseppe Bilotta 60bd878f0a Get rid of unused variables 2011-08-02 10:11:39 +02:00
Perttu Ahola 97d659c9fd added TODO in main.cpp 2011-08-01 19:21:43 +03:00
Nils Dagsson Moskopp 363487c97b * less clumsy ladder texture, based on rails 2011-08-01 15:47:02 +02:00
Mark Holmquist 7bd9e53ae6 Changing CONTENT_LADDER to be an extended block 2011-08-01 09:22:56 +02:00
Mark Holmquist 267744a568 Fixing ladders again 2011-08-01 09:22:44 +02:00
Mark Holmquist 8e67f4c4e6 Fixed a few problems in the ladder update, and changed the speed to account for gravity 2011-08-01 09:22:36 +02:00
Mark Holmquist 1c59cff832 Ladders implemented! 2011-08-01 09:22:36 +02:00
Mark Holmquist bc2819cab2 Added ladders--they don't have any use yet, though 2011-08-01 09:22:36 +02:00
Nils Dagsson Moskopp 7ece67727d Merge remote-tracking branch 'origin/upstream' 2011-07-31 20:04:04 +02:00
Perttu Ahola 19ea901cf2 Fixes a bug that made the server to deny non-empty passwords from players connecting the first time. 2011-07-31 15:51:24 +03:00
Perttu Ahola e0b8e66540 Fixed problem of server always receiving an empty password from the client 2011-07-31 15:32:45 +03:00
Constantin Wenger 54de4afd75 last fix was shit but this one works (tested) 2011-07-31 14:28:07 +02:00
Perttu Ahola 756f8f88d4 Made stricter handling for old clients because now they are not compatible at all. 2011-07-31 02:27:26 +03:00
Perttu Ahola d6a9bec843 Added MaterialItem conversion from old content type namespace to new 2011-07-31 02:20:40 +03:00
Perttu Ahola d7a5eea862 changelog update and disable motd by default 2011-07-31 01:14:56 +03:00
Perttu Ahola 149875607c updated CMakeList.txts a bit 2011-07-31 00:51:18 +03:00
Perttu Ahola 05d0eaf5fc added windows icon 2011-07-31 00:39:43 +03:00
Constantin Wenger 50dc2d8112 fixe for msvc broke linux 2011-07-30 23:05:40 +02:00
Perttu Ahola 8e1eacf3a8 Fixed handling of inventory in creative mode (normal inventory is not trashed anymore), fixed mese pick speed, added some forgotten stuff 2011-07-30 23:33:57 +03:00
Constantin Wenger c08720bfba this fixes problem with msvc++ and should work on other systems and so on anyway. 2011-07-30 22:08:16 +02:00
Constantin Wenger 4882bda667 changed one forgotten en_US.UTF-8 to C 2011-07-30 22:08:16 +02:00
Constantin Wenger a817419fe4 fixed redefinitivon of gettext.h is included more than once 2011-07-30 22:08:16 +02:00
Constantin Wenger 37bf9a666a set some more text to gettext and updated po files 2011-07-30 22:08:16 +02:00
Constantin Wenger 9baae3a701 set locales to C because en_US not installed on some systems, only UTF-8 version and en_US.UTF-8 does not work. 2011-07-30 22:08:16 +02:00
Constantin Wenger 92f504f98d fixed displaying "umlauts" (deutsch umlaute) and hopefully other non ASCII chars, too 2011-07-30 22:03:25 +02:00
Nils Dagsson Moskopp 96bee29e35 Merge branch 'upstream/master' 2011-07-30 19:47:55 +02:00
Perttu Ahola f2051c9822 fix to the former 2011-07-30 20:10:16 +03:00
Perttu Ahola f8fca8ca5e easier notice on old version 2011-07-30 20:06:30 +03:00
Perttu Ahola 24a662705c Added network protocol version number in protocol 2011-07-30 20:02:17 +03:00
Nils Dagsson Moskopp 4ef9c7675a Merge remote-tracking branch 'origin/upstream' 2011-07-30 18:55:43 +02:00
Perttu Ahola cdadbdbd17 Server configuration is now written when "/#setting whatever = whatever" is issued. 2011-07-30 19:49:42 +03:00
Perttu Ahola 9b294ffa7a Added message of the day and made it properly configurable using /#setting (not saved to config file yet) 2011-07-30 19:31:33 +03:00
Perttu Ahola 4b0c3e4357 Made picking items up in creative mode delete them (because they usually are in the inventory already anyway) 2011-07-30 19:05:25 +03:00
Perttu Ahola cae422076b updated pause menu text a bit 2011-07-30 18:54:02 +03:00
Perttu Ahola d62ae0e18b Rats are now eatable. Also made their selection box move smoothly. 2011-07-30 18:51:15 +03:00
Perttu Ahola 4556c212db Made rats cookable and made them spawn near trees 2011-07-30 17:51:21 +03:00
Perttu Ahola 8ceb0586b2 made more things burnable in furnace 2011-07-30 14:57:43 +03:00
Perttu Ahola df27b85432 quick fix to it not building with gettext on my visual studio environment 2011-07-30 14:38:41 +03:00
Perttu Ahola 1de45cc8a7 Removed remaining -delta references 2011-07-30 14:02:11 +03:00
Perttu Ahola 416499f978 fix server build 2011-07-25 23:31:02 +03:00
Giuseppe Bilotta cce210f676 Locale dir should be parallel to global data dir 2011-07-24 19:23:03 +02:00
Giuseppe Bilotta a8e493122e Read config from gettext.h 
Otherwise the USE_GETTEXT define might not be visible.
 2011-07-24 19:13:34 +02:00
Giuseppe Bilotta 3715e39e5d Actually make USE_GETTEXT available in the source 2011-07-24 18:34:10 +02:00
Giuseppe Bilotta 423109e64c Two more instances of unhardcoding the project name 2011-07-24 18:12:11 +02:00
Giuseppe Bilotta e034f8a2a3 Sanitize GETTEXT usage macros 
Now the user-level option is called ENABLE_GETTEXT, and USE_GETTEXT is
only set to true if gettext was enabled and found. This simplifies all
check to USE_GETTEXT only rather than the double checks for it being
enabled and found.
 2011-07-24 16:52:59 +02:00
Giuseppe Bilotta 47381bde3b Bring po update out of cmake again 
This solves two issues at once:
* CMake would delete po files during ‘make clean’ because it thought
  they were autogenerated and not just managed
* the only gettext tools readily available in Windows are so old they
  don't support options like --package-name

The change also moves minetest.pot down one level, so we don't need to
special case ‘en’ anymore.

The downside is of course that you need some sane POSIX shell to update
the po files.
 2011-07-24 16:52:59 +02:00
Giuseppe Bilotta c578efb32b Refactor gettext init 
Put the gettext init code in a macro and define it appropriately
depending on whether gettext is actually available or not.
 2011-07-24 16:52:59 +02:00
Perttu Ahola dbea511a6f Lowered default viewing range minimum to such that it allows fairly good 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.
 2011-07-24 12:49:47 +03:00
Perttu Ahola c9e615bde4 Updated the texture atlas a bit 2011-07-24 12:45:52 +03:00
Perttu Ahola 20fa7412c8 and now fixed a bug in removing that debug output 2011-07-24 12:13:51 +03:00
Perttu Ahola d099165271 removed a remaining debug print 2011-07-24 12:12:55 +03:00
Perttu Ahola 29d905f98a Added a mapblock analyzing function for debugging use and fixed remaining mapgen bugs 2011-07-24 12:09:33 +03:00
Perttu Ahola ed8f5576a5 changed jungletree/junglegrass content ids to extended range 2011-07-24 11:40:14 +03:00
Perttu Ahola 112b85d0fb merged fix to decapitated trees; other bugs now exists 2011-07-24 11:39:13 +03:00
Giuseppe Bilotta 5aa2679be7 Do not package en translation, since we don't build it 2011-07-24 09:19:25 +02:00
Giuseppe Bilotta d4e7faca21 Gettext domain should match the project name 
This partially reverts 023cc0d37776976b4b192b7363f73a5d2debdef6, goes
back to using PROJECT_NAME for the filename and also uses PROJECT_NAME
as text domain in the source code.
 2011-07-24 09:19:25 +02:00
Giuseppe Bilotta 4ffba76bb3 Place project name and gettext use in config 2011-07-24 09:18:29 +02:00
Perttu Ahola 8d84086f35 removed unnecessary verbosity from debug output of tile.cpp 2011-07-24 10:12:08 +03:00
Nils Dagsson Moskopp f4a08f7fb3 Merge pull request #34 from SpeedProg/master 
Changes to make gettext enabled if it is found
 2011-07-23 19:01:51 -07:00
Perttu Ahola 73cf4b3016 made shadows less blue 2011-07-24 00:49:45 +03:00
Constantin Wenger f6d9bcc9bb updated cmakerules to autodetect if gettext can be used 
fixed error if gettext is disabled
 2011-07-23 22:36:11 +02:00
Perttu Ahola 68a9157b94 Fixed issue #15: Glass blocks a lot of light 2011-07-23 20:28:05 +03:00
Perttu Ahola 26582e0e66 Fixed #21 Earth under torches oscillates between mud and grass 2011-07-23 20:22:22 +03:00
Perttu Ahola 0b4cdfa023 Made hotbar a bit smaller 2011-07-23 20:22:04 +03:00
Perttu Ahola 501034a792 merged jungle and bluish shadows 2011-07-23 20:01:06 +03:00
Perttu Ahola 96fedb5cb0 removed -delta namings 2011-07-23 19:33:49 +03:00
Perttu Ahola f13fc82abe converted main.cpp dos linefeeds to unix linefeeds. 2011-07-23 19:17:39 +03:00
Perttu Ahola bc14898bf9 updated main.cpp comments a bit 2011-07-23 19:16:49 +03:00
Perttu Ahola 2587bb361c merged the content type extension and delta 2011-07-23 19:04:37 +03:00
Perttu Ahola 90d793f8f3 extended content-type range 2011-07-23 16:55:26 +03:00
Perttu Ahola 976ec31c1f switched to old transformLiquids, new one is not ready 2011-07-23 16:46:34 +03:00
Perttu Ahola f17cfb35d1 uh, i guess this now merges the new delta stuff? 2011-07-23 15:50:05 +03:00
Perttu Ahola 3882536d40 merged some stuff from upstream while merging delta 2011-07-23 15:46:00 +03:00
Perttu Ahola d67cef0eb7 Made dark places tint slightly in blue 2011-07-23 04:10:17 +03:00
Perttu Ahola 8993d9dd83 Jungle biome/whatever thing 2011-07-23 02:04:24 +03:00
Perttu Ahola 6c2d95f868 * key change menu now saving immediately 2011-07-22 21:54:26 +02:00
Perttu Ahola 58f612eca1 Changing key settings now doesn't require a game restart 2011-07-22 22:35:20 +03:00
Constantin Wenger 383698186f Merge remote-tracking branch 'upstream/master' 2011-07-22 20:53:29 +02:00
Constantin Wenger 2abe6ed75c Merge remote-tracking branch 'upstream/master' 2011-07-22 20:53:29 +02:00
Constantin Wenger fb4c3ab4fb fixed some problems with filenames of the translations 2011-07-22 20:40:47 +02:00
Constantin Wenger a12229f271 fixed some problems with filenames of the translations 2011-07-22 20:40:47 +02:00
Nils Dagsson Moskopp 7985d746f9 Merge branch 'upstream/master' 2011-07-22 20:16:58 +02:00
Nils Dagsson Moskopp 805ccd449f Merge branch 'upstream/master' 2011-07-22 20:16:58 +02:00
Perttu Ahola f706644a50 Fixed the problem of <=r548 clients fucking up maps on >=r549 servers. Also, already fucked up maps are now loaded correctly. 2011-07-22 18:51:49 +03:00
Giuseppe Bilotta 7d9dd352cf Declare USE_GETTEXT option 2011-07-22 14:42:04 +02:00
Giuseppe Bilotta 9653522873 Declare USE_GETTEXT option 2011-07-22 14:42:04 +02:00
Constantin Wenger a09660dc85 fixed problem with displaying special chars 2011-07-22 13:27:30 +02:00
Constantin Wenger bf3dfec7d6 fixed problem with displaying special chars 2011-07-22 13:27:30 +02:00
Giuseppe Bilotta d78e5e7329 updatepo cmake rule 
Get rid of the system-specific updatelocales.sh and introduce an
updatepo cmake rule. po files are also updated before creating the mo
files, and we now keep the .pot file (in the po/en directory). To
stabilize the po file creation, file contents are sorted by source
filename.

Update po files in the process.
 2011-07-22 12:40:29 +02:00
Giuseppe Bilotta aaa165f985 updatepo cmake rule 
Get rid of the system-specific updatelocales.sh and introduce an
updatepo cmake rule. po files are also updated before creating the mo
files, and we now keep the .pot file (in the po/en directory). To
stabilize the po file creation, file contents are sorted by source
filename.

Update po files in the process.
 2011-07-22 12:40:29 +02:00
Perttu Ahola 2b39be44e4 added an unit test for the Settings thingy (the python ConfigParser -like thing) 2011-07-22 13:10:58 +03:00
Giuseppe Bilotta e61b2f99c1 Static naming of po file 
The po file should not be named c55 if we're in ∆. But since it is not
exposed at installation time, we don't actually need its name to be
based on the project name at all, so just call it minetest.po
 2011-07-22 09:58:02 +02:00
Giuseppe Bilotta 8f2409a1b4 Static naming of po file 
The po file should not be named c55 if we're in ∆. But since it is not
exposed at installation time, we don't actually need its name to be
based on the project name at all, so just call it minetest.po
 2011-07-22 09:58:02 +02:00
Giuseppe Bilotta d386f02893 Refactor mo creation/installation 2011-07-22 09:36:17 +02:00
Giuseppe Bilotta 0ec749317c Refactor mo creation/installation 2011-07-22 09:36:17 +02:00
Giuseppe Bilotta 5a3218e535 Use project name for mo files 2011-07-22 08:33:08 +02:00
Giuseppe Bilotta bc05bd8b59 Use project name for mo files 2011-07-22 08:33:08 +02:00
Giuseppe Bilotta 02653573d2 Merge remote-tracking branch 'erlehmann/master' 
Conflicts (from the introduction of fr translations):
	src/CMakeLists.txt
 2011-07-22 07:48:22 +02:00
Giuseppe Bilotta 7c1ea34baf Merge remote-tracking branch 'erlehmann/master' 
Conflicts (from the introduction of fr translations):
	src/CMakeLists.txt
 2011-07-22 07:48:22 +02:00
Constantin Wenger 5c66664aef changed some lines to fit the 80chars limit 2011-07-22 07:25:40 +02:00
Constantin Wenger 3d53cc2c11 changed some lines to fit the 80chars limit 2011-07-22 07:25:40 +02:00
Perttu Ahola 329158f7d1 Fixed small error in mapnode.cpp (didn't cause any harm though) 2011-07-22 01:37:21 +03:00
Perttu Ahola fe855e004f Fixed new map generator causing a crash when generating at map limit 2011-07-22 01:37:05 +03:00
Perttu Ahola 2b3bc33708 added some TODOs to main.cpp 2011-07-21 23:28:30 +03:00
Perttu Ahola 308d861327 Merged minetest-delta a624fe549bc75855a170 2011-07-21 20:55:08 +03:00
Cyriaque Skrapits 8048961cc5 Added french translation. 2011-07-21 16:09:57 +02:00
Cyriaque Skrapits 6875ead7cf Added french translation. 2011-07-21 16:09:57 +02:00
Perttu Ahola 52ad5944c0 Attempt to fix the big bug. Now server either stops sending map or mapgen starts generating CONTENT_IGNORE. 2011-07-21 17:00:08 +03:00
Nils Dagsson Moskopp cbf2ac5e8f * different collision box for fireflies so they now hover above the ground 2011-07-21 15:40:00 +02:00
Nils Dagsson Moskopp 5388e8b124 * different collision box for fireflies so they now hover above the ground 2011-07-21 15:40:00 +02:00
Giuseppe Bilotta 02b14090c2 Reorganize cmake gettext message output to ease debugging 2011-07-21 15:16:59 +02:00
Giuseppe Bilotta 767280577b Reorganize cmake gettext message output to ease debugging 2011-07-21 15:16:59 +02:00
Giuseppe Bilotta 56a744599f Restore "Leave address blank" position 2011-07-21 15:12:58 +02:00
Giuseppe Bilotta aa6506ce96 Restore "Leave address blank" position 2011-07-21 15:12:58 +02:00
Giuseppe Bilotta 9fa4b72a47 Find correct library for MSVC vs MingW in Winows 2011-07-21 14:50:15 +02:00
Giuseppe Bilotta 02695bebc6 Find correct library for MSVC vs MingW in Winows 2011-07-21 14:50:15 +02:00
Giuseppe Bilotta 3e78b29cae Only install locale files if using gettext 2011-07-21 14:46:23 +02:00
Giuseppe Bilotta 7b93fb59cf Only install locale files if using gettext 2011-07-21 14:46:23 +02:00
Giuseppe Bilotta d63c160bd6 Uppercase DEFINED or cmake 2.8.4 complains 2011-07-21 13:59:50 +02:00
Giuseppe Bilotta adb7181969 Uppercase DEFINED or cmake 2.8.4 complains 2011-07-21 13:59:50 +02:00
Giuseppe Bilotta 1340da7b54 Refactor and clean up gettext management 2011-07-21 12:33:29 +02:00
Giuseppe Bilotta b99174cb0c Refactor and clean up gettext management 2011-07-21 12:33:29 +02:00
Giuseppe Bilotta 89af509d10 Make gettext optional 2011-07-21 09:03:41 +02:00
Giuseppe Bilotta fd70bbd367 Make gettext optional 2011-07-21 09:03:41 +02:00
Weedy 89b8b792c1 Tweak makefiles to add -delta suffix. 2011-07-21 09:03:20 +02:00
Weedy 36d8f91f1a Tweak makefiles to add -delta suffix. 2011-07-21 09:03:20 +02:00
Weedy a19491dbd2 Fix win32 MSVC compile. (screw gettext) 2011-07-21 09:03:17 +02:00