b9e8e20c9c
Script-defined creative inventory
2011-12-02 12:43:57 +02:00
5344dec760
Move ServerRemotePlayer to a separate file
2011-12-02 10:44:20 +02:00
bc48cf076d
Remove content_inventory.{h,cpp}
2011-11-29 19:13:59 +02:00
d6b30dd3a5
CraftItem rework and Lua interface
2011-11-29 19:13:58 +02:00
c910ead4db
Fix CMake install data path
2011-11-29 19:13:57 +02:00
a91eb36277
Update installation in CMakeLists.txt
2011-11-29 19:13:57 +02:00
842eb5da28
Replace old active block random node modifying things with actual ActiveBlockModifiers
2011-11-29 19:13:56 +02:00
9d5b458479
Crafting definition in scripts
2011-11-29 19:13:48 +02:00
c0f6395cf0
Node definition names
2011-11-29 19:13:46 +02:00
9e1c4533b8
Move tool definitions to script
2011-11-29 19:13:43 +02:00
c6fd2986d4
GameDef compiles
2011-11-29 19:13:42 +02:00
abceeee92f
Create framework for getting rid of global definitions of node/tool/item/whatever types
2011-11-29 19:13:41 +02:00
5fc791ac9a
Move tool stuff to tool.{h,cpp}
2011-11-29 19:13:41 +02:00
64996422c0
Move ContentFeatures to mapnode_contentfeatures.{h,cpp} and clean stuff
2011-11-29 19:13:40 +02:00
dcedfdacd1
Scripting WIP
2011-11-29 19:13:39 +02:00
bfc68d3151
Scripting WIP
2011-11-29 19:13:38 +02:00
ee8b6d3444
Move images to data/textures and fix some path stuff; hope that installation still works
2011-11-29 19:11:04 +02:00
d1a5e97a7f
Add Lua
2011-11-29 19:11:04 +02:00
4846846a2d
Initially add small and tight logging facility
2011-10-16 12:45:00 +03:00
fd6452749e
Resource file handling for exe icon for MinGW
2011-10-15 17:05:16 +03:00
74febd5c31
Handle death and respawn better
2011-10-15 14:46:59 +03:00
43a28f04fa
mobv2
2011-10-15 02:28:57 +03:00
853a78681e
In CMake scripts: New version number, fix MSVC stuff
2011-10-14 09:55:39 +03:00
9e46cbf7ea
Header file tweaking; mainly for speed
2011-10-12 13:53:38 +03:00
061d4b4202
Merge branch 'view_bobbing_and_vielded_tool'
2011-09-26 15:10:02 +03:00
789c88509c
Move PLATFORM_LIBS around to make sqlite3 link with libdl on some distros
2011-09-23 08:48:58 +03:00
40707e3c5b
SQLite needs to be linked with -ldl on some Linux distros.
2011-09-16 19:06:45 +03:00
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
5784c14ab7
added ipban support
...
commands:
/#ipban <nick>
/#ipunban <ip>
2011-08-12 03:37:18 +02:00
69fca4f3cb
Merged some FreeBSD fixes
2011-08-11 12:32:36 +03:00
f6ed45fc20
Proper placement of binary files.
2011-08-11 11:19:33 +02:00
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
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
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
64a6da3e45
merged delta and c55
2011-08-05 11:22:13 +03:00
7ece67727d
Merge remote-tracking branch 'origin/upstream'
2011-07-31 20:04:04 +02:00
149875607c
updated CMakeList.txts a bit
2011-07-31 00:51:18 +03:00
05d0eaf5fc
added windows icon
2011-07-31 00:39:43 +03:00
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
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
5aa2679be7
Do not package en translation, since we don't build it
2011-07-24 09:19:25 +02:00
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
f6d9bcc9bb
updated cmakerules to autodetect if gettext can be used
...
fixed error if gettext is disabled
2011-07-23 22:36:11 +02:00
96fedb5cb0
removed -delta namings
2011-07-23 19:33:49 +03:00
fb4c3ab4fb
fixed some problems with filenames of the translations
2011-07-22 20:40:47 +02:00
a12229f271
fixed some problems with filenames of the translations
2011-07-22 20:40:47 +02:00
7d9dd352cf
Declare USE_GETTEXT option
2011-07-22 14:42:04 +02:00
9653522873
Declare USE_GETTEXT option
2011-07-22 14:42:04 +02:00
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
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
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
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
d386f02893
Refactor mo creation/installation
2011-07-22 09:36:17 +02:00
0ec749317c
Refactor mo creation/installation
2011-07-22 09:36:17 +02:00
5a3218e535
Use project name for mo files
2011-07-22 08:33:08 +02:00
bc05bd8b59
Use project name for mo files
2011-07-22 08:33:08 +02:00
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
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
6875ead7cf
Added french translation.
2011-07-21 16:09:57 +02:00
8048961cc5
Added french translation.
2011-07-21 16:09:57 +02:00
02b14090c2
Reorganize cmake gettext message output to ease debugging
2011-07-21 15:16:59 +02:00
767280577b
Reorganize cmake gettext message output to ease debugging
2011-07-21 15:16:59 +02:00
9fa4b72a47
Find correct library for MSVC vs MingW in Winows
2011-07-21 14:50:15 +02:00
02695bebc6
Find correct library for MSVC vs MingW in Winows
2011-07-21 14:50:15 +02:00
3e78b29cae
Only install locale files if using gettext
2011-07-21 14:46:23 +02:00
7b93fb59cf
Only install locale files if using gettext
2011-07-21 14:46:23 +02:00
d63c160bd6
Uppercase DEFINED or cmake 2.8.4 complains
2011-07-21 13:59:50 +02:00
adb7181969
Uppercase DEFINED or cmake 2.8.4 complains
2011-07-21 13:59:50 +02:00
1340da7b54
Refactor and clean up gettext management
2011-07-21 12:33:29 +02:00
b99174cb0c
Refactor and clean up gettext management
2011-07-21 12:33:29 +02:00
89af509d10
Make gettext optional
2011-07-21 09:03:41 +02:00
fd70bbd367
Make gettext optional
2011-07-21 09:03:41 +02:00
89b8b792c1
Tweak makefiles to add -delta suffix.
2011-07-21 09:03:20 +02:00
36d8f91f1a
Tweak makefiles to add -delta suffix.
2011-07-21 09:03:20 +02:00
a19491dbd2
Fix win32 MSVC compile. (screw gettext)
2011-07-21 09:03:17 +02:00
9cb5f70be5
Fix win32 MSVC compile. (screw gettext)
2011-07-21 09:03:17 +02:00
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
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
cd45ae3d0f
Use system sqlite3/jthread libs if available
2011-07-20 17:59:48 +02:00
3321edae77
Use system sqlite3/jthread libs if available
2011-07-20 17:59:48 +02:00
052bb24c7f
added gettext support
...
german translation file
and bashscript to update translations
2011-07-20 16:51:19 +02:00
6a8328de79
added gettext support
...
german translation file
and bashscript to update translations
2011-07-20 16:51:19 +02:00
af05e4b2de
Merge branch 'upstream/master'
...
Conflicts:
data/oerkki1.png
src/client.cpp
2011-07-14 22:43:28 +02:00
3560f0de08
Merge branch 'upstream/master'
...
Conflicts:
data/oerkki1.png
src/client.cpp
2011-07-14 22:43:28 +02:00
91cfbe2891
reorganized a lot of stuff and modified mapgen and objects slightly while doing it
2011-06-26 15:48:56 +03:00
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
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
2915bd5518
more reorganizing of map code
2011-06-26 01:31:43 +03:00
cb130d9158
cleaned map stuff
2011-06-26 00:03:58 +03:00
f2c26e2014
moved map generator to separate source files
2011-06-25 18:12:41 +03:00
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
534287892d
merged Mac OSX build fix from minetest-delta
2011-06-18 03:14:13 +03:00
c391bcee16
removed furnace menu because it is not needed anymore
2011-06-18 02:32:34 +03:00
cced6aaf8d
separated inventory-related game content to content_inventory.{h,cpp}
2011-06-18 02:30:33 +03:00
da692355e8
Created and moved stuff to content_nodemeta.{h,cpp}
2011-06-18 00:46:50 +03:00
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
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
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
fd64dd5e20
added -Wno-unused-but-set-variable to debug build
2011-06-02 02:59:30 +03:00
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
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
28234f6e54
MacOSX build support
2011-06-01 14:13:22 +02:00
2f2f28d398
MacOSX build support
2011-06-01 14:13:22 +02:00
63611932eb
player passwords and privileges in world/auth.txt
...
--HG--
extra : rebase_source : 7260636295d9068fbeeddf4143c89f2b8a91446c
2011-05-29 21:11:16 +03:00
a8a3271470
Added the ability to change your password (via pause menu)
...
--HG--
extra : rebase_source : e8ec407f60711d42d33be4811b2880088f617b5b
2011-05-22 21:09:12 +01:00
76e241392d
Merge: New map directory structure and player passwords
2011-05-21 01:11:58 +03:00
d4d49ee8f4
Passwords - password entry at main menu, stored and checked by server
2011-05-20 20:28:03 +01:00
5624dac3b7
added -Wno-unused-but-set-variable, which hides a new warning in gcc 4.6 which only slows down development with no effect on security or anything.
2011-05-16 20:40:19 +03:00
248d7c8469
Improved server commands and added player permissions.
...
--HG--
extra : rebase_source : 178fe08f10b7de3ebaba088bd24faad795114216
2011-05-16 10:41:19 +01:00
974c5cc08c
Added key configuration in the configuration file.
2011-05-14 15:43:26 +03:00
7a367f96e1
added clouds
2011-04-29 15:34:26 +03:00
1995b59320
Code refactoring; split half of main.cpp to game.cpp.
2011-04-23 18:31:31 +03:00
b36e5c0508
Removed IrrlichtWrapper
2011-04-22 09:54:05 +03:00
08bbf96877
items now fall by gravity... also some other random updating
2011-04-10 12:34:12 +03:00
389fe31ace
changed node metadata format to better accomodate future needs and problems
2011-04-05 00:24:47 +03:00
7df125c249
Modified windows build parameters a bit to make it build
2011-04-04 15:34:07 +03:00
14c621d853
removed reference to script directory in cmake install
2011-04-04 15:19:11 +03:00
01c2b003e1
commit before some more radical changes
2011-04-03 16:21:06 +03:00
e4f7f97e6c
Removed lua stuff
2011-04-03 12:28:55 +03:00
9f859d8389
modified the build system of lua to a more minimal one
2011-02-24 00:19:41 +02:00
bfd0980748
fixed a path in build system's packaging part
2011-02-23 11:12:03 +02:00
69dbc046eb
preliminary lua scripting framework for objects
2011-02-21 16:10:36 +02:00
c57637b4c3
Temporary commit; lots of test code and stuff
2011-02-21 00:45:14 +02:00
92432a28c0
small fixes: crack texture, server build on windows, configuration file example, adding config file example to install
2011-02-16 20:03:31 +02:00
ff6a348bb1
fixed slight error in server build
2011-02-15 22:27:10 +02:00
a0e8f3afd3
might work good on cmake+msvc now
2011-02-15 20:53:29 +02:00
d065bae323
Ctrl+C handling on POSIX, some commands for server and other tweaking
2011-02-15 16:11:24 +02:00
9a58749347
fixed CMakeLists.txt syntax (removed additional ,)
2011-02-14 19:42:43 +02:00
e9fe230381
Use random-generated fallback textures when real textures are not found
2011-02-12 14:01:23 +02:00
804b2647ce
new texture stuff quite working
2011-02-11 16:43:26 +02:00
841ac10e5c
fixes toward mingw compatibility
2011-02-10 15:55:15 +02:00
1704badc30
work-in-progress texture atlas optimization
2011-02-10 02:13:03 +02:00
dd9e82f5bc
bug-fixin'
2011-02-08 01:12:55 +02:00
ea6740e900
mapgen stuff
2011-02-05 14:55:16 +02:00
7f2aa30bf2
added sand to map generator
2011-02-04 14:32:30 +02:00
64b5975732
Now texture handling is fast. Also now players are saved on disk.
2011-01-28 01:38:16 +02:00
c914cbb0a0
OMG! Main Menu!
2011-01-23 17:29:15 +02:00
3ef2629e84
made old build system to work too. the cmake one doesn't make working binaries for some computers.
...
--HG--
rename : src/config.h.in => src/cmake_config.h.in
2011-01-18 15:05:29 +02:00
56918c0ca4
random build system tweaking
2011-01-09 17:28:31 +02:00
359e575ba3
Mainly small build system fixes
2011-01-09 00:49:32 +02:00
eb476f1ce2
Lots of small stuff
2011-01-08 19:35:14 +02:00
769a86be19
more linker parameters
2011-01-08 18:24:32 +02:00
d90a183b01
Fixed some missing linking to libraries
2011-01-08 18:21:22 +02:00
d435dedb89
doc updates; CMake works reasonably well now.
2011-01-08 17:45:26 +02:00
9fbb0889a7
CMake stuff works now on linux and windows... and should be possible to make to work on OS X.
2011-01-08 17:34:25 +02:00
d825ed572f
CMake working on Linux (not on windows)
...
--HG--
rename : Makefile => Makefile.bak
2011-01-08 03:10:20 +02:00
Perttu Ahola
Kahrl
Constantin Wenger
q66
Giuseppe Bilotta
Dmitry Marakasov
Nils Dagsson Moskopp
Cyriaque Skrapits
Weedy
Sebastian Rühl
teddydestodes
MrLoom
Ciaran Gultnieks