4914eb29d1
Replace M_PI with PI
2011-10-16 00:24:51 +03:00
825953bbdc
Fix some "Conditional jump or move depends on uninitialised value(s)" valgrind detections
2011-10-15 23:07:43 +03:00
fd6452749e
Resource file handling for exe icon for MinGW
2011-10-15 17:05:16 +03:00
7c2639ddd9
Make view bobbing amount configurable
2011-10-15 16:32:24 +03:00
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
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
74febd5c31
Handle death and respawn better
2011-10-15 14:46:59 +03:00
5341bf59c2
Improve mobv2
2011-10-15 12:17:21 +03:00
43a28f04fa
mobv2
2011-10-15 02:28:57 +03:00
080002f8ed
Lock mutex when accessing m_env in Server::~Server
2011-10-14 12:39:25 +03:00
853a78681e
In CMake scripts: New version number, fix MSVC stuff
2011-10-14 09:55:39 +03:00
9e46cbf7ea
Header file tweaking; mainly for speed
2011-10-12 13:53:38 +03:00
b60b58b627
Saner block modification flag operation for not saving everything always
2011-10-12 10:53:37 +03:00
a7833cca22
Merge remote-tracking branch 'marktraceur/master'
2011-09-26 22:41:06 +03:00
9a7471b740
Rotate wielded tool the right way and modify axe graphics accordingly
2011-09-26 16:10:54 +03:00
061d4b4202
Merge branch 'view_bobbing_and_vielded_tool'
2011-09-26 15:10:02 +03:00
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
b9e680d06c
Server user limit configuration option
2011-09-26 11:57:51 +03:00
0ccc0ac927
Merge remote-tracking branch 'darkrose/master'
2011-09-26 11:57:28 +03:00
ae561d705f
Fixed null pointer dereference errors found by cppcheck
2011-09-24 02:11:43 -05:00
bc01ae4cbd
Fixed merge issues with saplings, ready to pull now!
2011-09-23 18:19:47 -07:00
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
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
8b875d71d1
remove content_* things from map.cpp
2011-09-23 18:04:48 +10:00
789c88509c
Move PLATFORM_LIBS around to make sqlite3 link with libdl on some distros
2011-09-23 08:48:58 +03:00
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
582e450bad
added locking chests - clean patch
2011-09-22 19:11:48 +10:00
ae6d83a41e
Better apple tree generation
2011-09-21 23:31:55 +03:00
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
a4a2c34831
reduce view bobbing slightly
2011-09-21 15:54:06 +02:00
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
6599002149
fix a numerical problem, but tool is still jittery
2011-09-20 18:25:29 +02:00
cbd2bcf102
Fix jittery view bobbing at large map coordinates again. Wielded tool still has problems there
2011-09-20 18:19:26 +02:00
01f3ae1c50
Digging animation
2011-09-20 11:06:16 +02:00
eaff4616ad
fix some normals
2011-09-19 17:11:53 +02:00
ab42549b1e
Wielded tool updates, leaves and glass work now
2011-09-19 17:08:42 +02:00
02726f0003
Convert any inventory item into a mesh, bring back InventoryItem::getImageRay(), some const-correctness fixes
2011-09-19 06:37:24 +02:00
36bcbca9ac
Added sprite extruder
2011-09-19 03:01:11 +02:00
4ed837bcfa
trying some view bobbing changes
2011-09-18 17:02:30 +02:00
54f3796f91
Oops, up vector is needed.
2011-09-18 02:24:43 +02:00
ae66d611f2
This looks more like MC view bobbing, but still not even close
2011-09-18 02:17:39 +02:00
b22cb69a15
Merge remote-tracking branch 'sfan5/apple-trees'
2011-09-16 19:09:13 +03:00
40707e3c5b
SQLite needs to be linked with -ldl on some Linux distros.
2011-09-16 19:06:45 +03:00
acfb2bb8bc
Revert some changes that could lead to slower map transfer and increaed network load.
2011-09-16 18:03:58 +02:00
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
fc92da4324
View bobbing is slower in the water.
2011-09-15 01:53:42 +02:00
88dc8c694e
Added Iron Apple which heals 4 Hearts
2011-09-12 20:10:17 +02:00
785a2fd23a
Changed the Heal Amount of Apples from 6 to 2
2011-09-12 19:44:26 +02:00
4328a6442b
Fixed duplication bug
2011-09-11 19:17:14 +02:00
6496b1cf1f
Removed Spaces
2011-09-11 18:16:07 +02:00
c0caedc373
Added Apple Trees
2011-09-11 17:50:44 +02:00
524cf237b8
inventory displays tool breakage bar again
2011-09-08 17:45:39 +02:00
e4cb004460
trying something else... also replaced M_PI by PI everywhere
2011-09-08 16:10:44 +02:00
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
f2ec226521
minor view bobbing improvements
2011-09-08 13:34:28 +02:00
0931d4b7ff
make it slightly less annoying :o)
2011-09-08 13:14:59 +02:00
ccadebabba
Implemented view bobbing (testing simple lemniscate shape)
2011-09-08 13:03:55 +02:00
18771a39cf
Commented out debug statements again
2011-09-08 01:24:47 +02:00
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
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
f31b0a3361
Display which tool the player is holding
...
And some simple animation when trying to dig...
2011-09-07 10:56:04 -04:00
d28ea57083
Note about texture atlas
2011-09-07 01:27:04 +03:00
8e26c5c066
Add note about trans_table_19.
2011-09-07 01:19:48 +03:00
5c1074aa7d
Remove block file from disk when saved to database
2011-09-06 20:28:45 +03:00
bd72091150
Pause in unloaded territory instead of collide
2011-09-06 20:07:43 +03:00
faf3d7902a
Make Connection::Send cancel silently if peer doesn't exist.
2011-09-06 19:39:23 +03:00
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
310fa10035
Merge remote-tracking branch 'queatz/sqlite-map'
2011-09-06 18:04:02 +03:00
bc847e8cc2
Fix bug in posix file/directory removal wrapper, as pointed out by kahrl
2011-09-06 17:52:03 +03:00
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
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
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
d670c831c2
These numbers were well exceeding 2^32...
2011-09-04 17:01:28 -04:00
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
2d872ce3fa
Furnace was crashing stuff again
2011-09-02 17:33:06 -04:00
e3c58eff1c
Merge branch 'master' of /media/Field/Software/minetest-queatz/minetest-sqlite/.. into sqlite-map
2011-09-02 16:59:17 -04:00
99de37ff94
Update to SQLite 3.7.7.1
2011-09-01 18:27:30 -04:00
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
6415528f96
If there was no source item in a furnace it would cause a segmentation fault.
2011-08-30 11:38:53 -04:00
4af1f2963c
Merge remote-tracking branch 'kahrl/dissector'
2011-08-30 14:24:33 +03:00
ba0322f353
Merge remote-tracking branch 'queatz/mmb10'
2011-08-30 14:24:23 +03:00
1a705523c0
Merge remote-tracking branch 'queatz/furnace-is-not-blackhole'
2011-08-30 14:24:12 +03:00
87b9e5467d
Merge remote-tracking branch 'queatz/furnace-is-not-out-nor-can-rat-escape'
2011-08-30 14:24:07 +03:00
625dac8d8c
Merge remote-tracking branch 'queatz/privs'
2011-08-30 14:23:44 +03:00
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
3edf2bb417
dissector branch: fix description of TOCLIENT_PLAYERITEM in clientserver.h
2011-08-25 21:31:28 +02:00
e278742c5e
Middle mouse click will move 10 items around at a time.
2011-08-25 12:43:19 -04:00
ef08163c38
Don't remove furnace if something is inside it.
2011-08-24 18:53:06 -04:00
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
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
efd8dabd91
Lava is now better visible inside water. (a crappy hack)
2011-08-23 03:01:01 +03:00
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
d4df20a913
if creative mode and player has no build privileges, cannot drop items.
2011-08-22 22:55:17 +03:00
db495668ae
Fixed water mesh generation acting weird next to sand
2011-08-22 22:44:43 +03:00
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
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
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
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
5415256a52
Merge remote-tracking branch 'oblomov/me_cmd'
2011-08-22 14:46:54 +03:00
836e43db60
Merge remote-tracking branch 'oblomov/new_input'
2011-08-22 14:46:52 +03:00
9c94538fb7
Change way commands are displayed in chat window
2011-08-22 13:43:53 +02:00
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
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
0488bf54d3
/me command
2011-08-22 13:02:08 +02:00
da19aee307
Server now supports replies without prefix
2011-08-22 13:02:08 +02:00
d2c0b4905a
Defines for server command context flags
2011-08-22 13:02:08 +02:00
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
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
16aedc0ef6
Fix typos in key names
2011-08-22 12:52:15 +02:00
6596e585fe
Flowing lava updates lighting
2011-08-22 13:19:07 +03:00
f98eda4d52
Merge remote-tracking branch 'oblomov/liquid_fixes'
2011-08-22 12:53:18 +03:00
23717510c2
Merge branch 'lava'
2011-08-22 12:53:02 +03:00
c51564ab5b
Optimize for viscosity 1
2011-08-16 20:38:44 +02:00
1eb14c7743
Viscous fluids
2011-08-16 20:37:46 +02:00
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
774faf4e85
Let the liquids flow in the open
...
No need to curb their spread artificially.
2011-08-16 17:42:28 +02:00
d0711821f3
Ensure air neighbors to liquids that can flow are enqueued for transformation
2011-08-16 17:42:14 +02:00
7024b45197
Ensure param2 is set correctly in transformLiquids
2011-08-16 16:50:38 +02:00
5fce673a56
Use defines for liquid levels
2011-08-16 16:50:38 +02:00
29c9d3d5f4
Implemented MEET_OTHER
2011-08-16 12:23:19 +03:00
708f1c336e
transformLiquid: small optimization and whitespace cleanup
2011-08-16 06:42:11 +02:00
dc4ac0b96f
small fix to transformLiquids
2011-08-15 18:49:44 +03:00
296748d32e
Fixed liquid mesh generation
2011-08-15 17:45:35 +03:00
ad408f269c
Add lava to creative inventory (hmm, we're shortly running out of creative inventory space)
2011-08-15 16:57:57 +03:00
e57754868f
Hopefully fixed msvc "'sqrt' : ambiguous call to overloaded function"
2011-08-15 15:11:00 +03:00
0c7e7f4998
Non-vertex-alpha texture material for lava
2011-08-15 12:08:41 +03:00
4b85608e30
modified mapgen to generate less lava
2011-08-15 11:56:16 +03:00
8ab77f4153
Added #define WATER_ALPHA in content_mapnode.cpp
2011-08-15 11:51:33 +03:00
472585a7e8
tuned lava/universal damage code
2011-08-15 11:49:39 +03:00
8f42a8be0c
lava!
2011-08-15 02:04:56 +03:00
c4b707bca2
Windows.h -> windows.h for cross-mingw build
2011-08-14 21:26:07 +03:00
9e35fe8c37
Merge remote-tracking branch 'speedprog/fixedNotFindingData'
2011-08-13 14:05:01 +03:00
385904d75a
Let Settings accept a const char* directly
2011-08-13 07:33:43 +02:00
b1e0b7728b
Fix keycode_to_keyname return value
2011-08-13 07:31:46 +02:00
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
72e4c8f523
Fix use of && instead of &
2011-08-12 23:34:12 +02:00
835d2e4b5f
Removed assert if creating texture atlas image fails; cancel creating image instead.
2011-08-12 17:17:47 +03:00
94b42a79d7
fixed not finding data dir if installed
2011-08-12 14:26:37 +02:00
e40da2341c
Fixed/extended/modified ban stuff to be good for inclusion
2011-08-12 13:11:27 +03:00
7aa72c56b6
Merge remote-tracking branch 'speedprog/banByIp'
2011-08-12 11:55:51 +03:00
5784c14ab7
added ipban support
...
commands:
/#ipban <nick>
/#ipunban <ip>
2011-08-12 03:37:18 +02:00
dfdc817db3
Typo fix
2011-08-11 19:45:44 +02:00
371af9c241
Notify other players of wielded item change
2011-08-11 15:22:36 +02:00
88a9bae160
constify inventory item serialization
2011-08-11 15:22:36 +02:00
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
91d1186cbb
Keep track of player item
2011-08-11 15:22:36 +02:00
467b3cf4c1
Some inventory const-ification
2011-08-11 15:22:35 +02:00
c007d8219e
Server should use the same eye position as the client
2011-08-11 15:22:35 +02:00
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
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