Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						1320d07068
					 | 
					
						
						
							
							Scripting WIP: dynamic object stuff
						
						
						
						
						
						
					 | 
					
						2011-11-29 19:13:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						ddaff2d653
					 | 
					
						
						
							
							Scripting WIP
						
						
						
						
						
						
					 | 
					
						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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						1ddfdc55dd
					 | 
					
						
						
							
							Add textures in data/textures (appeared to not have been added)
						
						
						
						
						
						
					 | 
					
						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
							
						 
					 | 
					
						
						
							
						
						f8430723e0
					 | 
					
						
						
							
							Add the default.lua script
						
						
						
						
						
						
					 | 
					
						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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						43a28f04fa
					 | 
					
						
						
							
							mobv2
						
						
						
						
						
						
					 | 
					
						2011-10-15 02:28:57 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Holmquist
							
						 
					 | 
					
						
						
							
						
						f19919546d
					 | 
					
						
						
							
							Adding sapling texture
						
						
						
						
						
						
					 | 
					
						2011-09-23 18:13:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								darkrose
							
						 
					 | 
					
						
						
							
						
						79cb754358
					 | 
					
						
						
							
							added locking chest texture
						
						
						
						
						
						
					 | 
					
						2011-09-22 19:12:17 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfan5
							
						 
					 | 
					
						
						
							
						
						88dc8c694e
					 | 
					
						
						
							
							Added Iron Apple which heals 4 Hearts
						
						
						
						
						
						
					 | 
					
						2011-09-12 20:10:17 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sfan5
							
						 
					 | 
					
						
						
							
						
						c0caedc373
					 | 
					
						
						
							
							Added Apple Trees
						
						
						
						
						
						
					 | 
					
						2011-09-11 17:50:44 +02: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						8f42a8be0c
					 | 
					
						
						
							
							lava!
						
						
						
						
						
						
					 | 
					
						2011-08-15 02:04:56 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						64a6da3e45
					 | 
					
						
						
							
							merged delta and c55
						
						
						
						
						
						
					 | 
					
						2011-08-05 11:22:13 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						071c0b5536
					 | 
					
						
						
							
							* Welcome to OMSK.
						
						
						
						
						
						
					 | 
					
						2011-08-05 08:45:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						7b8227039f
					 | 
					
						
						
							
							* papyrus texture now darker and edgier
						
						
						
						
						
						
					 | 
					
						2011-08-01 16:49:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						363487c97b
					 | 
					
						
						
							
							* less clumsy ladder texture, based on rails
						
						
						
						
						
						
					 | 
					
						2011-08-01 15:47:02 +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
							
						 
					 | 
					
						
						
							
						
						17a85b947c
					 | 
					
						
						
							
							added sword textures
						
						
						
						
						
						
					 | 
					
						2011-07-30 23:54:16 +03: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						4ef9c7675a
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/upstream'
						
						
						
						
						
						
					 | 
					
						2011-07-30 18:55:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						501034a792
					 | 
					
						
						
							
							merged jungle and bluish shadows
						
						
						
						
						
						
					 | 
					
						2011-07-23 20:01:06 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						a42d324142
					 | 
					
						
						
							
							changed rat texture to mine
						
						
						
						
						
						
					 | 
					
						2011-07-23 19:05:06 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						98be778766
					 | 
					
						
						
							
							switched my textures back
						
						
						
						
						
						
					 | 
					
						2011-07-23 16:08:07 +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
							
						 
					 | 
					
						
						
							
						
						8993d9dd83
					 | 
					
						
						
							
							Jungle biome/whatever thing
						
						
						
						
						
						
					 | 
					
						2011-07-23 02:04:24 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						909075da5c
					 | 
					
						
						
							
							* nicer firefly texture
						
						
						
						
						
						
					 | 
					
						2011-07-21 20:13:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						308d861327
					 | 
					
						
						
							
							Merged minetest-delta a624fe549bc75855a170
						
						
						
						
						
						
					 | 
					
						2011-07-21 20:55:08 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						9c557c3846
					 | 
					
						
						
							
							+ unknown block is sick
						
						
						
						
						
						
					 | 
					
						2011-07-21 17:36:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						8129d16dd3
					 | 
					
						
						
							
							+ fireflies
						
						
						
						
						
						
					 | 
					
						2011-07-20 22:05:57 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						2586a186bd
					 | 
					
						
						
							
							* Омская птица
						
						
						
						
						
						
					 | 
					
						2011-07-18 02:09:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						3560f0de08
					 | 
					
						
						
							
							Merge branch 'upstream/master'
						
						
						
						
						
						
						
						Conflicts:
	data/oerkki1.png
	src/client.cpp 
						
						
					 | 
					
						2011-07-14 22:43:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						ab0cc1bb47
					 | 
					
						
						
							
							better handling of unknown blocks on client
						
						
						
						
						
						
					 | 
					
						2011-06-27 07:30:02 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						91cfbe2891
					 | 
					
						
						
							
							reorganized a lot of stuff and modified mapgen and objects slightly while doing it
						
						
						
						
						
						
					 | 
					
						2011-06-26 15:48:56 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Rühl
							
						 
					 | 
					
						
						
							
						
						7efe89ff58
					 | 
					
						
						
							
							backported cactus, papyrus and clay
						
						
						
						
						
						
					 | 
					
						2011-06-26 13:47:21 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						bf947833e9
					 | 
					
						
						
							
							uh oh, forgot to add treeprop.png to the repo
						
						
						
						
						
						
					 | 
					
						2011-06-19 12:37:00 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |