Perttu Ahola
|
23717510c2
|
Merge branch 'lava'
|
2011-08-22 12:53:02 +03:00 |
|
Perttu Ahola
|
29c9d3d5f4
|
Implemented MEET_OTHER
|
2011-08-16 12:23:19 +03: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 |
|
Giuseppe Bilotta
|
136657bcc1
|
Get rid of makepackage_binary.sh
It's outdated, and it would be better to use cmake's packaging
capabilities instead, for better cross-platformness.
|
2011-08-15 11:07:30 +02:00 |
|
Giuseppe Bilotta
|
dc16820e02
|
Cleanup root
These scripts should not be in the root but in util/ and in fact
they are, so let's get rid of these.
|
2011-08-15 11:05:05 +02: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 |
|
Perttu Ahola
|
3028bbb95b
|
Updated .gitignore to ignore vim swap files
|
2011-08-12 00:33:24 +03:00 |
|
Giuseppe Bilotta
|
dfdc817db3
|
Typo fix
|
2011-08-11 19:45:44 +02:00 |
|
Giuseppe Bilotta
|
f4856a33c9
|
.gitattributes
Marking *.cpp files as C++ files makes for nicer diffs when using
--color-words or similar options.
|
2011-08-11 17:57:40 +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
|
e81ff1e833
|
Gettext fix for *BSD - require special linkage as glibc is not used
|
2011-08-11 11:19:05 +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 |
|