BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity
1,426 Commits 5 Branches 61 Tags 104 MiB
cd563473fa
Commit Graph

1128 Commits

Author SHA1 Message Date
Perttu Ahola
0ac5f6a7ca Very simple occlusion culling 2011-11-03 12:48:08 +02:00
Perttu Ahola
1726b82a16 occlusion culling fix, a little reshaping of map rendering for more useful profiler output and dynamic profiler text size 2011-11-02 18:13:56 +02:00
Perttu Ahola
03db16d55b Remove trailing / or \ in path_userdata (probably fixes world deletion on Windows) 2011-11-02 13:43:00 +02:00
Perttu Ahola
0c20973c17 Add 3d cloud checkbox in main menu (and rename setting from enable_2d_clouds to enable_3d_clouds) 2011-11-02 12:50:21 +02:00
Perttu Ahola
899404f3b1 Fix an obvious bug in utility.h 2011-11-01 14:54:11 +02:00
Perttu Ahola
6aab526989 Attempt a workaround to the network layer segfault 2011-10-30 11:59:23 +02:00
Perttu Ahola
c349708eab Make it to compile on MSVC2010 2011-10-21 18:37:43 +03:00
Perttu Ahola
7f25183936 Some tuning in m_max_packets_per_second algorithm 2011-10-21 11:52:26 +03:00
Perttu Ahola
4b6138e69b Improve Connection with threading and some kind of congestion control 2011-10-20 23:04:09 +03:00
Perttu Ahola
b6fcbc5fba Default max_simultaneous_block_sends_server_total to 2 to make network not cough too much on the fixed block sending code 2011-10-19 19:34:47 +03:00
Perttu Ahola
ed870a7237 Fix apple inventory texture 2011-10-19 02:36:46 +03:00
Perttu Ahola
3a06fb8831 Fix and tune block sending 2011-10-19 02:17:23 +03:00
Perttu Ahola
d47120aeb3 Add enable_2d_clouds setting for usage on lower-end machines 2011-10-18 23:55:55 +03:00
Perttu Ahola
9b907dd65a Try to tune fog to work well on high-end machines also 2011-10-18 21:08:31 +03:00
Perttu Ahola
28f2fdb6de Fix possible NULL dereference in MobV2CAO::step 2011-10-18 19:53:34 +03:00
Perttu Ahola
4e1055543c Tune map rendering and related diagnostics 2011-10-18 19:18:01 +03:00
Perttu Ahola
8ead29a302 set backface culling off again for torches, ladders, rails and signs 2011-10-18 18:32:35 +03:00
Perttu Ahola
fe98fe342a ...Make the the server buildable again after the last commit 2011-10-18 17:20:54 +03:00
Perttu Ahola
554f7f120c Improve rendering and fix tiling in mesh generation 2011-10-18 13:56:35 +03:00
Perttu Ahola
05ab58cd14 Automate texture listing for texture atlas making 2011-10-18 11:31:23 +03:00
Perttu Ahola
eae2d35ca5 Fix client profiler print interval 2011-10-18 10:36:52 +03:00
Perttu Ahola
85002883bd Better handling of SendFailedException in Connection 2011-10-18 03:42:23 +03:00
Perttu Ahola
22b07bdb30 Fix object duplication bug 2011-10-18 02:58:15 +03:00
Perttu Ahola
fe338745a3 Make active_block_range default to 2 2011-10-18 00:41:17 +03:00
Perttu Ahola
6ce0c61dc0 Fix possible NULL pointer access in MobV2CAO 2011-10-18 00:41:02 +03:00
Perttu Ahola
78f4142f4f Add /clearobjects 2011-10-18 00:01:50 +03:00
Perttu Ahola
ea1fda5ebc Made a scheme to get rid of the objects in the worst object flooded blocks 2011-10-17 20:57:58 +03:00
Perttu Ahola
67db77b8b3 Modify default active block range 2011-10-17 20:41:43 +03:00
Perttu Ahola
64c4d00693 F2 toggles profiler display in client 2011-10-17 20:40:55 +03:00
Perttu Ahola
6661d9be1a Attempt to fix objects getting multiplicated by objects getting deactivated in a different block than where they were loaded and then the original block, from where the static object was removed, not getting saved at unload 2011-10-17 20:19:37 +03:00
Perttu Ahola
9a62a909bc Add a log message to SEnv and make it load objects if there are < 51 of them, to load blocks that were limited to 50 2011-10-17 19:44:28 +03:00
Perttu Ahola
93f4d2b3f1 Catch SendFailedException when replying back in Connection::Receive() 2011-10-17 18:02:26 +03:00
Perttu Ahola
558a133044 Display RTT (round trip time, ping) on client status text 2011-10-17 17:18:50 +03:00
Perttu Ahola
5037efdea9 Add some rendering statistics to profiler 2011-10-17 17:06:28 +03:00
Perttu Ahola
e9888c8e25 Workaround for blocks having a huge amount of active objects; add log messages related to active objects for investigation 2011-10-17 11:52:38 +03:00
Perttu Ahola
3daaff3a42 Remove very floody log message of MobV2SAO 2011-10-17 11:45:06 +03:00
celeron55
d39f98aeb0 Improve active object handling log output 2011-10-17 10:47:06 +03:00
celeron55
30c21b4abd Fix partly double printed debug.txt 2011-10-17 10:46:16 +03:00
Perttu Ahola
cfd19dcdb5 Fix punching of oerkkis 2011-10-17 01:58:38 +03:00
Perttu Ahola
b0481b9db1 Fix chest not working after walked away and came back 2011-10-17 01:04:22 +03:00
Perttu Ahola
5f39885975 Improve inventory debug output 2011-10-17 01:03:45 +03:00
Perttu Ahola
9ff8067426 Fix items showing up as sticks when placed in world 2011-10-17 00:08:27 +03:00
Perttu Ahola
162619a426 Fix to-transparend conversion of backgrounds of sprite image files that don't have an alpha channel 2011-10-16 23:41:43 +03:00
Perttu Ahola
2419d0029a Some more profiler stuff to get the hang on what really uses CPU 2011-10-16 22:39:35 +03:00
Perttu Ahola
b8f2dcea4d Improve debug profiler usage for investigating CPU usage of server 2011-10-16 21:16:44 +03:00
Perttu Ahola
07d000cc54 When granting or revoking privileges, notify the target player too 2011-10-16 20:03:43 +03:00
Perttu Ahola
6470743e51 Make dungeon masters not shoot the walls with no reason 2011-10-16 19:39:20 +03:00
Perttu Ahola
143dce6672 When player times out, log the action as a timeout rather than regular quitting 2011-10-16 19:38:56 +03:00
Perttu Ahola
96b2d1fd29 Check NULL pointer properly in some new code trying to log new stuff 2011-10-16 18:50:30 +03:00
Perttu Ahola
369177aa80 Better player damage prevention when falling on unloaded blocks, not involving getting stuck in there. 2011-10-16 18:45:17 +03:00
Perttu Ahola
0bf533f753 Switch more stuff to use the logging thing and fix segfault on player leave from server as introduced in a previous switch-to-logging commit 2011-10-16 16:28:12 +03:00
Perttu Ahola
67a6bc4ab5 Fix map delete on windows (concatenate paths correctly with / or \ depending on OS) 2011-10-16 16:16:47 +03:00
Perttu Ahola
b65a5aceb0 Use the logger; also, default to not showing much crap in console. Use --info-on-stderr to enable crap. 2011-10-16 14:57:53 +03:00
Perttu Ahola
4846846a2d Initially add small and tight logging facility 2011-10-16 12:45:00 +03:00
Perttu Ahola
414c614893 Add peaceful / not peaceful distinction in mobs and the only_peaceful_mobs setting 2011-10-16 11:52:33 +03:00
Perttu Ahola
4914eb29d1 Replace M_PI with PI 2011-10-16 00:24:51 +03:00
Perttu Ahola
825953bbdc Fix some "Conditional jump or move depends on uninitialised value(s)" valgrind detections 2011-10-15 23:07:43 +03:00
Perttu Ahola
fd6452749e Resource file handling for exe icon for MinGW 2011-10-15 17:05:16 +03:00
Perttu Ahola
7c2639ddd9 Make view bobbing amount configurable 2011-10-15 16:32:24 +03:00
Perttu Ahola
3f58028d31 Make dungeon masters though and make oerkkis disappear when they get to you (because hitting them doesn't work for some unknown reason) 2011-10-15 16:04:25 +03:00
Perttu Ahola
94dfececf6 strict_protocol_version_checking setting; PROTOCOL_VERSION in clientserver.h; clean up defaultsettings.cpp and minetest.conf.example 2011-10-15 15:02:28 +03:00
Perttu Ahola
74febd5c31 Handle death and respawn better 2011-10-15 14:46:59 +03:00
Perttu Ahola
5341bf59c2 Improve mobv2 2011-10-15 12:17:21 +03:00
Perttu Ahola
43a28f04fa mobv2 2011-10-15 02:28:57 +03:00
Perttu Ahola
080002f8ed Lock mutex when accessing m_env in Server::~Server 2011-10-14 12:39:25 +03:00
Perttu Ahola
853a78681e In CMake scripts: New version number, fix MSVC stuff 2011-10-14 09:55:39 +03:00
Perttu Ahola
9e46cbf7ea Header file tweaking; mainly for speed 2011-10-12 13:53:38 +03:00
Perttu Ahola
b60b58b627 Saner block modification flag operation for not saving everything always 2011-10-12 10:53:37 +03:00
Perttu Ahola
a7833cca22 Merge remote-tracking branch 'marktraceur/master' 2011-09-26 22:41:06 +03:00
Perttu Ahola
9a7471b740 Rotate wielded tool the right way and modify axe graphics accordingly 2011-09-26 16:10:54 +03:00
Perttu Ahola
061d4b4202 Merge branch 'view_bobbing_and_vielded_tool' 2011-09-26 15:10:02 +03:00
Perttu Ahola
2ecd53ce09 Fix single-frame lag in camera yaw/pitch, tune view bobbing and add wielded tool movement when walking and tweak stuff a bit 2011-09-26 15:09:04 +03:00
Perttu Ahola
b9e680d06c Server user limit configuration option 2011-09-26 11:57:51 +03:00
Perttu Ahola
0ccc0ac927 Merge remote-tracking branch 'darkrose/master' 2011-09-26 11:57:28 +03:00
Joshua Beck
ae561d705f Fixed null pointer dereference errors found by cppcheck 2011-09-24 02:11:43 -05:00
Mark Holmquist
bc01ae4cbd Fixed merge issues with saplings, ready to pull now! 2011-09-23 18:19:47 -07:00
Mark Holmquist
319f43e6d2 Fixed saplings growing into trees (thanks so much, Kahrl!) 
Put the random interval back to 1 in 50 chance. It's not as rare as rats, but rarer than grass.
 2011-09-23 18:14:35 -07:00
Mark Holmquist
85f119e1e6 Adding (most) of the sapling functionality. It has yet to work, since MEET_OTHER was not implemented at the time of this commit. Hopefully it will work when merged with celeron's latest. 2011-09-23 18:13:53 -07:00
darkrose
8b875d71d1 remove content_* things from map.cpp 2011-09-23 18:04:48 +10:00
Perttu Ahola
789c88509c Move PLATFORM_LIBS around to make sqlite3 link with libdl on some distros 2011-09-23 08:48:58 +03:00
Perttu Ahola
bdf54908aa Make client report a newer version number to the server than 2011-07-31 does and make the server enforce it 2011-09-22 20:47:47 +03:00
darkrose
582e450bad added locking chests - clean patch 2011-09-22 19:11:48 +10:00
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