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 |
|