Giuseppe Bilotta
							
						 
					 | 
					
						
						
							
						
						3321edae77
					 | 
					
						
						
							
							Use system sqlite3/jthread libs if available
						
						
						
						
						
						
					 | 
					
						2011-07-20 17:59:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Constantin Wenger
							
						 
					 | 
					
						
						
							
						
						6a8328de79
					 | 
					
						
						
							
							added gettext support
						
						
						
						
						
						
						
						german translation file
and bashscript to update translations 
						
						
					 | 
					
						2011-07-20 16:51:19 +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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						f2c26e2014
					 | 
					
						
						
							
							moved map generator to separate source files
						
						
						
						
						
						
					 | 
					
						2011-06-25 18:12:41 +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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						da692355e8
					 | 
					
						
						
							
							Created and moved stuff to content_nodemeta.{h,cpp}
						
						
						
						
						
						
					 | 
					
						2011-06-18 00:46:50 +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
							
						 
					 | 
					
						
						
							
						
						72e742c24e
					 | 
					
						
						
							
							Added an experimental "far view" thing. Doesn't work exactly like it should and not suitable for real use yet, and might never be.
						
						
						
						
						
						
					 | 
					
						2011-06-07 22:08:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						fd64dd5e20
					 | 
					
						
						
							
							added -Wno-unused-but-set-variable to debug build
						
						
						
						
						
						
					 | 
					
						2011-06-02 02:59:30 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								teddydestodes
							
						 
					 | 
					
						
						
							
						
						6434f64ab4
					 | 
					
						
						
							
							added new submenu for key assignment
						
						
						
						
						
						
						
						configwriting/saving isn't complete and will break your config if you use fancy keys 
						
						
					 | 
					
						2011-06-01 19:44:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MrLoom
							
						 
					 | 
					
						
						
							
						
						2f2f28d398
					 | 
					
						
						
							
							MacOSX build support
						
						
						
						
						
						
					 | 
					
						2011-06-01 14:13:22 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						63611932eb
					 | 
					
						
						
							
							player passwords and privileges in world/auth.txt
						
						
						
						
						
						
						
						--HG--
extra : rebase_source : 7260636295d9068fbeeddf4143c89f2b8a91446c 
						
						
					 | 
					
						2011-05-29 21:11:16 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ciaran Gultnieks
							
						 
					 | 
					
						
						
							
						
						a8a3271470
					 | 
					
						
						
							
							Added the ability to change your password (via pause menu)
						
						
						
						
						
						
						
						--HG--
extra : rebase_source : e8ec407f60711d42d33be4811b2880088f617b5b 
						
						
					 | 
					
						2011-05-22 21:09:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						76e241392d
					 | 
					
						
						
							
							Merge: New map directory structure and player passwords
						
						
						
						
						
						
					 | 
					
						2011-05-21 01:11:58 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ciaran Gultnieks
							
						 
					 | 
					
						
						
							
						
						d4d49ee8f4
					 | 
					
						
						
							
							Passwords - password entry at main menu, stored and checked by server
						
						
						
						
						
						
					 | 
					
						2011-05-20 20:28:03 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						5624dac3b7
					 | 
					
						
						
							
							added -Wno-unused-but-set-variable, which hides a new warning in gcc 4.6 which only slows down development with no effect on security or anything.
						
						
						
						
						
						
					 | 
					
						2011-05-16 20:40:19 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ciaran Gultnieks
							
						 
					 | 
					
						
						
							
						
						248d7c8469
					 | 
					
						
						
							
							Improved server commands and added player permissions.
						
						
						
						
						
						
						
						--HG--
extra : rebase_source : 178fe08f10b7de3ebaba088bd24faad795114216 
						
						
					 | 
					
						2011-05-16 10:41:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						974c5cc08c
					 | 
					
						
						
							
							Added key configuration in the configuration file.
						
						
						
						
						
						
					 | 
					
						2011-05-14 15:43:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						7a367f96e1
					 | 
					
						
						
							
							added clouds
						
						
						
						
						
						
					 | 
					
						2011-04-29 15:34:26 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						1995b59320
					 | 
					
						
						
							
							Code refactoring; split half of main.cpp to game.cpp.
						
						
						
						
						
						
					 | 
					
						2011-04-23 18:31:31 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						b36e5c0508
					 | 
					
						
						
							
							Removed IrrlichtWrapper
						
						
						
						
						
						
					 | 
					
						2011-04-22 09:54:05 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						08bbf96877
					 | 
					
						
						
							
							items now fall by gravity... also some other random updating
						
						
						
						
						
						
					 | 
					
						2011-04-10 12:34:12 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						389fe31ace
					 | 
					
						
						
							
							changed node metadata format to better accomodate future needs and problems
						
						
						
						
						
						
					 | 
					
						2011-04-05 00:24:47 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						7df125c249
					 | 
					
						
						
							
							Modified windows build parameters a bit to make it build
						
						
						
						
						
						
					 | 
					
						2011-04-04 15:34:07 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						14c621d853
					 | 
					
						
						
							
							removed reference to script directory in cmake install
						
						
						
						
						
						
					 | 
					
						2011-04-04 15:19:11 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						01c2b003e1
					 | 
					
						
						
							
							commit before some more radical changes
						
						
						
						
						
						
					 | 
					
						2011-04-03 16:21:06 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						e4f7f97e6c
					 | 
					
						
						
							
							Removed lua stuff
						
						
						
						
						
						
					 | 
					
						2011-04-03 12:28:55 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						9f859d8389
					 | 
					
						
						
							
							modified the build system of lua to a more minimal one
						
						
						
						
						
						
					 | 
					
						2011-02-24 00:19:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						bfd0980748
					 | 
					
						
						
							
							fixed a path in build system's packaging part
						
						
						
						
						
						
					 | 
					
						2011-02-23 11:12:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						69dbc046eb
					 | 
					
						
						
							
							preliminary lua scripting framework for objects
						
						
						
						
						
						
					 | 
					
						2011-02-21 16:10:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						c57637b4c3
					 | 
					
						
						
							
							Temporary commit; lots of test code and stuff
						
						
						
						
						
						
					 | 
					
						2011-02-21 00:45:14 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						92432a28c0
					 | 
					
						
						
							
							small fixes: crack texture, server build on windows, configuration file example, adding config file example to install
						
						
						
						
						
						
					 | 
					
						2011-02-16 20:03:31 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						ff6a348bb1
					 | 
					
						
						
							
							fixed slight error in server build
						
						
						
						
						
						
					 | 
					
						2011-02-15 22:27:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						a0e8f3afd3
					 | 
					
						
						
							
							might work good on cmake+msvc now
						
						
						
						
						
						
					 | 
					
						2011-02-15 20:53:29 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						d065bae323
					 | 
					
						
						
							
							Ctrl+C handling on POSIX, some commands for server and other tweaking
						
						
						
						
						
						
					 | 
					
						2011-02-15 16:11:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						9a58749347
					 | 
					
						
						
							
							fixed CMakeLists.txt syntax (removed additional ,)
						
						
						
						
						
						
					 | 
					
						2011-02-14 19:42:43 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						e9fe230381
					 | 
					
						
						
							
							Use random-generated fallback textures when real textures are not found
						
						
						
						
						
						
					 | 
					
						2011-02-12 14:01:23 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						804b2647ce
					 | 
					
						
						
							
							new texture stuff quite working
						
						
						
						
						
						
					 | 
					
						2011-02-11 16:43:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						841ac10e5c
					 | 
					
						
						
							
							fixes toward mingw compatibility
						
						
						
						
						
						
					 | 
					
						2011-02-10 15:55:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						1704badc30
					 | 
					
						
						
							
							work-in-progress texture atlas optimization
						
						
						
						
						
						
					 | 
					
						2011-02-10 02:13:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						dd9e82f5bc
					 | 
					
						
						
							
							bug-fixin'
						
						
						
						
						
						
					 | 
					
						2011-02-08 01:12:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Perttu Ahola
							
						 
					 | 
					
						
						
							
						
						ea6740e900
					 | 
					
						
						
							
							mapgen stuff
						
						
						
						
						
						
					 | 
					
						2011-02-05 14:55:16 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |