651657edfd
Print out number of blocks in memory at unload
2011-11-29 19:13:51 +02:00
74770ab718
Don't allow placing CONTENT_IGNORE with Map::setNode() because it is never useful and is only caused by bugs.
2011-11-29 19:13:51 +02:00
e5650bb549
Make liquid_alternative_* to be strings
2011-11-29 19:13:51 +02:00
6a8f9135de
Store metadata as metadata name in node definition
2011-11-29 19:13:51 +02:00
941176cd65
Default to saving stuff more often to minimize lag caused by a single save
2011-11-29 19:13:50 +02:00
251b015210
Don't print 'Blocks modified by: ' in Map::timerUpdate if no blocks were written
2011-11-29 19:13:50 +02:00
616bad96af
Don't print all block saves to verbosestream; rather print counts of distinct modifiers
2011-11-29 19:13:49 +02:00
1b765b9740
Add reason parameter to setModified and print it out to verbosestream when saving block
2011-11-29 19:13:49 +02:00
df8346ef4d
Do not expose CONTENT_* stuff in content_mapnode.h and use a name converter wrapper in old code
2011-11-29 19:13:47 +02:00
c0f6395cf0
Node definition names
2011-11-29 19:13:46 +02:00
f107967fdc
Remove node content-dependent stuff from map.cpp
2011-11-29 19:13:46 +02:00
c6fd2986d4
GameDef compiles
2011-11-29 19:13:42 +02:00
abceeee92f
Create framework for getting rid of global definitions of node/tool/item/whatever types
2011-11-29 19:13:41 +02:00
3b77a63d5d
Allocate MapBlock::m_node_metadata on heap to allow less header bloat
2011-11-29 19:13:41 +02:00
64996422c0
Move ContentFeatures to mapnode_contentfeatures.{h,cpp} and clean stuff
2011-11-29 19:13:40 +02:00
763da10c7b
Reset block usage timer on client only if it is very probably drawn
2011-11-08 02:13:22 +02:00
4964daa5be
Possible fix to bases of islands/hills getting culled out too early
2011-11-03 15:10:58 +02:00
718086f383
Tune occlusion culling a bit more
2011-11-03 13:35:32 +02:00
339b7588d2
Tune occlusion culling a bit
2011-11-03 13:35:09 +02:00
0ac5f6a7ca
Very simple occlusion culling
2011-11-03 12:48:08 +02:00
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
4b6138e69b
Improve Connection with threading and some kind of congestion control
2011-10-20 23:04:09 +03:00
9b907dd65a
Try to tune fog to work well on high-end machines also
2011-10-18 21:08:31 +03:00
4e1055543c
Tune map rendering and related diagnostics
2011-10-18 19:18:01 +03:00
78f4142f4f
Add /clearobjects
2011-10-18 00:01:50 +03:00
5037efdea9
Add some rendering statistics to profiler
2011-10-17 17:06:28 +03:00
b0481b9db1
Fix chest not working after walked away and came back
2011-10-17 01:04:22 +03:00
67a6bc4ab5
Fix map delete on windows (concatenate paths correctly with / or \ depending on OS)
2011-10-16 16:16:47 +03:00
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
9e46cbf7ea
Header file tweaking; mainly for speed
2011-10-12 13:53:38 +03:00
a7833cca22
Merge remote-tracking branch 'marktraceur/master'
2011-09-26 22:41:06 +03:00
061d4b4202
Merge branch 'view_bobbing_and_vielded_tool'
2011-09-26 15:10:02 +03: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
582e450bad
added locking chests - clean patch
2011-09-22 19:11:48 +10:00
e4cb004460
trying something else... also replaced M_PI by PI everywhere
2011-09-08 16:10:44 +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
5c1074aa7d
Remove block file from disk when saved to database
2011-09-06 20:28:45 +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
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
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
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
6596e585fe
Flowing lava updates lighting
2011-08-22 13:19:07 +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
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
59c58f230e
Some obvious errors in the new fluid flow management
2011-08-05 08:45:15 +02:00
0b37f98e16
* fix for broken water
2011-08-03 19:00:25 +02:00
4ef9c7675a
Merge remote-tracking branch 'origin/upstream'
2011-07-30 18:55:43 +02:00
20fa7412c8
and now fixed a bug in removing that debug output
2011-07-24 12:13:51 +03:00
d099165271
removed a remaining debug print
2011-07-24 12:12:55 +03:00
29d905f98a
Added a mapblock analyzing function for debugging use and fixed remaining mapgen bugs
2011-07-24 12:09:33 +03:00
112b85d0fb
merged fix to decapitated trees; other bugs now exists
2011-07-24 11:39:13 +03:00
2587bb361c
merged the content type extension and delta
2011-07-23 19:04:37 +03:00
90d793f8f3
extended content-type range
2011-07-23 16:55:26 +03:00
976ec31c1f
switched to old transformLiquids, new one is not ready
2011-07-23 16:46:34 +03:00
3882536d40
merged some stuff from upstream while merging delta
2011-07-23 15:46:00 +03:00
805ccd449f
Merge branch 'upstream/master'
2011-07-22 20:16:58 +02:00
fe855e004f
Fixed new map generator causing a crash when generating at map limit
2011-07-22 01:37:05 +03:00
52ad5944c0
Attempt to fix the big bug. Now server either stops sending map or mapgen starts generating CONTENT_IGNORE.
2011-07-21 17:00:08 +03:00
9bc701d194
Merge branch 'upstream/master'
2011-07-20 14:20:07 +02:00
57fcfb2b0d
* initialize liquid_kind properly so compiler does not bitch about it
2011-07-19 02:02:50 +02:00
466f9d87b6
final fixes to liquid flow, works now as intended
2011-07-18 02:38:57 +02:00
b7862805c8
fixes to liquid transformation
2011-07-18 02:38:48 +02:00
c4b86adee8
fixed refactoring issues // slowed down water flow a bit
...
* liquid flow no longer does random things when transformed
* if a flowi
ng liquid node doesn't have a solid block as neighbor, its spread distan
ce is shortened by 1
2011-07-18 02:38:32 +02:00
f1e8ff2245
* refactored liquid transformation code (has some flaws)
...
Completely rewrote the liquid transformation. The algorithm now exclusively modifies the current node in one iteration. Another change is that MapNode.param2 now stores a bit that tells other nodes if a flowing liquid node flows downwards. This is accomplished by two masks on param2 for the "flow down" bit and the "liquid level" bits.
This will be the base of future improvements to the liquid flow. However, in the current state flowing liquid does not always disappear when cut off its source. Be aware that this branch is work in progress.
2011-07-18 02:37:19 +02:00
496e783988
A small fix to an unlikely situation where the map generator requires a block that hasn't been loaded from disk. Now it is actually loaded from disk in that case.
2011-07-17 13:40:47 +03:00
3560f0de08
Merge branch 'upstream/master'
...
Conflicts:
data/oerkki1.png
src/client.cpp
2011-07-14 22:43:28 +02:00
5146c826be
* possibly improved water flow, by flyx86
...
- When flowing liquid starts to flow down, it stops contributing to its neighboring nodes' liquid level (possibly transforming it back to air)
- Flowing liquid turns into a source if there are at least 2 adjacent liquid source nodes
- If a new liquid flow reaches existing flowing liquid, the existing liquid is now updated properly.
2011-07-14 16:17:53 +02:00
71f5d4b344
Fixed objects being sometimes not able to be stored statically in a block when block has been unloaded
2011-07-01 21:04:40 +03:00
282912caa0
tried to fix block selection in map rendering a bit
2011-06-27 09:50:34 +03:00
dd22ea051a
map unloading is now a whole lot better
2011-06-27 00:27:17 +03:00
3fccc67eb7
fixed block unloading from memory (a better fix coming next)
2011-06-26 21:53:11 +03:00
d3d369a63b
reorganized stuff
2011-06-26 18:51:57 +03:00
91cfbe2891
reorganized a lot of stuff and modified mapgen and objects slightly while doing it
2011-06-26 15:48:56 +03:00
bb940a946d
even more code refactoring
2011-06-26 02:34:36 +03:00
2915bd5518
more reorganizing of map code
2011-06-26 01:31:43 +03:00
cb130d9158
cleaned map stuff
2011-06-26 00:03:58 +03:00
a80025c352
moved mapgen stuff around abit
2011-06-25 18:35:32 +03:00
f2c26e2014
moved map generator to separate source files
2011-06-25 18:12:41 +03:00
aed9e809a1
mapgen stuff
2011-06-25 16:32:09 +03:00
7538b4c620
New map generator added (and SQLite, messed up the commits at that time...) (import from temporary git repo)
2011-06-25 04:25:14 +03:00
5ac900ddd9
Changed MapBlockObjects to be never written anymore. Incremented version number.
2011-06-18 15:16:35 +03:00
7773e68c2a
farmesh is now usable.
2011-06-18 12:42:17 +03:00
6b1f059ccd
modified iron amount a bit
2011-06-17 23:43:28 +03:00
682c9d8e7d
Moved stuff from mapblock{h,cpp} to mapblock_mesh.{h,cpp} and content_mapblock.{h,cpp}
2011-06-17 23:20:31 +03:00
dc5319b6c9
Moved some mapnode content stuff from mapnode.{h,cpp} and digging property stuff from material.cpp to content_mapnode.{h,cpp}
2011-06-17 22:20:15 +03:00
1d372b9273
Probably fixed the single-MapBlock generator using 1 block lower water height than it should
2011-06-16 18:51:23 +03:00
9b565b6bc4
tried to reduce unnecessary map saving disk i/o a bit
2011-06-05 18:57:36 +03:00
a649d43fe7
Messed around with genmap.py. Now supports format version 17.
2011-06-05 00:10:06 +03:00
223b379348
Reduced the CPU usage of the sent block selector algorithm
2011-05-31 00:15:43 +03:00
Perttu Ahola
Mark Holmquist
darkrose
Kahrl
JacobF
Giuseppe Bilotta
Nils Dagsson Moskopp
Felix Krause