Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						6103e59c19
					 | 
					
						
						
							
							* amended upstream branch notes
						
						
						
						
						
						
					 | 
					
						2011-07-09 18:22:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						10caac8839
					 | 
					
						
						
							
							+ notes regarding upstream conversion from mercurial using hg-fast-export
						
						
						
						
						
						
					 | 
					
						2011-07-09 18:14:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						a106c0dbdc
					 | 
					
						
						
							
							+ notes regarding upstream conversion from mercurial using hg-fast-export
						
						
						
						
						
						
					 | 
					
						2011-07-09 18:14:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						98ccac5969
					 | 
					
						
						
							
							Added tag 0.2.20110704_0 for changeset 65263ec55caf
						
						
						
						
						
						
					 | 
					
						2011-07-04 22:15:22 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						81535f6277
					 | 
					
						
						
							
							Updated version and changelog
						
						
						
						
						
						
					 | 
					
						2011-07-04 22:15:15 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						f9a05849ed
					 | 
					
						
						
							
							Removed tag 0.2.20110704_0
						
						
						
						
						
						
					 | 
					
						2011-07-04 22:12:58 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						31a804ff47
					 | 
					
						
						
							
							Added tag 0.2.20110704_0 for changeset 25aa2021937f
						
						
						
						
						
						
					 | 
					
						2011-07-04 22:12:38 +03: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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						1c90f9fc2e
					 | 
					
						
						
							
							Merge pull request #13 from Bahamada/upstream_merge
						
						
						
						
						
						
						
						Upstream merge 
						
						
					 | 
					
						2011-06-27 06:56:26 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						f37a3a84fa
					 | 
					
						
						
							
							Merge pull request #13 from Bahamada/upstream_merge
						
						
						
						
						
						
						
						Upstream merge 
						
						
					 | 
					
						2011-06-27 06:56:26 -07: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
							
						 
					 | 
					
						
						
							
						
						b55d2d4a65
					 | 
					
						
						
							
							added minetestmapper in utils/
						
						
						
						
						
						
					 | 
					
						2011-06-25 17:46:08 +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
							
						 
					 | 
					
						
						
							
						
						47e4eda4bb
					 | 
					
						
						
							
							Reorganizing stuff (import from temporary git repo)
						
						
						
						
						
						
					 | 
					
						2011-06-25 04:23:21 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |