Perttu Ahola
f1d9880006
Clean up log messages everywhere
2012-03-11 04:15:45 +02:00
Kahrl
02b334a679
Create node metadata when placing nodes again
2012-01-22 17:31:20 +02:00
Kahrl
157a4cf18c
Node placement / mineral / serialization / iron freq / node_dig callback
...
- Node placement code moved to Lua
- Mineral system removed (added default:stone_with_coal and default:stone_with_iron).
- MapBlock and MapNode serialization updated.
- Mapgen: Frequency of iron increased.
- node_dig callback and related changes.
2012-01-22 17:24:50 +02:00
Perttu Ahola
cd030639a4
Print debug stacks to infostream rather than errorstream when placing CONTENT_IGNORE
2011-11-29 21:05:36 +02:00
Perttu Ahola
be2ecf9186
Quick fix to a bug that makes it possible to raise water levels everywhere with one source
2011-11-29 19:13:59 +02:00
Perttu Ahola
705f142b8d
GenericNodeMetadata and an example furnace
2011-11-29 19:13:57 +02:00
Perttu Ahola
842eb5da28
Replace old active block random node modifying things with actual ActiveBlockModifiers
2011-11-29 19:13:56 +02:00
Perttu Ahola
ec4f58741b
Fix a random commented-out piece of lighting code, altough it doesn't work any better
2011-11-29 19:13:55 +02:00
Perttu Ahola
b2ccbdffc1
Make map generator as much threaded as possible (not much benefit with current generator because of small generator chunk size (a single MapBlock))
2011-11-29 19:13:54 +02:00
Perttu Ahola
651657edfd
Print out number of blocks in memory at unload
2011-11-29 19:13:51 +02:00
Perttu Ahola
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
Perttu Ahola
e5650bb549
Make liquid_alternative_* to be strings
2011-11-29 19:13:51 +02:00
Perttu Ahola
6a8f9135de
Store metadata as metadata name in node definition
2011-11-29 19:13:51 +02:00
Perttu Ahola
941176cd65
Default to saving stuff more often to minimize lag caused by a single save
2011-11-29 19:13:50 +02:00
Perttu Ahola
251b015210
Don't print 'Blocks modified by: ' in Map::timerUpdate if no blocks were written
2011-11-29 19:13:50 +02:00
Perttu Ahola
616bad96af
Don't print all block saves to verbosestream; rather print counts of distinct modifiers
2011-11-29 19:13:49 +02:00
Perttu Ahola
1b765b9740
Add reason parameter to setModified and print it out to verbosestream when saving block
2011-11-29 19:13:49 +02:00
Perttu Ahola
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
Perttu Ahola
c0f6395cf0
Node definition names
2011-11-29 19:13:46 +02:00
Perttu Ahola
f107967fdc
Remove node content-dependent stuff from map.cpp
2011-11-29 19:13:46 +02:00
Perttu Ahola
c6fd2986d4
GameDef compiles
2011-11-29 19:13:42 +02:00
Perttu Ahola
abceeee92f
Create framework for getting rid of global definitions of node/tool/item/whatever types
2011-11-29 19:13:41 +02:00
Perttu Ahola
3b77a63d5d
Allocate MapBlock::m_node_metadata on heap to allow less header bloat
2011-11-29 19:13:41 +02:00
Perttu Ahola
64996422c0
Move ContentFeatures to mapnode_contentfeatures.{h,cpp} and clean stuff
2011-11-29 19:13:40 +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
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
4b6138e69b
Improve Connection with threading and some kind of congestion control
2011-10-20 23:04:09 +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
4e1055543c
Tune map rendering and related diagnostics
2011-10-18 19:18:01 +03:00
Perttu Ahola
78f4142f4f
Add /clearobjects
2011-10-18 00:01:50 +03:00
Perttu Ahola
5037efdea9
Add some rendering statistics to profiler
2011-10-17 17:06:28 +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
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
9e46cbf7ea
Header file tweaking; mainly for speed
2011-10-12 13:53:38 +03:00
Perttu Ahola
a7833cca22
Merge remote-tracking branch 'marktraceur/master'
2011-09-26 22:41:06 +03:00
Perttu Ahola
061d4b4202
Merge branch 'view_bobbing_and_vielded_tool'
2011-09-26 15:10:02 +03: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
darkrose
582e450bad
added locking chests - clean patch
2011-09-22 19:11:48 +10:00
Kahrl
e4cb004460
trying something else... also replaced M_PI by PI everywhere
2011-09-08 16:10:44 +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
Perttu Ahola
5c1074aa7d
Remove block file from disk when saved to database
2011-09-06 20:28:45 +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
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
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
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
6596e585fe
Flowing lava updates lighting
2011-08-22 13:19:07 +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
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
Giuseppe Bilotta
59c58f230e
Some obvious errors in the new fluid flow management
2011-08-05 08:45:15 +02:00
Perttu Ahola
0b37f98e16
* fix for broken water
2011-08-03 19:00:25 +02:00
Nils Dagsson Moskopp
4ef9c7675a
Merge remote-tracking branch 'origin/upstream'
2011-07-30 18:55:43 +02:00
Perttu Ahola
20fa7412c8
and now fixed a bug in removing that debug output
2011-07-24 12:13:51 +03:00
Perttu Ahola
d099165271
removed a remaining debug print
2011-07-24 12:12:55 +03:00
Perttu Ahola
29d905f98a
Added a mapblock analyzing function for debugging use and fixed remaining mapgen bugs
2011-07-24 12:09:33 +03:00
Perttu Ahola
112b85d0fb
merged fix to decapitated trees; other bugs now exists
2011-07-24 11:39:13 +03:00
Perttu Ahola
2587bb361c
merged the content type extension and delta
2011-07-23 19:04:37 +03:00
Perttu Ahola
90d793f8f3
extended content-type range
2011-07-23 16:55:26 +03:00
Perttu Ahola
976ec31c1f
switched to old transformLiquids, new one is not ready
2011-07-23 16:46:34 +03:00
Perttu Ahola
3882536d40
merged some stuff from upstream while merging delta
2011-07-23 15:46:00 +03:00
Nils Dagsson Moskopp
805ccd449f
Merge branch 'upstream/master'
2011-07-22 20:16:58 +02:00
Perttu Ahola
fe855e004f
Fixed new map generator causing a crash when generating at map limit
2011-07-22 01:37:05 +03:00
Perttu Ahola
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
Nils Dagsson Moskopp
9bc701d194
Merge branch 'upstream/master'
2011-07-20 14:20:07 +02:00
Nils Dagsson Moskopp
57fcfb2b0d
* initialize liquid_kind properly so compiler does not bitch about it
2011-07-19 02:02:50 +02:00
Felix Krause
466f9d87b6
final fixes to liquid flow, works now as intended
2011-07-18 02:38:57 +02:00
Felix Krause
b7862805c8
fixes to liquid transformation
2011-07-18 02:38:48 +02:00
Felix Krause
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
Felix Krause
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
Perttu Ahola
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
Nils Dagsson Moskopp
3560f0de08
Merge branch 'upstream/master'
...
Conflicts:
data/oerkki1.png
src/client.cpp
2011-07-14 22:43:28 +02:00
Nils Dagsson Moskopp
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
Perttu Ahola
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
Perttu Ahola
282912caa0
tried to fix block selection in map rendering a bit
2011-06-27 09:50:34 +03:00
Perttu Ahola
dd22ea051a
map unloading is now a whole lot better
2011-06-27 00:27:17 +03:00
Perttu Ahola
3fccc67eb7
fixed block unloading from memory (a better fix coming next)
2011-06-26 21:53:11 +03:00
Perttu Ahola
d3d369a63b
reorganized stuff
2011-06-26 18:51:57 +03:00
Perttu Ahola
91cfbe2891
reorganized a lot of stuff and modified mapgen and objects slightly while doing it
2011-06-26 15:48:56 +03:00
Perttu Ahola
bb940a946d
even more code refactoring
2011-06-26 02:34:36 +03:00
Perttu Ahola
2915bd5518
more reorganizing of map code
2011-06-26 01:31:43 +03:00
Perttu Ahola
cb130d9158
cleaned map stuff
2011-06-26 00:03:58 +03:00
Perttu Ahola
a80025c352
moved mapgen stuff around abit
2011-06-25 18:35:32 +03:00
Perttu Ahola
f2c26e2014
moved map generator to separate source files
2011-06-25 18:12:41 +03:00
Perttu Ahola
aed9e809a1
mapgen stuff
2011-06-25 16:32:09 +03:00
Perttu Ahola
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
Perttu Ahola
5ac900ddd9
Changed MapBlockObjects to be never written anymore. Incremented version number.
2011-06-18 15:16:35 +03:00
Perttu Ahola
7773e68c2a
farmesh is now usable.
2011-06-18 12:42:17 +03:00
Perttu Ahola
6b1f059ccd
modified iron amount a bit
2011-06-17 23:43:28 +03:00
Perttu Ahola
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
Perttu Ahola
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
Perttu Ahola
1d372b9273
Probably fixed the single-MapBlock generator using 1 block lower water height than it should
2011-06-16 18:51:23 +03:00
Perttu Ahola
9b565b6bc4
tried to reduce unnecessary map saving disk i/o a bit
2011-06-05 18:57:36 +03:00
Perttu Ahola
a649d43fe7
Messed around with genmap.py. Now supports format version 17.
2011-06-05 00:10:06 +03:00
Perttu Ahola
223b379348
Reduced the CPU usage of the sent block selector algorithm
2011-05-31 00:15:43 +03:00
Perttu Ahola
ab02f0aa1b
Added a check that avoids server crash (unhandled exception) when map generation is attempted near limit
2011-05-24 20:03:19 +03:00
Perttu Ahola
e0329a3cae
mud placed in sunlight no longer instantly turns to grass; also tuned transforming speed a bit (will be made a lot longer when testing is complete)
2011-05-22 17:25:52 +03:00
Perttu Ahola
0af5311538
Preliminary "active block" stuff + set up test code to grow grass.
2011-05-22 17:00:09 +03:00
Ciaran Gultnieks
e09fec3373
New map directory structure that avoids map size being limited by filesystem
2011-05-18 16:48:27 +01:00
Ciaran Gultnieks
29932d4bdd
Get rid of all the string format warnings caused by the DSTACK macro
2011-05-16 21:47:50 +01:00
Perttu Ahola
821d5bb4cc
Hopefully fixed the bug of huge mineral deposits rarely in seafloor sand
2011-05-03 17:33:13 +03:00
Perttu Ahola
9c72d44fe7
random comment updates
2011-04-30 02:12:32 +03:00
Perttu Ahola
8377b5f2a6
Changed a bit of the code that is and should still be commented out.
2011-04-27 00:14:16 +03:00
Perttu Ahola
36d299ce58
forgot to change one thing back
2011-04-26 16:22:00 +03:00
Perttu Ahola
ffb1128951
tested out and commented out some new stuff for the terrain generator, to be used in the future.
2011-04-26 15:38:42 +03:00
Perttu Ahola
664eb4f7c5
A small fix to unnecessary saving of map metadata
2011-04-26 01:13:30 +03:00
Perttu Ahola
2830095366
Optimized map saving and sending (server-side)
2011-04-26 00:23:38 +03:00
Perttu Ahola
c9967d6d07
updated menu a bit, and some other small fixes
2011-04-24 15:37:41 +03:00
Perttu Ahola
c638442e78
Some work-in-progress in hp and mobs and a frightening amount of random fixes.
2011-04-21 19:35:17 +03:00
Perttu Ahola
81ac026e1f
updated example map generator python script
2011-04-11 18:33:05 +03:00
Perttu Ahola
9d4e9c59de
fixed warnings reported by cppcheck
2011-04-11 11:36:13 +03:00
Perttu Ahola
032882ae05
hopefully fixed a bit more
2011-04-11 00:24:32 +03:00
Perttu Ahola
3236032101
improved old map support
2011-04-11 00:19:40 +03:00
Perttu Ahola
dc6966cb9d
added ignoring of map_meta.txt to better support old maps
2011-04-11 00:06:07 +03:00
Perttu Ahola
b0b5c43254
better support for old maps
2011-04-10 22:50:31 +03:00
Perttu Ahola
3d25fe42f3
missing include for server build
2011-04-10 20:53:39 +03:00
Perttu Ahola
10eedbc1d2
Map generation is now properly threaded and doesn't block block placement and other stuff.
2011-04-10 20:18:34 +03:00
Perttu Ahola
6fa85c8502
a commit before starting to reorganize the map loading/generation logic
2011-04-10 19:12:56 +03:00
Perttu Ahola
7aa2d4d109
new-style rats are now generated in the map
2011-04-10 16:20:31 +03:00
Perttu Ahola
fd7a0735c9
new object system
2011-04-10 04:15:10 +03:00
Perttu Ahola
89aa8b9be1
Furnace is now usable. Added more tools.
...
--HG--
rename : data/tool_stpick.png => data/tool_stonepick.png
rename : data/tool_wpick.png => data/tool_woodpick.png
2011-04-05 18:23:30 +03:00
Perttu Ahola
d1d57cf5c3
initial workings of the furnace
2011-04-05 02:56:29 +03:00
Perttu Ahola
389fe31ace
changed node metadata format to better accomodate future needs and problems
2011-04-05 00:24:47 +03:00
Perttu Ahola
fa08294d09
Node metadata framework
2011-04-04 03:45:08 +03:00
Perttu Ahola
2f466726e6
Made a proper queued thread to client for handling some block mesh updates. Also made client mutex-free to allow easier adding of new stuff.
2011-04-04 02:05:12 +03:00
Perttu Ahola
e0f7bd4d57
Modified block mesh generation to have clearer input and output. Instead of being a messy object oriented cludge, it now is a messy cludge with separate parameters.
2011-04-03 19:50:54 +03:00
Perttu Ahola
01c2b003e1
commit before some more radical changes
2011-04-03 16:21:06 +03:00
Perttu Ahola
06eb0ad4d0
copied draft of updateNodeMeshes from backup
2011-04-03 12:48:20 +03:00
Perttu Ahola
ee89e29ae1
Revert mapgen to best working version (2)
2011-04-03 12:14:23 +03:00
Perttu Ahola
bc66bb2d40
Mapgen is better now. Not a lot, but a bit!
2011-04-02 20:55:22 +03:00
Perttu Ahola
2990f5d90b
commit before some radical changes
2011-04-02 13:44:06 +03:00
Perttu Ahola
2e7b15fed3
mapgen work-in-progress
2011-03-02 02:00:11 +02:00
Perttu Ahola
9a22d02903
mapgen tweaking
2011-03-01 01:32:54 +02:00
Perttu Ahola
f923c1fb66
tweaked mapgen
2011-02-28 21:12:01 +02:00
Perttu Ahola
231386d501
tweaked mapgen
2011-02-28 14:51:57 +02:00
Perttu Ahola
ad9e084e94
added trees (very glitchy) and changed grass texture
2011-02-28 02:48:31 +02:00
