Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'oblomov/liquid_fixes' | Perttu Ahola | 2011-08-22 | 3 | -57/+70 | |
|\ \ | ||||||
| * | | Optimize for viscosity 1 | Giuseppe Bilotta | 2011-08-16 | 1 | -2/+2 | |
| | | | ||||||
| * | | Viscous fluids | Giuseppe Bilotta | 2011-08-16 | 3 | -6/+41 | |
| | | | ||||||
| * | | Make sure all neighbors of changed fluids are activated | Giuseppe Bilotta | 2011-08-16 | 1 | -13/+1 | |
| | | | | | | | | | | | | | | | This should fix the remaining cases of fluid not advancing or not retreating. | |||||
| * | | Let the liquids flow in the open | Giuseppe Bilotta | 2011-08-16 | 1 | -13/+0 | |
| | | | | | | | | | | | | No need to curb their spread artificially. | |||||
| * | | Ensure air neighbors to liquids that can flow are enqueued for transformation | Giuseppe Bilotta | 2011-08-16 | 1 | -1/+7 | |
| | | | ||||||
| * | | Ensure param2 is set correctly in transformLiquids | Giuseppe Bilotta | 2011-08-16 | 1 | -4/+4 | |
| | | | ||||||
| * | | Use defines for liquid levels | Giuseppe Bilotta | 2011-08-16 | 2 | -4/+8 | |
| | | | ||||||
| * | | transformLiquid: small optimization and whitespace cleanup | Giuseppe Bilotta | 2011-08-16 | 1 | -18/+11 | |
| | | | ||||||
* | | | Merge branch 'lava' | Perttu Ahola | 2011-08-22 | 12 | -99/+296 | |
|\| | | |/ |/| | ||||||
| * | small fix to transformLiquids | Perttu Ahola | 2011-08-15 | 1 | -6/+5 | |
| | | ||||||
| * | Fixed liquid mesh generation | Perttu Ahola | 2011-08-15 | 1 | -9/+23 | |
| | | ||||||
| * | Add lava to creative inventory (hmm, we're shortly running out of creative ↵ | Perttu Ahola | 2011-08-15 | 1 | -0/+1 | |
| | | | | | | | | inventory space) | |||||
| * | Hopefully fixed msvc "'sqrt' : ambiguous call to overloaded function" | Perttu Ahola | 2011-08-15 | 1 | -1/+1 | |
| | | ||||||
| * | Non-vertex-alpha texture material for lava | Perttu Ahola | 2011-08-15 | 1 | -2/+2 | |
| | | ||||||
| * | modified mapgen to generate less lava | Perttu Ahola | 2011-08-15 | 1 | -1/+1 | |
| | | ||||||
| * | Added #define WATER_ALPHA in content_mapnode.cpp | Perttu Ahola | 2011-08-15 | 1 | -3/+5 | |
| | | ||||||
| * | tuned lava/universal damage code | Perttu Ahola | 2011-08-15 | 3 | -7/+22 | |
| | | ||||||
| * | lava! | Perttu Ahola | 2011-08-15 | 10 | -89/+255 | |
| | | ||||||
* | | Implemented MEET_OTHER | Perttu Ahola | 2011-08-16 | 1 | -2/+8 | |
|/ | ||||||
* | Windows.h -> windows.h for cross-mingw build | Perttu Ahola | 2011-08-14 | 1 | -1/+1 | |
| | ||||||
* | Merge remote-tracking branch 'speedprog/fixedNotFindingData' | Perttu Ahola | 2011-08-13 | 3 | -14/+12 | |
|\ | ||||||
| * | fixed not finding data dir if installed | Constantin Wenger | 2011-08-12 | 3 | -14/+12 | |
| | | ||||||
* | | Let Settings accept a const char* directly | Giuseppe Bilotta | 2011-08-13 | 1 | -0/+8 | |
| | | ||||||
* | | Fix keycode_to_keyname return value | Giuseppe Bilotta | 2011-08-13 | 2 | -2/+2 | |
| | | ||||||
* | | Clean up key names handling | Giuseppe Bilotta | 2011-08-12 | 4 | -86/+87 | |
| | | | | | | | | | | Constify keycode and move the static array of localizable names from the guiKeyChangeMenu header to the implementation file, changing its name. | |||||
* | | Fix use of && instead of & | Giuseppe Bilotta | 2011-08-12 | 2 | -5/+5 | |
| | | ||||||
* | | Removed assert if creating texture atlas image fails; cancel creating image ↵ | Perttu Ahola | 2011-08-12 | 1 | -1/+7 | |
|/ | | | | instead. | |||||
* | Fixed/extended/modified ban stuff to be good for inclusion | Perttu Ahola | 2011-08-12 | 5 | -35/+96 | |
| | ||||||
* | Merge remote-tracking branch 'speedprog/banByIp' | Perttu Ahola | 2011-08-12 | 11 | -1/+271 | |
|\ | ||||||
| * | added ipban support | Constantin Wenger | 2011-08-12 | 11 | -1/+271 | |
| | | | | | | | | | | commands: /#ipban <nick> /#ipunban <ip> | |||||
* | | Typo fix | Giuseppe Bilotta | 2011-08-11 | 1 | -2/+2 | |
|/ | ||||||
* | Notify other players of wielded item change | Giuseppe Bilotta | 2011-08-11 | 4 | -0/+110 | |
| | ||||||
* | constify inventory item serialization | Giuseppe Bilotta | 2011-08-11 | 2 | -19/+14 | |
| | ||||||
* | Clients inform server on wielded item | Giuseppe Bilotta | 2011-08-11 | 4 | -0/+42 | |
| | | | | | This is done with the new TOSERVER_PLAYERITEM message, that informs the server on the index of the wielded item. | |||||
* | Keep track of player item | Giuseppe Bilotta | 2011-08-11 | 5 | -1/+28 | |
| | ||||||
* | Some inventory const-ification | Giuseppe Bilotta | 2011-08-11 | 3 | -35/+52 | |
| | ||||||
* | Server should use the same eye position as the client | Giuseppe Bilotta | 2011-08-11 | 1 | -2/+1 | |
| | ||||||
* | Refactor player's eye position coding | Giuseppe Bilotta | 2011-08-11 | 4 | -8/+16 | |
| | | | | | 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. | |||||
* | Introduce Player::getLightPosition | Giuseppe Bilotta | 2011-08-11 | 2 | -1/+6 | |
| | | | | | This is currently only used in the lighting update for remote players in client. | |||||
* | Merged some FreeBSD fixes | Perttu Ahola | 2011-08-11 | 2 | -5/+5 | |
|\ | ||||||
| * | Proper placement of binary files. | q66 | 2011-08-11 | 1 | -1/+1 | |
| | | ||||||
| * | Prevent threadid_t from losing precision when casted on 64bit systems | q66 | 2011-08-11 | 1 | -4/+4 | |
| | | ||||||
* | | Respect base virtual functions' signatures | Giuseppe Bilotta | 2011-08-08 | 2 | -3/+3 | |
| | | ||||||
* | | Always return from non-void functions | Giuseppe Bilotta | 2011-08-08 | 2 | -0/+4 | |
| | | | | | | | | This quiets a warning in Clang. | |||||
* | | Keys should be s32, not u32 | Giuseppe Bilotta | 2011-08-08 | 1 | -14/+14 | |
| | | | | | | | | | | | | 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 | |||||
* | | Remove spurious assignment | Giuseppe Bilotta | 2011-08-08 | 1 | -3/+0 | |
| | | ||||||
* | | InventoryAction is a struct, not a class | Giuseppe Bilotta | 2011-08-08 | 1 | -1/+1 | |
| | | ||||||
* | | Clang doesn't like -Wno-unused-but-set-variable | Giuseppe Bilotta | 2011-08-11 | 1 | -1/+1 | |
| | | | | | | | | | | 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. | |||||
* | | Project uses C++, so use CHECK_CXX_COMPILER_FLAG | Giuseppe Bilotta | 2011-08-11 | 1 | -2/+2 | |
|/ | | | | | Although this doesn't change much for our specific case, it can make a difference for some flags, so use the appropriate macro. |