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

389 Commits

Author SHA1 Message Date
Sfan5 3875a77bf8 Fix curl dll not getting installed when sound is disabled 2014-01-21 13:35:26 +01:00
Kahrl 8966c16ad2 Add formspec table 2014-01-13 18:11:08 -05:00
hasufell 10eea107ed BUILD: fix cmake list parsing 
because cmake is unable to parse it's own lists properly
 2014-01-05 20:58:40 +04:00
hasufell cb7bb736c7 BUILD: prefer pkg-config for freetype2 detection 
This can solve numerous problems such as:
http://www.cmake.org/Bug/view.php?id=13959
http://www.cmake.org/Bug/view.php?id=14601

If pkg-config or freetype2.pc is not found, then fall back to the
FindFreetype.cmake module logic.

Restrict to UNIX since I only tested it here.
 2014-01-05 20:58:40 +04:00
Sfan5 160e2b7b7d Add option to link to OpenGL ES, fixes #1051 2014-01-05 20:50:55 +04:00
Kahrl 0404bbf671 Rewrite client media download and support hash-based remote download 
Move most of the media-related code in client.cpp into a new class
ClientMediaDownloader (clientmedia.cpp, clientmedia.h). Among other
things, this class does the following things:

- Download [remote_server][sha1] instead of [remote_server][name]. This
is to support servers that provide the same file name with different
contents.
- Initially fetch [remote_server]index.mth. This file should follow the
Minetest Hashset format (currently version 1) and contain a list of SHA1
hashes that exist on the server.
- The list of needed SHA1s is uploaded (via HTTP POST) when index.mth is
requested, so servers can optionally narrow down the list to the needs
of the client.
- If index.mth is missing (HTTP response code 404), we enter compat mode,
fetching [remote_server][name] as before this commit.
- remote_server can now contain multiple servers, separated by commas.
The downloader code attempts to split requests between the different
servers, as permitted by each server's index.mth. If one server claims
to have a file but actually doesn't (or something fails), we ask a
different server that also claims to have it.
- As before, when none of the remote servers provide a particular
file, we download it via the conventional method, i.e. using
the minetest protocol: TOSERVER_REQUEST_MEDIA / TOCLIENT_MEDIA.
- Bugfix: Every downloaded file's SHA1 is now verified against the SHA1
announced by the minetest server (before loading it and inserting it
into the file cache).
- Bugfix: Only send TOSERVER_RECEIVED_MEDIA when we actually have all
media. This should fix #863.
 2013-12-13 18:05:20 +01:00
Kahrl 0ea3e6dbe2 Implement httpfetch module and initialize it from main() 
Add curl_parallel_limit setting that will replace media_fetch_threads in
a later commit.

Fix a typo in MutexedQueue::pop_back() that made it impossible to compile
code that used this function. (Noticed this while implementing httpfetch.)
 2013-12-13 18:05:10 +01:00
sapier 22a59b3912 Fix win32/msvc i18n (quite UGLY version, blame Microsoft) 2013-11-11 19:56:49 +01:00
Kahrl 2134316c80 Pass VERSION_EXTRA to GenerateVersion.cmake 2013-09-29 16:05:09 +02:00
Kahrl 8bc7ea61b9 Show git hash in version string at top left corner of window 2013-09-28 21:30:17 +02:00
PilzAdam 4ea0e4f606 Add curl, freetype and luaJIT to CMAKE_BUILD_INFO 2013-09-28 15:41:37 +02:00
kwolekr d308352dbd Always use builtin JThread library 2013-09-15 23:00:01 -04:00
Sfan5 3725179736 Use system-wide LevelDB instead of bundled one 2013-09-09 22:50:51 +02:00
Ilya Zhuravlev 58841ef12f Add dummy and LevelDB database backends 2013-09-09 22:50:50 +02:00
Kahrl 4e1f50035e Omnicleanup: header cleanup, add ModApiUtil shared between game and mainmenu 2013-08-14 21:03:33 +02:00
Kahrl c8930850e3 Remove farmesh 2013-08-13 09:25:13 +02:00
kwolekr ad4c065344 Change debug optimization level back to -O1 2013-07-02 21:48:18 -04:00
sapier 967121a34b Replace C++ mainmenu by formspec powered one 2013-07-02 19:58:20 -04:00
proller 75b8c13b00 New math mapgen with fractal based worlds 2013-06-23 18:07:10 +04:00
sapier ab43377577 Move scriptapi to separate folder (by sapier) 
On the lua side, notably minetest.env:<function>(<args>) should now
be replaced by minetest.<function>(<args>).
The old way is and will stay supported for a long time.

Also:
Update and clean up lua_api.txt (by celeron55)
Move EnvRef to lua and remove add_rat and add_firefly (by kahrl)
Add separate src/util/CMakeLists.txt, other minor fixes (by kahrl)
 2013-05-25 00:51:02 +02:00
kwolekr 03868ff8e1 Class-ify caves & move to cavegen.cpp, fix cave regression, add caves to Mapgen V7 2013-04-21 01:06:19 -04:00
kwolekr 666aae3593 Split HUD code off to hud.cpp, make into a class, extensive Lua HUD modification 2013-04-18 02:19:31 -04:00
RealBadAngel 9449026839 Use system wide LuaJIT if aviable. 2013-04-08 22:10:00 +02:00
kwolekr fbf76184f0 Revert "Fix to be able to build from dir different than source dir" 
This commit broke RUN_IN_PLACE
 2013-04-07 01:30:06 -04:00
kwolekr 8ec3fc35c6 Add Mapgen V7, reorganize biomes 2013-04-07 00:50:21 -04:00
Diego Martínez 046534e14b Fix to be able to build from dir different than source dir 2013-04-06 12:31:12 -04:00
sapier 69367aa799 Add Dijkstra A* and A* without prefetching pathfind algorithms 2013-04-06 11:24:03 -04:00
kwolekr 6cf581e360 Fix build on Linux with some glibcs 2013-03-29 21:12:14 -04:00
Jeija e1ff5b1361 Allow spawning particles from the server, from lua 
Spawn single particles or make use of ParticleSpawner for many randomly spawned particles.
Accessible in Lua using minetest.spawn_particle and minetest.add_particlespawner.
Increase Protocol Version to 17.

Conflicts:
	src/clientserver.h
 2013-03-23 23:16:29 +01:00
Perttu Ahola 34b185e955 Add singlenode mapgen; generates solely the node 'mapgen_singlenode', defaults to air 2013-03-22 19:16:51 +02:00
proller 10c03e1a9d build with ogles2 driver 2013-03-16 22:37:50 -04:00
proller 165498cecf initial mapgen indev version with farscale feature and huge caves 2013-03-16 21:48:32 -04:00
kwolekr 650e932ddf Re-add dungeons in new dungeongen.cpp 2013-03-10 00:42:51 -05:00
sapier bdbdeab005 split scriptapi.cpp 
Remerge some files in order to reduce number of additional files

Make necessary changes for split, rename files, reorganize some bits
 2013-03-05 00:59:49 -05:00
kwolekr b9d8e59bbf Add emerge.cpp, initial EmergeThread changes 
- Neatly placed all emerge related code into a new file, emerge.cpp
- Greatly cleaned up the code in EmergeThread::Thread()
- Reworked Emerge queue.  Now an actual std::queue of v3s16 block positions
- Removed the completely unnecessary map of peer ids requesting blocks
 2013-02-25 22:56:18 -05:00
RealBadAngel 4d73d99ebc Add sound volume controls to ingame menu 2013-02-23 16:01:35 +01:00
proller ee07c3f7cf new auto masterserver 2013-02-22 02:04:53 +04:00
Ilya Zhuravlev 30b9a4d6b4 Add Freetype support 2013-02-14 18:46:08 +01:00
Dmitry Marakasov 8e69b9cb26 Server requires gettext library as well 2013-02-12 20:27:50 +01:00
kwolekr d5029958b9 Readded and optimized mapgen V6 2013-01-21 21:41:37 +02:00
kwolekr 11afcbff69 The new mapgen, noise functions, et al. 2013-01-21 21:41:33 +02:00
Jürgen Doser 6af8a34d91 Basic support for configuring which mods to load for each world 
settings.h: added function to return all keys used in settings, and a
function to remove a setting

mods.{h,cpp}: added class ModConfiguration that represents a subset of the installed mods.

server.{h,cpp}: server does not load add-on mods that are disabled in
the world.mt file. mods are disabled by a setting of the form
"load_mod_<modname> = false". if no load_mod_<modname> = ... setting
is found, the mod is loaded anyways for backwards compatibilty. server
also complains to errorstream about mods with unstatisfied
dependencies and about mods that are not installed.

guiConfigureWorld.{h,cpp}: shows a treeview of installed add-on mods
and modpacks with little icons in front of their name indicating their
status: a checkmark for enabled mods, a cross for disabled mods, a
question mark for "new" mods

Mods can be enabled/disabled by a checkbox. Mods also show a list of
dependencies and reverse dependencies. double-click on a mod in
dependency or reverse dependency listbox selects the corresponding
mod. Enabling a mod also enables all its dependencies. Disabling a mod
also disables all its reverse dependencies.

For modpacks, show buttons to enable/disable all mods (recursively,
including their dependencies) in it.

Button "Save" saves the current settings to the world.mt file and
returns to the main menu. Button "Cancel" returns to main menu without
saving.

basic keyboard controls (if the proper widget has keyboard focus):

up/down: scroll through tree of mods
left/right: collaps/expand a modpack
space: enable/disable the selected mod
 2013-01-21 17:31:50 +02:00
Jeija 6f93c01af9 Add a list of servers to the "Multiplayer" tab 
If USE_CURL is set, it also downloads a list from a remote server.
The url of this list is configurable in minetest.conf using the setting "serverlist_url"
The local list of favorite servers is saved in client/serverlist/filename
filename is also configureable using the setting "serverlist_file"
 2013-01-21 16:42:56 +02:00
Jeija 61f5ca6b16 Add particles 2013-01-14 15:27:00 +01:00
RealBadAngel b40e599866 L-System treegen 2012-12-30 13:42:19 +04:00
sfan5 05b58501f2 Tweak CMake files for cURL 2012-12-18 21:52:56 +04:00
Ilya Zhuravlev 3578e1d4a7 Added ability to fetch media from remote server (using cURL library) 2012-12-16 15:20:18 +04:00
Kahrl 22e6fb7056 ShaderSource and silly example shaders 2012-12-02 00:46:18 +02:00
Perttu Ahola eca1c96412 Move util/serialize.h out from staticobject.h for smaller header dependencies 2012-11-26 11:18:34 +02:00
Perttu Ahola 2f5686ca48 Move a function from clientserver.h to clientserver.cpp 2012-11-26 10:31:24 +02:00
Matthew I b29d609b0b Move chat commands to Lua and remove servercommand.{cpp,h} 
Commands moved:
 /me
 /status
 /time
 /shutdown
 /ban
 /clearobjects
 2012-08-12 16:45:58 +03:00
Perttu Ahola 0190f9b077 Experimental-ish rollback functionality 2012-07-27 02:27:18 +03:00
Perttu Ahola aef1332e42 Improve build configuration options 2012-07-23 15:23:33 +03:00
darkrose 506203345b Implement formspec 2012-07-22 17:40:41 +03:00
Perttu Ahola d0ea6f9920 Properly and efficiently use split utility headers 2012-06-17 02:40:36 +03:00
Perttu Ahola 1bc37d576c Initially split utility.h to multiple files in util/ 2012-06-17 01:29:13 +03:00
Kahrl 704782c95b WIP node metadata, node timers 2012-06-03 22:31:00 +03:00
Perttu Ahola b9b56bac6b Fix buildbot 2012-04-03 08:55:13 +03:00
Perttu Ahola b131a0cf0c Add optional MINGWM10_DLL to cmake install 2012-04-03 01:03:31 +03:00
Perttu Ahola 2cd5addc0c Fix things for cross-compiling using mingw 2012-04-02 21:14:30 +03:00
Perttu Ahola 52122c342d Add 'fly' and 'fast' privileges and the underlying privileges-to-client system 2012-03-31 16:25:02 +03:00
Perttu Ahola 7cad0a2dcd Reimplement authentication handler in Lua; now we have 1) infinite privilege names, 2) minetest.register_authentication_handler() 2012-03-30 18:42:18 +03:00
Perttu Ahola 9e7ccedba4 ObjectProperties 2012-03-30 12:51:51 +03:00
Perttu Ahola 443f45eca1 Add GenericCAO and player armor groups, but don't use them yet 2012-03-29 16:10:11 +03:00
Kahrl f8c3743991 added PlayerSAO and RemotePlayer, removed ServerRemotePlayer 2012-03-29 14:05:45 +03:00
Perttu Ahola 56496ad5d8 Implement propagateSunlight for VoxelManipulator 2012-03-27 19:01:50 +03:00
Perttu Ahola 0557df8d06 Add OPENAL_DLL LIBOGG_DLL LIBVORBIS_DLL and LIBVORBISFILE_DLL to be used optionally when installing 2012-03-25 22:50:09 +03:00
Perttu Ahola 3a9753b85f Add OGG_INCLUDE_DIR to SOUND_INCLUDE_DIRS 2012-03-25 22:07:34 +03:00
Perttu Ahola 188b303991 Don't try to use sound if building only server 2012-03-25 21:10:25 +03:00
Jonathan Neuschäfer 4bf5065a9c Cache textures by checksum 2012-03-25 11:51:00 +03:00
Perttu Ahola c8997e48c0 Build configuration fixes/improvements on Windows 2012-03-25 04:03:51 +03:00
Perttu Ahola 77621568fd Fix build on MinGW (as compared to Linux) 2012-03-24 23:16:09 +02:00
Perttu Ahola 8c2f3bb378 c55sound continued 2012-03-24 04:24:25 +02:00
Perttu Ahola c301e3c82a celeron55's sound system initial framework 2012-03-24 04:24:23 +02:00
Perttu Ahola db4911f956 Fix for MSVC and move stuff around a bit in CMakeLists.txt and src/CMakeLists.txt 2012-03-20 01:06:58 +02:00
Perttu Ahola 97b693052c Flatten share/ and user/ in the source and for the RUN_IN_PLACE build 2012-03-20 00:08:00 +02:00
Perttu Ahola b409803527 Fix installation in cmake project files 2012-03-18 16:30:02 +02:00
Perttu Ahola 2e90ed07ac Dynamic sky, fog and cloud colors; sun and moon 2012-03-18 13:42:18 +02:00
Perttu Ahola 58bed83d03 Move ClientMap to clientmap.{h,cpp} 2012-03-16 00:25:18 +02:00
Perttu Ahola 64232f0aec Add confirmation menu and make world deletion possible in GUI 2012-03-13 00:48:05 +02:00
Perttu Ahola 591527d878 World creation button and dialog and functionality 2012-03-13 00:06:37 +02:00
Perttu Ahola 18c4a90101 Add quicktune.{cpp,h} 2012-03-12 08:38:15 +02:00
Perttu Ahola 7f7fb9750d command-line/world game selection 2012-03-11 14:54:23 +02:00
Kahrl 967f25461b Chat console, including a number of rebases and modifications. 
Defaults modified from original: alpha=200, key=F10
 2012-03-10 20:11:10 +02:00
Perttu Ahola f3dba05143 Remove servermain.cpp, use main.cpp with a couple of #ifdefs instead 2012-03-10 17:10:16 +02:00
Perttu Ahola f9da2c9507 Immediate smoke puff when a normal entity is punched to death 2012-03-10 11:28:14 +02:00
Perttu Ahola 562ac3bce9 Digging time groups WIP 2012-03-10 11:28:12 +02:00
Kahrl 157a4cf18c Node placement / mineral / serialization / iron freq / node_dig callback 
- Node placement code moved to Lua
- Mineral system removed (added default:stone_with_coal and default:stone_with_iron).
- MapBlock and MapNode serialization updated.
- Mapgen: Frequency of iron increased.
- node_dig callback and related changes.
 2012-01-22 17:24:50 +02:00
Kahrl 6a76c226e1 The huge item definition and item namespace unification patch (itemdef), see http://c55.me/minetest/wiki/doku.php?id=changes:itemdef 2012-01-12 06:10:39 +01:00
Perttu Ahola 103173fc9b Add InvRef and InvStack (currently untested and unusable) 2012-01-02 01:49:38 +02:00
Kahrl ceaf8edade Use plain IBillboardSceneNode instead of MyBillboardSceneNode (improves 
Irrlicht 1.8 compat); also find dungeon master's fireball texture
again; add /spawnentity command
 2011-12-04 13:27:30 +02:00
Kahrl 392485aa45 inventorycube: use all three specified textures; also moved mesh creation / modification functions to mesh.cpp; in lua, inventorycube is now called minetest.inventorycube 2011-12-03 11:47:37 +02:00
Perttu Ahola 2f4a92d701 Better mod loading error handling 2011-12-03 03:23:14 +02:00
Perttu Ahola b9e8e20c9c Script-defined creative inventory 2011-12-02 12:43:57 +02:00
Perttu Ahola 5344dec760 Move ServerRemotePlayer to a separate file 2011-12-02 10:44:20 +02:00
Perttu Ahola bc48cf076d Remove content_inventory.{h,cpp} 2011-11-29 19:13:59 +02:00
Kahrl d6b30dd3a5 CraftItem rework and Lua interface 2011-11-29 19:13:58 +02:00
Perttu Ahola c910ead4db Fix CMake install data path 2011-11-29 19:13:57 +02:00
Perttu Ahola a91eb36277 Update installation in CMakeLists.txt 2011-11-29 19:13:57 +02:00
Perttu Ahola 842eb5da28 Replace old active block random node modifying things with actual ActiveBlockModifiers 2011-11-29 19:13:56 +02:00
Perttu Ahola 9d5b458479 Crafting definition in scripts 2011-11-29 19:13:48 +02:00
Perttu Ahola c0f6395cf0 Node definition names 2011-11-29 19:13:46 +02:00
Perttu Ahola 9e1c4533b8 Move tool definitions to script 2011-11-29 19:13:43 +02:00
Perttu Ahola c6fd2986d4 GameDef compiles 2011-11-29 19:13:42 +02:00
Perttu Ahola abceeee92f Create framework for getting rid of global definitions of node/tool/item/whatever types 2011-11-29 19:13:41 +02:00
Perttu Ahola 5fc791ac9a Move tool stuff to tool.{h,cpp} 2011-11-29 19:13:41 +02:00
Perttu Ahola 64996422c0 Move ContentFeatures to mapnode_contentfeatures.{h,cpp} and clean stuff 2011-11-29 19:13:40 +02:00
Perttu Ahola dcedfdacd1 Scripting WIP 2011-11-29 19:13:39 +02:00
Perttu Ahola bfc68d3151 Scripting WIP 2011-11-29 19:13:38 +02:00
Perttu Ahola ee8b6d3444 Move images to data/textures and fix some path stuff; hope that installation still works 2011-11-29 19:11:04 +02:00
Perttu Ahola d1a5e97a7f Add Lua 2011-11-29 19:11:04 +02:00
Perttu Ahola 4846846a2d Initially add small and tight logging facility 2011-10-16 12:45:00 +03:00
Perttu Ahola fd6452749e Resource file handling for exe icon for MinGW 2011-10-15 17:05:16 +03:00
Perttu Ahola 74febd5c31 Handle death and respawn better 2011-10-15 14:46:59 +03:00
Perttu Ahola 43a28f04fa mobv2 2011-10-15 02:28:57 +03:00
Perttu Ahola 853a78681e In CMake scripts: New version number, fix MSVC stuff 2011-10-14 09:55:39 +03:00
Perttu Ahola 9e46cbf7ea Header file tweaking; mainly for speed 2011-10-12 13:53:38 +03:00
Perttu Ahola 061d4b4202 Merge branch 'view_bobbing_and_vielded_tool' 2011-09-26 15:10:02 +03:00
Perttu Ahola 789c88509c Move PLATFORM_LIBS around to make sqlite3 link with libdl on some distros 2011-09-23 08:48:58 +03:00
Kahrl 40707e3c5b SQLite needs to be linked with -ldl on some Linux distros. 2011-09-16 19:06:45 +03:00
Kahrl baf7da9d4a Collected and moved existing camera infrastructure from game.cpp to 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. 2011-09-08 01:08:47 +02:00
Constantin Wenger 5784c14ab7 added ipban support 
commands:
/#ipban <nick>
/#ipunban <ip>
 2011-08-12 03:37:18 +02:00
Perttu Ahola 69fca4f3cb Merged some FreeBSD fixes 2011-08-11 12:32:36 +03:00
q66 f6ed45fc20 Proper placement of binary files. 2011-08-11 11:19:33 +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 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 64a6da3e45 merged delta and c55 2011-08-05 11:22:13 +03:00
Nils Dagsson Moskopp 7ece67727d Merge remote-tracking branch 'origin/upstream' 2011-07-31 20:04:04 +02: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
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 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
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 96fedb5cb0 removed -delta namings 2011-07-23 19:33:49 +03: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
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
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
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
Cyriaque Skrapits 6875ead7cf Added french translation. 2011-07-21 16:09:57 +02:00
Cyriaque Skrapits 8048961cc5 Added french translation. 2011-07-21 16:09:57 +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 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
Weedy 9cb5f70be5 Fix win32 MSVC compile. (screw gettext) 2011-07-21 09:03:17 +02:00
Giuseppe Bilotta e7beaac6f5 Move package search out of conditional 
This unbreaks the Windows build which would otherwise have problems at
the jthread level.
 2011-07-20 23:09:28 +02:00
Giuseppe Bilotta 29aae3dcb5 Move package search out of conditional 
This unbreaks the Windows build which would otherwise have problems at
the jthread level.
 2011-07-20 23:09:28 +02:00
Giuseppe Bilotta cd45ae3d0f Use system sqlite3/jthread libs if available 2011-07-20 17:59:48 +02:00
Giuseppe Bilotta 3321edae77 Use system sqlite3/jthread libs if available 2011-07-20 17:59:48 +02:00
Constantin Wenger 052bb24c7f added gettext support 
german translation file
and bashscript to update translations
 2011-07-20 16:51:19 +02:00
Constantin Wenger 6a8328de79 added gettext support 
german translation file
and bashscript to update translations
 2011-07-20 16:51:19 +02:00
Nils Dagsson Moskopp af05e4b2de Merge branch 'upstream/master' 
Conflicts:
	data/oerkki1.png
	src/client.cpp
 2011-07-14 22:43:28 +02:00
Nils Dagsson Moskopp 3560f0de08 Merge branch 'upstream/master' 
Conflicts:
	data/oerkki1.png
	src/client.cpp
 2011-07-14 22:43:28 +02:00
Perttu Ahola 91cfbe2891 reorganized a lot of stuff and modified mapgen and objects slightly while doing it 2011-06-26 15:48:56 +03:00
Sebastian Rühl 033ae0dcae Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git 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>
 2011-06-26 12:24:32 +02:00
Sebastian Rühl 9d09103e48 Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git 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>
 2011-06-26 12:24:32 +02:00
Perttu Ahola 2915bd5518 more reorganizing of map code 2011-06-26 01:31:43 +03:00
Perttu Ahola cb130d9158 cleaned map stuff 2011-06-26 00:03:58 +03:00
Perttu Ahola f2c26e2014 moved map generator to separate source files 2011-06-25 18:12:41 +03:00
Perttu Ahola 7538b4c620 New map generator added (and SQLite, messed up the commits at that time...) (import from temporary git repo) 2011-06-25 04:25:14 +03:00
Perttu Ahola 534287892d merged Mac OSX build fix from minetest-delta 2011-06-18 03:14:13 +03:00
Perttu Ahola c391bcee16 removed furnace menu because it is not needed anymore 2011-06-18 02:32:34 +03:00
Perttu Ahola cced6aaf8d separated inventory-related game content to content_inventory.{h,cpp} 2011-06-18 02:30:33 +03:00
Perttu Ahola da692355e8 Created and moved stuff to content_nodemeta.{h,cpp} 2011-06-18 00:46:50 +03:00
Perttu Ahola 682c9d8e7d Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and content_mapblock.{h,cpp} 2011-06-17 23:20:31 +03:00
Perttu Ahola dc5319b6c9 Moved some mapnode content stuff from mapnode.{h,cpp} and digging property stuff from material.cpp to content_mapnode.{h,cpp} 2011-06-17 22:20:15 +03:00
Perttu Ahola 72e742c24e Added an experimental "far view" thing. Doesn't work exactly like it should and not suitable for real use yet, and might never be. 2011-06-07 22:08:16 +03:00
Perttu Ahola fd64dd5e20 added -Wno-unused-but-set-variable to debug build 2011-06-02 02:59:30 +03:00
teddydestodes 58bc6f3a18 added new submenu for key assignment 
configwriting/saving isn't complete and will break your config if you use fancy keys
 2011-06-01 19:44:07 +02:00
teddydestodes 6434f64ab4 added new submenu for key assignment 
configwriting/saving isn't complete and will break your config if you use fancy keys
 2011-06-01 19:44:07 +02:00
MrLoom 28234f6e54 MacOSX build support 2011-06-01 14:13:22 +02:00
MrLoom 2f2f28d398 MacOSX build support 2011-06-01 14:13:22 +02:00
Perttu Ahola 63611932eb player passwords and privileges in world/auth.txt 
--HG--
extra : rebase_source : 7260636295d9068fbeeddf4143c89f2b8a91446c
 2011-05-29 21:11:16 +03:00
Ciaran Gultnieks a8a3271470 Added the ability to change your password (via pause menu) 
--HG--
extra : rebase_source : e8ec407f60711d42d33be4811b2880088f617b5b
 2011-05-22 21:09:12 +01:00
Perttu Ahola 76e241392d Merge: New map directory structure and player passwords 2011-05-21 01:11:58 +03:00
Ciaran Gultnieks d4d49ee8f4 Passwords - password entry at main menu, stored and checked by server 2011-05-20 20:28:03 +01:00