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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						bf947833e9
					 | 
					
						
						
							
							uh oh, forgot to add treeprop.png to the repo
						
						
						
						
						
						
					 | 
					
						2011-06-19 12:37:00 +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
							
						 
					 | 
					
						
						
							
						
						3c532fff15
					 | 
					
						
						
							
							lol, i have apparently used python too much...
						
						
						
						
						
						
					 | 
					
						2011-06-18 21:37:08 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						90dba34d80
					 | 
					
						
						
							
							added a small php example
						
						
						
						
						
						
					 | 
					
						2011-06-18 21:36:31 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						0d949c68d8
					 | 
					
						
						
							
							Added endianess to procotol.txt
						
						
						
						
						
						
					 | 
					
						2011-06-18 20:27:17 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						50ef74da1e
					 | 
					
						
						
							
							Fixed typo in protocol.txt
						
						
						
						
						
						
					 | 
					
						2011-06-18 20:21:25 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						cde8c70f8c
					 | 
					
						
						
							
							updated protocol.txt
						
						
						
						
						
						
					 | 
					
						2011-06-18 20:18:13 +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
							
						 
					 | 
					
						
						
							
						
						13f469073e
					 | 
					
						
						
							
							Added tag 0.2.20110618_0_dev for changeset dd08a9b5cb84
						
						
						
						
						
						
					 | 
					
						2011-06-18 15:32:35 +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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |