Perttu Ahola
|
bfc68d3151
|
Scripting WIP
|
2011-11-29 19:13:38 +02:00 |
|
Perttu Ahola
|
ee8b6d3444
|
Move images to data/textures and fix some path stuff; hope that installation still works
|
2011-11-29 19:11:04 +02:00 |
|
Perttu Ahola
|
2115a766f6
|
Make it actually build
|
2011-11-29 19:11:04 +02:00 |
|
Perttu Ahola
|
d1a5e97a7f
|
Add Lua
|
2011-11-29 19:11:04 +02:00 |
|
Perttu Ahola
|
7372282a72
|
Better spawn position finding and checking
|
2011-11-13 03:17:42 +02:00 |
|
Perttu Ahola
|
045e32b6ec
|
Fix water-glass and water-lava surfaces
|
2011-11-08 16:17:38 +02:00 |
|
Perttu Ahola
|
763da10c7b
|
Reset block usage timer on client only if it is very probably drawn
|
2011-11-08 02:13:22 +02:00 |
|
Kahrl
|
1c98ec94da
|
Make Connection::Receive return the data via a SharedBuffer reference, so the caller doesn't have to choose the right buffer size in advance.
Conflicts:
src/test.cpp
|
2011-11-07 11:21:42 +02:00 |
|
Kahrl
|
28660b4c1a
|
utility.h: Change Buffer's interface to be more compatible with SharedBuffer's interface, connection.h: use Buffer instead of SharedBuffer in command and event queues
|
2011-11-07 11:19:56 +02:00 |
|
Perttu Ahola
|
fa72e65b59
|
Add new Connection test in test.cpp in case needed in the future (commented out), improve comments in test.cpp a bit
|
2011-11-07 11:15:43 +02:00 |
|
Perttu Ahola
|
7d5d676eac
|
Infinite packet flood test for debugging the new network layer
|
2011-11-07 01:20:58 +02:00 |
|
Constantin Wenger
|
61f2cc45c2
|
Command-line signal handling for Windows
|
2011-11-06 19:24:44 +02:00 |
|
Perttu Ahola
|
c1d92d72e1
|
Make water invisible next to underwater glass
|
2011-11-05 23:30:27 +02:00 |
|
Perttu Ahola
|
d0fdfd44c5
|
Add option to set water opaque (mainly for stylistic choice)
|
2011-11-03 23:06:57 +02:00 |
|
Perttu Ahola
|
f5995337e8
|
Fix flowing liquid spacing; water and lava next to each other will glitch a bit but it isn't as bad as this was
|
2011-11-03 23:04:56 +02:00 |
|
Perttu Ahola
|
e9fd3def90
|
Make CONTENT_IGNORE to not block the view when occlusion culling
|
2011-11-03 20:45:44 +02:00 |
|
Perttu Ahola
|
a2af490b7b
|
Disable mipmapping because it is sometimes ugly
|
2011-11-03 20:17:18 +02:00 |
|
Perttu Ahola
|
4964daa5be
|
Possible fix to bases of islands/hills getting culled out too early
|
2011-11-03 15:10:58 +02:00 |
|
Perttu Ahola
|
718086f383
|
Tune occlusion culling a bit more
|
2011-11-03 13:35:32 +02:00 |
|
Perttu Ahola
|
339b7588d2
|
Tune occlusion culling a bit
|
2011-11-03 13:35:09 +02:00 |
|
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 |
|