Nils Dagsson Moskopp
4d20f1283f
* fix automerge regression
2011-07-15 20:16:02 +02:00
Nils Dagsson Moskopp
2c5617709d
* regression fix, clay occurs again now
2011-07-15 06:37:47 +02:00
Nils Dagsson Moskopp
0a38e542c1
* regression fix, clay occurs again now
2011-07-15 06:37:47 +02:00
Nils Dagsson Moskopp
287b735224
* possibly nicer trees
2011-07-15 02:23:41 +02:00
Nils Dagsson Moskopp
96f551a287
* possibly nicer trees
2011-07-15 02:23:41 +02: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
af05e4b2de
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
Nils Dagsson Moskopp
4415d95c50
* 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
Nils Dagsson Moskopp
5383aa847f
* possible fix for large cubic holes in map
2011-07-13 23:12:18 +02:00
Nils Dagsson Moskopp
1cdf210e4f
* possible fix for large cubic holes in map
2011-07-13 23:12:18 +02:00
Nils Dagsson Moskopp
b96450b586
* slightly different values for 3d perlin noise
2011-07-13 23:10:41 +02:00
Nils Dagsson Moskopp
b0ad5ce8e2
* slightly different values for 3d perlin noise
2011-07-13 23:10:41 +02:00
Nils Dagsson Moskopp
a676493f46
* regression fix, papyrus should appear again now
2011-07-13 16:21:20 +02:00
Nils Dagsson Moskopp
b2447393e4
* regression fix, papyrus should appear again now
2011-07-13 16:21:20 +02:00
Jiří Procházka
692bd66011
+ farmesh config options
2011-07-11 15:01:43 +02:00
Jiří Procházka
858b2d7439
+ farmesh config options
2011-07-11 15:01:43 +02:00
Perttu Ahola
8f742855a1
initial steps in doing content type extension
2011-07-02 01:07:54 +03:00
Perttu Ahola
7b290660ea
made screen go slightly blue when underwater
2011-07-01 21:25:31 +03: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
ccf5eae751
fixed bug in inventory textures caused from better handling of unknown blocks
2011-06-27 08:46:54 +03:00
Perttu Ahola
3e40235ce2
updated minetest.conf.example and changed client_unload_unused_data_timeout default to 600
2011-06-27 08:36:37 +03:00
Perttu Ahola
ab0cc1bb47
better handling of unknown blocks on client
2011-06-27 07:30:02 +03:00
Perttu Ahola
cf9a1f0109
updated to-do list
2011-06-27 06:52:20 +03:00
Perttu Ahola
d09f9c0d1d
made dtime jitter compare value and fps calculation a bit faster changing
2011-06-27 00:29:17 +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
d702a2c33b
Made the initial loading screen slightly more alive
2011-06-26 20:00:04 +03:00
Perttu Ahola
7e59938c54
added screenshot key F12 (from spongie)
2011-06-26 19:33:40 +03:00
Perttu Ahola
5e3deed672
Added CPT_FACEDIR_SIMPLE calculation, finally, as figured out by spongie
2011-06-26 19:23:44 +03:00
Perttu Ahola
97840e93b5
changed one "if" to "else if" in content_mapblock.cpp
2011-06-26 19:23:05 +03:00
Perttu Ahola
d3d369a63b
reorganized stuff
2011-06-26 18:51:57 +03:00
Perttu Ahola
af6860f6f4
tuned mapgen
2011-06-26 18:51:35 +03:00
Perttu Ahola
d3a5eac22c
changed water color in farmesh
2011-06-26 18:50:43 +03:00
Perttu Ahola
2bd2bdff08
updated noise stuff
2011-06-26 18:50:13 +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
3b098fd5dc
improved player fall damage detection
2011-06-26 15:45:13 +03:00
Sebastian Rühl
7efe89ff58
backported cactus, papyrus and clay
2011-06-26 13:47:21 +02:00
Sebastian Rühl
13cf5425db
backported cactus, papyrus and clay
2011-06-26 13:47:21 +02:00
Sebastian Rühl
4f44cabe1c
small fix
2011-06-26 12:52:03 +02:00
Sebastian Rühl
fb6ac9a1a6
small fix
2011-06-26 12:52:03 +02:00
Sebastian Rühl
9d09103e48
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
...
Conflicts:
.gitignore
CMakeLists.txt
data/heart.png
src/CMakeLists.txt
src/game.cpp
src/guiMainMenu.cpp
src/inventory.cpp
src/map.cpp
src/mapblock.cpp
src/mapnode.cpp
src/mapnode.h
src/materials.cpp
src/server.cpp
Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
2011-06-26 12:24:32 +02:00
Sebastian Rühl
033ae0dcae
Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git into upstream_merge
...
Conflicts:
.gitignore
CMakeLists.txt
data/heart.png
src/CMakeLists.txt
src/game.cpp
src/guiMainMenu.cpp
src/inventory.cpp
src/map.cpp
src/mapblock.cpp
src/mapnode.cpp
src/mapnode.h
src/materials.cpp
src/server.cpp
Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
2011-06-26 12:24:32 +02:00
Perttu Ahola
c1ceabef71
added and commented out some debug output
2011-06-26 03:14:52 +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
e8a731adc5
added correct data to new images, added comments in main.cpp
2011-06-25 04:41:38 +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
30c34cc23e
disabled farmesh in default settings
2011-06-23 14:10:46 +03:00
Perttu Ahola
c1844a921d
fixed servermain.cpp lacking filesys.h
2011-06-22 14:21:55 +03:00
Perttu Ahola
051c0048d8
path_userdata is now created before potentially creating debug.txt in there
2011-06-20 18:04:49 +03:00
Perttu Ahola
bdd1375011
moved the mac include in porting.cpp out of namespace
2011-06-20 07:56:45 +03:00
Perttu Ahola
748340fad5
fixed a segfault in case of wrong input from network on the server (reported by spongie)
2011-06-19 19:40:41 +03:00
Perttu Ahola
02006a9540
Modified the mesh update thread's sleep time to speed it up (it was way too high)
2011-06-18 22:31:24 +03:00
Perttu Ahola
28a8218adf
Documentation update
2011-06-18 20:16:11 +03:00
Perttu Ahola
5d1ae85ab9
Hand-picked Mac OSX cursor and bundle path fixes from https://bitbucket.org/toabi/minetest-mac
2011-06-18 18:44:01 +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
c7ab4f15a5
comment update
2011-06-18 13:52:49 +03:00
Perttu Ahola
c78d610618
farmesh render range is now dynamic
2011-06-18 13:43:49 +03:00
Perttu Ahola
7d0395ba36
fixed tree placement in farmesh
2011-06-18 13:11:11 +03:00
Perttu Ahola
7773e68c2a
farmesh is now usable.
2011-06-18 12:42:17 +03:00
Perttu Ahola
0bd1b782d0
modified health bar a bit
2011-06-18 09:04:31 +03:00
Perttu Ahola
4a6e6cee20
enabled word wrap in chat
2011-06-18 08:50:14 +03:00
Perttu Ahola
a4cceb93ec
fixed wrong furnace menu layout
2011-06-18 08:50:05 +03:00
Perttu Ahola
534287892d
merged Mac OSX build fix from minetest-delta
2011-06-18 03:14:13 +03:00
Perttu Ahola
c391bcee16
removed furnace menu because it is not needed anymore
2011-06-18 02:32:34 +03:00
Perttu Ahola
cced6aaf8d
separated inventory-related game content to content_inventory.{h,cpp}
2011-06-18 02:30:33 +03:00
Perttu Ahola
a23f6a1548
forgot to add mapblock_nodemod.h
2011-06-18 02:01:51 +03:00
Perttu Ahola
931474658d
moved inventory menu definition of chest and furnace to content_nodemeta.{h,cpp}
2011-06-18 02:00:01 +03:00
Perttu Ahola
da692355e8
Created and moved stuff to content_nodemeta.{h,cpp}
2011-06-18 00:46:50 +03:00
Perttu Ahola
e7580d2804
added in-game key shortcuts for toggling free_move and fast_move (default K and J)
2011-06-17 23:55:21 +03:00
Perttu Ahola
6b1f059ccd
modified iron amount a bit
2011-06-17 23:43:28 +03:00
Perttu Ahola
6378a71ea5
Updated comments
2011-06-17 23:28:25 +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
d6b54514bf
hopefully fixed old furnaces taking ridiculous amounts of cpu and halting the server
2011-06-16 19:43:28 +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
Nils Dagsson Moskopp
158b054e72
+ rail block bounding box
2011-06-08 05:27:55 +02:00
Nils Dagsson Moskopp
e261cc9e8f
+ rail block bounding box
2011-06-08 05:27:55 +02:00
Perttu Ahola
72e742c24e
Added an experimental "far view" thing. Doesn't work exactly like it should and not suitable for real use yet, and might never be.
2011-06-07 22:08:16 +03:00
Nils Dagsson Moskopp
3be6891938
+ rail
2011-06-07 19:24:30 +02:00
Nils Dagsson Moskopp
51d308c666
+ rail
2011-06-07 19:24:30 +02:00
Perttu Ahola
fdee31abf1
...and the map part of that
2011-06-05 21:07:54 +03:00
Perttu Ahola
c68f21214d
made server to send map seed for testing
2011-06-05 21:06:54 +03:00
Perttu Ahola
d2a145b826
updated comment in main.cpp
2011-06-05 18:59:36 +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
6bd4cb2562
documentation update (mapformat.txt mainly)
2011-06-04 16:54:26 +03:00
Nils Dagsson Moskopp
f625a22e01
* point out setInventoryTextureCube() is broken with a FIXME
2011-06-03 13:13:31 +02:00
Nils Dagsson Moskopp
c3cd89705d
* point out setInventoryTextureCube() is broken with a FIXME
2011-06-03 13:13:31 +02:00
Nils Dagsson Moskopp
8835433b5e
+ paper, book, bookshelf
2011-06-03 13:12:56 +02:00
Nils Dagsson Moskopp
1bd25925cb
+ paper, book, bookshelf
2011-06-03 13:12:56 +02:00
Nils Dagsson Moskopp
ccc0420c52
+ papyrus
2011-06-03 00:55:28 +02:00
Nils Dagsson Moskopp
3bb1cfdf36
+ papyrus
2011-06-03 00:55:28 +02:00
Perttu Ahola
bf22dba687
removed a debug print that would flood a lot in some kind of a timeout
2011-06-02 20:09:30 +03:00
Perttu Ahola
1b8cff8fbf
In a globally installed build, debug.txt is now placed in userdata directory. Needs testing still.
2011-06-02 19:30:03 +03:00
Perttu Ahola
fd64dd5e20
added -Wno-unused-but-set-variable to debug build
2011-06-02 02:59:30 +03:00
Perttu Ahola
75f3e68451
Merged CiaranG's fence graphic updates (ugh, well, it worked, i guess, kind of.) This commit should also get rid of multiple heads on the server.
2011-06-02 02:37:49 +03:00
Perttu Ahola
7d57b71ffe
0.2.20110602_0
2011-06-02 00:15:42 +03:00
Perttu Ahola
51cf464f74
Fixed the password crash on Windows
2011-06-02 00:01:11 +03:00
teddydestodes
6434f64ab4
added new submenu for key assignment
...
configwriting/saving isn't complete and will break your config if you use fancy keys
2011-06-01 19:44:07 +02:00
teddydestodes
58bc6f3a18
added new submenu for key assignment
...
configwriting/saving isn't complete and will break your config if you use fancy keys
2011-06-01 19:44:07 +02:00
teddydestodes
9b6b4b65f8
Merge remote-tracking branch 'bucket-t/master'
2011-06-01 14:43:27 +02:00
teddydestodes
09d7654f46
Merge remote-tracking branch 'bucket-t/master'
2011-06-01 14:43:27 +02:00
MrLoom
2f2f28d398
MacOSX build support
2011-06-01 14:13:22 +02:00
MrLoom
28234f6e54
MacOSX build support
2011-06-01 14:13:22 +02:00
teddydestodes
4ddf2bc8a2
Merge remote-tracking branch 'upstream/master'
2011-06-01 14:11:52 +02:00
teddydestodes
63fe487d93
Merge remote-tracking branch 'upstream/master'
2011-06-01 14:11:52 +02:00
Nils Dagsson Moskopp
9de57d13bc
* improved fence dimensions (cuboid side lengths now multiples of 2, textures should fit better)
2011-06-01 20:06:16 +08:00
Nils Dagsson Moskopp
d2b2c7c09e
* improved fence dimensions (cuboid side lengths now multiples of 2, textures should fit better)
2011-06-01 20:06:16 +08:00
Nils Dagsson Moskopp
5f52a622b6
* clay is rarer now
2011-06-01 08:09:28 +02:00
Nils Dagsson Moskopp
c930a92b72
* clay is rarer now
2011-06-01 08:09:28 +02:00
Nils Dagsson Moskopp
ba1460a582
+ clay and associated items
2011-06-01 04:57:46 +02:00
Nils Dagsson Moskopp
cffd40c5d6
+ clay and associated items
2011-06-01 04:57:46 +02:00
Nils Dagsson Moskopp
d7b768dc4b
+ brick
2011-05-31 22:04:09 +02:00
Nils Dagsson Moskopp
fb78854e9b
+ brick
2011-05-31 22:04:09 +02:00
Perttu Ahola
bbead93c1a
Reduced server CPU usage on NodeMetadata step()s. Also furnace now cooks while no players are near it.
2011-05-31 20:02:55 +03:00
Ciaran Gultnieks
06427e355a
Slightly better texture coordinates for fences
2011-05-31 10:12:51 +01:00
celeron55
7740425085
Updated licenses of CiaranG's contributions to be in line with the new contribution policy and added a TODO note to server.cpp
2011-05-31 11:59:51 +03:00
Nils Dagsson Moskopp
6ca51de990
+ fence inventory icon
2011-05-31 03:54:39 +02:00
Nils Dagsson Moskopp
6c3ca42e0e
+ fence inventory icon
2011-05-31 03:54:39 +02:00
Nils Dagsson Moskopp
b461213ddb
* improved fence dimensions (cuboid side lengths now multiples of 2, textures should fit better)
2011-05-31 02:56:23 +02:00
Nils Dagsson Moskopp
0f4c83eb98
* improved fence dimensions (cuboid side lengths now multiples of 2, textures should fit better)
2011-05-31 02:56:23 +02:00
Perttu Ahola
63ae3d7387
forgot to add profiler to servermain.cpp
2011-05-31 00:26:47 +03:00
Perttu Ahola
db36771c63
auth stuff is now saved only when modified
2011-05-31 00:23:39 +03:00
Perttu Ahola
41f07328c8
removed some debug prints
...
...and added support for simple time usage profiling in the last one.
2011-05-31 00:16:58 +03:00
Perttu Ahola
223b379348
Reduced the CPU usage of the sent block selector algorithm
2011-05-31 00:15:43 +03:00
Ciaran Gultnieks
10cf6c3f6d
Ability to set texture coordinates on a generated cuboid (for fences)
...
Note: can't test this properly yet - may be fixes to follow
--HG--
extra : rebase_source : e2d41621018f886d340c7847b29240042d4412ac
2011-05-30 18:38:46 +01:00
Nils Dagsson Moskopp
289e31ed98
+ cactii
2011-05-30 14:42:08 +02:00
Nils Dagsson Moskopp
880aa870a0
+ cactii
2011-05-30 14:42:08 +02:00
Perttu Ahola
e81919c818
hopefully fixed the privilege problems
...
--HG--
extra : rebase_source : 9826d20176134a53ff232816a10407465d8c0f50
2011-05-29 22:34:04 +03:00
Perttu Ahola
b7361e295a
updated comments
...
--HG--
extra : rebase_source : bb7c083b9ab2989d90f41255b85e9e3edaf578ef
2011-05-29 21:16:37 +03:00
Perttu Ahola
b3d242ae38
tuned grass growth rate
...
--HG--
extra : rebase_source : 8ad4d13fc7ab1088ebd18cf968d912949aab8eae
2011-05-29 21:16:15 +03:00
Perttu Ahola
9f7c21a0b4
invert_mouse config option
...
--HG--
extra : rebase_source : 2695ad71185244cefbcf6e3e28ba1ab5e54c882f
2011-05-29 21:13:29 +03:00
Perttu Ahola
63611932eb
player passwords and privileges in world/auth.txt
...
--HG--
extra : rebase_source : 7260636295d9068fbeeddf4143c89f2b8a91446c
2011-05-29 21:11:16 +03:00
teddydestodes
544aeb0840
fast_move and free_move can now be toggled
2011-05-29 19:17:42 +02:00
teddydestodes
ca26de72c9
fast_move and free_move can now be toggled
2011-05-29 19:17:42 +02:00
Nils Dagsson Moskopp
e76f4155d5
+ sandstone
2011-05-29 18:44:42 +02:00
Nils Dagsson Moskopp
843ffba567
+ sandstone
2011-05-29 18:44:42 +02:00
Ciaran Gultnieks
99c2ac0125
A very poor (but better than nothing) inventory icon for fences
2011-05-24 23:18:41 +01:00
Perttu Ahola
acd7ce897d
when pause menu is activated, move mouse cursor on top of the disconnect button, for convenience.
2011-05-24 21:04:22 +03:00
Perttu Ahola
12ca835e14
Merged CiaranG's fence and fixed two things
2011-05-24 20:13:21 +03:00
Perttu Ahola
0c5f580365
a work-in-progress map modified callback interface (committing because i want to merge the fence stuff)
2011-05-24 20:05:30 +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
Ciaran Gultnieks
c5e583e059
Added fences (but still needs an icon or something to display in inventory)
2011-05-24 17:52:04 +01:00
Ciaran Gultnieks
8bbc512fe5
Added 'shout' player privilege
2011-05-23 20:40:25 +01:00
Ciaran Gultnieks
a9940c2ccf
Allow default privileges for new players to be set in the server config
2011-05-22 23:56:57 +01:00
Perttu Ahola
e1a2b8f600
merged password change menu
2011-05-23 00:12:24 +03:00
Perttu Ahola
4a6b9a6ac1
Some work-in-progress stuff and many comment updates
2011-05-22 23:55:02 +03:00
Ciaran Gultnieks
a8a3271470
Added the ability to change your password (via pause menu)
...
--HG--
extra : rebase_source : e8ec407f60711d42d33be4811b2880088f617b5b
2011-05-22 21:09:12 +01: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
Perttu Ahola
af7d50e910
Fixed a small memory leak in ServerEnvironment and cleaned the code a bit
2011-05-21 14:28:58 +03:00
Perttu Ahola
eb6f1804fb
fixed a small memory leak in game.cpp
2011-05-21 14:28:28 +03:00
Perttu Ahola
60bb663bf8
fixed a small memory leak in mapnode.cpp
2011-05-21 14:28:13 +03:00
Perttu Ahola
c1b164cbcb
added a delay to menu loop
2011-05-21 12:28:33 +03:00
Perttu Ahola
fe02a19f17
Cleaned networking code a bit (had this one on the to-do list for like 4 months already)
2011-05-21 12:25:08 +03:00
Perttu Ahola
969fbb189d
All textures are are now searched first from the directory specified by the texture_path setting.
2011-05-21 11:07:03 +03:00
Perttu Ahola
76e241392d
Merge: New map directory structure and player passwords
2011-05-21 01:11:58 +03:00
Ciaran Gultnieks
52d857cf15
Passwords - a few corrections to the previous commit
2011-05-20 21:37:13 +01:00
Ciaran Gultnieks
d4d49ee8f4
Passwords - password entry at main menu, stored and checked by server
2011-05-20 20:28:03 +01:00
Perttu Ahola
73a18b9271
change default sneak key from RSHIFT to LSHIFT
2011-05-19 22:59:10 +03:00
Perttu Ahola
26bbe66288
Moved the temporary mapgen test files and added a modified map.cpp too... These are probably useful in the next mapgen update and shouldn't be lost.
...
--HG--
rename : src/noise.cpp.new => misc/noise.cpp
rename : src/noise.h.new => misc/noise.h
2011-05-19 20:10:17 +03:00
Perttu Ahola
bc6d477cbb
Add (possibly non-compatible) work-in-progress noise.{h,cpp} so that they won't be accidentally lost. These are useful for upcoming mapgen updates.
2011-05-19 20:06:54 +03:00
Ciaran Gultnieks
b5ceaf445a
Don't say 'Creating server and client' if the server is remote, so not being created
2011-05-19 12:18:42 +01:00
Perttu Ahola
889de3e93a
put the wstring stoi too in the ignore-on-vc2010 #if
2011-05-19 08:16:48 +03:00
Perttu Ahola
ea3c653a8b
(hopefully) fixed stoi/stof compile problems on vc2010
2011-05-18 22:05:31 +03:00
Perttu Ahola
cdfb5345e9
small comment update
2011-05-18 21:59:31 +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
Perttu Ahola
c52fbcd8e9
merged fix to readlink ignored return value warning
2011-05-17 00:00:01 +03:00
Perttu Ahola
07ff1da6ae
merged CiaranG's stuff again: auto-admin powers to local user, DSTACK macro -Wformat warnings
2011-05-16 23:59:28 +03:00
Ciaran Gultnieks
f1bdc6b187
Get rid of ignored return value warning
2011-05-16 21:57:36 +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
5624dac3b7
added -Wno-unused-but-set-variable, which hides a new warning in gcc 4.6 which only slows down development with no effect on security or anything.
2011-05-16 20:40:19 +03:00
Ciaran Gultnieks
8bba9cde5c
Restored the auto-admin powers of the local user (via name= in the config)
...
--HG--
extra : rebase_source : a35aa0d978990c28fa4fc158ce47d1f4aa967c04
2011-05-16 18:26:37 +01:00
Perttu Ahola
bc59c18503
Fixed two compiler warnings
2011-05-16 19:54:08 +03:00
Perttu Ahola
94c9686020
merged CiaranG's changes (player privileges)
2011-05-16 19:39:15 +03:00
Ciaran Gultnieks
b3268ff389
Server commands without classes
2011-05-16 17:13:33 +01:00
Ciaran Gultnieks
1520d49310
Privileges to/from string conversion functions standalone, not static members
2011-05-16 16:13:17 +01:00
Ciaran Gultnieks
7cdd988f88
Better synchronisation of build/mine attempts when the player isn't allowed to
2011-05-16 11:34:06 +01:00
Ciaran Gultnieks
50c48219a7
Allow "all" to be specified in player config file for privileges
2011-05-16 11:32:49 +01:00
Ciaran Gultnieks
248d7c8469
Improved server commands and added player permissions.
...
--HG--
extra : rebase_source : 178fe08f10b7de3ebaba088bd24faad795114216
2011-05-16 10:41:19 +01:00
Perttu Ahola
1c3a85fa54
fixed an "unused variable" warning
2011-05-15 13:07:53 +03:00
Perttu Ahola
17f575b11b
added missing #ifndef KEYCODE_HEADER to keycode.h
2011-05-15 13:06:46 +03:00
Perttu Ahola
dadac0e79f
removed a leftover debug print
2011-05-14 19:46:35 +03:00
Perttu Ahola
5cb569af7f
removed unnecessary comment
2011-05-14 15:44:27 +03:00
Perttu Ahola
974c5cc08c
Added key configuration in the configuration file.
2011-05-14 15:43:26 +03:00
Perttu Ahola
0674db4a6b
merged CiaranG's changes: the glass block
2011-05-09 21:41:16 +03:00
Ciaran Gultnieks
2e1a69c3b1
Added glass, with rendering and furnace support.
2011-05-09 19:22:07 +01:00
Perttu Ahola
8c3b4fed10
Removed a single outdated comment in client.cpp
2011-05-09 16:39:37 +03:00
Perttu Ahola
1a6e1e142f
Fixed viewing range stuff a bit (now it works better with very low ranges)
2011-05-06 16:58:06 +03:00
Perttu Ahola
59c4a342a9
Fixed a temporary solution of server shutting down to an assert(0) when a too large block metadata is sent to an old client
2011-05-03 17:33:51 +03: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
1c08b6c99a
comment update
2011-05-03 08:22:05 +03:00
Perttu Ahola
9c72d44fe7
random comment updates
2011-04-30 02:12:32 +03:00
Perttu Ahola
67529acf5f
added cobblestone to the texture atlas
2011-04-29 18:30:34 +03:00
Perttu Ahola
a73b10eb1c
made proper skyboxes for dawn/evening and night
2011-04-29 17:53:07 +03:00
Perttu Ahola
a5df5f8291
Tweaked clouds a bit
2011-04-29 16:39:47 +03:00
Perttu Ahola
0847e550f0
added simple skybox
2011-04-29 16:00:36 +03:00
Perttu Ahola
7a367f96e1
added clouds
2011-04-29 15:34:26 +03:00
Perttu Ahola
288822e73d
Maybe fixed the flood of "WARNING: StaticObjectList::remove(): id=13 not found" style debug messages on the server when a player has quit.
2011-04-29 00:29:34 +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
42fb1ba676
Set oerkki1 to not be drawn in completely dark
2011-04-25 11:55:40 +03:00
Perttu Ahola
041b5e5479
Added /#time <int> command to server for changing the time of day
2011-04-25 11:55:07 +03:00
Perttu Ahola
2c4351b9b2
fix to the previous commit
2011-04-25 00:31:22 +03:00
Perttu Ahola
ab51298a0d
server to print version in chat
2011-04-25 00:24:40 +03:00
Perttu Ahola
6edb8c567c
Tuned polygon generation to sort the triangles for nicer gradients
2011-04-24 21:54:04 +03:00
Perttu Ahola
f2349ec5df
...Now the tesselation should actually work
2011-04-24 21:18:25 +03:00
Perttu Ahola
2704bdc68e
Optimized smooth lighting calculation code
2011-04-24 21:15:50 +03:00
Perttu Ahola
c9967d6d07
updated menu a bit, and some other small fixes
2011-04-24 15:37:41 +03:00
Perttu Ahola
ba88685fab
cleaned the smooth lighting code a bit
2011-04-24 14:19:35 +03:00
Perttu Ahola
79799840a2
disable tiling of textures only if smooth lighting is used
2011-04-24 12:39:33 +03:00
Perttu Ahola
b21c7de3ed
Added a setting for disabling smooth lighting. Updated changelog.
2011-04-24 12:31:19 +03:00
Perttu Ahola
8c1f7a0dd2
Added a simple software "ambient occlusion" effect, like minecraft's "smooth lighting"
2011-04-24 11:41:33 +03:00
Perttu Ahola
0034744568
Made the main menu a bit more unique looking
2011-04-24 00:11:23 +03:00
Perttu Ahola
96e09703ba
fix to the previous commit
2011-04-23 18:59:23 +03:00
Perttu Ahola
ea69a49a7b
tuned error reporting a bit
2011-04-23 18:53:39 +03:00
Perttu Ahola
179fc8597b
port to be not set to 0 from configuration
2011-04-23 18:43:20 +03:00
Perttu Ahola
1995b59320
Code refactoring; split half of main.cpp to game.cpp.
2011-04-23 18:31:31 +03:00
Perttu Ahola
9f17664336
cleaning up main.cpp a bit
2011-04-23 16:01:49 +03:00
Perttu Ahola
bda4681242
fixed flowing water lighting when it is below a solid block
2011-04-23 16:01:32 +03:00
Perttu Ahola
bbe47f845b
Updated to-do list and added the give_initial_stuff setting for testing
2011-04-22 10:48:40 +03:00
Perttu Ahola
b36e5c0508
Removed IrrlichtWrapper
2011-04-22 09:54:05 +03:00
Perttu Ahola
983bf6677d
set client to not show hp if server doesn't support it
2011-04-21 19:54:05 +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
3c61d57f6d
item drop multiplication fix
2011-04-19 17:09:45 +03:00
Perttu Ahola
a7d36a50bb
Menu will now ignore an invalid port or the port 0.
2011-04-15 23:35:32 +03:00
Perttu Ahola
e20dbbf6ee
fixed port setting not being loaded from configuration file for client
2011-04-12 17:42:17 +03:00
Perttu Ahola
08139f32f9
fixing
2011-04-12 01:59:09 +03:00
Perttu Ahola
249c0dc68a
Fixed some problems with crafting and inventory
2011-04-11 21:28:04 +03:00
Perttu Ahola
81ac026e1f
updated example map generator python script
2011-04-11 18:33:05 +03:00
Perttu Ahola
50a8087684
support for format 0 and 1 maps
2011-04-11 16:58:49 +03:00
Perttu Ahola
f5f15e38a5
Added installing build-essential to build instructions and modified the main.cpp notes a bit
2011-04-11 14:04:26 +03:00
Perttu Ahola
9d4e9c59de
fixed warnings reported by cppcheck
2011-04-11 11:36:13 +03:00
Perttu Ahola
3f153c20d3
Fixed error reported by cppcheck:
...
[./server.cpp:1327]: (error) Possible null pointer dereference: obj - otherwise it is redundant to check if obj is null at line 1332
2011-04-11 11:05:40 +03:00
Perttu Ahola
67d5f5c1d5
fixed problem with vc++ build crashing at startup
2011-04-11 09:47:25 +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
bb39795ab2
fixed the object update interval thingy
2011-04-10 23:29:36 +03:00
Perttu Ahola
9d5ccafbb0
changed server to do object management at longer intervals (0.5s)
2011-04-10 23:14:41 +03:00
Perttu Ahola
26eb607a11
Made environment to not consider disconnected players when dealing with ActiveObjects
2011-04-10 23:05:21 +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
89eaaa3e6e
added missing file
2011-04-10 20:49:15 +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
1a32e5585f
fixed a bit
2011-04-10 15:23:36 +03:00
Perttu Ahola
5a4d8ffad3
implemented rats in new system to verify that it works
2011-04-10 15:16:27 +03:00
Perttu Ahola
08bbf96877
items now fall by gravity... also some other random updating
2011-04-10 12:34:12 +03:00
Perttu Ahola
fd7a0735c9
new object system
2011-04-10 04:15:10 +03:00
Perttu Ahola
6f99cd021b
set GUIInventoryMenu to be scaled according to the height of the window (not width)
2011-04-09 17:11:31 +03:00
Perttu Ahola
4b54b291ae
Some progress on transitioning from MapBlockObject to ActiveObject.
2011-04-08 00:47:14 +03:00
Perttu Ahola
2dba606e12
stone shovel now needs cobble, not stone.
2011-04-06 22:28:51 +03:00
Perttu Ahola
90234e35a6
cleaning notes and stuff
2011-04-06 11:34:41 +03:00
Perttu Ahola
3269fce795
Server: Only send node removal/addition to client if client's player is near it. Otherwise set the modified blocks unsent.
2011-04-06 11:02:39 +03:00
Perttu Ahola
b5ace9a064
Made mesh update on node removal asynchronous on client, to reduce frametime spikes
2011-04-06 11:01:55 +03:00
Perttu Ahola
e56d166337
Made mesh update on node addition asynchronous on client, to reduce frametime spikes
2011-04-06 10:28:39 +03:00
Perttu Ahola
212f34db82
fixed the bug of disabled removal of empty chests
2011-04-06 01:42:37 +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
5b4928e07c
forgot the furnace menu files!
2011-04-05 11:46:17 +03:00
Perttu Ahola
d6d811f97b
A more robust format for node metadata
2011-04-05 10:59:48 +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
042834b09d
Fixed chest contents not immediately updating to all players
2011-04-04 18:29:44 +03:00
Perttu Ahola
7df125c249
Modified windows build parameters a bit to make it build
2011-04-04 15:34:07 +03:00
Perttu Ahola
14c621d853
removed reference to script directory in cmake install
2011-04-04 15:19:11 +03:00
Perttu Ahola
4a92df6ff0
Chests work now!
2011-04-04 15:13:19 +03:00
Perttu Ahola
9e683fff50
initial chest metadata
2011-04-04 11:18:14 +03:00
Perttu Ahola
a9f89fb3fb
now the server builds
2011-04-04 05:25:55 +03:00
Perttu Ahola
023fc5b771
still a missing file
2011-04-04 05:14:59 +03:00
Perttu Ahola
3a58f8179f
forgot some files
2011-04-04 05:13:08 +03:00
Perttu Ahola
fa736e138c
fully implemented the sign with the new framework
2011-04-04 05:12:33 +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
e4f7f97e6c
Removed lua stuff
2011-04-03 12:28:55 +03:00
Perttu Ahola
ee89e29ae1
Revert mapgen to best working version (2)
2011-04-03 12:14:23 +03:00
Perttu Ahola
8581bf0091
tuned water texture and removed two debug prints from server
2011-04-02 21:10:53 +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
c137946a3f
fixed server sending wrong position of node removal
2011-02-28 16:40:25 +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
Perttu Ahola
a302ae3e08
-
2011-02-28 02:14:52 +02:00
Perttu Ahola
c8be58a65c
A third try on terrain generation. No trees yet.
2011-02-28 02:01:40 +02:00
Perttu Ahola
d9d0efdeed
fixed 3d noise and made 2d noise faster
2011-02-27 00:59:56 +02:00
Perttu Ahola
48a772b3c6
3d noise stuff
2011-02-26 20:16:47 +02:00
Perttu Ahola
ec3cb2d1d7
fixed a possible infinite loop in ClientEnvironment (dtime counter getting so small that it doesn't increment the value)
2011-02-24 18:25:19 +02:00
Perttu Ahola
9f859d8389
modified the build system of lua to a more minimal one
2011-02-24 00:19:41 +02:00
Perttu Ahola
bfd0980748
fixed a path in build system's packaging part
2011-02-23 11:12:03 +02:00
Perttu Ahola
be32adc872
updated scripting api a bit
...
--HG--
rename : data/luaobjects/test/client.lua => data/scripts/objects/test/client.lua
rename : data/luaobjects/test/server.lua => data/scripts/objects/test/server.lua
2011-02-23 11:10:09 +02:00
Perttu Ahola
9778347c7f
mainly work on object scripting api
2011-02-23 02:49:57 +02:00
Perttu Ahola
eef7bc3570
removed an old comment
2011-02-23 00:07:07 +02:00
Perttu Ahola
b82d3f2744
Fixed insufficient error handling in narrow_to_wide, which caused a crash if the path of the userdata directory contained special characters that were not included in the used charset (which is used because of the font)
2011-02-23 00:06:45 +02:00
Perttu Ahola
62e7912577
some tidying
2011-02-21 16:50:05 +02:00
Perttu Ahola
69dbc046eb
preliminary lua scripting framework for objects
2011-02-21 16:10:36 +02:00
Perttu Ahola
c57637b4c3
Temporary commit; lots of test code and stuff
2011-02-21 00:45:14 +02:00
Perttu Ahola
f5ff378dd0
video backend selection
2011-02-19 11:48:54 +02:00
Perttu Ahola
4c2b9ed516
random code cleaning, shouldn't affect anything
2011-02-18 22:25:25 +02:00
Perttu Ahola
74f4a0ece8
Set ambient light in inventory cube generation
2011-02-18 22:25:13 +02:00
Perttu Ahola
31572eaf8a
removed duplicate "bmp"
2011-02-17 19:13:27 +02:00
Perttu Ahola
3264ac4390
Better texture handling. Textures are not added to atlas if they are big, and atlas is not further made after it is full.
2011-02-17 19:07:14 +02:00
Perttu Ahola
fb5ae9a7a5
Debug stacks will now be printed on Ctrl-C. Also client properly quits on Ctrl-C.
2011-02-16 22:54:07 +02:00
Perttu Ahola
741776313a
fixed invalid block loading (the action is to generate a new one)
2011-02-16 22:53:35 +02:00
Perttu Ahola
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
Perttu Ahola
ff6a348bb1
fixed slight error in server build
2011-02-15 22:27:10 +02:00
Perttu Ahola
a0e8f3afd3
might work good on cmake+msvc now
2011-02-15 20:53:29 +02:00
Perttu Ahola
95c88d258b
still a little fix!
2011-02-15 16:14:02 +02:00
Perttu Ahola
40556f4b2d
Fix for windows
2011-02-15 16:12:04 +02:00
Perttu Ahola
d065bae323
Ctrl+C handling on POSIX, some commands for server and other tweaking
2011-02-15 16:11:24 +02:00
Perttu Ahola
be7391c2b1
mud gets now grass onto it when placed into sunlight. also removed three old files
2011-02-15 12:33:59 +02:00
Perttu Ahola
f0e739b69e
smgr->drop() is now used in tile.cpp
2011-02-15 12:19:33 +02:00
Perttu Ahola
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
Perttu Ahola
9a58749347
fixed CMakeLists.txt syntax (removed additional ,)
2011-02-14 19:42:43 +02:00
Perttu Ahola
20a09d5ede
new hotbar, more minecraft-like
2011-02-14 17:41:49 +02:00
Perttu Ahola
467f43d47c
Some fiddling around with fog... not much changed
2011-02-14 16:13:03 +02:00
Perttu Ahola
7701753131
removed useless SMaterial parameter from mapblock
2011-02-14 16:12:38 +02:00
Perttu Ahola
d34c19f553
sneaking bug fixing
2011-02-14 16:11:28 +02:00
Perttu Ahola
607f548712
cube inventory texture rendering thing (not good yet)
2011-02-14 16:10:46 +02:00
Perttu Ahola
00810408a8
New way of determining the outcome of digging
2011-02-14 12:08:03 +02:00
Perttu Ahola
5573142a2b
disabled jumping in sneak mode if far away from the edge because it can drop the player
2011-02-14 12:07:49 +02:00
Perttu Ahola
b1defb4def
fixed bug in sneaking
2011-02-14 11:43:42 +02:00
Perttu Ahola
32a29489f3
players to not be saved when map saving is disabled (due to some error)
2011-02-14 11:10:44 +02:00
Perttu Ahola
14fafc7217
added sneaking/crouching and changelog
2011-02-14 02:54:15 +02:00
Perttu Ahola
0947c4cc48
tuned fog distance a bit
2011-02-13 16:04:21 +02:00
Perttu Ahola
80a2ee6d59
mapgen parameter tweaking
2011-02-13 15:25:00 +02:00
Perttu Ahola
0386279b6f
changed sky color and made new style leaves a bit more bright
2011-02-13 14:21:31 +02:00
Perttu Ahola
3bb040043c
hopefully a fix for the majority of the windows 7 problems - thanks to zerochen
2011-02-12 20:15:57 +02:00
Perttu Ahola
e9fe230381
Use random-generated fallback textures when real textures are not found
2011-02-12 14:01:23 +02:00
Perttu Ahola
cabe6f1d65
some fixes to make compiling on some bsd easier
2011-02-11 22:34:34 +02:00
Perttu Ahola
6f16c2e313
tiny fix
2011-02-11 21:12:32 +02:00
Perttu Ahola
cbef07a9f2
pauseMenu text change
2011-02-11 21:11:21 +02:00
Perttu Ahola
41f4caebcb
disabled work wrap to show every line of chat in any case
2011-02-11 21:10:06 +02:00
Perttu Ahola
6e2cd15902
more stuff...
2011-02-11 20:55:28 +02:00