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
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
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
0af5311538
Preliminary "active block" stuff + set up test code to grow grass.
2011-05-22 17:00:09 +03:00
e09fec3373
New map directory structure that avoids map size being limited by filesystem
2011-05-18 16:48:27 +01:00
29932d4bdd
Get rid of all the string format warnings caused by the DSTACK macro
2011-05-16 21:47:50 +01:00
821d5bb4cc
Hopefully fixed the bug of huge mineral deposits rarely in seafloor sand
2011-05-03 17:33:13 +03:00
9c72d44fe7
random comment updates
2011-04-30 02:12:32 +03:00
8377b5f2a6
Changed a bit of the code that is and should still be commented out.
2011-04-27 00:14:16 +03:00
36d299ce58
forgot to change one thing back
2011-04-26 16:22:00 +03:00
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
664eb4f7c5
A small fix to unnecessary saving of map metadata
2011-04-26 01:13:30 +03:00
2830095366
Optimized map saving and sending (server-side)
2011-04-26 00:23:38 +03:00
c9967d6d07
updated menu a bit, and some other small fixes
2011-04-24 15:37:41 +03:00
c638442e78
Some work-in-progress in hp and mobs and a frightening amount of random fixes.
2011-04-21 19:35:17 +03:00
81ac026e1f
updated example map generator python script
2011-04-11 18:33:05 +03:00
9d4e9c59de
fixed warnings reported by cppcheck
2011-04-11 11:36:13 +03:00
032882ae05
hopefully fixed a bit more
2011-04-11 00:24:32 +03:00
3236032101
improved old map support
2011-04-11 00:19:40 +03:00
dc6966cb9d
added ignoring of map_meta.txt to better support old maps
2011-04-11 00:06:07 +03:00
b0b5c43254
better support for old maps
2011-04-10 22:50:31 +03:00
3d25fe42f3
missing include for server build
2011-04-10 20:53:39 +03:00
10eedbc1d2
Map generation is now properly threaded and doesn't block block placement and other stuff.
2011-04-10 20:18:34 +03:00
6fa85c8502
a commit before starting to reorganize the map loading/generation logic
2011-04-10 19:12:56 +03:00
7aa2d4d109
new-style rats are now generated in the map
2011-04-10 16:20:31 +03:00
fd7a0735c9
new object system
2011-04-10 04:15:10 +03:00
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
d1d57cf5c3
initial workings of the furnace
2011-04-05 02:56:29 +03:00
389fe31ace
changed node metadata format to better accomodate future needs and problems
2011-04-05 00:24:47 +03:00
fa08294d09
Node metadata framework
2011-04-04 03:45:08 +03:00
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
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
01c2b003e1
commit before some more radical changes
2011-04-03 16:21:06 +03:00
06eb0ad4d0
copied draft of updateNodeMeshes from backup
2011-04-03 12:48:20 +03:00
ee89e29ae1
Revert mapgen to best working version (2)
2011-04-03 12:14:23 +03:00
bc66bb2d40
Mapgen is better now. Not a lot, but a bit!
2011-04-02 20:55:22 +03:00
2990f5d90b
commit before some radical changes
2011-04-02 13:44:06 +03:00
2e7b15fed3
mapgen work-in-progress
2011-03-02 02:00:11 +02:00
9a22d02903
mapgen tweaking
2011-03-01 01:32:54 +02:00
f923c1fb66
tweaked mapgen
2011-02-28 21:12:01 +02:00
231386d501
tweaked mapgen
2011-02-28 14:51:57 +02:00
ad9e084e94
added trees (very glitchy) and changed grass texture
2011-02-28 02:48:31 +02:00
c8be58a65c
A third try on terrain generation. No trees yet.
2011-02-28 02:01:40 +02:00
9778347c7f
mainly work on object scripting api
2011-02-23 02:49:57 +02:00
c57637b4c3
Temporary commit; lots of test code and stuff
2011-02-21 00:45:14 +02:00
741776313a
fixed invalid block loading (the action is to generate a new one)
2011-02-16 22:53:35 +02:00
92432a28c0
small fixes: crack texture, server build on windows, configuration file example, adding config file example to install
2011-02-16 20:03:31 +02:00
be7391c2b1
mud gets now grass onto it when placed into sunlight. also removed three old files
2011-02-15 12:33:59 +02:00
2684e620b5
server now won't crash when it is tries to generate blocks that are not inside MAP_GENERATION_LIMIT
2011-02-15 01:02:31 +02:00
467f43d47c
Some fiddling around with fog... not much changed
2011-02-14 16:13:03 +02:00
b1defb4def
fixed bug in sneaking
2011-02-14 11:43:42 +02:00
14fafc7217
added sneaking/crouching and changelog
2011-02-14 02:54:15 +02:00
80a2ee6d59
mapgen parameter tweaking
2011-02-13 15:25:00 +02:00
21372749f5
now it works nicely
2011-02-11 20:37:54 +02:00
52d99fef31
fully working i guess
2011-02-11 19:55:42 +02:00
1704badc30
work-in-progress texture atlas optimization
2011-02-10 02:13:03 +02:00
15f27a1937
made it to work with my windows compiler
2011-02-08 10:11:26 +02:00
dd9e82f5bc
bug-fixin'
2011-02-08 01:12:55 +02:00
25a7fabed8
mapgen tweaking
2011-02-06 16:35:27 +02:00
ea6740e900
mapgen stuff
2011-02-05 14:55:16 +02:00
7f2aa30bf2
added sand to map generator
2011-02-04 14:32:30 +02:00
6545ea12e9
nicer looking water
2011-02-04 01:48:52 +02:00
102c5e31fe
all kinds of tweaking and fixing
2011-02-04 01:22:07 +02:00
71dbee43d0
some generation-time mud flow tweaking
2011-02-03 13:48:17 +02:00
9b1b57a523
some tweaking
2011-02-02 18:46:14 +02:00
a75876f248
more tweaking
2011-02-02 09:28:46 +02:00
a5f109dafb
Map generator tweaking. Still doesn't resume from save properly.
2011-02-01 23:59:46 +02:00
3d6e71a7d0
end-of-day.
2011-02-01 20:28:21 +02:00
6834b39c96
tweaking mapgenv2 settings for maximum awesomeness.
2011-02-01 17:42:39 +02:00
e92238edc8
This map generator is starting to look pretty good now... also, disabled loading player position from disk because map is regenerated always.
2011-02-01 16:17:55 +02:00
6e196c2ce4
partly working chunk-based map generator (doesn't save properly, spawn is pretty random)
2011-02-01 03:06:02 +02:00
be851871cd
map generation framework under development... not quite operational at this point.
2011-01-30 01:44:54 +02:00
9f882bf74d
Reworked texture, material, mineral and whatever handling
2011-01-26 00:41:06 +02:00
d3a6a12bae
removed alternative name "pressure" from param2
2011-01-25 09:53:21 +02:00
3909e712a0
Faster lighting at map generation time
2011-01-24 16:36:58 +02:00
24e41ab4c8
Mainly some texture tweaking
2011-01-24 13:32:11 +02:00
4a952f22d7
small fixes here and there
2011-01-24 01:58:15 +02:00
c914cbb0a0
OMG! Main Menu!
2011-01-23 17:29:15 +02:00
7dc6b03f31
.
2011-01-17 21:18:08 +02:00
d44abdab17
minecraft-style water done (but no texture animation or sound)
2011-01-17 21:15:31 +02:00
0fa0e0752a
old water removed, some fixes here and there
2011-01-17 14:57:37 +02:00
3891bc43e0
fine-tuning of map generator and server and stuff.
2011-01-17 02:40:53 +02:00
7068bc90af
Initial commit of mapgen v.2. Lacks configuration and saving to disk.
2011-01-16 19:32:14 +02:00
a176f9eb36
generate-time lighting optimization
2011-01-15 13:50:13 +02:00
cfaa15895a
tweaking around, including mapgen, player speed in water, settings
2011-01-15 01:26:29 +02:00
eb476f1ce2
Lots of small stuff
2011-01-08 19:35:14 +02:00
426c206d7e
Made dungeons a bit rarer
2011-01-08 14:08:48 +02:00
bcd9813acc
tuned expired mesh updating while drawing a bit
2010-12-29 18:14:14 +02:00
6d4cd2ea1a
A bit longer day and a bit shorter night. Client-side.
2010-12-29 15:26:47 +02:00
847a4227b8
better grass generation (integration to sunlight propagation algorithms)
2010-12-26 14:34:34 +02:00
c32da52104
working good
2010-12-26 13:51:56 +02:00
4ba5cd580d
drawing range updater update and myrand() (but not usage of it)
2010-12-26 13:33:20 +02:00
582af0cb21
new viewing range updater algorithm
2010-12-26 03:58:19 +02:00
822621f792
some... stuff. dunno. 8-)
2010-12-25 23:23:53 +02:00
07a759fdb8
better caves
2010-12-25 16:04:51 +02:00
705de63dcd
ProgressBarTextureMod
2010-12-24 11:44:26 +02:00
58ccc68c81
server starting on port 0 on invalid settings
2010-12-22 17:58:02 +02:00
3de176cc58
crafting system!
2010-12-22 16:30:23 +02:00
b94a007864
some work-in-progress
2010-12-22 03:33:58 +02:00
3f5bad938a
organizing stuff.
2010-12-21 18:08:24 +02:00
3b0bff2f74
Cracking blocks while digging
2010-12-21 02:25:47 +02:00
Giuseppe Bilotta
Perttu Ahola
Nils Dagsson Moskopp
Felix Krause
Ciaran Gultnieks