Commit Graph

6535 Commits

Author SHA1 Message Date
Perttu Ahola
d566ffaa5f Allow digging unknown nodes 2011-12-03 13:56:39 +02:00
Perttu Ahola
d06d7cb9a4 Show infotext for unknown nodes 2011-12-03 13:51:16 +02:00
Perttu Ahola
e494b5d422 Show infotext for unknown items placed on ground 2011-12-03 13:46:19 +02:00
Perttu Ahola
871e6c0c73 On SIGINT in main menu, don't connect before shutting down 2011-12-03 12:02:27 +02:00
Kahrl
392485aa45 inventorycube: use all three specified textures; also moved mesh creation / modification functions to mesh.cpp; in lua, inventorycube is now called minetest.inventorycube 2011-12-03 11:47:37 +02:00
Kahrl
275a348b75 Do not broadcast an empty chat message when someone tries to log in with the wrong password 2011-12-03 11:47:19 +02:00
Kahrl
189689716c Notify player whose password is being changed 2011-12-03 11:47:19 +02:00
Perttu Ahola
746b960c0d Note about debug.txt in error message dialog when mod fails to load 2011-12-03 11:44:47 +02:00
Perttu Ahola
760416b81f Change naming convention to be modname:* instead of modname_* (sorry modders!) 2011-12-03 11:41:52 +02:00
Perttu Ahola
c6dd75ccfb Add usermods/ to mod search paths and print out the paths at server startup 2011-12-03 03:43:20 +02:00
Perttu Ahola
6b2023dc3e Properly handle mod name conflicts 2011-12-03 03:32:30 +02:00
Perttu Ahola
2f4a92d701 Better mod loading error handling 2011-12-03 03:23:14 +02:00
Perttu Ahola
324c544922 Add world/mods to mod search path 2011-12-03 02:55:54 +02:00
Perttu Ahola
d96cd236f3 Enforced mod global naming convention and better error reporting 2011-12-03 02:45:55 +02:00
Perttu Ahola
581f950e10 Fix script error reporting a bit 2011-12-02 22:49:54 +02:00
Perttu Ahola
9344816bd6 Fix ActiveObject creation for fast player respawns 2011-12-02 17:30:22 +02:00
Perttu Ahola
67c21fc42f Fix sending of player hp (was sent all the time) 2011-12-02 17:19:42 +02:00
Perttu Ahola
ec1859b095 Show bare hand when no item is selected 2011-12-02 15:20:42 +02:00
Perttu Ahola
b9e8e20c9c Script-defined creative inventory 2011-12-02 12:43:57 +02:00
Perttu Ahola
932988af46 Rename "build" privilege to "interact" (backwards-compatibly, of course) 2011-12-02 12:18:19 +02:00
Perttu Ahola
69bc9224db Rename "NodeItem"/"ToolItem"/"CraftItem" to "node"/"tool"/"craft" 2011-12-02 12:12:07 +02:00
Perttu Ahola
a17efe6e8f Remove obsolete createPickedUpItem() 2011-12-02 11:54:23 +02:00
Perttu Ahola
e8b0722137 Add time_from_last_punch to Lua API 2011-12-02 11:51:41 +02:00
Mark Holmquist
a465fd5b99 + middle-click now empties the inventory slot properly 2011-12-02 11:31:10 +02:00
Perttu Ahola
9af0142a36 Add enable_pvp setting 2011-12-02 11:25:47 +02:00
Perttu Ahola
34fd47887e Make unlimited player transfer distance configurable 2011-12-02 11:22:09 +02:00
Perttu Ahola
2dc9a0c724 Fix player double damage 2011-12-02 11:16:51 +02:00
Perttu Ahola
c357985135 Make hitting players make a visual damage flash to the player texture and the screen of the local player 2011-12-02 10:57:40 +02:00
Perttu Ahola
ae2b7f9523 Don't hide players in pitch black (like oerkkis) 2011-12-02 10:45:43 +02:00
Perttu Ahola
5344dec760 Move ServerRemotePlayer to a separate file 2011-12-02 10:44:20 +02:00
Perttu Ahola
dc05b106f2 Fix the previous commit 2011-12-02 02:04:25 +02:00
Perttu Ahola
a416cf7c45 Enforce PLAYER_INVENTORY_SIZE in ObjectRef::l_inventory_set_list 2011-12-02 02:01:46 +02:00
Perttu Ahola
09010410cf Print out PROTOCOL_VERSIONs if server is incompatible with client 2011-12-02 01:24:54 +02:00
Perttu Ahola
f8bbecebf5 Higher default map save and unload interval 2011-12-02 01:20:54 +02:00
Perttu Ahola
9d67037570 Don't send objects or map data before definitions have been sent 2011-12-02 01:18:25 +02:00
Perttu Ahola
e4daa4c065 Make players be again visible from a long distance 2011-12-02 01:08:14 +02:00
Perttu Ahola
08a10b8a6a Remove stuff made obsolete by making players more ActiveObject-like and raise protocol version number by one (because it is not compatible at all anymore) 2011-12-01 23:55:57 +02:00
Perttu Ahola
af32240545 Players are more like objects + related stuff 2011-12-01 23:33:48 +02:00
Perttu Ahola
ee0d3bacbc Player-is-SAO WIP 2011-12-01 18:23:58 +02:00
Perttu Ahola
9dcfa882b1 Fix non-fancy leaves not making faces with water 2011-12-01 14:48:52 +02:00
Perttu Ahola
cb589b1f99 Make non-fancy leaf texture to go in texture atlas too 2011-12-01 14:12:47 +02:00
Perttu Ahola
e6e3eef0ef Add ServerActiveObject::removingFromEnvironment() 2011-12-01 13:22:33 +02:00
Perttu Ahola
0e113a4c81 Remove +"^[forcesingle" from ContentFeatures::setInventoryTexture, because 1) it was not used, 2) if it will be used, it won't need to do that anymore 2011-12-01 13:01:37 +02:00
Perttu Ahola
1da3a8e24b Fix getTextureRaw to always return an image that is not in the texture atlas and fix plain "^[forcesingle" handling 2011-12-01 13:00:27 +02:00
Perttu Ahola
3509714951 Fix loading of legacy MaterialItems (was loaded as a quite random type) 2011-12-01 12:50:32 +02:00
Perttu Ahola
146be1f0b6 Fix texture atlas not being created correctly 2011-12-01 12:43:17 +02:00
Kahrl
2ca00fa585 Fix processing of the default_password setting. It is now actually used as the plaintext password for new users. Also add /setpassword and /clearpassword server commands that can be used by admins with the PRIV_PASSWORD privilege, and update the /help message. 2011-12-01 12:06:39 +02:00
Kahrl
1901158b3e Make camera.cpp Irrlicht 1.8-compatible by calling ITexture::lock differently depending on the irrlicht version. 2011-12-01 11:56:06 +02:00
Perttu Ahola
f4272ccf8f Enable simple drag and drop in inventory 2011-12-01 11:32:51 +02:00
Perttu Ahola
4196b0d341 Inventory move-to-slot hilighting 2011-12-01 11:25:55 +02:00
Giuseppe Bilotta
aab50cd2cc Fix conditional bug in inventory
A spurious semicolon after the conditional checking for the drop count
to be not higher than the owned count caused the subsequent
    count = getCount()
to be always executed. Fix by removing the extra semicolon.
2011-12-01 10:41:24 +02:00
Giuseppe Bilotta
96c30452f9 Fix structs being declared as classes
Some compilers complain when a class is declared as a struct or vice
versa. Fix by making sure that the correct tag is used both in
declaration and definition.
2011-12-01 10:39:47 +02:00
Perttu Ahola
b6539399f4 Fix deadlock if MeshUpdateThread asks new textures while it is being stopped (happened if texture data was transferred slowly) 2011-12-01 02:41:52 +02:00
Perttu Ahola
8b8ef8acc0 Move NodeMetadata prototype containers to content_nodemeta.cpp to fix them not being filled correctly on some systems and compilers 2011-12-01 01:58:31 +02:00
Perttu Ahola
d8d6d0dc95 Do not assert if count becomes larger than getStackMax() in InventoryItem::add(); it is nicer for scripting and overall hacking this way, because rising it higher than the limit is does not break anything. It should be, and is, enforced elsewhere where appropriate. 2011-12-01 00:07:21 +02:00
Perttu Ahola
f6c6c4f917 Load count 0 in itemstring as 1 2011-12-01 00:04:21 +02:00
Perttu Ahola
1b61ca412b ObjectRef:get_player_name, ObjectRef:inventory_set_list, ObjectRef:inventory_get_list 2011-11-30 23:38:18 +02:00
Perttu Ahola
cd563473fa Add ObjectRef:punch and ObjectRef:right_click to Lua API 2011-11-30 20:54:54 +02:00
Perttu Ahola
a244e367ea Add get_wielded_itemstring, get_wielded_item, damage_wielded_item and make getacceleration visible in API 2011-11-30 20:36:07 +02:00
Perttu Ahola
347216d654 Reworked the inventory move handling code, hopefully fixed more problems than caused 2011-11-30 19:49:34 +02:00
Perttu Ahola
49e4f55b09 Fix player getting reset to 0,0 at connect if being far from 0,0 2011-11-30 00:39:36 +02:00
Perttu Ahola
ccfec0400f Modify builtin ABMs to have lower interval and higher trigger non-chance 2011-11-29 23:22:44 +02:00
Perttu Ahola
e109ed5cef Proper player inventory and hp modification tracking and sending accordingly 2011-11-29 23:18:20 +02:00
Perttu Ahola
b2c905d800 Tune main menu a bit and show version number in there 2011-11-29 22:34:58 +02:00
Perttu Ahola
4bcff65ad0 Better version match fail messages from server 2011-11-29 22:23:03 +02:00
Perttu Ahola
103d4793f0 Create the necessary API for /giveme and /give and implement those commands; also sort out the scripts a bit 2011-11-29 21:30:22 +02:00
Perttu Ahola
2a610b011a Handle items with m_count==0 sanely when placing 2011-11-29 21:05:53 +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
6d23fb2592 Do not install the static lua library file 2011-11-29 19:27:41 +02:00
Perttu Ahola
bc48cf076d Remove content_inventory.{h,cpp} 2011-11-29 19:13:59 +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
bd1e5f4fc8 Add missing files for a previous commit 2011-11-29 19:13:58 +02:00
Kahrl
d6b30dd3a5 CraftItem rework and Lua interface 2011-11-29 19:13:58 +02:00
Perttu Ahola
1c19f959db Fix active_object_count and active_object_count_wider not getting updated between ABM calls causing huge amounts of DMs and rats and stuff 2011-11-29 19:13:58 +02:00
Perttu Ahola
dde22d26a8 Add NULL terminations to EnumString definitions 2011-11-29 19:13:57 +02:00
Perttu Ahola
c8211ceb3e Some MSVC fixes 2011-11-29 19:13:57 +02:00
Perttu Ahola
c910ead4db Fix CMake install data path 2011-11-29 19:13:57 +02:00
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
a91eb36277 Update installation in CMakeLists.txt 2011-11-29 19:13:57 +02:00
Perttu Ahola
026979e39d Rename menu background to menubg.png, move unknown_block.png and unknown_object.png to client, make generating a placeholder image for the filename "" not cause an error 2011-11-29 19:13:57 +02:00
Perttu Ahola
705f142b8d GenericNodeMetadata and an example furnace 2011-11-29 19:13:57 +02:00
Perttu Ahola
e880cc40e9 Fix stuff in inventory.{cpp,h} 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
0f2b932e92 Initial NodeMetaRef stuff 2011-11-29 19:13:56 +02:00
Perttu Ahola
34bd1b3032 Lua interface for ActiveBlockModifier 2011-11-29 19:13:56 +02:00
Perttu Ahola
8924588511 Remove creation of builtin.lua defined minetest.registered_* tables in C 2011-11-29 19:13:56 +02:00
Perttu Ahola
19a1ac1f34 For consistency, implement calling of on_chat_message callbacks in C 2011-11-29 19:13:56 +02:00
Perttu Ahola
30648d1cc9 Implement callback registration in Lua instead of C 2011-11-29 19:13:56 +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
05df2ee8a4 Add chat message callback and send functions 2011-11-29 19:13:56 +02:00
Perttu Ahola
ab3911ba9e Print errors from local log to chat 2011-11-29 19:13:56 +02:00
Perttu Ahola
013921782b Add a third log output interface method 2011-11-29 19:13:56 +02:00
Perttu Ahola
c449e5f20a Use log_deregister_thread in EmergeThread 2011-11-29 19:13:56 +02:00
Perttu Ahola
6e0de7b42c Add log_remove_output and log_deregister_thread 2011-11-29 19:13:55 +02:00
Perttu Ahola
2e42391b86 Fix mod dependency sort 2011-11-29 19:13:55 +02:00
Perttu Ahola
fd8b9a3a44 Warn about unsatisfied dependencies 2011-11-29 19:13:55 +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
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
4ce6e5f0c5 Optimize lighting by a tiny bit 2011-11-29 19:13:55 +02:00
Perttu Ahola
a8a82e0b21 Sort mods by dependencies defined by modpath/depends.txt in each mod (not mandatory) 2011-11-29 19:13:55 +02:00
Perttu Ahola
739cb87385 Fix default value of visual in LuaEntityProperties 2011-11-29 19:13:55 +02:00
Perttu Ahola
8492796a5c Allow server-side teleporting 2011-11-29 19:13:55 +02:00
Perttu Ahola
218b626016 Fix and tune player movement checks (make them very loose) 2011-11-29 19:13:55 +02:00
Kahrl
f42c57d9a8 Add IDropAction and related stuff 2011-11-29 19:13:54 +02:00
Perttu Ahola
82a460ec90 Improve luaentity sprite functionality (and add some random stuff) 2011-11-29 19:13:54 +02:00
Perttu Ahola
1d36e68346 Fix liquid source backface culling (was not turned off) 2011-11-29 19:13:54 +02:00
Perttu Ahola
41c473cf5e Fix player getting thrown underground after connecting 2011-11-29 19:13:54 +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
769cc9879f Add on_generated hook 2011-11-29 19:13:54 +02:00
Perttu Ahola
0dbb31afeb Improve player movement speed checking 2011-11-29 19:13:54 +02:00
Perttu Ahola
1bfc3c1eb9 Player movement speed and node access distance checking 2011-11-29 19:13:54 +02:00
Perttu Ahola
8bd178c2e5 If available, use local textures instead of those sent by server 2011-11-29 19:13:53 +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
70363847aa Reshape LuaEntityCAO implementation a bit and make TNT to blink 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
Perttu Ahola
08c9b6037d Re-implement give_initial_stuff 2011-11-29 19:13:53 +02:00
Perttu Ahola
57a2bd056c Exception handling in Lua setting get 2011-11-29 19:13:53 +02:00
Perttu Ahola
234bf99743 Lua setting getter 2011-11-29 19:13:53 +02:00
Perttu Ahola
f93144fee7 remove get_nodedef 2011-11-29 19:13:53 +02:00
Perttu Ahola
945d01fd9e on_newplayer and on_respawnplayer callbacks 2011-11-29 19:13:53 +02:00
Perttu Ahola
908db7c1d2 Make node definitions available to Lua 2011-11-29 19:13:52 +02:00
Perttu Ahola
77337271fc Remove give_initial_stuff 2011-11-29 19:13:52 +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
1f53ca5f4c Modify CONTENT_AIR and CONTENT_IGNORE handling in nodedef.cpp 2011-11-29 19:13:52 +02:00
Perttu Ahola
425db289d5 Fix random node definition stuff 2011-11-29 19:13:52 +02:00
Perttu Ahola
61ffe1eac4 builtin.lua 2011-11-29 19:13:52 +02:00
Perttu Ahola
9e7ad1e2aa Add object reference to Lua on_place/dig/punchnode parameters 2011-11-29 19:13:52 +02:00
Perttu Ahola
ae9f183cda Fix "warning: comparison between signed and unsigned integer expressions" 2011-11-29 19:13:52 +02:00
Perttu Ahola
ff1ae29f97 Duplicate last tile image automatically to all for lua node definitions 2011-11-29 19:13:51 +02:00
Perttu Ahola
fdf6eecd59 Make map generator more responsive 2011-11-29 19:13:51 +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
6153a2fb10 Improve debug stack printing interface 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
18bb0ea1ea Mode node definition loading from Lua (still not finished), fix metadata creation from name 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
704d8a62bf Set block modified flag when node metadata inventory is modified 2011-11-29 19:13:50 +02:00
Perttu Ahola
3b3ca65562 Add names to NodeMetadata 2011-11-29 19:13:50 +02:00
Perttu Ahola
697ff926ce Add Lua node definition stuff (not complete) 2011-11-29 19:13:50 +02:00
Perttu Ahola
e8a9578774 Add texture modifier [brighten and modify [toalpha to modify existing texture, not read a new base 2011-11-29 19:13:50 +02:00
Perttu Ahola
0bf3a15886 Random Lua tweaks/fixes 2011-11-29 19:13:50 +02:00
Perttu Ahola
cebc8c78a4 Make object hit delay smaller for fun; actually it should be roughly zero and hit damage should be calculated from the amount of time since last punch, limited to a maximum value 2011-11-29 19:13:50 +02:00
Perttu Ahola
290e921920 Relatively snappy object-ground collision detection 2011-11-29 19:13:50 +02:00
Perttu Ahola
94feb62b08 When digging a node, don't switch to punching an object without raising button 2011-11-29 19:13:50 +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
0ce0c8fcfb Improve LuaEntity velocity/acceleration handling (by kahrl); implement staticdata interface to Lua 2011-11-29 19:13:49 +02:00
Perttu Ahola
811ac5ac3a Mess up with node definitions to make CONTENT_IGNORE be correctly interpreted when creating meshes 2011-11-29 19:13:49 +02:00
Perttu Ahola
901d98b687 Optimize map generator for the dynamic content ids a bit 2011-11-29 19:13:49 +02:00
Perttu Ahola
4503b03b26 Make added nodes give the corresponding NodeItem as of now (placeholder code) 2011-11-29 19:13:49 +02:00
Perttu Ahola
0e64406b06 Fix tool wear 2011-11-29 19:13:49 +02:00
Perttu Ahola
1220b642eb Falling sand and gravel 2011-11-29 19:13:49 +02:00
Perttu Ahola
cc03718d3c Node place/dig Lua callbacks 2011-11-29 19:13:49 +02:00
Perttu Ahola
4f021fc7dd Remove crafting definitions from content_craft.cpp 2011-11-29 19:13:48 +02:00
Perttu Ahola
cebbaf1664 Catch SerializationError in CCraftDefManager::getCraftResult() 2011-11-29 19:13:48 +02:00
Perttu Ahola
227e067512 Add note about craft_get_result() not being used anymore, but don't remove before it's contents have been transferred to scripts 2011-11-29 19:13:48 +02:00
Perttu Ahola
9d5b458479 Crafting definition in scripts 2011-11-29 19:13:48 +02:00
Perttu Ahola
8dd3622c6d Improve item serialization 2011-11-29 19:13:48 +02:00
Perttu Ahola
564c3a9c96 Allow inputting nodename of MaterialItem in ItemSpec::checkItem 2011-11-29 19:13:48 +02:00
Perttu Ahola
4725e5c52e Fix another silly mistake making CONTENT_IGNORE definition not being what it should 2011-11-29 19:13:47 +02:00
Perttu Ahola
106027fc29 Fix silly misspelling in mapgen that made junglegrass to be CONTENT_IGNORE 2011-11-29 19:13:47 +02:00
Perttu Ahola
d1298fe5e7 Actually fill in the NewNameGetter names to allow map generator operation and crafting 2011-11-29 19:13:47 +02:00
Perttu Ahola
eabfb370ac MapNode constructor to allow ndef+name 2011-11-29 19:13:47 +02:00
Perttu Ahola
62164d955c Initial node definition stuff 2011-11-29 19:13:47 +02:00
Perttu Ahola
a5545593ba Fix camera MaterialItem draw logic 2011-11-29 19:13:47 +02:00
Perttu Ahola
f68fa667c8 Clean InventoryItem interface a bit 2011-11-29 19:13:47 +02:00
Perttu Ahola
7a29b14a20 Improved MaterialItem (stores nodename) 2011-11-29 19:13:47 +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
50d63e4b0a Add name field to ContentFeatures 2011-11-29 19:13:46 +02:00
Perttu Ahola
6a417c538f Remove burn time definitions from FurnaceNodeMetadata 2011-11-29 19:13:46 +02:00
Perttu Ahola
7fae32095a Remove old comments 2011-11-29 19:13:46 +02:00
Perttu Ahola
37a5f8a30b Move cook result properly to ContentFeatures 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
a793533d1a Remove content_mapnode.h and nodedef.h #includes 2011-11-29 19:13:46 +02:00
Perttu Ahola
3318d0b4b8 Remove content dependencies from mapblock.cpp 2011-11-29 19:13:46 +02:00
Perttu Ahola
81f1cc662f Remove #include <content_mapnode.h> from game.cpp 2011-11-29 19:13:46 +02:00
Perttu Ahola
28fe2987a0 Saner sized sapling 2011-11-29 19:13:45 +02:00
Perttu Ahola
26abf6fd82 Cut down content transfer verbosity 2011-11-29 19:13:45 +02:00
Perttu Ahola
594b189569 Cut down TextureSource verbosity 2011-11-29 19:13:45 +02:00
Perttu Ahola
7696a38543 Improve loading screen and protocol 2011-11-29 19:13:45 +02:00
Perttu Ahola
cde35d1606 Clean nodefeat and content_mapnode a bit 2011-11-29 19:13:45 +02:00
Perttu Ahola
9fc78cbece Fix flowing water being always opaque 2011-11-29 19:13:45 +02:00
Perttu Ahola
e4dff41560 Fix MaterialProperties serialization (constant_time was missing) 2011-11-29 19:13:45 +02:00
Perttu Ahola
2f2392f783 Improve glass 2011-11-29 19:13:45 +02:00
Perttu Ahola
c3703ded95 Fix NDT_PLANTLIKE scaling to always keep the bottom at ground level 2011-11-29 19:13:44 +02:00
Perttu Ahola
e5fd010a6c Replace direct irrlicht texture fetching in CAO content with TextureSource 2011-11-29 19:13:44 +02:00
Perttu Ahola
ba762bcd49 Clean mapnode.h and fix other files accordingly 2011-11-29 19:13:44 +02:00
Perttu Ahola
6da8cb00e2 Node definitions transfer 2011-11-29 19:13:44 +02:00
Perttu Ahola
eed727c61b Completely generalized mesh generation; ContentFeatures serialization 2011-11-29 19:13:44 +02:00
Perttu Ahola
89e7bacd99 Clean more 2011-11-29 19:13:44 +02:00
Perttu Ahola
ff34955a0d Remove commented out code 2011-11-29 19:13:44 +02:00
Perttu Ahola
a48a0e77eb Prepare more for node definition serialization 2011-11-29 19:13:43 +02:00
Perttu Ahola
cf6e22e9a6 Better node texture generation 2011-11-29 19:13:43 +02:00
Perttu Ahola
c1202a2ecc Update inventory texture too 2011-11-29 19:13:43 +02:00
Perttu Ahola
01ae0daea5 Properly update textures in node definitions 2011-11-29 19:13:43 +02:00
Perttu Ahola
45fc45a49e Sending of textures WIP 2011-11-29 19:13:43 +02:00
Perttu Ahola
7bdc328a71 Fix yet-another serialization error in utility.h and set constructor of Buffer take const data for copying 2011-11-29 19:13:43 +02:00
Perttu Ahola
e71744b918 Modify mod and texture directory hierarchies 2011-11-29 19:13:43 +02:00
Perttu Ahola
40e7a1a5c9 Update TODO list in scriptapi.cpp 2011-11-29 19:13:43 +02:00
Perttu Ahola
9e1c4533b8 Move tool definitions to script 2011-11-29 19:13:43 +02:00
Perttu Ahola
4b8e4dae58 Tool definition transfer to client 2011-11-29 19:13:42 +02:00
Perttu Ahola
0754f2a7af ToolDefManager serialization 2011-11-29 19:13:42 +02:00
Perttu Ahola
8d2d28f1dc ToolDefinition serialization 2011-11-29 19:13:42 +02:00
Perttu Ahola
e9620d9c8c Make fence post selection box smaller and create code to allow node placement to the side of a static box 2011-11-29 19:13:42 +02:00
Perttu Ahola
de51f87e05 Tune gravel and picks 2011-11-29 19:13:42 +02:00
Perttu Ahola
1afed48a2c Make possible and do update textures in node definitions after late texture atlas making 2011-11-29 19:13:42 +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
5fc791ac9a Move tool stuff to tool.{h,cpp} 2011-11-29 19:13:41 +02:00
Perttu Ahola
72884bf85f Tune the tool speed thing 2011-11-29 19:13:41 +02:00
Perttu Ahola
f97d4355be New kind of tool speed and wear calculation thingy 2011-11-29 19:13:41 +02:00
Perttu Ahola
96b71236ed Clean headers a bit 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
64fa59e24f Generic NodeMetadata text input 2011-11-29 19:13:41 +02:00
Perttu Ahola
79c9f14aec Generalize selection boxes 2011-11-29 19:13:41 +02:00
Perttu Ahola
2ef414d05f Set the BS constant to be floating-point; this removes the need for floating point numbers when dividing it 2011-11-29 19:13:41 +02:00
Perttu Ahola
77cf27b82b Clean code and modify comments in mapnode_contentfeatures.h 2011-11-29 19:13:40 +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
f8c9b70379 Scripting: Allow multiple global step callbacks and improve documentation 2011-11-29 19:13:40 +02:00
Perttu Ahola
7b802c547d Handle undefined objects better 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
1320d07068 Scripting WIP: dynamic object stuff 2011-11-29 19:13:40 +02:00
Perttu Ahola
0b97ad8384 ServerRemotePlayer implements ServerActiveObject 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
23adfff4fe Scripting WIP 2011-11-29 19:13:39 +02:00
Perttu Ahola
b35adfbd2d Scripting WIP 2011-11-29 19:13:39 +02:00
Perttu Ahola
526eedf98e Scripting WIP 2011-11-29 19:13:39 +02:00
Perttu Ahola
dcedfdacd1 Scripting WIP 2011-11-29 19:13:39 +02:00
Perttu Ahola
ea8d6d7abd 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
41c91391fc Scripting WIP; Lua entity step callback works 2011-11-29 19:13:39 +02:00
Perttu Ahola
a6a1e6ed1a random scripting work-in-progress 2011-11-29 19:13:39 +02:00
Perttu Ahola
bfc68d3151 Scripting WIP 2011-11-29 19:13:38 +02:00
Perttu Ahola
ee8b6d3444 Move images to data/textures and fix some path stuff; hope that installation still works 2011-11-29 19:11:04 +02:00
Perttu Ahola
2115a766f6 Make it actually build 2011-11-29 19:11:04 +02:00
Perttu Ahola
d1a5e97a7f Add Lua 2011-11-29 19:11:04 +02:00
Perttu Ahola
7372282a72 Better spawn position finding and checking 2011-11-13 03:17:42 +02:00
Perttu Ahola
045e32b6ec Fix water-glass and water-lava surfaces 2011-11-08 16:17:38 +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
Kahrl
1c98ec94da Make Connection::Receive return the data via a SharedBuffer reference, so the caller doesn't have to choose the right buffer size in advance.
Conflicts:

	src/test.cpp
2011-11-07 11:21:42 +02:00
Kahrl
28660b4c1a utility.h: Change Buffer's interface to be more compatible with SharedBuffer's interface, connection.h: use Buffer instead of SharedBuffer in command and event queues 2011-11-07 11:19:56 +02:00
Perttu Ahola
fa72e65b59 Add new Connection test in test.cpp in case needed in the future (commented out), improve comments in test.cpp a bit 2011-11-07 11:15:43 +02:00
Perttu Ahola
7d5d676eac Infinite packet flood test for debugging the new network layer 2011-11-07 01:20:58 +02:00
Constantin Wenger
61f2cc45c2 Command-line signal handling for Windows 2011-11-06 19:24:44 +02:00
Perttu Ahola
c1d92d72e1 Make water invisible next to underwater glass 2011-11-05 23:30:27 +02:00
Perttu Ahola
d0fdfd44c5 Add option to set water opaque (mainly for stylistic choice) 2011-11-03 23:06:57 +02:00
Perttu Ahola
f5995337e8 Fix flowing liquid spacing; water and lava next to each other will glitch a bit but it isn't as bad as this was 2011-11-03 23:04:56 +02:00
Perttu Ahola
e9fd3def90 Make CONTENT_IGNORE to not block the view when occlusion culling 2011-11-03 20:45:44 +02:00
Perttu Ahola
a2af490b7b Disable mipmapping because it is sometimes ugly 2011-11-03 20:17:18 +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
03db16d55b Remove trailing / or \ in path_userdata (probably fixes world deletion on Windows) 2011-11-02 13:43:00 +02:00
Perttu Ahola
0c20973c17 Add 3d cloud checkbox in main menu (and rename setting from enable_2d_clouds to enable_3d_clouds) 2011-11-02 12:50:21 +02:00
Perttu Ahola
899404f3b1 Fix an obvious bug in utility.h 2011-11-01 14:54:11 +02:00
Perttu Ahola
6aab526989 Attempt a workaround to the network layer segfault 2011-10-30 11:59:23 +02:00
Perttu Ahola
c349708eab Make it to compile on MSVC2010 2011-10-21 18:37:43 +03:00
Perttu Ahola
7f25183936 Some tuning in m_max_packets_per_second algorithm 2011-10-21 11:52:26 +03:00
Perttu Ahola
4b6138e69b Improve Connection with threading and some kind of congestion control 2011-10-20 23:04:09 +03:00
Perttu Ahola
b6fcbc5fba Default max_simultaneous_block_sends_server_total to 2 to make network not cough too much on the fixed block sending code 2011-10-19 19:34:47 +03:00
Perttu Ahola
ed870a7237 Fix apple inventory texture 2011-10-19 02:36:46 +03:00
Perttu Ahola
3a06fb8831 Fix and tune block sending 2011-10-19 02:17:23 +03:00
Perttu Ahola
d47120aeb3 Add enable_2d_clouds setting for usage on lower-end machines 2011-10-18 23:55:55 +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
28f2fdb6de Fix possible NULL dereference in MobV2CAO::step 2011-10-18 19:53:34 +03:00
Perttu Ahola
4e1055543c Tune map rendering and related diagnostics 2011-10-18 19:18:01 +03:00
Perttu Ahola
8ead29a302 set backface culling off again for torches, ladders, rails and signs 2011-10-18 18:32:35 +03:00
Perttu Ahola
fe98fe342a ...Make the the server buildable again after the last commit 2011-10-18 17:20:54 +03:00
Perttu Ahola
554f7f120c Improve rendering and fix tiling in mesh generation 2011-10-18 13:56:35 +03:00
Perttu Ahola
05ab58cd14 Automate texture listing for texture atlas making 2011-10-18 11:31:23 +03:00
Perttu Ahola
eae2d35ca5 Fix client profiler print interval 2011-10-18 10:36:52 +03:00
Perttu Ahola
85002883bd Better handling of SendFailedException in Connection 2011-10-18 03:42:23 +03:00
Perttu Ahola
22b07bdb30 Fix object duplication bug 2011-10-18 02:58:15 +03:00
Perttu Ahola
fe338745a3 Make active_block_range default to 2 2011-10-18 00:41:17 +03:00
Perttu Ahola
6ce0c61dc0 Fix possible NULL pointer access in MobV2CAO 2011-10-18 00:41:02 +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
67db77b8b3 Modify default active block range 2011-10-17 20:41:43 +03:00
Perttu Ahola
64c4d00693 F2 toggles profiler display in client 2011-10-17 20:40:55 +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
93f4d2b3f1 Catch SendFailedException when replying back in Connection::Receive() 2011-10-17 18:02:26 +03:00
Perttu Ahola
558a133044 Display RTT (round trip time, ping) on client status text 2011-10-17 17:18:50 +03:00
Perttu Ahola
5037efdea9 Add some rendering statistics to profiler 2011-10-17 17:06: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
Perttu Ahola
3daaff3a42 Remove very floody log message of MobV2SAO 2011-10-17 11:45:06 +03:00
celeron55
d39f98aeb0 Improve active object handling log output 2011-10-17 10:47:06 +03:00
celeron55
30c21b4abd Fix partly double printed debug.txt 2011-10-17 10:46:16 +03:00
Perttu Ahola
cfd19dcdb5 Fix punching of oerkkis 2011-10-17 01:58:38 +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
5f39885975 Improve inventory debug output 2011-10-17 01:03:45 +03:00
Perttu Ahola
9ff8067426 Fix items showing up as sticks when placed in world 2011-10-17 00:08:27 +03:00
Perttu Ahola
162619a426 Fix to-transparend conversion of backgrounds of sprite image files that don't have an alpha channel 2011-10-16 23:41:43 +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
07d000cc54 When granting or revoking privileges, notify the target player too 2011-10-16 20:03:43 +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
143dce6672 When player times out, log the action as a timeout rather than regular quitting 2011-10-16 19:38:56 +03:00
Perttu Ahola
96b2d1fd29 Check NULL pointer properly in some new code trying to log new stuff 2011-10-16 18:50:30 +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
0bf533f753 Switch more stuff to use the logging thing and fix segfault on player leave from server as introduced in a previous switch-to-logging commit 2011-10-16 16:28:12 +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
4846846a2d Initially add small and tight logging facility 2011-10-16 12:45:00 +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
4914eb29d1 Replace M_PI with PI 2011-10-16 00:24:51 +03:00
Perttu Ahola
825953bbdc Fix some "Conditional jump or move depends on uninitialised value(s)" valgrind detections 2011-10-15 23:07:43 +03:00
Perttu Ahola
fd6452749e Resource file handling for exe icon for MinGW 2011-10-15 17:05:16 +03:00
Perttu Ahola
7c2639ddd9 Make view bobbing amount configurable 2011-10-15 16:32:24 +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
94dfececf6 strict_protocol_version_checking setting; PROTOCOL_VERSION in clientserver.h; clean up defaultsettings.cpp and minetest.conf.example 2011-10-15 15:02:28 +03:00
Perttu Ahola
74febd5c31 Handle death and respawn better 2011-10-15 14:46:59 +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
080002f8ed Lock mutex when accessing m_env in Server::~Server 2011-10-14 12:39:25 +03:00
Perttu Ahola
853a78681e In CMake scripts: New version number, fix MSVC stuff 2011-10-14 09:55:39 +03:00
Perttu Ahola
9e46cbf7ea Header file tweaking; mainly for speed 2011-10-12 13:53:38 +03:00
Perttu Ahola
b60b58b627 Saner block modification flag operation for not saving everything always 2011-10-12 10:53:37 +03:00
Perttu Ahola
a7833cca22 Merge remote-tracking branch 'marktraceur/master' 2011-09-26 22:41:06 +03:00
Perttu Ahola
9a7471b740 Rotate wielded tool the right way and modify axe graphics accordingly 2011-09-26 16:10:54 +03:00
Perttu Ahola
061d4b4202 Merge branch 'view_bobbing_and_vielded_tool' 2011-09-26 15:10:02 +03:00
Perttu Ahola
2ecd53ce09 Fix single-frame lag in camera yaw/pitch, tune view bobbing and add wielded tool movement when walking and tweak stuff a bit 2011-09-26 15:09:04 +03:00
Perttu Ahola
b9e680d06c Server user limit configuration option 2011-09-26 11:57:51 +03:00
Perttu Ahola
0ccc0ac927 Merge remote-tracking branch 'darkrose/master' 2011-09-26 11:57:28 +03:00
Joshua Beck
ae561d705f Fixed null pointer dereference errors found by cppcheck 2011-09-24 02:11:43 -05:00
Mark Holmquist
bc01ae4cbd Fixed merge issues with saplings, ready to pull now! 2011-09-23 18:19:47 -07: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
darkrose
8b875d71d1 remove content_* things from map.cpp 2011-09-23 18:04:48 +10:00
Perttu Ahola
789c88509c Move PLATFORM_LIBS around to make sqlite3 link with libdl on some distros 2011-09-23 08:48:58 +03:00
Perttu Ahola
bdf54908aa Make client report a newer version number to the server than 2011-07-31 does and make the server enforce it 2011-09-22 20:47:47 +03:00
darkrose
582e450bad added locking chests - clean patch 2011-09-22 19:11:48 +10:00
Perttu Ahola
ae6d83a41e Better apple tree generation 2011-09-21 23:31:55 +03: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
a4a2c34831 reduce view bobbing slightly 2011-09-21 15:54:06 +02:00
Kahrl
36af9bb027 Create a separate scene manager for the wielded tool. This fixes the glitchyness in large map coordinates and some depth buffer problems. (The tool doesn't bob anymore when walking, this will be fixed later.) Fix MSVC build (thanks to dannydark). 2011-09-21 01:42:52 +02:00
Kahrl
6599002149 fix a numerical problem, but tool is still jittery 2011-09-20 18:25:29 +02:00
Kahrl
cbd2bcf102 Fix jittery view bobbing at large map coordinates again. Wielded tool still has problems there 2011-09-20 18:19:26 +02:00
Kahrl
01f3ae1c50 Digging animation 2011-09-20 11:06:16 +02:00
Kahrl
eaff4616ad fix some normals 2011-09-19 17:11:53 +02:00
Kahrl
ab42549b1e Wielded tool updates, leaves and glass work now 2011-09-19 17:08:42 +02:00
Kahrl
02726f0003 Convert any inventory item into a mesh, bring back InventoryItem::getImageRay(), some const-correctness fixes 2011-09-19 06:37:24 +02:00
Kahrl
36bcbca9ac Added sprite extruder 2011-09-19 03:01:11 +02:00
Kahrl
4ed837bcfa trying some view bobbing changes 2011-09-18 17:02:30 +02:00
Kahrl
54f3796f91 Oops, up vector is needed. 2011-09-18 02:24:43 +02:00
Kahrl
ae66d611f2 This looks more like MC view bobbing, but still not even close 2011-09-18 02:17:39 +02:00
Perttu Ahola
b22cb69a15 Merge remote-tracking branch 'sfan5/apple-trees' 2011-09-16 19:09:13 +03:00
Kahrl
40707e3c5b SQLite needs to be linked with -ldl on some Linux distros. 2011-09-16 19:06:45 +03:00
Kahrl
acfb2bb8bc Revert some changes that could lead to slower map transfer and increaed network load. 2011-09-16 18:03:58 +02:00
Kahrl
63266928a5 Made wielded tool move slightly (and smoothly) during view bobbing. Making the tool be a child node of an empty scene node instead of the camera scene node seemingly fixed the uncontrollable tool jitter, too. 2011-09-15 01:53:42 +02:00
Kahrl
fc92da4324 View bobbing is slower in the water. 2011-09-15 01:53:42 +02:00
sfan5
88dc8c694e Added Iron Apple which heals 4 Hearts 2011-09-12 20:10:17 +02:00
sfan5
785a2fd23a Changed the Heal Amount of Apples from 6 to 2 2011-09-12 19:44:26 +02:00
sfan5
4328a6442b Fixed duplication bug 2011-09-11 19:17:14 +02:00
sfan5
6496b1cf1f Removed Spaces 2011-09-11 18:16:07 +02:00
sfan5
c0caedc373 Added Apple Trees 2011-09-11 17:50:44 +02:00
Kahrl
524cf237b8 inventory displays tool breakage bar again 2011-09-08 17:45:39 +02:00
Kahrl
e4cb004460 trying something else... also replaced M_PI by PI everywhere 2011-09-08 16:10:44 +02:00
Kahrl
71418639d3 attempting to merge Queatz/the-wielded-tool and kahrl/viewbobbing, something doesn't work right yet 2011-09-08 14:21:56 +02:00
Kahrl
f2ec226521 minor view bobbing improvements 2011-09-08 13:34:28 +02:00
Kahrl
0931d4b7ff make it slightly less annoying :o) 2011-09-08 13:14:59 +02:00
Kahrl
ccadebabba Implemented view bobbing (testing simple lemniscate shape) 2011-09-08 13:03:55 +02:00
Kahrl
18771a39cf Commented out debug statements again 2011-09-08 01:24:47 +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
JacobF
f31b0a3361 Display which tool the player is holding
And some simple animation when trying to dig...
2011-09-07 10:56:04 -04:00
Perttu Ahola
d28ea57083 Note about texture atlas 2011-09-07 01:27:04 +03:00
Perttu Ahola
8e26c5c066 Add note about trans_table_19. 2011-09-07 01:19:48 +03:00
Perttu Ahola
5c1074aa7d Remove block file from disk when saved to database 2011-09-06 20:28:45 +03:00
JacobF
bd72091150 Pause in unloaded territory instead of collide 2011-09-06 20:07:43 +03:00
Perttu Ahola
faf3d7902a Make Connection::Send cancel silently if peer doesn't exist. 2011-09-06 19:39:23 +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
Perttu Ahola
bc847e8cc2 Fix bug in posix file/directory removal wrapper, as pointed out by kahrl 2011-09-06 17:52:03 +03:00
Perttu Ahola
b82952bdba Fix some texture stuff: remove item_fence.png, use fence.png, remove inexisting cactus.png from texture atlas (replace with nothing because cactus is rare) 2011-09-06 17:13:24 +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
c68ea19e8d Now SAOs will reflect changes to their temporary inventory object
Also, the temp item wasn't being deleted, might have been a memory leak.
Now you will only eat 1 item off a stack
2011-09-06 16:36:11 +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
JacobF
2d872ce3fa Furnace was crashing stuff again 2011-09-02 17:33:06 -04:00
JacobF
e3c58eff1c Merge branch 'master' of /media/Field/Software/minetest-queatz/minetest-sqlite/.. into sqlite-map 2011-09-02 16:59:17 -04:00
JacobF
99de37ff94 Update to SQLite 3.7.7.1 2011-09-01 18:27:30 -04:00
JacobF
5e3b9e3578 * Furnace would say it was overloaded when it had a non-cookable source
* I didn't understand that expression last fix and now the furnace would burn fuel
even when it had no source item.
2011-09-01 15:39:15 -04:00
JacobF
6415528f96 If there was no source item in a furnace it would cause a segmentation fault. 2011-08-30 11:38:53 -04:00
Perttu Ahola
4af1f2963c Merge remote-tracking branch 'kahrl/dissector' 2011-08-30 14:24:33 +03:00
Perttu Ahola
ba0322f353 Merge remote-tracking branch 'queatz/mmb10' 2011-08-30 14:24:23 +03:00
Perttu Ahola
1a705523c0 Merge remote-tracking branch 'queatz/furnace-is-not-blackhole' 2011-08-30 14:24:12 +03:00
Perttu Ahola
87b9e5467d Merge remote-tracking branch 'queatz/furnace-is-not-out-nor-can-rat-escape' 2011-08-30 14:24:07 +03:00
Perttu Ahola
625dac8d8c Merge remote-tracking branch 'queatz/privs' 2011-08-30 14:23:44 +03:00
JacobF
134e49cc8e Merged 2 branches because they relied on each other.
This one contains these changes from main c55:
* Adds a function to check if there is room for a specific item
* Using that, you can now pick up rats if you have a full inventory and a not full rat stack
* Furnace would cook only 1 item if that item used the last available result slot, now it will continue
* Furnace will say it's overloaded
* Furnace won't wait until the next step to start on the next item
 - This caused small fuels to cook slower than meant to
 - Also caused furnaces to say they were out of fuel after finishing the last fuel item
2011-08-25 19:27:50 -04:00
Kahrl
3edf2bb417 dissector branch: fix description of TOCLIENT_PLAYERITEM in clientserver.h 2011-08-25 21:31:28 +02:00
JacobF
e278742c5e Middle mouse click will move 10 items around at a time. 2011-08-25 12:43:19 -04:00
JacobF
ef08163c38 Don't remove furnace if something is inside it. 2011-08-24 18:53:06 -04:00
JacobF
2e82268a67 If a user doesn't have build rights, don't allow them to move items to and from their inventory 2011-08-23 22:08:09 -04:00
JacobF
00bdfad5f6 The password box in the mainmenu is focused if there is already a name and address filled in 2011-08-23 22:06:35 -04:00
Perttu Ahola
efd8dabd91 Lava is now better visible inside water. (a crappy hack) 2011-08-23 03:01:01 +03:00
Perttu Ahola
e4f443a57a Inventory transparency; very loosely based on sapier's commits.
Also contains some commented-out code for testing out different looks
in the future.
2011-08-23 00:33:38 +03:00
Perttu Ahola
d4df20a913 if creative mode and player has no build privileges, cannot drop items. 2011-08-22 22:55:17 +03:00
Perttu Ahola
db495668ae Fixed water mesh generation acting weird next to sand 2011-08-22 22:44:43 +03:00
Perttu Ahola
996c653490 Fix byte count in serialization of "F1000"
Some access violations and segfaults and strange behaviour might have
been caused by this.
2011-08-22 22:17:26 +03:00
Perttu Ahola
4acad897cf Fixed some protocol comment errors in clientserver.h and elsewhere
-- TOCLIENT_OBJECTDATA: peer ID field is missing
-- TOCLIENT_ACTIVE_OBJECT_REMOVE_ADD: added: init length should be u32, not u16
2011-08-22 22:04:46 +03: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
a99450ab72 Possibly fixed the extremely rare PeerNotFound loop bug.
See explanation in http://2pktfkt.de/irc/minetest-delta/2011-08-22.html
2011-08-22 21:27:11 +03:00
Perttu Ahola
5415256a52 Merge remote-tracking branch 'oblomov/me_cmd' 2011-08-22 14:46:54 +03:00
Perttu Ahola
836e43db60 Merge remote-tracking branch 'oblomov/new_input' 2011-08-22 14:46:52 +03:00
Giuseppe Bilotta
9c94538fb7 Change way commands are displayed in chat window 2011-08-22 13:43:53 +02:00
Giuseppe Bilotta
53eedd3ba4 Introduce hotkey for calling up a command window
This is just a chat window with the / text pre-loaded.
2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
42134bb49e Send KEY_END when (re)creating a text input
This ensures that on creation and when resizing the cursor is at the end
of the text rather than at the beginnig.
2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
0488bf54d3 /me command 2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
da19aee307 Server now supports replies without prefix 2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
d2c0b4905a Defines for server command context flags 2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
153f07fdfb Remove distinction between /# and / commands
No need to make the server command syntax more complicated than
necessary. If the need ever arise, we'll find some other way to
distinguish the client commands. Also, the /# syntax is deprecated and
will be made obsolete in time.
2011-08-22 13:02:08 +02:00
Giuseppe Bilotta
7e610aece5 Overhaul the input system
This allows us to map the keys which are not considered in
irrlicht's EKEY_CODE system, such as \, [, /, ] etc.
2011-08-22 13:01:11 +02:00
Giuseppe Bilotta
16aedc0ef6 Fix typos in key names 2011-08-22 12:52:15 +02:00
Perttu Ahola
6596e585fe Flowing lava updates lighting 2011-08-22 13:19:07 +03:00
Perttu Ahola
f98eda4d52 Merge remote-tracking branch 'oblomov/liquid_fixes' 2011-08-22 12:53:18 +03:00
Perttu Ahola
23717510c2 Merge branch 'lava' 2011-08-22 12:53:02 +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
Perttu Ahola
29c9d3d5f4 Implemented MEET_OTHER 2011-08-16 12:23:19 +03: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
Perttu Ahola
296748d32e Fixed liquid mesh generation 2011-08-15 17:45:35 +03:00
Perttu Ahola
ad408f269c Add lava to creative inventory (hmm, we're shortly running out of creative inventory space) 2011-08-15 16:57:57 +03:00
Perttu Ahola
e57754868f Hopefully fixed msvc "'sqrt' : ambiguous call to overloaded function" 2011-08-15 15:11:00 +03:00
Perttu Ahola
0c7e7f4998 Non-vertex-alpha texture material for lava 2011-08-15 12:08:41 +03:00
Perttu Ahola
4b85608e30 modified mapgen to generate less lava 2011-08-15 11:56:16 +03:00
Perttu Ahola
8ab77f4153 Added #define WATER_ALPHA in content_mapnode.cpp 2011-08-15 11:51:33 +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
Perttu Ahola
c4b707bca2 Windows.h -> windows.h for cross-mingw build 2011-08-14 21:26:07 +03:00
Perttu Ahola
9e35fe8c37 Merge remote-tracking branch 'speedprog/fixedNotFindingData' 2011-08-13 14:05:01 +03:00
Giuseppe Bilotta
385904d75a Let Settings accept a const char* directly 2011-08-13 07:33:43 +02:00
Giuseppe Bilotta
b1e0b7728b Fix keycode_to_keyname return value 2011-08-13 07:31:46 +02:00
Giuseppe Bilotta
eb255e6870 Clean up key names handling
Constify keycode and move the static array of localizable names from the
guiKeyChangeMenu header to the implementation file, changing its name.
2011-08-12 23:42:00 +02:00
Giuseppe Bilotta
72e4c8f523 Fix use of && instead of & 2011-08-12 23:34:12 +02:00
Perttu Ahola
835d2e4b5f Removed assert if creating texture atlas image fails; cancel creating image instead. 2011-08-12 17:17:47 +03:00
Constantin Wenger
94b42a79d7 fixed not finding data dir if installed 2011-08-12 14:26:37 +02:00
Perttu Ahola
e40da2341c Fixed/extended/modified ban stuff to be good for inclusion 2011-08-12 13:11:27 +03:00
Perttu Ahola
7aa72c56b6 Merge remote-tracking branch 'speedprog/banByIp' 2011-08-12 11:55:51 +03:00
Constantin Wenger
5784c14ab7 added ipban support
commands:
/#ipban <nick>
/#ipunban <ip>
2011-08-12 03:37:18 +02:00
Giuseppe Bilotta
dfdc817db3 Typo fix 2011-08-11 19:45:44 +02:00
Giuseppe Bilotta
371af9c241 Notify other players of wielded item change 2011-08-11 15:22:36 +02:00
Giuseppe Bilotta
88a9bae160 constify inventory item serialization 2011-08-11 15:22:36 +02:00
Giuseppe Bilotta
ecd5c5f920 Clients inform server on wielded item
This is done with the new TOSERVER_PLAYERITEM message, that informs the
server on the index of the wielded item.
2011-08-11 15:22:36 +02:00
Giuseppe Bilotta
91d1186cbb Keep track of player item 2011-08-11 15:22:36 +02:00
Giuseppe Bilotta
467b3cf4c1 Some inventory const-ification 2011-08-11 15:22:35 +02:00
Giuseppe Bilotta
c007d8219e Server should use the same eye position as the client 2011-08-11 15:22:35 +02:00
Giuseppe Bilotta
b318e82356 Refactor player's eye position coding
Collect the player's eye position coding in a Player method, and
use it in client to pass the eye position information to the game.
2011-08-11 15:22:35 +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
Perttu Ahola
69fca4f3cb Merged some FreeBSD fixes 2011-08-11 12:32:36 +03:00
q66
f6ed45fc20 Proper placement of binary files. 2011-08-11 11:19:33 +02:00
q66
43b6ca0d14 Prevent threadid_t from losing precision when casted on 64bit systems 2011-08-11 10:52:27 +02:00
Giuseppe Bilotta
34492ce480 Respect base virtual functions' signatures 2011-08-08 16:15:53 +02:00
Giuseppe Bilotta
163c38e175 Always return from non-void functions
This quiets a warning in Clang.
2011-08-08 16:13:48 +02:00
Giuseppe Bilotta
11be390110 Keys should be s32, not u32
At least two reasons for this:
* activeKey is treated as signed (check for sign, assign -1, etc)
* the ID retrieved from Irrlicht's events are signed
2011-08-08 16:12:15 +02:00
Giuseppe Bilotta
ea26a9f543 Remove spurious assignment 2011-08-08 16:11:37 +02:00
Giuseppe Bilotta
f9e1b0cd97 InventoryAction is a struct, not a class 2011-08-08 15:38:20 +02:00
Giuseppe Bilotta
805564dcf2 Clang doesn't like -Wno-unused-but-set-variable
The release versions of CMake don't yet properly support flag checking
in Clang, so we need to exclude it explicitly for the time being.
2011-08-11 10:08:58 +02:00
Giuseppe Bilotta
76fb792544 Project uses C++, so use CHECK_CXX_COMPILER_FLAG
Although this doesn't change much for our specific case, it can make a
difference for some flags, so use the appropriate macro.
2011-08-11 10:06:48 +02:00
Dmitry Marakasov
ff35014eff Fix data paths for FreeBSD 2011-08-02 02:50:16 +04:00
Dmitry Marakasov
de868d24c1 Fix "integer constant is too large for 'long' type" error 2011-08-02 02:49:15 +04:00
Dmitry Marakasov
318a730c45 Check whether -Wno-unused-but-set-variable is supported before using
it. It seems to only be available on recent (>=4.6) versions of gcc.
2011-08-01 22:17:32 +04:00
Perttu Ahola
9017c51e7f the zlib error print function now prints to dstream (debug.txt) 2011-08-08 12:11:41 +03:00
Perttu Ahola
64a6da3e45 merged delta and c55 2011-08-05 11:22:13 +03:00
Giuseppe Bilotta
59c58f230e Some obvious errors in the new fluid flow management 2011-08-05 08:45:15 +02:00
Giuseppe Bilotta
f79069f5b3 MapNode is a struct, not a class 2011-08-05 08:45:15 +02:00
Constantin Wenger
7361f29527 fixed some error :/ 2011-08-05 08:45:15 +02:00
Constantin Wenger
4ab4e33450 marked strings as translation
now translated if set to a button
2011-08-05 08:45:15 +02:00
Constantin Wenger
0cfca69b42 fixed displaying special chars in the keychange menu 2011-08-05 08:45:15 +02:00
Perttu Ahola
0b37f98e16 * fix for broken water 2011-08-03 19:00:25 +02:00
Perttu Ahola
5f8809e425 Fixed farmesh to such that it was a long time ago. 2011-08-03 13:03:30 +03:00
Giuseppe Bilotta
1d1aec9631 Use wgettext 2011-08-02 10:11:40 +02:00
Giuseppe Bilotta
817180bd55 Introduce wgettext
All usages of gettext() are converted to wchars, so let's factor this
into a single inline.
2011-08-02 10:11:40 +02:00
Giuseppe Bilotta
60bd878f0a Get rid of unused variables 2011-08-02 10:11:39 +02:00
Perttu Ahola
97d659c9fd added TODO in main.cpp 2011-08-01 19:21:43 +03:00
Nils Dagsson Moskopp
363487c97b * less clumsy ladder texture, based on rails 2011-08-01 15:47:02 +02:00
Mark Holmquist
7bd9e53ae6 Changing CONTENT_LADDER to be an extended block 2011-08-01 09:22:56 +02:00
Mark Holmquist
267744a568 Fixing ladders again 2011-08-01 09:22:44 +02:00
Mark Holmquist
8e67f4c4e6 Fixed a few problems in the ladder update, and changed the speed to account for gravity 2011-08-01 09:22:36 +02:00
Mark Holmquist
1c59cff832 Ladders implemented! 2011-08-01 09:22:36 +02:00
Mark Holmquist
bc2819cab2 Added ladders--they don't have any use yet, though 2011-08-01 09:22:36 +02:00
Nils Dagsson Moskopp
7ece67727d Merge remote-tracking branch 'origin/upstream' 2011-07-31 20:04:04 +02:00
Perttu Ahola
19ea901cf2 Fixes a bug that made the server to deny non-empty passwords from players connecting the first time. 2011-07-31 15:51:24 +03:00
Perttu Ahola
e0b8e66540 Fixed problem of server always receiving an empty password from the client 2011-07-31 15:32:45 +03:00
Constantin Wenger
54de4afd75 last fix was shit but this one works (tested) 2011-07-31 14:28:07 +02:00
Perttu Ahola
756f8f88d4 Made stricter handling for old clients because now they are not compatible at all. 2011-07-31 02:27:26 +03:00
Perttu Ahola
d6a9bec843 Added MaterialItem conversion from old content type namespace to new 2011-07-31 02:20:40 +03:00
Perttu Ahola
d7a5eea862 changelog update and disable motd by default 2011-07-31 01:14:56 +03:00
Perttu Ahola
149875607c updated CMakeList.txts a bit 2011-07-31 00:51:18 +03:00
Perttu Ahola
05d0eaf5fc added windows icon 2011-07-31 00:39:43 +03:00
Constantin Wenger
50dc2d8112 fixe for msvc broke linux 2011-07-30 23:05:40 +02:00
Perttu Ahola
8e1eacf3a8 Fixed handling of inventory in creative mode (normal inventory is not trashed anymore), fixed mese pick speed, added some forgotten stuff 2011-07-30 23:33:57 +03:00
Constantin Wenger
c08720bfba this fixes problem with msvc++ and should work on other systems and so on anyway. 2011-07-30 22:08:16 +02:00
Constantin Wenger
4882bda667 changed one forgotten en_US.UTF-8 to C 2011-07-30 22:08:16 +02:00
Constantin Wenger
a817419fe4 fixed redefinitivon of gettext.h is included more than once 2011-07-30 22:08:16 +02:00
Constantin Wenger
37bf9a666a set some more text to gettext and updated po files 2011-07-30 22:08:16 +02:00
Constantin Wenger
9baae3a701 set locales to C because en_US not installed on some systems, only UTF-8 version and en_US.UTF-8 does not work. 2011-07-30 22:08:16 +02:00
Constantin Wenger
92f504f98d fixed displaying "umlauts" (deutsch umlaute) and hopefully other non ASCII chars, too 2011-07-30 22:03:25 +02:00
Nils Dagsson Moskopp
96bee29e35 Merge branch 'upstream/master' 2011-07-30 19:47:55 +02:00
Perttu Ahola
f2051c9822 fix to the former 2011-07-30 20:10:16 +03:00
Perttu Ahola
f8fca8ca5e easier notice on old version 2011-07-30 20:06:30 +03:00
Perttu Ahola
24a662705c Added network protocol version number in protocol 2011-07-30 20:02:17 +03:00
Nils Dagsson Moskopp
4ef9c7675a Merge remote-tracking branch 'origin/upstream' 2011-07-30 18:55:43 +02:00
Perttu Ahola
cdadbdbd17 Server configuration is now written when "/#setting whatever = whatever" is issued. 2011-07-30 19:49:42 +03:00
Perttu Ahola
9b294ffa7a Added message of the day and made it properly configurable using /#setting (not saved to config file yet) 2011-07-30 19:31:33 +03:00
Perttu Ahola
4b0c3e4357 Made picking items up in creative mode delete them (because they usually are in the inventory already anyway) 2011-07-30 19:05:25 +03:00
Perttu Ahola
cae422076b updated pause menu text a bit 2011-07-30 18:54:02 +03:00
Perttu Ahola
d62ae0e18b Rats are now eatable. Also made their selection box move smoothly. 2011-07-30 18:51:15 +03:00
Perttu Ahola
4556c212db Made rats cookable and made them spawn near trees 2011-07-30 17:51:21 +03:00
Perttu Ahola
8ceb0586b2 made more things burnable in furnace 2011-07-30 14:57:43 +03:00
Perttu Ahola
df27b85432 quick fix to it not building with gettext on my visual studio environment 2011-07-30 14:38:41 +03:00
Perttu Ahola
1de45cc8a7 Removed remaining -delta references 2011-07-30 14:02:11 +03:00
Perttu Ahola
416499f978 fix server build 2011-07-25 23:31:02 +03:00
Giuseppe Bilotta
cce210f676 Locale dir should be parallel to global data dir 2011-07-24 19:23:03 +02:00
Giuseppe Bilotta
a8e493122e Read config from gettext.h
Otherwise the USE_GETTEXT define might not be visible.
2011-07-24 19:13:34 +02:00
Giuseppe Bilotta
3715e39e5d Actually make USE_GETTEXT available in the source 2011-07-24 18:34:10 +02:00
Giuseppe Bilotta
423109e64c Two more instances of unhardcoding the project name 2011-07-24 18:12:11 +02:00
Giuseppe Bilotta
e034f8a2a3 Sanitize GETTEXT usage macros
Now the user-level option is called ENABLE_GETTEXT, and USE_GETTEXT is
only set to true if gettext was enabled and found. This simplifies all
check to USE_GETTEXT only rather than the double checks for it being
enabled and found.
2011-07-24 16:52:59 +02:00
Giuseppe Bilotta
47381bde3b Bring po update out of cmake again
This solves two issues at once:
* CMake would delete po files during ‘make clean’ because it thought
  they were autogenerated and not just managed
* the only gettext tools readily available in Windows are so old they
  don't support options like --package-name

The change also moves minetest.pot down one level, so we don't need to
special case ‘en’ anymore.

The downside is of course that you need some sane POSIX shell to update
the po files.
2011-07-24 16:52:59 +02:00
Giuseppe Bilotta
c578efb32b Refactor gettext init
Put the gettext init code in a macro and define it appropriately
depending on whether gettext is actually available or not.
2011-07-24 16:52:59 +02:00
Perttu Ahola
dbea511a6f Lowered default viewing range minimum to such that it allows fairly good framerate in jungles with sucky hardware.
Almost all computers stick to the minimum with the current farmesh range that someone has set up without asking from me, but farmesh is not used as default anyway so those that use it can raise the lower limit in their configuration as they wish.
2011-07-24 12:49:47 +03:00
Perttu Ahola
c9e615bde4 Updated the texture atlas a bit 2011-07-24 12:45:52 +03: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
ed8f5576a5 changed jungletree/junglegrass content ids to extended range 2011-07-24 11:40:14 +03:00
Perttu Ahola
112b85d0fb merged fix to decapitated trees; other bugs now exists 2011-07-24 11:39:13 +03:00
Giuseppe Bilotta
5aa2679be7 Do not package en translation, since we don't build it 2011-07-24 09:19:25 +02:00
Giuseppe Bilotta
d4e7faca21 Gettext domain should match the project name
This partially reverts 023cc0d37776976b4b192b7363f73a5d2debdef6, goes
back to using PROJECT_NAME for the filename and also uses PROJECT_NAME
as text domain in the source code.
2011-07-24 09:19:25 +02:00
Giuseppe Bilotta
4ffba76bb3 Place project name and gettext use in config 2011-07-24 09:18:29 +02:00
Perttu Ahola
8d84086f35 removed unnecessary verbosity from debug output of tile.cpp 2011-07-24 10:12:08 +03:00
Nils Dagsson Moskopp
f4a08f7fb3 Merge pull request #34 from SpeedProg/master
Changes to make gettext enabled if it is found
2011-07-23 19:01:51 -07:00
Perttu Ahola
73cf4b3016 made shadows less blue 2011-07-24 00:49:45 +03:00
Constantin Wenger
f6d9bcc9bb updated cmakerules to autodetect if gettext can be used
fixed error if gettext is disabled
2011-07-23 22:36:11 +02:00
Perttu Ahola
68a9157b94 Fixed issue #15: Glass blocks a lot of light 2011-07-23 20:28:05 +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
0b4cdfa023 Made hotbar a bit smaller 2011-07-23 20:22:04 +03:00
Perttu Ahola
501034a792 merged jungle and bluish shadows 2011-07-23 20:01:06 +03:00
Perttu Ahola
96fedb5cb0 removed -delta namings 2011-07-23 19:33:49 +03:00
Perttu Ahola
f13fc82abe converted main.cpp dos linefeeds to unix linefeeds. 2011-07-23 19:17:39 +03:00
Perttu Ahola
bc14898bf9 updated main.cpp comments a bit 2011-07-23 19:16:49 +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
f17cfb35d1 uh, i guess this now merges the new delta stuff? 2011-07-23 15:50:05 +03:00
Perttu Ahola
3882536d40 merged some stuff from upstream while merging delta 2011-07-23 15:46:00 +03:00
Perttu Ahola
d67cef0eb7 Made dark places tint slightly in blue 2011-07-23 04:10:17 +03:00
Perttu Ahola
8993d9dd83 Jungle biome/whatever thing 2011-07-23 02:04:24 +03:00
Perttu Ahola
6c2d95f868 * key change menu now saving immediately 2011-07-22 21:54:26 +02:00
Perttu Ahola
58f612eca1 Changing key settings now doesn't require a game restart 2011-07-22 22:35:20 +03:00
Constantin Wenger
383698186f Merge remote-tracking branch 'upstream/master' 2011-07-22 20:53:29 +02:00
Constantin Wenger
2abe6ed75c Merge remote-tracking branch 'upstream/master' 2011-07-22 20:53:29 +02:00
Constantin Wenger
fb4c3ab4fb fixed some problems with filenames of the translations 2011-07-22 20:40:47 +02:00
Constantin Wenger
a12229f271 fixed some problems with filenames of the translations 2011-07-22 20:40:47 +02:00
Nils Dagsson Moskopp
7985d746f9 Merge branch 'upstream/master' 2011-07-22 20:16:58 +02:00
Nils Dagsson Moskopp
805ccd449f Merge branch 'upstream/master' 2011-07-22 20:16:58 +02:00
Perttu Ahola
f706644a50 Fixed the problem of <=r548 clients fucking up maps on >=r549 servers. Also, already fucked up maps are now loaded correctly. 2011-07-22 18:51:49 +03:00
Giuseppe Bilotta
7d9dd352cf Declare USE_GETTEXT option 2011-07-22 14:42:04 +02:00
Giuseppe Bilotta
9653522873 Declare USE_GETTEXT option 2011-07-22 14:42:04 +02:00
Constantin Wenger
a09660dc85 fixed problem with displaying special chars 2011-07-22 13:27:30 +02:00
Constantin Wenger
bf3dfec7d6 fixed problem with displaying special chars 2011-07-22 13:27:30 +02:00
Giuseppe Bilotta
d78e5e7329 updatepo cmake rule
Get rid of the system-specific updatelocales.sh and introduce an
updatepo cmake rule. po files are also updated before creating the mo
files, and we now keep the .pot file (in the po/en directory). To
stabilize the po file creation, file contents are sorted by source
filename.

Update po files in the process.
2011-07-22 12:40:29 +02:00
Giuseppe Bilotta
aaa165f985 updatepo cmake rule
Get rid of the system-specific updatelocales.sh and introduce an
updatepo cmake rule. po files are also updated before creating the mo
files, and we now keep the .pot file (in the po/en directory). To
stabilize the po file creation, file contents are sorted by source
filename.

Update po files in the process.
2011-07-22 12:40:29 +02:00
Perttu Ahola
2b39be44e4 added an unit test for the Settings thingy (the python ConfigParser -like thing) 2011-07-22 13:10:58 +03:00
Giuseppe Bilotta
e61b2f99c1 Static naming of po file
The po file should not be named c55 if we're in ∆. But since it is not
exposed at installation time, we don't actually need its name to be
based on the project name at all, so just call it minetest.po
2011-07-22 09:58:02 +02:00
Giuseppe Bilotta
8f2409a1b4 Static naming of po file
The po file should not be named c55 if we're in ∆. But since it is not
exposed at installation time, we don't actually need its name to be
based on the project name at all, so just call it minetest.po
2011-07-22 09:58:02 +02:00
Giuseppe Bilotta
d386f02893 Refactor mo creation/installation 2011-07-22 09:36:17 +02:00
Giuseppe Bilotta
0ec749317c Refactor mo creation/installation 2011-07-22 09:36:17 +02:00
Giuseppe Bilotta
5a3218e535 Use project name for mo files 2011-07-22 08:33:08 +02:00
Giuseppe Bilotta
bc05bd8b59 Use project name for mo files 2011-07-22 08:33:08 +02:00
Giuseppe Bilotta
02653573d2 Merge remote-tracking branch 'erlehmann/master'
Conflicts (from the introduction of fr translations):
	src/CMakeLists.txt
2011-07-22 07:48:22 +02:00
Giuseppe Bilotta
7c1ea34baf Merge remote-tracking branch 'erlehmann/master'
Conflicts (from the introduction of fr translations):
	src/CMakeLists.txt
2011-07-22 07:48:22 +02:00
Constantin Wenger
5c66664aef changed some lines to fit the 80chars limit 2011-07-22 07:25:40 +02:00
Constantin Wenger
3d53cc2c11 changed some lines to fit the 80chars limit 2011-07-22 07:25:40 +02:00
Perttu Ahola
329158f7d1 Fixed small error in mapnode.cpp (didn't cause any harm though) 2011-07-22 01:37:21 +03: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
2b3bc33708 added some TODOs to main.cpp 2011-07-21 23:28:30 +03:00
Perttu Ahola
308d861327 Merged minetest-delta a624fe549bc75855a170 2011-07-21 20:55:08 +03:00
Cyriaque Skrapits
8048961cc5 Added french translation. 2011-07-21 16:09:57 +02:00
Cyriaque Skrapits
6875ead7cf Added french translation. 2011-07-21 16:09:57 +02: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
cbf2ac5e8f * different collision box for fireflies so they now hover above the ground 2011-07-21 15:40:00 +02:00
Nils Dagsson Moskopp
5388e8b124 * different collision box for fireflies so they now hover above the ground 2011-07-21 15:40:00 +02:00
Giuseppe Bilotta
02b14090c2 Reorganize cmake gettext message output to ease debugging 2011-07-21 15:16:59 +02:00
Giuseppe Bilotta
767280577b Reorganize cmake gettext message output to ease debugging 2011-07-21 15:16:59 +02:00
Giuseppe Bilotta
56a744599f Restore "Leave address blank" position 2011-07-21 15:12:58 +02:00
Giuseppe Bilotta
aa6506ce96 Restore "Leave address blank" position 2011-07-21 15:12:58 +02:00
Giuseppe Bilotta
9fa4b72a47 Find correct library for MSVC vs MingW in Winows 2011-07-21 14:50:15 +02:00
Giuseppe Bilotta
02695bebc6 Find correct library for MSVC vs MingW in Winows 2011-07-21 14:50:15 +02:00
Giuseppe Bilotta
3e78b29cae Only install locale files if using gettext 2011-07-21 14:46:23 +02:00
Giuseppe Bilotta
7b93fb59cf Only install locale files if using gettext 2011-07-21 14:46:23 +02:00
Giuseppe Bilotta
d63c160bd6 Uppercase DEFINED or cmake 2.8.4 complains 2011-07-21 13:59:50 +02:00
Giuseppe Bilotta
adb7181969 Uppercase DEFINED or cmake 2.8.4 complains 2011-07-21 13:59:50 +02:00
Giuseppe Bilotta
1340da7b54 Refactor and clean up gettext management 2011-07-21 12:33:29 +02:00
Giuseppe Bilotta
b99174cb0c Refactor and clean up gettext management 2011-07-21 12:33:29 +02:00
Giuseppe Bilotta
89af509d10 Make gettext optional 2011-07-21 09:03:41 +02:00
Giuseppe Bilotta
fd70bbd367 Make gettext optional 2011-07-21 09:03:41 +02:00
Weedy
89b8b792c1 Tweak makefiles to add -delta suffix. 2011-07-21 09:03:20 +02:00
Weedy
36d8f91f1a Tweak makefiles to add -delta suffix. 2011-07-21 09:03:20 +02:00
Weedy
a19491dbd2 Fix win32 MSVC compile. (screw gettext) 2011-07-21 09:03:17 +02:00
Weedy
9cb5f70be5 Fix win32 MSVC compile. (screw gettext) 2011-07-21 09:03:17 +02:00
Nils Dagsson Moskopp
bca3de3d08 Merge pull request #27 from Oblomov/master
* regression fix for windows build.
2011-07-20 14:29:01 -07:00
Nils Dagsson Moskopp
f5c6e3973c Merge pull request #27 from Oblomov/master
* regression fix for windows build.
2011-07-20 14:29:01 -07:00
Giuseppe Bilotta
29aae3dcb5 Move package search out of conditional
This unbreaks the Windows build which would otherwise have problems at
the jthread level.
2011-07-20 23:09:28 +02:00
Giuseppe Bilotta
e7beaac6f5 Move package search out of conditional
This unbreaks the Windows build which would otherwise have problems at
the jthread level.
2011-07-20 23:09:28 +02:00
Nils Dagsson Moskopp
8129d16dd3 + fireflies 2011-07-20 22:05:57 +02:00
Nils Dagsson Moskopp
84684e53ed + fireflies 2011-07-20 22:05:57 +02:00
Nils Dagsson Moskopp
2732dac337 Merge branch 'master' of github.com:erlehmann/minetest-delta 2011-07-20 18:56:32 +02:00
Nils Dagsson Moskopp
8ed83250d7 Merge branch 'master' of github.com:erlehmann/minetest-delta 2011-07-20 18:56:32 +02:00
Nils Dagsson Moskopp
0f10fc0cd9 Merge pull request #24 from SpeedProg/master
gettext paths problem
2011-07-20 09:56:23 -07:00
Nils Dagsson Moskopp
360a8918dd Merge pull request #24 from SpeedProg/master
gettext paths problem
2011-07-20 09:56:23 -07:00
Constantin Wenger
c6d99fbe0c fixed problem with wront paths in gettext 2011-07-20 18:49:18 +02:00
Constantin Wenger
4d43a67419 fixed problem with wront paths in gettext 2011-07-20 18:49:18 +02:00
Nils Dagsson Moskopp
84b85964fa Merge branch 'master' of github.com:erlehmann/minetest-delta 2011-07-20 18:29:48 +02:00
Nils Dagsson Moskopp
33e80dae7f Merge branch 'master' of github.com:erlehmann/minetest-delta 2011-07-20 18:29:48 +02:00
Giuseppe Bilotta
52df1b598c Set the window caption for the initial window too 2011-07-20 17:59:48 +02:00
Giuseppe Bilotta
3fb5b7a3bd Set the window caption for the initial window too 2011-07-20 17:59:48 +02:00
Giuseppe Bilotta
8fa94c3547 Check the data path before usage
When not running in place, check if the assumed data path in
../share/APPNAME exists. If it doesn't exist, fall back to ../data
instead. This allows the program to run successfully from the checkout
directory even without the run-in-place flag active.
2011-07-20 17:59:48 +02:00
Giuseppe Bilotta
bcd3e1af2f Check the data path before usage
When not running in place, check if the assumed data path in
../share/APPNAME exists. If it doesn't exist, fall back to ../data
instead. This allows the program to run successfully from the checkout
directory even without the run-in-place flag active.
2011-07-20 17:59:48 +02:00
Giuseppe Bilotta
3321edae77 Use system sqlite3/jthread libs if available 2011-07-20 17:59:48 +02:00
Giuseppe Bilotta
cd45ae3d0f Use system sqlite3/jthread libs if available 2011-07-20 17:59:48 +02:00
Nils Dagsson Moskopp
69937c342c Merge branch 'master' of github.com:erlehmann/minetest-delta 2011-07-20 17:56:49 +02:00
Nils Dagsson Moskopp
e5dc58e710 Merge branch 'master' of github.com:erlehmann/minetest-delta 2011-07-20 17:56:49 +02:00
Constantin Wenger
6a8328de79 added gettext support
german translation file
and bashscript to update translations
2011-07-20 16:51:19 +02:00
Constantin Wenger
052bb24c7f added gettext support
german translation file
and bashscript to update translations
2011-07-20 16:51:19 +02:00
Nils Dagsson Moskopp
9bc701d194 Merge branch 'upstream/master' 2011-07-20 14:20:07 +02:00
Nils Dagsson Moskopp
3c630c0d90 Merge branch 'upstream/master' 2011-07-20 14:20:07 +02:00
Nils Dagsson Moskopp
6791c856b2 * by popular request, fewer clouds 2011-07-20 02:44:51 +02:00
Nils Dagsson Moskopp
ffd3cdf519 * by popular request, fewer clouds 2011-07-20 02:44:51 +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
Nils Dagsson Moskopp
821ff68f54 * initialize liquid_kind properly so compiler does not bitch about it 2011-07-19 02:02:50 +02:00
Nils Dagsson Moskopp
a99b7e6e05 + fake shading for the volumetric clouds 2011-07-19 01:43:30 +02:00
Nils Dagsson Moskopp
e8eb4d233b + fake shading for the volumetric clouds 2011-07-19 01:43:30 +02:00
Nils Dagsson Moskopp
890d3468e7 + volumetric clouds (thanks teddydestodes) 2011-07-18 22:50:14 +02:00
Nils Dagsson Moskopp
414d1ff9e2 + volumetric clouds (thanks teddydestodes) 2011-07-18 22:50:14 +02:00
Felix Krause
466f9d87b6 final fixes to liquid flow, works now as intended 2011-07-18 02:38:57 +02:00
Felix Krause
7d92ce061d 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
a1e2a8bec6 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
f34a9b6a71 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
Felix Krause
def870953a * 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
Nils Dagsson Moskopp
13b2bad54b * changed GUI to indicate Minetest Δ 2011-07-17 22:33:51 +02:00
Nils Dagsson Moskopp
077ffa5231 * changed GUI to indicate Minetest Δ 2011-07-17 22:33:51 +02:00
Perttu Ahola
74ef5b8a42 Hopefully fixed u64 to be the actual 64-bit type on 64-bit architectures. This should fix the compiler error caused by irrlicht on 64-bit fedora defining u64 to be different. 2011-07-17 19:32:06 +03: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
014a3aea32 Merge remote-tracking branch 'origin/upstream' 2011-07-16 16:52:45 +02:00
Nils Dagsson Moskopp
8bfa56648d Merge remote-tracking branch 'origin/upstream' 2011-07-16 16:52:45 +02:00
Perttu Ahola
afa2b8714f Attempt to fix a problem with the factory mappings of objects residing in different source files than the prototype objects that fill them in 2011-07-16 17:39:03 +03:00
Nils Dagsson Moskopp
5086bd5664 * fix automerge regression 2011-07-15 20:16:02 +02:00
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
Perttu Ahola
21372749f5 now it works nicely 2011-02-11 20:37:54 +02:00
Perttu Ahola
52d99fef31 fully working i guess 2011-02-11 19:55:42 +02:00
Perttu Ahola
804b2647ce new texture stuff quite working 2011-02-11 16:43:26 +02:00
Perttu Ahola
841ac10e5c fixes toward mingw compatibility 2011-02-10 15:55:15 +02:00
Perttu Ahola
a7b158fada some texture stuff 2011-02-10 10:53:17 +02:00
Perttu Ahola
1704badc30 work-in-progress texture atlas optimization 2011-02-10 02:13:03 +02:00
Perttu Ahola
949383a2f7 uh... accidentally left directX as the default in main.cpp 2011-02-08 11:34:31 +02:00
Perttu Ahola
b0971f4459 local game connects to 127.0.0.1 instead of localhost (windows returns an ipv6 address sometimes which is not supported) 2011-02-08 11:24:07 +02:00
Perttu Ahola
15f27a1937 made it to work with my windows compiler 2011-02-08 10:11:26 +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
ea2d03e468 added noise.* 2011-02-05 14:56:01 +02:00
Perttu Ahola
ea6740e900 mapgen stuff 2011-02-05 14:55:16 +02:00
Perttu Ahola
7f2aa30bf2 added sand to map generator 2011-02-04 14:32:30 +02:00
Perttu Ahola
6545ea12e9 nicer looking water 2011-02-04 01:48:52 +02:00
Perttu Ahola
102c5e31fe all kinds of tweaking and fixing 2011-02-04 01:22:07 +02:00
Perttu Ahola
24c1ea7103 water drawing glitch fix 2011-02-04 01:21:57 +02:00
Perttu Ahola
6bb9de3cc6 a little backwards compatibility with coal 2011-02-03 15:59:59 +02:00
Perttu Ahola
44ce9018dd added temporary backwards compatibility to player inventory 2011-02-03 15:45:53 +02:00
Perttu Ahola
71dbee43d0 some generation-time mud flow tweaking 2011-02-03 13:48:17 +02:00
Perttu Ahola
9b1b57a523 some tweaking 2011-02-02 18:46:14 +02:00
Perttu Ahola
a75876f248 more tweaking 2011-02-02 09:28:46 +02:00
Perttu Ahola
a5f109dafb Map generator tweaking. Still doesn't resume from save properly. 2011-02-01 23:59:46 +02:00
Perttu Ahola
3d6e71a7d0 end-of-day. 2011-02-01 20:28:21 +02:00
Perttu Ahola
6834b39c96 tweaking mapgenv2 settings for maximum awesomeness. 2011-02-01 17:42:39 +02:00
Perttu Ahola
39faa654bf one line of cleaning server code 2011-02-01 17:08:28 +02:00
Perttu Ahola
c957858bbb changed default minimum viewing range to a bit lower 2011-02-01 16:29:07 +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
6e196c2ce4 partly working chunk-based map generator (doesn't save properly, spawn is pretty random) 2011-02-01 03:06:02 +02:00
Perttu Ahola
be851871cd map generation framework under development... not quite operational at this point. 2011-01-30 01:44:54 +02:00
Perttu Ahola
8788fffec0 Commented out some debug output of class Settings 2011-01-29 00:56:53 +02:00
Perttu Ahola
a4179abb1b Fixed MBOItem inventory images 2011-01-29 00:53:30 +02:00
Perttu Ahola
80acdab93b Commented out some debug output about saving players on server. 2011-01-29 00:48:54 +02:00
Perttu Ahola
1c776c3df8 server builds now! 2011-01-28 02:11:44 +02:00
Perttu Ahola
364c961200 server might build now 2011-01-28 01:56:58 +02:00
Perttu Ahola
64b5975732 Now texture handling is fast. Also now players are saved on disk. 2011-01-28 01:38:16 +02:00
Perttu Ahola
bd100c5483 backing up some stuff 2011-01-26 17:13:19 +02:00
Perttu Ahola
adb7f248da comments 2011-01-26 01:30:36 +02:00
Perttu Ahola
a0f0517c5b should work now 2011-01-26 01:06:45 +02:00
Perttu Ahola
b456821680 Little fixes 2011-01-26 00:49:32 +02:00
Perttu Ahola
9f882bf74d Reworked texture, material, mineral and whatever handling 2011-01-26 00:41:06 +02:00
Perttu Ahola
035345f13d Map deletion button 2011-01-26 00:40:33 +02:00
Perttu Ahola
d3a6a12bae removed alternative name "pressure" from param2 2011-01-25 09:53:21 +02:00
Perttu Ahola
de3fdba568 Tweaking around 2011-01-25 09:30:49 +02:00
Perttu Ahola
39fbf15273 Fixed a bug of server not reloading unloaded blocks when player builds or digs on them. 2011-01-25 09:29:59 +02:00
Perttu Ahola
3909e712a0 Faster lighting at map generation time 2011-01-24 16:36:58 +02:00
Perttu Ahola
87554408ca forgot old water unit tests 2011-01-24 13:44:07 +02:00
Perttu Ahola
7274b82ef4 commented out old water stuff 2011-01-24 13:42:13 +02:00
Perttu Ahola
24e41ab4c8 Mainly some texture tweaking 2011-01-24 13:32:11 +02:00
Perttu Ahola
4a952f22d7 small fixes here and there 2011-01-24 01:58:15 +02:00
Perttu Ahola
f081924670 todo-list update 2011-01-23 17:33:19 +02:00
Perttu Ahola
c914cbb0a0 OMG! Main Menu! 2011-01-23 17:29:15 +02:00
Perttu Ahola
360e305849 Documentation updates. 2011-01-21 11:11:00 +02:00
Perttu Ahola
3ef2629e84 made old build system to work too. the cmake one doesn't make working binaries for some computers.
--HG--
rename : src/config.h.in => src/cmake_config.h.in
2011-01-18 15:05:29 +02:00
Perttu Ahola
515a480d0e now it works! 2011-01-18 00:45:07 +02:00
Perttu Ahola
a1b2cd550e tinkering 2011-01-18 00:38:23 +02:00
Perttu Ahola
b6787a2b58 fixed erroneus handling of many players with no peer existing at same time 2011-01-18 00:27:14 +02:00
Perttu Ahola
1986326731 fixed erroneus handling of many players with no peer existing at same time 2011-01-18 00:26:09 +02:00
Perttu Ahola
a35d8dabcf configuration updates; making to build on msvc 2011-01-17 23:35:09 +02:00
Perttu Ahola
7dc6b03f31 . 2011-01-17 21:18:08 +02:00
Perttu Ahola
d44abdab17 minecraft-style water done (but no texture animation or sound) 2011-01-17 21:15:31 +02:00
Perttu Ahola
0fa0e0752a old water removed, some fixes here and there 2011-01-17 14:57:37 +02:00
Perttu Ahola
bd26be262d commit before messing with water 2011-01-17 11:16:41 +02:00
Perttu Ahola
3891bc43e0 fine-tuning of map generator and server and stuff. 2011-01-17 02:40:53 +02:00
Perttu Ahola
7068bc90af Initial commit of mapgen v.2. Lacks configuration and saving to disk. 2011-01-16 19:32:14 +02:00
Perttu Ahola
69e7cd9b5b backing up working heightmap.{h,cpp} 2011-01-15 15:55:03 +02:00
Perttu Ahola
a176f9eb36 generate-time lighting optimization 2011-01-15 13:50:13 +02:00
Perttu Ahola
83e083a667 just backuppin' a working mapblock.cpp 2011-01-15 13:07:10 +02:00
Perttu Ahola
3fb0d2fb65 Players are left on server while server is running. No passwords yet. 2011-01-15 03:28:19 +02:00
Perttu Ahola
cfaa15895a tweaking around, including mapgen, player speed in water, settings 2011-01-15 01:26:29 +02:00
Perttu Ahola
023876dafb fixed data path in porting.cpp for normal linux builds to get data from /binary/dir/../share/APPNAME 2011-01-10 18:21:44 +02:00
Perttu Ahola
56918c0ca4 random build system tweaking 2011-01-09 17:28:31 +02:00
Perttu Ahola
359e575ba3 Mainly small build system fixes 2011-01-09 00:49:32 +02:00
Perttu Ahola
eb476f1ce2 Lots of small stuff 2011-01-08 19:35:14 +02:00
Perttu Ahola
340de48dbf continued. 2011-01-08 18:58:40 +02:00
Perttu Ahola
c3159160fa Fixed (maybe) segfault if font is not found 2011-01-08 18:57:21 +02:00
Perttu Ahola
769a86be19 more linker parameters 2011-01-08 18:24:32 +02:00
Perttu Ahola
d90a183b01 Fixed some missing linking to libraries 2011-01-08 18:21:22 +02:00
Perttu Ahola
d435dedb89 doc updates; CMake works reasonably well now. 2011-01-08 17:45:26 +02:00
Perttu Ahola
7862a6f68d forgot config.h.in 2011-01-08 17:35:41 +02:00
Perttu Ahola
9fbb0889a7 CMake stuff works now on linux and windows... and should be possible to make to work on OS X. 2011-01-08 17:34:25 +02:00
Perttu Ahola
426c206d7e Made dungeons a bit rarer 2011-01-08 14:08:48 +02:00
Perttu Ahola
d825ed572f CMake working on Linux (not on windows)
--HG--
rename : Makefile => Makefile.bak
2011-01-08 03:10:20 +02:00
Perttu Ahola
fcaa61de3c Fixed dedicated server build 2011-01-07 19:56:47 +02:00
Perttu Ahola
6b6c2d37ea Added a more flexible path system (and fixed some minor stuff) 2011-01-07 19:39:27 +02:00
Perttu Ahola
dc414091e7 removing unused code and comments 2011-01-07 14:54:55 +02:00
Perttu Ahola
2e40217793 updated main.cpp TODO comments 2011-01-07 14:53:53 +02:00
Perttu Ahola
ec509fac12 removed Client::isFetchingBlocks 2011-01-07 14:53:01 +02:00
Perttu Ahola
d38ac3aae3 removed boost support from filesys.cpp; default to posix 2011-01-07 14:52:27 +02:00
Perttu Ahola
c32bd982e3 possibly fixed broken crack textures on some machines 2010-12-29 21:53:42 +02:00
Perttu Ahola
bcd9813acc tuned expired mesh updating while drawing a bit 2010-12-29 18:14:14 +02:00
Perttu Ahola
6d4cd2ea1a A bit longer day and a bit shorter night. Client-side. 2010-12-29 15:26:47 +02:00
Perttu Ahola
a9dd12281f oops, forgot some test code in 2010-12-27 14:35:24 +02:00
Perttu Ahola
fa64103aa8 better debug output in segfaults and stack overflows in windows 2010-12-27 14:34:17 +02:00
Perttu Ahola
847a4227b8 better grass generation (integration to sunlight propagation algorithms) 2010-12-26 14:34:34 +02:00
Perttu Ahola
c32da52104 working good 2010-12-26 13:51:56 +02:00
Perttu Ahola
4ba5cd580d drawing range updater update and myrand() (but not usage of it) 2010-12-26 13:33:20 +02:00
Perttu Ahola
582af0cb21 new viewing range updater algorithm 2010-12-26 03:58:19 +02:00
Perttu Ahola
3cae2310f5 main.cpp before viewing range stuff redoing 2010-12-25 23:25:40 +02:00
Perttu Ahola
822621f792 some... stuff. dunno. 8-) 2010-12-25 23:23:53 +02:00
Perttu Ahola
07a759fdb8 better caves 2010-12-25 16:04:51 +02:00
Perttu Ahola
c37eb9b139 tinkering around 2010-12-25 11:27:14 +02:00
Perttu Ahola
5e0c426677 missing files 2010-12-25 03:34:27 +02:00
Perttu Ahola
9bf96faef2 more tinkering around 2010-12-25 03:34:13 +02:00
Perttu Ahola
c1e0d3e031 some tinkering around 2010-12-25 03:33:38 +02:00
Perttu Ahola
a5c62045ed slight map generation bugs 2010-12-25 02:48:17 +02:00
Perttu Ahola
3fe377be4e builds on both platforms 2010-12-25 02:33:41 +02:00
Perttu Ahola
699d0e9a5e minecraft-like crafting 2010-12-25 01:54:39 +02:00
Perttu Ahola
a26c92d7dd disconnect method to connection to be used instead of just timing out 2010-12-24 17:08:50 +02:00
Perttu Ahola
705de63dcd ProgressBarTextureMod 2010-12-24 11:44:26 +02:00
Perttu Ahola
8823af5d6b small segfault bug fix 2010-12-24 03:15:24 +02:00
Perttu Ahola
f15670379d base stuff for item->object conversion 2010-12-24 03:08:05 +02:00
Perttu Ahola
10b06419ab changes to handing of digging (non backwards-compatible i guess) 2010-12-23 22:35:53 +02:00
Perttu Ahola
61b5a35384 little tinkering 2010-12-23 17:32:21 +02:00
Perttu Ahola
7e490e7213 work-in-progress gui system updating + some settings system updating 2010-12-23 17:09:49 +02:00
Perttu Ahola
2816d8f638 redoing gui stuff 2010-12-23 15:31:50 +02:00
Perttu Ahola
a55850e4dc fixed crack animation timing in client 2010-12-23 12:10:46 +02:00
Perttu Ahola
03d67af9e8 a mutex added to TempMods which hopefully fixes rare segfaults on client 2010-12-23 10:29:09 +02:00
Perttu Ahola
71948dbf96 changed default time speed 2010-12-22 20:59:34 +02:00
Perttu Ahola
813b6a91b3 added fog to players 2010-12-22 20:47:17 +02:00
Perttu Ahola
2c645d5d8a fixed crafting bug 2010-12-22 19:00:48 +02:00
Perttu Ahola
58ccc68c81 server starting on port 0 on invalid settings 2010-12-22 17:58:02 +02:00
Perttu Ahola
3de176cc58 crafting system! 2010-12-22 16:30:23 +02:00
Perttu Ahola
2e41a5e304 just savin' 2010-12-22 11:29:06 +02:00
Perttu Ahola
4ec61b0ccd missing files 2010-12-22 03:34:21 +02:00
Perttu Ahola
b94a007864 some work-in-progress 2010-12-22 03:33:58 +02:00
Perttu Ahola
3f5bad938a organizing stuff. 2010-12-21 18:08:24 +02:00
Perttu Ahola
3b0bff2f74 Cracking blocks while digging 2010-12-21 02:25:47 +02:00
Perttu Ahola
d5a78c1253 added some missing files 2010-12-20 22:23:24 +02:00
Perttu Ahola
123e8fdf53 framework for modifying textures 2010-12-20 22:03:49 +02:00
Perttu Ahola
6350c5d7a6 some tinkering with gui. removed updating of configuration file at end 2010-12-20 14:59:21 +02:00
Perttu Ahola
5a36956f75 working time-of-day sending from server to client 2010-12-20 14:04:31 +02:00
Perttu Ahola
ab7477c4c3 added dedicated server build without irrlicht 2010-12-19 19:11:05 +02:00
Perttu Ahola
0ca9423b8b day/night working client side 2010-12-19 16:51:45 +02:00
Perttu Ahola
240499dc2c before daynight mesh cache 2010-12-18 17:46:00 +02:00
Perttu Ahola
15a43c5ed0 before adding day/night lighting
--HG--
rename : data/light.png => data/cloud.png
2010-12-18 13:10:37 +02:00
Perttu Ahola
385dd9917f settings manager: better default setting handling and updating config file and command line parsing 2010-12-14 15:16:49 +02:00
Perttu Ahola
f501cfd799 tinkering around 2010-12-14 13:14:43 +02:00
Perttu Ahola
be2c7dfb97 pausemenu stuff 2010-12-14 03:07:37 +02:00
Perttu Ahola
451f46f623 pause menu added 2010-12-14 03:07:13 +02:00
Perttu Ahola
c951ce3b7c little fixes 2010-12-14 02:24:00 +02:00
Perttu Ahola
8592a37efb added some missing files 2010-12-14 01:59:56 +02:00
Perttu Ahola
6129e31b96 better graphics, zlib to work on vc++ 2010-12-14 01:56:24 +02:00
Perttu Ahola
47f76d8a51 grass edges workin' 2010-12-14 00:29:32 +02:00
Perttu Ahola
626ed6338a in before messing with face drawing orientation 2010-12-14 00:21:18 +02:00
Perttu Ahola
3ac2abb0b5 commit before content-tile separation 2010-12-13 21:32:35 +02:00
Perttu Ahola
22037459e3 fixes for vc++ 2010-12-13 11:51:53 +02:00
Perttu Ahola
2b9d03b267 random stuff and different node lighting 2010-12-13 11:38:04 +02:00
Perttu Ahola
571fb14f94 working nicely 2010-12-13 03:19:12 +02:00
Perttu Ahola
47a593b519 starting to separate "material" to "content" and "tile" 2010-12-12 14:33:13 +02:00
Perttu Ahola
db49f37692 removed accidental double flowWater 2010-12-11 18:12:18 +02:00
Perttu Ahola
2a0d1a059e commit before some radicallish changes to water behavior 2010-12-11 18:11:03 +02:00
Perttu Ahola
5e0c284f3a some work-in-progress water stuff 2010-12-01 15:20:12 +02:00
Perttu Ahola
38353751c9 better water 2010-11-30 15:35:03 +02:00
Perttu Ahola
4a8973aeac doc update 2010-11-29 23:07:03 +02:00
Perttu Ahola
b22abef143 test 2010-11-29 21:28:14 +02:00
Perttu Ahola
fc26dcdb19 license stuff
--HG--
rename : src/licensecomment.txt => licensecomment.txt
2010-11-29 20:13:04 +02:00
Perttu Ahola
0604f3f2ee license stuff (more to come) 2010-11-29 20:05:30 +02:00
Perttu Ahola
c51fef56a8 default setting change, random tinkering 2010-11-29 19:55:41 +02:00
Perttu Ahola
d10627a77f Windows bug fixes 2010-11-29 17:55:07 +02:00
Perttu Ahola
d2090a32d8 plant amount fix and ravine amount setting 2010-11-29 14:17:46 +02:00
Perttu Ahola
a18525a14e fixed face updating slowness bug 2010-11-29 14:03:40 +02:00
Perttu Ahola
aaafb5add0 reversed meshbuffer cache 2010-11-29 13:04:03 +02:00
Perttu Ahola
3ad212c90b meshbuffer cache test. No much speed improvement. 2010-11-29 13:03:30 +02:00
Perttu Ahola
c18af6e728 - added map generating script
- dropped support for versions older than 2 because of lighting support
2010-11-29 12:16:17 +02:00
Perttu Ahola
b326e75baa constant size for array for vc 2010-11-29 11:01:18 +02:00
Perttu Ahola
af95cfc7a1 vokselijuttu lisätty 2010-11-29 10:57:05 +02:00
Perttu Ahola
c707e00195 sitä sun tätä tekeillä, toimii kivasti 2010-11-29 10:52:07 +02:00
Perttu Ahola
e8fd5eb8ee block send priority queue 2010-11-27 18:10:11 +02:00
Perttu Ahola
24c4b7c68d Working version before block send priorization update 2010-11-27 17:18:34 +02:00
Perttu Ahola
4e249fb3fb Initial files 2010-11-27 01:02:21 +02:00