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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |