Perttu Ahola
|
fe64f2b673
|
Silly MSVC doesn't know how to handle type conversions for parameters of pow(). Help it.
|
2011-11-29 19:13:57 +02:00 |
|
Perttu Ahola
|
7bb4b7911b
|
Comment out debug output in ServerEnvironment::activateBlock
|
2011-11-29 19:13:57 +02:00 |
|
Perttu Ahola
|
fadf248892
|
Handle ActiveBlockModifier intervals properly, down to 1s
|
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
|
5c1cb01936
|
Make blocks to be loaded from disk when the active block area reaches them
|
2011-11-29 19:13:55 +02:00 |
|
Perttu Ahola
|
41c473cf5e
|
Fix player getting thrown underground after connecting
|
2011-11-29 19:13:54 +02:00 |
|
Perttu Ahola
|
65b2a2cb02
|
Make lighting update occur immediately after ClientActiveObject addition to make objects show up much more responsively
|
2011-11-29 19:13:53 +02:00 |
|
Perttu Ahola
|
1ce749c86a
|
Optimize active block modifier stuff (was left horribly unoptimized after making content ids dynamic)
|
2011-11-29 19:13:53 +02:00 |
Kahrl
|
c1479a2732
|
Add node definitions in Lua and do not use content_mapnode_init anymore (except in test.cpp)
|
2011-11-29 19:13:52 +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
|
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
|
73bb3bc595
|
Scripting WIP: Add global environment step function on_step
|
2011-11-29 19:13:40 +02:00 |
|
Perttu Ahola
|
75a0ca6bd6
|
Scripting WIP
|
2011-11-29 19:13:40 +02:00 |
|
Perttu Ahola
|
38944467d3
|
Scripting WIP
|
2011-11-29 19:13:39 +02:00 |
|
Perttu Ahola
|
f145d498a6
|
Scripting WIP
|
2011-11-29 19:13:39 +02:00 |
|
Perttu Ahola
|
bfc68d3151
|
Scripting WIP
|
2011-11-29 19:13:38 +02:00 |
|
Perttu Ahola
|
22b07bdb30
|
Fix object duplication bug
|
2011-10-18 02:58:15 +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
|
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
|
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 |
celeron55
|
d39f98aeb0
|
Improve active object handling log output
|
2011-10-17 10:47:06 +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
|
6470743e51
|
Make dungeon masters not shoot the walls with no reason
|
2011-10-16 19:39:20 +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
|
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
|
414c614893
|
Add peaceful / not peaceful distinction in mobs and the only_peaceful_mobs setting
|
2011-10-16 11:52:33 +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
|
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
|
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 |
Joshua Beck
|
ae561d705f
|
Fixed null pointer dereference errors found by cppcheck
|
2011-09-24 02:11:43 -05: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 |
|
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
|
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
|
bd72091150
|
Pause in unloaded territory instead of collide
|
2011-09-06 20:07:43 +03:00 |
|
Perttu Ahola
|
472585a7e8
|
tuned lava/universal damage code
|
2011-08-15 11:49:39 +03:00 |
|
Perttu Ahola
|
8f42a8be0c
|
lava!
|
2011-08-15 02:04:56 +03:00 |
Giuseppe Bilotta
|
dfdc817db3
|
Typo fix
|
2011-08-11 19:45:44 +02:00 |
|
Giuseppe Bilotta
|
98fa00db12
|
Introduce Player::getLightPosition
This is currently only used in the lighting update for remote
players in client.
|
2011-08-11 15:22:35 +02:00 |
|
Mark Holmquist
|
267744a568
|
Fixing ladders again
|
2011-08-01 09:22:44 +02:00 |
|
Perttu Ahola
|
4556c212db
|
Made rats cookable and made them spawn near trees
|
2011-07-30 17:51:21 +03:00 |
|
Perttu Ahola
|
26582e0e66
|
Fixed #21 Earth under torches oscillates between mud and grass
|
2011-07-23 20:22:22 +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 |
Nils Dagsson Moskopp
|
8129d16dd3
|
+ fireflies
|
2011-07-20 22:05:57 +02:00 |
|
Nils Dagsson Moskopp
|
5086bd5664
|
* fix automerge regression
|
2011-07-15 20:16:02 +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 |
|
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
|
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
|
91cfbe2891
|
reorganized a lot of stuff and modified mapgen and objects slightly while doing it
|
2011-06-26 15:48:56 +03: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 |
|
Perttu Ahola
|
bb940a946d
|
even more code refactoring
|
2011-06-26 02:34:36 +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
|
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
|
9b565b6bc4
|
tried to reduce unnecessary map saving disk i/o a bit
|
2011-06-05 18:57:36 +03: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 |
|
Perttu Ahola
|
b3d242ae38
|
tuned grass growth rate
--HG--
extra : rebase_source : 8ad4d13fc7ab1088ebd18cf968d912949aab8eae
|
2011-05-29 21:16:15 +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 |
|
Perttu Ahola
|
4a6b9a6ac1
|
Some work-in-progress stuff and many comment updates
|
2011-05-22 23:55:02 +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
|
9c72d44fe7
|
random comment updates
|
2011-04-30 02:12:32 +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
|
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
|
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
|
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
|
fd7a0735c9
|
new object system
|
2011-04-10 04:15:10 +03:00 |
|
Perttu Ahola
|
4b54b291ae
|
Some progress on transitioning from MapBlockObject to ActiveObject.
|
2011-04-08 00:47:14 +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
|
e4f7f97e6c
|
Removed lua stuff
|
2011-04-03 12:28:55 +03: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
|
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
|
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
|
14fafc7217
|
added sneaking/crouching and changelog
|
2011-02-14 02:54:15 +02:00 |
|
Perttu Ahola
|
1704badc30
|
work-in-progress texture atlas optimization
|
2011-02-10 02:13:03 +02:00 |
|
Perttu Ahola
|
dd9e82f5bc
|
bug-fixin'
|
2011-02-08 01:12:55 +02:00 |
|
Perttu Ahola
|
25a7fabed8
|
mapgen tweaking
|
2011-02-06 16:35:27 +02:00 |
|
Perttu Ahola
|
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 |
|
Perttu Ahola
|
80acdab93b
|
Commented out some debug output about saving players on server.
|
2011-01-29 00:48:54 +02:00 |