Perttu Ahola
ae6d83a41e
Better apple tree generation
2011-09-21 23:31:55 +03:00
Kahrl
3e012122d1
Simplistic wielded tool lighting, added setMeshVerticesColor to utility.h and refactored some other code into calls of that
2011-09-21 18:37:29 +02:00
Kahrl
a4a2c34831
reduce view bobbing slightly
2011-09-21 15:54:06 +02:00
Kahrl
36af9bb027
Create a separate scene manager for the wielded tool. This fixes the glitchyness in large map coordinates and some depth buffer problems. (The tool doesn't bob anymore when walking, this will be fixed later.) Fix MSVC build (thanks to dannydark).
2011-09-21 01:42:52 +02:00
Kahrl
6599002149
fix a numerical problem, but tool is still jittery
2011-09-20 18:25:29 +02:00
Kahrl
cbd2bcf102
Fix jittery view bobbing at large map coordinates again. Wielded tool still has problems there
2011-09-20 18:19:26 +02:00
Kahrl
01f3ae1c50
Digging animation
2011-09-20 11:06:16 +02:00
Kahrl
eaff4616ad
fix some normals
2011-09-19 17:11:53 +02:00
Kahrl
ab42549b1e
Wielded tool updates, leaves and glass work now
2011-09-19 17:08:42 +02:00
Kahrl
02726f0003
Convert any inventory item into a mesh, bring back InventoryItem::getImageRay(), some const-correctness fixes
2011-09-19 06:37:24 +02:00
Kahrl
36bcbca9ac
Added sprite extruder
2011-09-19 03:01:11 +02:00
Kahrl
4ed837bcfa
trying some view bobbing changes
2011-09-18 17:02:30 +02:00
Kahrl
54f3796f91
Oops, up vector is needed.
2011-09-18 02:24:43 +02:00
Kahrl
ae66d611f2
This looks more like MC view bobbing, but still not even close
2011-09-18 02:17:39 +02:00
Perttu Ahola
b22cb69a15
Merge remote-tracking branch 'sfan5/apple-trees'
2011-09-16 19:09:13 +03:00
Kahrl
40707e3c5b
SQLite needs to be linked with -ldl on some Linux distros.
2011-09-16 19:06:45 +03:00
Kahrl
acfb2bb8bc
Revert some changes that could lead to slower map transfer and increaed network load.
2011-09-16 18:03:58 +02:00
Kahrl
63266928a5
Made wielded tool move slightly (and smoothly) during view bobbing. Making the tool be a child node of an empty scene node instead of the camera scene node seemingly fixed the uncontrollable tool jitter, too.
2011-09-15 01:53:42 +02:00
Kahrl
fc92da4324
View bobbing is slower in the water.
2011-09-15 01:53:42 +02:00
sfan5
88dc8c694e
Added Iron Apple which heals 4 Hearts
2011-09-12 20:10:17 +02:00
sfan5
785a2fd23a
Changed the Heal Amount of Apples from 6 to 2
2011-09-12 19:44:26 +02:00
sfan5
4328a6442b
Fixed duplication bug
2011-09-11 19:17:14 +02:00
sfan5
6496b1cf1f
Removed Spaces
2011-09-11 18:16:07 +02:00
sfan5
c0caedc373
Added Apple Trees
2011-09-11 17:50:44 +02:00
Kahrl
524cf237b8
inventory displays tool breakage bar again
2011-09-08 17:45:39 +02:00
Kahrl
e4cb004460
trying something else... also replaced M_PI by PI everywhere
2011-09-08 16:10:44 +02:00
Kahrl
71418639d3
attempting to merge Queatz/the-wielded-tool and kahrl/viewbobbing, something doesn't work right yet
2011-09-08 14:21:56 +02:00
Kahrl
f2ec226521
minor view bobbing improvements
2011-09-08 13:34:28 +02:00
Kahrl
0931d4b7ff
make it slightly less annoying :o)
2011-09-08 13:14:59 +02:00
Kahrl
ccadebabba
Implemented view bobbing (testing simple lemniscate shape)
2011-09-08 13:03:55 +02:00
Kahrl
18771a39cf
Commented out debug statements again
2011-09-08 01:24:47 +02: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
Kahrl
c0b35fa429
Removed unused camera_position and camera_direction fields from Client. Moved ClientEnvironment::drawPostFx to ClientMap::renderPostFx -- this will make the camera management classes easier to write, as ClientMap already knows the camera position but ClientEnvironment doesn't and has to be told about it. This also eliminates the need for Client::getEnv(). Made the post effect color a content feature defined in content_mapnode.h.
2011-09-07 19:21:28 +02:00
JacobF
f31b0a3361
Display which tool the player is holding
...
And some simple animation when trying to dig...
2011-09-07 10:56:04 -04:00
Perttu Ahola
d28ea57083
Note about texture atlas
2011-09-07 01:27:04 +03:00
Perttu Ahola
8e26c5c066
Add note about trans_table_19.
2011-09-07 01:19:48 +03:00
Perttu Ahola
5c1074aa7d
Remove block file from disk when saved to database
2011-09-06 20:28:45 +03:00
JacobF
bd72091150
Pause in unloaded territory instead of collide
2011-09-06 20:07:43 +03:00
Perttu Ahola
faf3d7902a
Make Connection::Send cancel silently if peer doesn't exist.
2011-09-06 19:39:23 +03:00
Perttu Ahola
3c30ab2807
Speed up periodical map unloading by moving beginSave() and endSave() to outer loop in Map::timerUpdate()
2011-09-06 19:16:36 +03:00
Perttu Ahola
310fa10035
Merge remote-tracking branch 'queatz/sqlite-map'
2011-09-06 18:04:02 +03:00
Perttu Ahola
bc847e8cc2
Fix bug in posix file/directory removal wrapper, as pointed out by kahrl
2011-09-06 17:52:03 +03:00
Perttu Ahola
b82952bdba
Fix some texture stuff: remove item_fence.png, use fence.png, remove inexisting cactus.png from texture atlas (replace with nothing because cactus is rare)
2011-09-06 17:13:24 +03:00
Kahrl
570a8dbf22
allow specifying a fixed seed in the config file for generating the map (fixed_map_seed)
2011-09-06 17:05:17 +03:00
JacobF
c68ea19e8d
Now SAOs will reflect changes to their temporary inventory object
...
Also, the temp item wasn't being deleted, might have been a memory leak.
Now you will only eat 1 item off a stack
2011-09-06 16:36:11 +03:00
JacobF
d670c831c2
These numbers were well exceeding 2^32...
2011-09-04 17:01:28 -04:00
JacobF
d1a16f24cf
Initial sqlite3 maps.
...
* The map will reside in world/map.sqlite
* It will load from the sectors folder but will not save there
2011-09-02 19:07:14 -04:00
JacobF
2d872ce3fa
Furnace was crashing stuff again
2011-09-02 17:33:06 -04:00
JacobF
e3c58eff1c
Merge branch 'master' of /media/Field/Software/minetest-queatz/minetest-sqlite/.. into sqlite-map
2011-09-02 16:59:17 -04:00
JacobF
99de37ff94
Update to SQLite 3.7.7.1
2011-09-01 18:27:30 -04:00
JacobF
5e3b9e3578
* Furnace would say it was overloaded when it had a non-cookable source
...
* I didn't understand that expression last fix and now the furnace would burn fuel
even when it had no source item.
2011-09-01 15:39:15 -04:00
JacobF
6415528f96
If there was no source item in a furnace it would cause a segmentation fault.
2011-08-30 11:38:53 -04:00
Perttu Ahola
4af1f2963c
Merge remote-tracking branch 'kahrl/dissector'
2011-08-30 14:24:33 +03:00
Perttu Ahola
ba0322f353
Merge remote-tracking branch 'queatz/mmb10'
2011-08-30 14:24:23 +03:00
Perttu Ahola
1a705523c0
Merge remote-tracking branch 'queatz/furnace-is-not-blackhole'
2011-08-30 14:24:12 +03:00
Perttu Ahola
87b9e5467d
Merge remote-tracking branch 'queatz/furnace-is-not-out-nor-can-rat-escape'
2011-08-30 14:24:07 +03:00
Perttu Ahola
625dac8d8c
Merge remote-tracking branch 'queatz/privs'
2011-08-30 14:23:44 +03:00
JacobF
134e49cc8e
Merged 2 branches because they relied on each other.
...
This one contains these changes from main c55:
* Adds a function to check if there is room for a specific item
* Using that, you can now pick up rats if you have a full inventory and a not full rat stack
* Furnace would cook only 1 item if that item used the last available result slot, now it will continue
* Furnace will say it's overloaded
* Furnace won't wait until the next step to start on the next item
- This caused small fuels to cook slower than meant to
- Also caused furnaces to say they were out of fuel after finishing the last fuel item
2011-08-25 19:27:50 -04:00
Kahrl
3edf2bb417
dissector branch: fix description of TOCLIENT_PLAYERITEM in clientserver.h
2011-08-25 21:31:28 +02:00
JacobF
e278742c5e
Middle mouse click will move 10 items around at a time.
2011-08-25 12:43:19 -04:00
JacobF
ef08163c38
Don't remove furnace if something is inside it.
2011-08-24 18:53:06 -04:00
JacobF
2e82268a67
If a user doesn't have build rights, don't allow them to move items to and from their inventory
2011-08-23 22:08:09 -04:00
JacobF
00bdfad5f6
The password box in the mainmenu is focused if there is already a name and address filled in
2011-08-23 22:06:35 -04:00
Perttu Ahola
efd8dabd91
Lava is now better visible inside water. (a crappy hack)
2011-08-23 03:01:01 +03:00
Perttu Ahola
e4f443a57a
Inventory transparency; very loosely based on sapier's commits.
...
Also contains some commented-out code for testing out different looks
in the future.
2011-08-23 00:33:38 +03:00
Perttu Ahola
d4df20a913
if creative mode and player has no build privileges, cannot drop items.
2011-08-22 22:55:17 +03:00
Perttu Ahola
db495668ae
Fixed water mesh generation acting weird next to sand
2011-08-22 22:44:43 +03:00
Perttu Ahola
996c653490
Fix byte count in serialization of "F1000"
...
Some access violations and segfaults and strange behaviour might have
been caused by this.
2011-08-22 22:17:26 +03:00
Perttu Ahola
4acad897cf
Fixed some protocol comment errors in clientserver.h and elsewhere
...
-- TOCLIENT_OBJECTDATA: peer ID field is missing
-- TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD: added: init length should be u32, not u16
2011-08-22 22:04:46 +03:00
Giuseppe Bilotta
b37fffc2c5
Hopefully fix 'dangling water'
...
If a block has (at least visible) liquids, the block below should also
be flowed in.
2011-08-22 21:45:13 +03:00
Perttu Ahola
a99450ab72
Possibly fixed the extremely rare PeerNotFound loop bug.
...
See explanation in http://2pktfkt.de/irc/minetest-delta/2011-08-22.html
2011-08-22 21:27:11 +03:00
Perttu Ahola
5415256a52
Merge remote-tracking branch 'oblomov/me_cmd'
2011-08-22 14:46:54 +03:00
Perttu Ahola
836e43db60
Merge remote-tracking branch 'oblomov/new_input'
2011-08-22 14:46:52 +03:00
Giuseppe Bilotta
9c94538fb7
Change way commands are displayed in chat window
2011-08-22 13:43:53 +02:00
Giuseppe Bilotta
53eedd3ba4
Introduce hotkey for calling up a command window
...
This is just a chat window with the / text pre-loaded.
2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
42134bb49e
Send KEY_END when (re)creating a text input
...
This ensures that on creation and when resizing the cursor is at the end
of the text rather than at the beginnig.
2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
0488bf54d3
/me command
2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
da19aee307
Server now supports replies without prefix
2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
d2c0b4905a
Defines for server command context flags
2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
153f07fdfb
Remove distinction between /# and / commands
...
No need to make the server command syntax more complicated than
necessary. If the need ever arise, we'll find some other way to
distinguish the client commands. Also, the /# syntax is deprecated and
will be made obsolete in time.
2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
7e610aece5
Overhaul the input system
...
This allows us to map the keys which are not considered in
irrlicht's EKEY_CODE system, such as \, [, /, ] etc.
2011-08-22 13:01:11 +02:00
Giuseppe Bilotta
16aedc0ef6
Fix typos in key names
2011-08-22 12:52:15 +02:00
Perttu Ahola
6596e585fe
Flowing lava updates lighting
2011-08-22 13:19:07 +03:00
Perttu Ahola
f98eda4d52
Merge remote-tracking branch 'oblomov/liquid_fixes'
2011-08-22 12:53:18 +03:00
Perttu Ahola
23717510c2
Merge branch 'lava'
2011-08-22 12:53:02 +03:00
Giuseppe Bilotta
c51564ab5b
Optimize for viscosity 1
2011-08-16 20:38:44 +02:00
Giuseppe Bilotta
1eb14c7743
Viscous fluids
2011-08-16 20:37:46 +02:00
Giuseppe Bilotta
56e9f97294
Make sure all neighbors of changed fluids are activated
...
This should fix the remaining cases of fluid not advancing or not
retreating.
2011-08-16 18:05:28 +02:00
Giuseppe Bilotta
774faf4e85
Let the liquids flow in the open
...
No need to curb their spread artificially.
2011-08-16 17:42:28 +02:00
Giuseppe Bilotta
d0711821f3
Ensure air neighbors to liquids that can flow are enqueued for transformation
2011-08-16 17:42:14 +02:00
Giuseppe Bilotta
7024b45197
Ensure param2 is set correctly in transformLiquids
2011-08-16 16:50:38 +02:00
Giuseppe Bilotta
5fce673a56
Use defines for liquid levels
2011-08-16 16:50:38 +02:00
Perttu Ahola
29c9d3d5f4
Implemented MEET_OTHER
2011-08-16 12:23:19 +03:00
Giuseppe Bilotta
708f1c336e
transformLiquid: small optimization and whitespace cleanup
2011-08-16 06:42:11 +02:00
Perttu Ahola
dc4ac0b96f
small fix to transformLiquids
2011-08-15 18:49:44 +03:00
Perttu Ahola
296748d32e
Fixed liquid mesh generation
2011-08-15 17:45:35 +03:00
Perttu Ahola
ad408f269c
Add lava to creative inventory (hmm, we're shortly running out of creative inventory space)
2011-08-15 16:57:57 +03:00
Perttu Ahola
e57754868f
Hopefully fixed msvc "'sqrt' : ambiguous call to overloaded function"
2011-08-15 15:11:00 +03:00
Perttu Ahola
0c7e7f4998
Non-vertex-alpha texture material for lava
2011-08-15 12:08:41 +03:00
Perttu Ahola
4b85608e30
modified mapgen to generate less lava
2011-08-15 11:56:16 +03:00
Perttu Ahola
8ab77f4153
Added #define WATER_ALPHA in content_mapnode.cpp
2011-08-15 11:51:33 +03:00
Perttu Ahola
472585a7e8
tuned lava/universal damage code
2011-08-15 11:49:39 +03:00
Perttu Ahola
8f42a8be0c
lava!
2011-08-15 02:04:56 +03:00
Perttu Ahola
c4b707bca2
Windows.h -> windows.h for cross-mingw build
2011-08-14 21:26:07 +03:00
Perttu Ahola
9e35fe8c37
Merge remote-tracking branch 'speedprog/fixedNotFindingData'
2011-08-13 14:05:01 +03:00
Giuseppe Bilotta
385904d75a
Let Settings accept a const char* directly
2011-08-13 07:33:43 +02:00
Giuseppe Bilotta
b1e0b7728b
Fix keycode_to_keyname return value
2011-08-13 07:31:46 +02:00
Giuseppe Bilotta
eb255e6870
Clean up key names handling
...
Constify keycode and move the static array of localizable names from the
guiKeyChangeMenu header to the implementation file, changing its name.
2011-08-12 23:42:00 +02:00
Giuseppe Bilotta
72e4c8f523
Fix use of && instead of &
2011-08-12 23:34:12 +02:00
Perttu Ahola
835d2e4b5f
Removed assert if creating texture atlas image fails; cancel creating image instead.
2011-08-12 17:17:47 +03:00
Constantin Wenger
94b42a79d7
fixed not finding data dir if installed
2011-08-12 14:26:37 +02:00
Perttu Ahola
e40da2341c
Fixed/extended/modified ban stuff to be good for inclusion
2011-08-12 13:11:27 +03:00
Perttu Ahola
7aa72c56b6
Merge remote-tracking branch 'speedprog/banByIp'
2011-08-12 11:55:51 +03:00
Constantin Wenger
5784c14ab7
added ipban support
...
commands:
/#ipban <nick>
/#ipunban <ip>
2011-08-12 03:37:18 +02:00
Giuseppe Bilotta
dfdc817db3
Typo fix
2011-08-11 19:45:44 +02:00
Giuseppe Bilotta
371af9c241
Notify other players of wielded item change
2011-08-11 15:22:36 +02:00
Giuseppe Bilotta
88a9bae160
constify inventory item serialization
2011-08-11 15:22:36 +02:00
Giuseppe Bilotta
ecd5c5f920
Clients inform server on wielded item
...
This is done with the new TOSERVER_PLAYERITEM message, that informs the
server on the index of the wielded item.
2011-08-11 15:22:36 +02:00
Giuseppe Bilotta
91d1186cbb
Keep track of player item
2011-08-11 15:22:36 +02:00
Giuseppe Bilotta
467b3cf4c1
Some inventory const-ification
2011-08-11 15:22:35 +02:00
Giuseppe Bilotta
c007d8219e
Server should use the same eye position as the client
2011-08-11 15:22:35 +02:00
Giuseppe Bilotta
b318e82356
Refactor player's eye position coding
...
Collect the player's eye position coding in a Player method, and
use it in client to pass the eye position information to the game.
2011-08-11 15:22:35 +02:00
Giuseppe Bilotta
98fa00db12
Introduce Player::getLightPosition
...
This is currently only used in the lighting update for remote
players in client.
2011-08-11 15:22:35 +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
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
Weedy
9cb5f70be5
Fix win32 MSVC compile. (screw gettext)
2011-07-21 09:03:17 +02:00
Nils Dagsson Moskopp
bca3de3d08
Merge pull request #27 from Oblomov/master
...
* regression fix for windows build.
2011-07-20 14:29:01 -07:00
Nils Dagsson Moskopp
f5c6e3973c
Merge pull request #27 from Oblomov/master
...
* regression fix for windows build.
2011-07-20 14:29:01 -07: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
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
Nils Dagsson Moskopp
8129d16dd3
+ fireflies
2011-07-20 22:05:57 +02:00
Nils Dagsson Moskopp
84684e53ed
+ fireflies
2011-07-20 22:05:57 +02:00
Nils Dagsson Moskopp
2732dac337
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 18:56:32 +02:00
Nils Dagsson Moskopp
8ed83250d7
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 18:56:32 +02:00
Nils Dagsson Moskopp
0f10fc0cd9
Merge pull request #24 from SpeedProg/master
...
gettext paths problem
2011-07-20 09:56:23 -07:00
Nils Dagsson Moskopp
360a8918dd
Merge pull request #24 from SpeedProg/master
...
gettext paths problem
2011-07-20 09:56:23 -07:00
Constantin Wenger
c6d99fbe0c
fixed problem with wront paths in gettext
2011-07-20 18:49:18 +02:00
Constantin Wenger
4d43a67419
fixed problem with wront paths in gettext
2011-07-20 18:49:18 +02:00
Nils Dagsson Moskopp
84b85964fa
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 18:29:48 +02:00
Nils Dagsson Moskopp
33e80dae7f
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 18:29:48 +02:00
Giuseppe Bilotta
52df1b598c
Set the window caption for the initial window too
2011-07-20 17:59:48 +02:00
Giuseppe Bilotta
3fb5b7a3bd
Set the window caption for the initial window too
2011-07-20 17:59:48 +02:00
Giuseppe Bilotta
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
Giuseppe Bilotta
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
Giuseppe Bilotta
3321edae77
Use system sqlite3/jthread libs if available
2011-07-20 17:59:48 +02:00
Giuseppe Bilotta
cd45ae3d0f
Use system sqlite3/jthread libs if available
2011-07-20 17:59:48 +02:00
Nils Dagsson Moskopp
69937c342c
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 17:56:49 +02:00
Nils Dagsson Moskopp
e5dc58e710
Merge branch 'master' of github.com:erlehmann/minetest-delta
2011-07-20 17:56:49 +02:00
Constantin Wenger
6a8328de79
added gettext support
...
german translation file
and bashscript to update translations
2011-07-20 16:51:19 +02:00
Constantin Wenger
052bb24c7f
added gettext support
...
german translation file
and bashscript to update translations
2011-07-20 16:51:19 +02:00
Nils Dagsson Moskopp
9bc701d194
Merge branch 'upstream/master'
2011-07-20 14:20:07 +02:00
Nils Dagsson Moskopp
3c630c0d90
Merge branch 'upstream/master'
2011-07-20 14:20:07 +02:00
Nils Dagsson Moskopp
6791c856b2
* by popular request, fewer clouds
2011-07-20 02:44:51 +02:00
Nils Dagsson Moskopp
ffd3cdf519
* by popular request, fewer clouds
2011-07-20 02:44:51 +02:00
Nils Dagsson Moskopp
57fcfb2b0d
* initialize liquid_kind properly so compiler does not bitch about it
2011-07-19 02:02:50 +02:00
Nils Dagsson Moskopp
821ff68f54
* initialize liquid_kind properly so compiler does not bitch about it
2011-07-19 02:02:50 +02:00
Nils Dagsson Moskopp
a99b7e6e05
+ fake shading for the volumetric clouds
2011-07-19 01:43:30 +02:00
Nils Dagsson Moskopp
e8eb4d233b
+ fake shading for the volumetric clouds
2011-07-19 01:43:30 +02:00
Nils Dagsson Moskopp
890d3468e7
+ volumetric clouds (thanks teddydestodes)
2011-07-18 22:50:14 +02:00
Nils Dagsson Moskopp
414d1ff9e2
+ volumetric clouds (thanks teddydestodes)
2011-07-18 22:50:14 +02:00
Felix Krause
466f9d87b6
final fixes to liquid flow, works now as intended
2011-07-18 02:38:57 +02:00
Felix Krause
7d92ce061d
final fixes to liquid flow, works now as intended
2011-07-18 02:38:57 +02:00
Felix Krause
b7862805c8
fixes to liquid transformation
2011-07-18 02:38:48 +02:00
Felix Krause
a1e2a8bec6
fixes to liquid transformation
2011-07-18 02:38:48 +02:00
Felix Krause
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
Felix Krause
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
Felix Krause
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
Felix Krause
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
Nils Dagsson Moskopp
13b2bad54b
* changed GUI to indicate Minetest Δ
2011-07-17 22:33:51 +02:00
Nils Dagsson Moskopp
077ffa5231
* changed GUI to indicate Minetest Δ
2011-07-17 22:33:51 +02:00
Perttu Ahola
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
Perttu Ahola
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
Nils Dagsson Moskopp
014a3aea32
Merge remote-tracking branch 'origin/upstream'
2011-07-16 16:52:45 +02:00
Nils Dagsson Moskopp
8bfa56648d
Merge remote-tracking branch 'origin/upstream'
2011-07-16 16:52:45 +02:00
Perttu Ahola
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
Nils Dagsson Moskopp
5086bd5664
* fix automerge regression
2011-07-15 20:16:02 +02:00
Nils Dagsson Moskopp
4d20f1283f
* fix automerge regression
2011-07-15 20:16:02 +02:00
Nils Dagsson Moskopp
2c5617709d
* regression fix, clay occurs again now
2011-07-15 06:37:47 +02:00
Nils Dagsson Moskopp
0a38e542c1
* regression fix, clay occurs again now
2011-07-15 06:37:47 +02:00
Nils Dagsson Moskopp
287b735224
* possibly nicer trees
2011-07-15 02:23:41 +02:00
Nils Dagsson Moskopp
96f551a287
* possibly nicer trees
2011-07-15 02:23:41 +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
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
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
Nils Dagsson Moskopp
4415d95c50
* 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
Nils Dagsson Moskopp
5383aa847f
* possible fix for large cubic holes in map
2011-07-13 23:12:18 +02:00
Nils Dagsson Moskopp
1cdf210e4f
* possible fix for large cubic holes in map
2011-07-13 23:12:18 +02:00
Nils Dagsson Moskopp
b96450b586
* slightly different values for 3d perlin noise
2011-07-13 23:10:41 +02:00
Nils Dagsson Moskopp
b0ad5ce8e2
* slightly different values for 3d perlin noise
2011-07-13 23:10:41 +02:00
Nils Dagsson Moskopp
a676493f46
* regression fix, papyrus should appear again now
2011-07-13 16:21:20 +02:00
Nils Dagsson Moskopp
b2447393e4
* regression fix, papyrus should appear again now
2011-07-13 16:21:20 +02:00
Jiří Procházka
692bd66011
+ farmesh config options
2011-07-11 15:01:43 +02:00
Jiří Procházka
858b2d7439
+ farmesh config options
2011-07-11 15:01:43 +02:00
Perttu Ahola
8f742855a1
initial steps in doing content type extension
2011-07-02 01:07:54 +03:00
Perttu Ahola
7b290660ea
made screen go slightly blue when underwater
2011-07-01 21:25:31 +03:00
Perttu Ahola
71f5d4b344
Fixed objects being sometimes not able to be stored statically in a block when block has been unloaded
2011-07-01 21:04:40 +03:00
Perttu Ahola
282912caa0
tried to fix block selection in map rendering a bit
2011-06-27 09:50:34 +03:00
Perttu Ahola
ccf5eae751
fixed bug in inventory textures caused from better handling of unknown blocks
2011-06-27 08:46:54 +03:00
Perttu Ahola
3e40235ce2
updated minetest.conf.example and changed client_unload_unused_data_timeout default to 600
2011-06-27 08:36:37 +03:00
Perttu Ahola
ab0cc1bb47
better handling of unknown blocks on client
2011-06-27 07:30:02 +03:00
Perttu Ahola
cf9a1f0109
updated to-do list
2011-06-27 06:52:20 +03:00
Perttu Ahola
d09f9c0d1d
made dtime jitter compare value and fps calculation a bit faster changing
2011-06-27 00:29:17 +03:00
Perttu Ahola
dd22ea051a
map unloading is now a whole lot better
2011-06-27 00:27:17 +03:00
Perttu Ahola
3fccc67eb7
fixed block unloading from memory (a better fix coming next)
2011-06-26 21:53:11 +03:00
Perttu Ahola
d702a2c33b
Made the initial loading screen slightly more alive
2011-06-26 20:00:04 +03:00
Perttu Ahola
7e59938c54
added screenshot key F12 (from spongie)
2011-06-26 19:33:40 +03:00
Perttu Ahola
5e3deed672
Added CPT_FACEDIR_SIMPLE calculation, finally, as figured out by spongie
2011-06-26 19:23:44 +03:00
Perttu Ahola
97840e93b5
changed one "if" to "else if" in content_mapblock.cpp
2011-06-26 19:23:05 +03:00
Perttu Ahola
d3d369a63b
reorganized stuff
2011-06-26 18:51:57 +03:00
Perttu Ahola
af6860f6f4
tuned mapgen
2011-06-26 18:51:35 +03:00
Perttu Ahola
d3a5eac22c
changed water color in farmesh
2011-06-26 18:50:43 +03:00
Perttu Ahola
2bd2bdff08
updated noise stuff
2011-06-26 18:50:13 +03: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
Perttu Ahola
3b098fd5dc
improved player fall damage detection
2011-06-26 15:45:13 +03:00
Sebastian Rühl
7efe89ff58
backported cactus, papyrus and clay
2011-06-26 13:47:21 +02:00
Sebastian Rühl
13cf5425db
backported cactus, papyrus and clay
2011-06-26 13:47:21 +02:00
Sebastian Rühl
4f44cabe1c
small fix
2011-06-26 12:52:03 +02:00
Sebastian Rühl
fb6ac9a1a6
small fix
2011-06-26 12:52:03 +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
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
Perttu Ahola
c1ceabef71
added and commented out some debug output
2011-06-26 03:14:52 +03:00
Perttu Ahola
bb940a946d
even more code refactoring
2011-06-26 02:34:36 +03: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
a80025c352
moved mapgen stuff around abit
2011-06-25 18:35:32 +03:00
Perttu Ahola
f2c26e2014
moved map generator to separate source files
2011-06-25 18:12:41 +03:00
Perttu Ahola
aed9e809a1
mapgen stuff
2011-06-25 16:32:09 +03:00
Perttu Ahola
e8a731adc5
added correct data to new images, added comments in main.cpp
2011-06-25 04:41:38 +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
30c34cc23e
disabled farmesh in default settings
2011-06-23 14:10:46 +03:00
Perttu Ahola
c1844a921d
fixed servermain.cpp lacking filesys.h
2011-06-22 14:21:55 +03:00
Perttu Ahola
051c0048d8
path_userdata is now created before potentially creating debug.txt in there
2011-06-20 18:04:49 +03:00
Perttu Ahola
bdd1375011
moved the mac include in porting.cpp out of namespace
2011-06-20 07:56:45 +03:00
Perttu Ahola
748340fad5
fixed a segfault in case of wrong input from network on the server (reported by spongie)
2011-06-19 19:40:41 +03:00
Perttu Ahola
02006a9540
Modified the mesh update thread's sleep time to speed it up (it was way too high)
2011-06-18 22:31:24 +03:00
Perttu Ahola
28a8218adf
Documentation update
2011-06-18 20:16:11 +03:00
Perttu Ahola
5d1ae85ab9
Hand-picked Mac OSX cursor and bundle path fixes from https://bitbucket.org/toabi/minetest-mac
2011-06-18 18:44:01 +03:00
Perttu Ahola
5ac900ddd9
Changed MapBlockObjects to be never written anymore. Incremented version number.
2011-06-18 15:16:35 +03:00
Perttu Ahola
c7ab4f15a5
comment update
2011-06-18 13:52:49 +03:00
Perttu Ahola
c78d610618
farmesh render range is now dynamic
2011-06-18 13:43:49 +03:00
Perttu Ahola
7d0395ba36
fixed tree placement in farmesh
2011-06-18 13:11:11 +03:00
Perttu Ahola
7773e68c2a
farmesh is now usable.
2011-06-18 12:42:17 +03:00
Perttu Ahola
0bd1b782d0
modified health bar a bit
2011-06-18 09:04:31 +03:00
Perttu Ahola
4a6e6cee20
enabled word wrap in chat
2011-06-18 08:50:14 +03:00
Perttu Ahola
a4cceb93ec
fixed wrong furnace menu layout
2011-06-18 08:50:05 +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
a23f6a1548
forgot to add mapblock_nodemod.h
2011-06-18 02:01:51 +03:00
Perttu Ahola
931474658d
moved inventory menu definition of chest and furnace to content_nodemeta.{h,cpp}
2011-06-18 02:00:01 +03:00
Perttu Ahola
da692355e8
Created and moved stuff to content_nodemeta.{h,cpp}
2011-06-18 00:46:50 +03:00
Perttu Ahola
e7580d2804
added in-game key shortcuts for toggling free_move and fast_move (default K and J)
2011-06-17 23:55:21 +03:00
Perttu Ahola
6b1f059ccd
modified iron amount a bit
2011-06-17 23:43:28 +03:00
Perttu Ahola
6378a71ea5
Updated comments
2011-06-17 23:28:25 +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
d6b54514bf
hopefully fixed old furnaces taking ridiculous amounts of cpu and halting the server
2011-06-16 19:43:28 +03:00
Perttu Ahola
1d372b9273
Probably fixed the single-MapBlock generator using 1 block lower water height than it should
2011-06-16 18:51:23 +03:00
Nils Dagsson Moskopp
158b054e72
+ rail block bounding box
2011-06-08 05:27:55 +02:00
Nils Dagsson Moskopp
e261cc9e8f
+ rail block bounding box
2011-06-08 05:27:55 +02: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
Nils Dagsson Moskopp
3be6891938
+ rail
2011-06-07 19:24:30 +02:00
Nils Dagsson Moskopp
51d308c666
+ rail
2011-06-07 19:24:30 +02:00
Perttu Ahola
fdee31abf1
...and the map part of that
2011-06-05 21:07:54 +03:00
Perttu Ahola
c68f21214d
made server to send map seed for testing
2011-06-05 21:06:54 +03:00
Perttu Ahola
d2a145b826
updated comment in main.cpp
2011-06-05 18:59:36 +03:00
Perttu Ahola
9b565b6bc4
tried to reduce unnecessary map saving disk i/o a bit
2011-06-05 18:57:36 +03:00
Perttu Ahola
a649d43fe7
Messed around with genmap.py. Now supports format version 17.
2011-06-05 00:10:06 +03:00
Perttu Ahola
6bd4cb2562
documentation update (mapformat.txt mainly)
2011-06-04 16:54:26 +03:00
Nils Dagsson Moskopp
f625a22e01
* point out setInventoryTextureCube() is broken with a FIXME
2011-06-03 13:13:31 +02:00
Nils Dagsson Moskopp
c3cd89705d
* point out setInventoryTextureCube() is broken with a FIXME
2011-06-03 13:13:31 +02:00
Nils Dagsson Moskopp
8835433b5e
+ paper, book, bookshelf
2011-06-03 13:12:56 +02:00
Nils Dagsson Moskopp
1bd25925cb
+ paper, book, bookshelf
2011-06-03 13:12:56 +02:00
Nils Dagsson Moskopp
ccc0420c52
+ papyrus
2011-06-03 00:55:28 +02:00
Nils Dagsson Moskopp
3bb1cfdf36
+ papyrus
2011-06-03 00:55:28 +02:00
Perttu Ahola
bf22dba687
removed a debug print that would flood a lot in some kind of a timeout
2011-06-02 20:09:30 +03:00
Perttu Ahola
1b8cff8fbf
In a globally installed build, debug.txt is now placed in userdata directory. Needs testing still.
2011-06-02 19:30:03 +03:00
Perttu Ahola
fd64dd5e20
added -Wno-unused-but-set-variable to debug build
2011-06-02 02:59:30 +03:00
Perttu Ahola
75f3e68451
Merged CiaranG's fence graphic updates (ugh, well, it worked, i guess, kind of.) This commit should also get rid of multiple heads on the server.
2011-06-02 02:37:49 +03:00
Perttu Ahola
7d57b71ffe
0.2.20110602_0
2011-06-02 00:15:42 +03:00
Perttu Ahola
51cf464f74
Fixed the password crash on Windows
2011-06-02 00:01:11 +03: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
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
9b6b4b65f8
Merge remote-tracking branch 'bucket-t/master'
2011-06-01 14:43:27 +02:00
teddydestodes
09d7654f46
Merge remote-tracking branch 'bucket-t/master'
2011-06-01 14:43:27 +02:00
MrLoom
2f2f28d398
MacOSX build support
2011-06-01 14:13:22 +02:00
MrLoom
28234f6e54
MacOSX build support
2011-06-01 14:13:22 +02:00
teddydestodes
4ddf2bc8a2
Merge remote-tracking branch 'upstream/master'
2011-06-01 14:11:52 +02:00
teddydestodes
63fe487d93
Merge remote-tracking branch 'upstream/master'
2011-06-01 14:11:52 +02:00
Nils Dagsson Moskopp
9de57d13bc
* improved fence dimensions (cuboid side lengths now multiples of 2, textures should fit better)
2011-06-01 20:06:16 +08:00
Nils Dagsson Moskopp
d2b2c7c09e
* improved fence dimensions (cuboid side lengths now multiples of 2, textures should fit better)
2011-06-01 20:06:16 +08:00
Nils Dagsson Moskopp
5f52a622b6
* clay is rarer now
2011-06-01 08:09:28 +02:00
Nils Dagsson Moskopp
c930a92b72
* clay is rarer now
2011-06-01 08:09:28 +02:00
Nils Dagsson Moskopp
ba1460a582
+ clay and associated items
2011-06-01 04:57:46 +02:00
Nils Dagsson Moskopp
cffd40c5d6
+ clay and associated items
2011-06-01 04:57:46 +02:00
Nils Dagsson Moskopp
d7b768dc4b
+ brick
2011-05-31 22:04:09 +02:00
Nils Dagsson Moskopp
fb78854e9b
+ brick
2011-05-31 22:04:09 +02:00
Perttu Ahola
bbead93c1a
Reduced server CPU usage on NodeMetadata step()s. Also furnace now cooks while no players are near it.
2011-05-31 20:02:55 +03:00
Ciaran Gultnieks
06427e355a
Slightly better texture coordinates for fences
2011-05-31 10:12:51 +01:00
celeron55
7740425085
Updated licenses of CiaranG's contributions to be in line with the new contribution policy and added a TODO note to server.cpp
2011-05-31 11:59:51 +03:00
Nils Dagsson Moskopp
6ca51de990
+ fence inventory icon
2011-05-31 03:54:39 +02:00
