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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						0bd1b782d0
					 | 
					
						
						
							
							modified health bar a bit
						
						
						
						
						
						
					 | 
					
						2011-06-18 09:04:31 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						3be6891938
					 | 
					
						
						
							
							+ rail
						
						
						
						
						
						
					 | 
					
						2011-06-07 19:24:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						8835433b5e
					 | 
					
						
						
							
							+ 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
							
						 
					 | 
					
						
						
							
						
						ba1460a582
					 | 
					
						
						
							
							+ 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
							
						 
					 | 
					
						
						
							
						
						8d580ddf29
					 | 
					
						
						
							
							* menulogo now shows minetest delta
						
						
						
						
						
						
					 | 
					
						2011-05-31 20:52:20 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						6ca51de990
					 | 
					
						
						
							
							+ fence inventory icon
						
						
						
						
						
						
					 | 
					
						2011-05-31 03:54:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						289e31ed98
					 | 
					
						
						
							
							+ cactii
						
						
						
						
						
						
					 | 
					
						2011-05-30 14:42:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						16c8826041
					 | 
					
						
						
							
							* better heart icon
						
						
						
						
						
						
					 | 
					
						2011-05-29 18:49:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						c484aaf6f6
					 | 
					
						
						
							
							* better glass graphics
						
						
						
						
						
						
					 | 
					
						2011-05-29 18:48:39 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						cd71566a46
					 | 
					
						
						
							
							* better rat graphics
						
						
						
						
						
						
					 | 
					
						2011-05-29 18:48:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						50021073bf
					 | 
					
						
						
							
							* enemies are now omsk birds
						
						
						
						
						
						
					 | 
					
						2011-05-29 18:47:40 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						c39a03d803
					 | 
					
						
						
							
							* better player graphics
						
						
						
						
						
						
					 | 
					
						2011-05-29 18:45:50 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp
							
						 
					 | 
					
						
						
							
						
						e76f4155d5
					 | 
					
						
						
							
							+ 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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ciaran Gultnieks
							
						 
					 | 
					
						
						
							
						
						e16c78aac1
					 | 
					
						
						
							
							Added glass texture (poor artwork skills, apologies in advance)
						
						
						
						
						
						
					 | 
					
						2011-05-09 19:28:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						a73b10eb1c
					 | 
					
						
						
							
							made proper skyboxes for dawn/evening and night
						
						
						
						
						
						
					 | 
					
						2011-04-29 17:53:07 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						0847e550f0
					 | 
					
						
						
							
							added simple skybox
						
						
						
						
						
						
					 | 
					
						2011-04-29 16:00:36 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						0fecd24758
					 | 
					
						
						
							
							didn't actually change everything, just re-saved the grass texture.
						
						
						
						
						
						
					 | 
					
						2011-04-29 00:38:11 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						0034744568
					 | 
					
						
						
							
							Made the main menu a bit more unique looking
						
						
						
						
						
						
					 | 
					
						2011-04-24 00:11:23 +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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						4a92df6ff0
					 | 
					
						
						
							
							Chests work now!
						
						
						
						
						
						
					 | 
					
						2011-04-04 15:13:19 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						e4f7f97e6c
					 | 
					
						
						
							
							Removed lua stuff
						
						
						
						
						
						
					 | 
					
						2011-04-03 12:28:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						685a635aea
					 | 
					
						
						
							
							reverted mud to old texture
						
						
						
						
						
						
					 | 
					
						2011-04-03 12:13:53 +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
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |