8ceb0586b2
made more things burnable in furnace
2011-07-30 14:57:43 +03:00
df27b85432
quick fix to it not building with gettext on my visual studio environment
2011-07-30 14:38:41 +03:00
1de45cc8a7
Removed remaining -delta references
2011-07-30 14:02:11 +03:00
416499f978
fix server build
2011-07-25 23:31:02 +03:00
cce210f676
Locale dir should be parallel to global data dir
2011-07-24 19:23:03 +02:00
a8e493122e
Read config from gettext.h
...
Otherwise the USE_GETTEXT define might not be visible.
2011-07-24 19:13:34 +02:00
3715e39e5d
Actually make USE_GETTEXT available in the source
2011-07-24 18:34:10 +02:00
423109e64c
Two more instances of unhardcoding the project name
2011-07-24 18:12:11 +02: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
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
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
c9e615bde4
Updated the texture atlas a bit
2011-07-24 12:45:52 +03:00
20fa7412c8
and now fixed a bug in removing that debug output
2011-07-24 12:13:51 +03:00
d099165271
removed a remaining debug print
2011-07-24 12:12:55 +03:00
29d905f98a
Added a mapblock analyzing function for debugging use and fixed remaining mapgen bugs
2011-07-24 12:09:33 +03:00
ed8f5576a5
changed jungletree/junglegrass content ids to extended range
2011-07-24 11:40:14 +03:00
112b85d0fb
merged fix to decapitated trees; other bugs now exists
2011-07-24 11:39:13 +03: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
4ffba76bb3
Place project name and gettext use in config
2011-07-24 09:18:29 +02:00
8d84086f35
removed unnecessary verbosity from debug output of tile.cpp
2011-07-24 10:12:08 +03:00
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
73cf4b3016
made shadows less blue
2011-07-24 00:49:45 +03: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
68a9157b94
Fixed issue #15 : Glass blocks a lot of light
2011-07-23 20:28:05 +03:00
26582e0e66
Fixed #21 Earth under torches oscillates between mud and grass
2011-07-23 20:22:22 +03:00
0b4cdfa023
Made hotbar a bit smaller
2011-07-23 20:22:04 +03:00
501034a792
merged jungle and bluish shadows
2011-07-23 20:01:06 +03:00
96fedb5cb0
removed -delta namings
2011-07-23 19:33:49 +03:00
f13fc82abe
converted main.cpp dos linefeeds to unix linefeeds.
2011-07-23 19:17:39 +03:00
bc14898bf9
updated main.cpp comments a bit
2011-07-23 19:16:49 +03:00
2587bb361c
merged the content type extension and delta
2011-07-23 19:04:37 +03:00
90d793f8f3
extended content-type range
2011-07-23 16:55:26 +03:00
976ec31c1f
switched to old transformLiquids, new one is not ready
2011-07-23 16:46:34 +03:00
f17cfb35d1
uh, i guess this now merges the new delta stuff?
2011-07-23 15:50:05 +03:00
3882536d40
merged some stuff from upstream while merging delta
2011-07-23 15:46:00 +03:00
d67cef0eb7
Made dark places tint slightly in blue
2011-07-23 04:10:17 +03:00
8993d9dd83
Jungle biome/whatever thing
2011-07-23 02:04:24 +03:00
6c2d95f868
* key change menu now saving immediately
2011-07-22 21:54:26 +02:00
58f612eca1
Changing key settings now doesn't require a game restart
2011-07-22 22:35:20 +03:00
383698186f
Merge remote-tracking branch 'upstream/master'
2011-07-22 20:53:29 +02:00
2abe6ed75c
Merge remote-tracking branch 'upstream/master'
2011-07-22 20:53:29 +02: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
7985d746f9
Merge branch 'upstream/master'
2011-07-22 20:16:58 +02:00
805ccd449f
Merge branch 'upstream/master'
2011-07-22 20:16:58 +02:00
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
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
a09660dc85
fixed problem with displaying special chars
2011-07-22 13:27:30 +02:00
bf3dfec7d6
fixed problem with displaying special chars
2011-07-22 13:27:30 +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
2b39be44e4
added an unit test for the Settings thingy (the python ConfigParser -like thing)
2011-07-22 13:10:58 +03: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
5c66664aef
changed some lines to fit the 80chars limit
2011-07-22 07:25:40 +02:00
3d53cc2c11
changed some lines to fit the 80chars limit
2011-07-22 07:25:40 +02:00
329158f7d1
Fixed small error in mapnode.cpp (didn't cause any harm though)
2011-07-22 01:37:21 +03:00
fe855e004f
Fixed new map generator causing a crash when generating at map limit
2011-07-22 01:37:05 +03:00
2b3bc33708
added some TODOs to main.cpp
2011-07-21 23:28:30 +03:00
308d861327
Merged minetest-delta a624fe549bc75855a170
2011-07-21 20:55:08 +03:00
8048961cc5
Added french translation.
2011-07-21 16:09:57 +02:00
6875ead7cf
Added french translation.
2011-07-21 16:09:57 +02:00
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
cbf2ac5e8f
* different collision box for fireflies so they now hover above the ground
2011-07-21 15:40:00 +02:00
5388e8b124
* different collision box for fireflies so they now hover above the ground
2011-07-21 15:40:00 +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
56a744599f
Restore "Leave address blank" position
2011-07-21 15:12:58 +02:00
aa6506ce96
Restore "Leave address blank" position
2011-07-21 15:12:58 +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
bca3de3d08
Merge pull request #27 from Oblomov/master
...
* regression fix for windows build.
2011-07-20 14:29:01 -07:00
f5c6e3973c
Merge pull request #27 from Oblomov/master
...
* regression fix for windows build.
2011-07-20 14:29:01 -07: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
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
8129d16dd3
+ fireflies
2011-07-20 22:05:57 +02:00
84684e53ed
+ fireflies
2011-07-20 22:05:57 +02:00
2732dac337
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 18:56:32 +02:00
8ed83250d7
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 18:56:32 +02:00
0f10fc0cd9
Merge pull request #24 from SpeedProg/master
...
gettext paths problem
2011-07-20 09:56:23 -07:00
360a8918dd
Merge pull request #24 from SpeedProg/master
...
gettext paths problem
2011-07-20 09:56:23 -07:00
c6d99fbe0c
fixed problem with wront paths in gettext
2011-07-20 18:49:18 +02:00
4d43a67419
fixed problem with wront paths in gettext
2011-07-20 18:49:18 +02:00
84b85964fa
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 18:29:48 +02:00
33e80dae7f
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 18:29:48 +02:00
52df1b598c
Set the window caption for the initial window too
2011-07-20 17:59:48 +02:00
3fb5b7a3bd
Set the window caption for the initial window too
2011-07-20 17:59:48 +02:00
8fa94c3547
Check the data path before usage
...
When not running in place, check if the assumed data path in
../share/APPNAME exists. If it doesn't exist, fall back to ../data
instead. This allows the program to run successfully from the checkout
directory even without the run-in-place flag active.
2011-07-20 17:59:48 +02:00
bcd3e1af2f
Check the data path before usage
...
When not running in place, check if the assumed data path in
../share/APPNAME exists. If it doesn't exist, fall back to ../data
instead. This allows the program to run successfully from the checkout
directory even without the run-in-place flag active.
2011-07-20 17:59:48 +02:00
3321edae77
Use system sqlite3/jthread libs if available
2011-07-20 17:59:48 +02:00
cd45ae3d0f
Use system sqlite3/jthread libs if available
2011-07-20 17:59:48 +02:00
69937c342c
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 17:56:49 +02:00
e5dc58e710
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 17:56:49 +02:00
6a8328de79
added gettext support
...
german translation file
and bashscript to update translations
2011-07-20 16:51:19 +02:00
052bb24c7f
added gettext support
...
german translation file
and bashscript to update translations
2011-07-20 16:51:19 +02:00
9bc701d194
Merge branch 'upstream/master'
2011-07-20 14:20:07 +02:00
3c630c0d90
Merge branch 'upstream/master'
2011-07-20 14:20:07 +02:00
6791c856b2
* by popular request, fewer clouds
2011-07-20 02:44:51 +02:00
ffd3cdf519
* by popular request, fewer clouds
2011-07-20 02:44:51 +02:00
57fcfb2b0d
* initialize liquid_kind properly so compiler does not bitch about it
2011-07-19 02:02:50 +02:00
821ff68f54
* initialize liquid_kind properly so compiler does not bitch about it
2011-07-19 02:02:50 +02:00
a99b7e6e05
+ fake shading for the volumetric clouds
2011-07-19 01:43:30 +02:00
e8eb4d233b
+ fake shading for the volumetric clouds
2011-07-19 01:43:30 +02:00
890d3468e7
+ volumetric clouds (thanks teddydestodes)
2011-07-18 22:50:14 +02:00
414d1ff9e2
+ volumetric clouds (thanks teddydestodes)
2011-07-18 22:50:14 +02:00
466f9d87b6
final fixes to liquid flow, works now as intended
2011-07-18 02:38:57 +02:00
7d92ce061d
final fixes to liquid flow, works now as intended
2011-07-18 02:38:57 +02:00
b7862805c8
fixes to liquid transformation
2011-07-18 02:38:48 +02:00
a1e2a8bec6
fixes to liquid transformation
2011-07-18 02:38:48 +02:00
c4b86adee8
fixed refactoring issues // slowed down water flow a bit
...
* liquid flow no longer does random things when transformed
* if a flowi
ng liquid node doesn't have a solid block as neighbor, its spread distan
ce is shortened by 1
2011-07-18 02:38:32 +02:00
f34a9b6a71
fixed refactoring issues // slowed down water flow a bit
...
* liquid flow no longer does random things when transformed
* if a flowi
ng liquid node doesn't have a solid block as neighbor, its spread distan
ce is shortened by 1
2011-07-18 02:38:32 +02:00
f1e8ff2245
* refactored liquid transformation code (has some flaws)
...
Completely rewrote the liquid transformation. The algorithm now exclusively modifies the current node in one iteration. Another change is that MapNode.param2 now stores a bit that tells other nodes if a flowing liquid node flows downwards. This is accomplished by two masks on param2 for the "flow down" bit and the "liquid level" bits.
This will be the base of future improvements to the liquid flow. However, in the current state flowing liquid does not always disappear when cut off its source. Be aware that this branch is work in progress.
2011-07-18 02:37:19 +02:00
def870953a
* refactored liquid transformation code (has some flaws)
...
Completely rewrote the liquid transformation. The algorithm now exclusively modifies the current node in one iteration. Another change is that MapNode.param2 now stores a bit that tells other nodes if a flowing liquid node flows downwards. This is accomplished by two masks on param2 for the "flow down" bit and the "liquid level" bits.
This will be the base of future improvements to the liquid flow. However, in the current state flowing liquid does not always disappear when cut off its source. Be aware that this branch is work in progress.
2011-07-18 02:37:19 +02:00
13b2bad54b
* changed GUI to indicate Minetest Δ
2011-07-17 22:33:51 +02:00
077ffa5231
* changed GUI to indicate Minetest Δ
2011-07-17 22:33:51 +02:00
74ef5b8a42
Hopefully fixed u64 to be the actual 64-bit type on 64-bit architectures. This should fix the compiler error caused by irrlicht on 64-bit fedora defining u64 to be different.
2011-07-17 19:32:06 +03:00
496e783988
A small fix to an unlikely situation where the map generator requires a block that hasn't been loaded from disk. Now it is actually loaded from disk in that case.
2011-07-17 13:40:47 +03:00
014a3aea32
Merge remote-tracking branch 'origin/upstream'
2011-07-16 16:52:45 +02:00
8bfa56648d
Merge remote-tracking branch 'origin/upstream'
2011-07-16 16:52:45 +02:00
afa2b8714f
Attempt to fix a problem with the factory mappings of objects residing in different source files than the prototype objects that fill them in
2011-07-16 17:39:03 +03:00
5086bd5664
* fix automerge regression
2011-07-15 20:16:02 +02:00
4d20f1283f
* fix automerge regression
2011-07-15 20:16:02 +02:00
2c5617709d
* regression fix, clay occurs again now
2011-07-15 06:37:47 +02:00
0a38e542c1
* regression fix, clay occurs again now
2011-07-15 06:37:47 +02:00
287b735224
* possibly nicer trees
2011-07-15 02:23:41 +02:00
96f551a287
* possibly nicer trees
2011-07-15 02:23:41 +02:00
3560f0de08
Merge branch 'upstream/master'
...
Conflicts:
data/oerkki1.png
src/client.cpp
2011-07-14 22:43:28 +02:00
af05e4b2de
Merge branch 'upstream/master'
...
Conflicts:
data/oerkki1.png
src/client.cpp
2011-07-14 22:43:28 +02:00
5146c826be
* possibly improved water flow, by flyx86
...
- When flowing liquid starts to flow down, it stops contributing to its neighboring nodes' liquid level (possibly transforming it back to air)
- Flowing liquid turns into a source if there are at least 2 adjacent liquid source nodes
- If a new liquid flow reaches existing flowing liquid, the existing liquid is now updated properly.
2011-07-14 16:17:53 +02:00
Perttu Ahola
Giuseppe Bilotta
Nils Dagsson Moskopp
Constantin Wenger
Cyriaque Skrapits
Weedy
Felix Krause