Marc Tiehuis 
							
						 
					 
					
						
						
							
						
						05ddb9c1a1 
					 
					
						
						
							
							Merge pull request  #28  from Servuc/master  
						
						 
						
						... 
						
						
						
						Improvement : Add french language and correct markdown 
						
						
					 
					
						2019-12-11 00:01:10 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas SERVUC 
							
						 
					 
					
						
						
							
						
						ca512ae2ff 
					 
					
						
						
							
							Improvement : Add french translation  
						
						 
						
						
						
						
					 
					
						2019-10-24 23:45:50 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thomas SERVUC 
							
						 
					 
					
						
						
							
						
						5dc0ee8cf1 
					 
					
						
						
							
							Improvement : Review commands and MD syntax  
						
						 
						
						
						
						
					 
					
						2019-10-24 23:45:37 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marc Tiehuis 
							
						 
					 
					
						
						
							
						
						0e81799f02 
					 
					
						
						
							
							Merge branch 'spanishTra' of  https://github.com/matiasbian/2048-cli  into matiasbian-spanishTra  
						
						 
						
						
						
						
					 
					
						2018-11-18 23:04:58 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marc Tiehuis 
							
						 
					 
					
						
						
							
						
						850638e40b 
					 
					
						
						
							
							Merge pull request  #24  from pedroferreiramamede/update-high-score  
						
						 
						
						... 
						
						
						
						Update the Hi Score and Score at the same time when you hit the Hi Score 
						
						
					 
					
						2018-11-18 21:48:47 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marc Tiehuis 
							
						 
					 
					
						
						
							
						
						d5c1b9c2f6 
					 
					
						
						
							
							Merge pull request  #23  from paul-arutyunov/master  
						
						 
						
						... 
						
						
						
						Add arrow keys 
						
						
					 
					
						2018-11-18 21:48:26 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								elsyspedromamede 
							
						 
					 
					
						
						
							
						
						751404655a 
					 
					
						
						
							
							Update the Hi Score and Score at the same time when you hit the Hi Score  
						
						 
						
						
						
						
					 
					
						2018-10-29 15:47:10 -03:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul_Arutyunov 
							
						 
					 
					
						
						
							
						
						c5f6ca6beb 
					 
					
						
						
							
							Handle arrow keys  
						
						 
						
						
						
						
					 
					
						2018-10-13 13:45:48 +03:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul_Arutyunov 
							
						 
					 
					
						
						
							
						
						28cd69b501 
					 
					
						
						
							
							Add arrow keys return values  
						
						 
						
						
						
						
					 
					
						2018-10-13 13:45:27 +03:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Paul_Arutyunov 
							
						 
					 
					
						
						
							
						
						42aa4c8cf1 
					 
					
						
						
							
							Add arrow keys definitions  
						
						 
						
						
						
						
					 
					
						2018-10-13 13:45:02 +03:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								matiasbian 
							
						 
					 
					
						
						
							
						
						6ad9b16454 
					 
					
						
						
							
							gettext.h added - gettenv overwrite fixed.  
						
						 
						
						
						
						
					 
					
						2018-06-21 19:45:08 -03:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								matiasbian 
							
						 
					 
					
						
						
							
						
						70897bc9db 
					 
					
						
						
							
							Documentation added  
						
						 
						
						
						
						
					 
					
						2018-06-10 19:33:13 -03:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								matiasbian 
							
						 
					 
					
						
						
							
						
						1a02433aa3 
					 
					
						
						
							
							fully translated to spanish  
						
						 
						
						
						
						
					 
					
						2018-06-10 19:17:40 -03:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								matiasbian 
							
						 
					 
					
						
						
							
						
						560bb6cf8b 
					 
					
						
						
							
							gettext funcion applied to strings  
						
						 
						
						
						
						
					 
					
						2018-05-29 19:56:28 -03:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marc Tiehuis 
							
						 
					 
					
						
						
							
						
						eaca6e1445 
					 
					
						
						
							
							Merge pull request  #20  from bentley/master  
						
						 
						
						... 
						
						
						
						Convert manpage to -mdoc 
						
						
					 
					
						2017-12-11 22:31:27 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Anthony J. Bentley 
							
						 
					 
					
						
						
							
						
						4bb0985018 
					 
					
						
						
							
							Rewrite manpage with semantic -mdoc macros, and move it to section 6.  
						
						 
						
						
						
						
					 
					
						2017-12-11 02:22:48 -07:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marc Tiehuis 
							
						 
					 
					
						
						
							
						
						23fc7bce09 
					 
					
						
						
							
							Update readme to reflect SDL removal  
						
						 
						
						
						
						
					 
					
						2017-08-12 11:13:06 +12:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marc Tiehuis 
							
						 
					 
					
						
						
							
						
						984a5b9f18 
					 
					
						
						
							
							Add memory allocation checks  
						
						 
						
						... 
						
						
						
						Closes  #18 . 
						
						
					 
					
						2017-08-12 11:09:07 +12:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tiehuis 
							
						 
					 
					
						
						
							
						
						912afdfe05 
					 
					
						
						
							
							Remove SDL2 frontend  
						
						 
						
						... 
						
						
						
						This was rather ugly and was not ever the main focus. This allows us to
remove the now unneeded font resources and simplifies the build
process/project. 
						
						
					 
					
						2017-08-12 10:58:47 +12:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marc Tiehuis 
							
						 
					 
					
						
						
							
						
						c065ab4657 
					 
					
						
						
							
							Merge pull request  #17  from fe051/master  
						
						 
						
						... 
						
						
						
						Fixed small typo in manpage. 
						
						
					 
					
						2016-08-05 19:20:45 +12:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marc-Andre Dion 
							
						 
					 
					
						
						
							
						
						5815309c24 
					 
					
						
						
							
							Fixed small typo in manpage.  
						
						 
						
						
						
						
					 
					
						2016-08-04 19:19:51 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marc Tiehuis 
							
						 
					 
					
						
						
							
						
						dccd115ca5 
					 
					
						
						
							
							Merge pull request  #15  from besser82/bugfix/ldflags  
						
						 
						
						... 
						
						
						
						small improvement 
						
						
					 
					
						2016-03-30 20:46:31 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Björn Esser 
							
						 
					 
					
						
						
							
						
						1e1338f1de 
					 
					
						
						
							
							make TTF_FONT_PATH configurable  
						
						 
						
						
						
						
					 
					
						2016-03-29 16:52:05 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Björn Esser 
							
						 
					 
					
						
						
							
						
						12aeff6d19 
					 
					
						
						
							
							obey LDFLAGS from $ENV  
						
						 
						
						
						
						
					 
					
						2016-03-29 16:44:27 +02:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tiehuis 
							
						 
					 
					
						
						
							
						
						4520781f25 
					 
					
						
						
							
							Remove various compilation warnings  
						
						 
						
						... 
						
						
						
						With the removal of these warnings we slightly improve the robustness of
the highscore parsing, handling some more cases of bad parsing/writing
and failure to open files. 
						
						
					 
					
						2015-12-30 11:49:04 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tiehuis 
							
						 
					 
					
						
						
							
						
						28b4a46336 
					 
					
						
						
							
							Fix blocks incorrectly spawning on no field change  
						
						 
						
						... 
						
						
						
						See https://github.com/Tiehuis/2048-cli/issues/14 . 
						
						
					 
					
						2015-12-30 11:35:35 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						cd13ef000f 
					 
					
						
						
							
							Fix makefile targets. Remove unnecessary warnings.  
						
						 
						
						
						
						
					 
					
						2015-08-04 16:42:28 +12:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						dc9adea7b5 
					 
					
						
						
							
							Get rid of random blockgenerator in favor of a linear time one. Changed a sleep in ai to use gfx_sleep  
						
						 
						
						
						
						
					 
					
						2015-02-25 23:54:13 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						05f2713179 
					 
					
						
						
							
							Alter engine so we can init a gamestate with no arguments. May be able to be utilized in ai code  
						
						 
						
						
						
						
					 
					
						2015-02-25 18:58:36 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						c0d4b6de3e 
					 
					
						
						
							
							Small change to animating rows  
						
						 
						
						
						
						
					 
					
						2015-02-25 15:14:15 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						160b6ce7ac 
					 
					
						
						
							
							Update man page with highscore option  
						
						 
						
						
						
						
					 
					
						2015-02-25 14:54:45 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						1da480b331 
					 
					
						
						
							
							Add the ai files that were forgotten in previous commit  
						
						 
						
						
						
						
					 
					
						2015-02-25 14:53:49 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						cf1a147078 
					 
					
						
						
							
							Added ai modes. Altered output of highscores to allow possible parsing with tools easier  
						
						 
						
						
						
						
					 
					
						2015-02-25 14:51:48 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						2d9f89f339 
					 
					
						
						
							
							Make conditional linking happen in makefile for merges  
						
						 
						
						
						
						
					 
					
						2015-02-25 10:47:41 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						3db0537685 
					 
					
						
						
							
							Wrong url fixed  
						
						 
						
						
						
						
					 
					
						2015-02-23 16:53:35 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						2c5ae324a8 
					 
					
						
						
							
							Update screenshot for readme  
						
						 
						
						
						
						
					 
					
						2015-02-23 16:52:00 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						d1b80fe2fe 
					 
					
						
						
							
							Aesthetic changes to graphics in ncurses version  
						
						 
						
						
						
						
					 
					
						2015-02-23 16:42:45 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						622a4b46ef 
					 
					
						
						
							
							Invert colorscheme by default on ncurses version for more distinct squares  
						
						 
						
						
						
						
					 
					
						2015-02-23 16:18:41 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						1e2b2b76ac 
					 
					
						
						
							
							Slight change to reset prompt to allow mix-cased response  
						
						 
						
						
						
						
					 
					
						2015-02-23 16:07:13 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						2d9af767d1 
					 
					
						
						
							
							Add -r option to man and readme and make reset option actually prompt. Remove hardcoded merge_goal value.  
						
						 
						
						
						
						
					 
					
						2015-02-23 16:00:14 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						40f6419c55 
					 
					
						
						
							
							Fix errors. Add printing of scores after game so user can actually see what they scored  
						
						 
						
						
						
						
					 
					
						2015-02-23 12:41:34 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						2b0f6a159e 
					 
					
						
						
							
							Update man page to reflect removal of goal options. Goals are now set for a particular set of merges  
						
						 
						
						
						
						
					 
					
						2015-02-23 12:35:18 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						02197d43cc 
					 
					
						
						
							
							Forgot to change Makefile back after testing  
						
						 
						
						
						
						
					 
					
						2015-02-23 12:33:15 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						6d247f282f 
					 
					
						
						
							
							Added easy extension of custom merge results. Example fib merge rules added. Code altered to make use of this new style  
						
						 
						
						
						
						
					 
					
						2015-02-23 12:32:29 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						375cdeb7da 
					 
					
						
						
							
							Allow spawn rate option to work as intended  
						
						 
						
						
						
						
					 
					
						2015-02-23 10:12:01 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						a75c200842 
					 
					
						
						
							
							Fixed README links  
						
						 
						
						
						
						
					 
					
						2015-02-22 20:21:48 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						b58907aa2e 
					 
					
						
						
							
							Remove lines not removed in README during merge  
						
						 
						
						
						
						
					 
					
						2015-02-22 18:19:42 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						72aa176f19 
					 
					
						
						
							
							Remove old man pages  
						
						 
						
						
						
						
					 
					
						2015-02-22 17:54:03 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						9bba1cc4b8 
					 
					
						
						
							
							Fix merge with upstream master pull  
						
						 
						
						
						
						
					 
					
						2015-02-22 17:46:26 +13:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tiehuis 
							
						 
					 
					
						
						
							
						
						1c73dbbeda 
					 
					
						
						
							
							Merge branch 'devel' into master branch  
						
						 
						
						
						
						
					 
					
						2015-02-22 17:41:37 +13:00