Commit Graph

72 Commits

Author SHA1 Message Date
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
Tiehuis 032659ff1e Fixing merge conflicts 2015-02-22 17:40:27 +13:00
Tiehuis 53e941bf98 Remove the c99 for loops, just for gcc users. Optional CC var set in makefile 2015-02-22 16:38:53 +13:00
Tiehuis 5d6c3f92be Reintroduced color support for ncurses version 2015-02-22 16:30:40 +13:00
Tiehuis d8cef1def4 Rewritten man page. Removed large dependencies by writing directly for man. 2015-02-22 16:08:11 +13:00
Tiehuis c8e55ed6e9 Added highscore functionality 2015-02-22 11:29:15 +13:00
Tiehuis 75ef085260 Small makefile fixes and readme alterations 2015-02-21 17:37:54 +13:00
Tiehuis 3dd23136d5 Added sdl version to exmplify extension of the main engine 2015-02-21 17:31:54 +13:00
Tiehuis 8cff1bb002 Major rewrite. Abstracting graphics code completely and allowing new extensions via a consistent drawing interface 2015-02-21 15:36:15 +13:00
Tiehuis 723738c706 Merge pull request #10 from besser82/improvements
fixed malformated manpage
2014-12-14 14:39:18 +13:00
Björn Esser 3ee17edd2c update readme for Fedora and EPEL 2014-12-13 16:53:19 +01:00
Björn Esser 3b82fe1c7e fixed malformated manpage 2014-12-13 16:40:04 +01:00
Björn Esser bc6f565c61 create manpages with one target 2014-12-13 16:40:04 +01:00
Marc da0ff59971 Makefile updated. Small init changes in game_engine 2014-12-11 07:49:42 +13:00
Tiehuis 0a76b9c452 Various changes. Alter grid allocation. Add current block count 2014-12-07 22:09:22 +13:00
Tiehuis 3085bd4eb6 Removed unsigned/signed compare warnings. Change all to size_t types 2014-12-07 09:55:18 +13:00
Tiehuis a116923c69 Clean devel src dir 2014-12-06 13:49:54 +13:00
Tiehuis 32a4b483ee Consolidate printing styles, make more generic. Add goal option to create a custom target 2014-12-06 13:43:00 +13:00
Tiehuis 3ca10eb8d5 Correct last commit 2014-12-06 13:00:47 +13:00
Tiehuis 44bc1cbe87 correct grid malloc to calloc 2014-12-06 12:58:29 +13:00
Tiehuis b7c45f7f87 Add some option mechanics 2014-12-06 12:57:07 +13:00
Tiehuis 569e11710f vt100 simple mode added 2014-12-06 12:02:12 +13:00
Tiehuis 01af91121b Fix curses not displaying until keypress. Callback example demonstrating some pseudo-animation 2014-12-06 11:49:16 +13:00
Tiehuis 2b1d230330 Alter looping variables to better describe intent 2014-12-06 11:20:13 +13:00
Tiehuis 2a69fdfceb Merge pull request #9 from besser82/improvements
add manpage
2014-12-06 09:58:38 +13:00
Björn Esser 986bb70d9b add manpage 2014-12-05 12:21:13 +01:00
Tiehuis a9505d949e Merge pull request #8 from besser82/improvements
Unified codebase
2014-12-05 14:09:29 +13:00
Marc 387f37a64a Abstract engine and drawing logic apart from one another. Keep gamestate in a struct 2014-12-05 10:27:25 +13:00
Björn Esser 2efc3db045 unified codebase 2014-12-04 13:48:10 +01:00
Björn Esser 82db92d4bf ignore backup-files 2014-12-03 16:07:02 +01:00
Marc 2195f44005 Don't need flog of negative integers 2014-12-02 00:07:34 +13:00
Tiehuis 2fef5a4822 Merge pull request #6 from besser82/improvements
some minor improvements
2014-12-01 16:29:06 +13:00
Björn Esser 27fd8b3218 Fix compiler warnings about unused result 2014-11-03 10:53:34 +01:00
Björn Esser dfcc1f5634 Makefile should obey LDFLAGS from $ENV 2014-11-03 10:53:33 +01:00
Björn Esser 042e3fde77 Add basic gitignore 2014-11-03 10:53:29 +01:00
Tiehuis e9e6ce2715 Readd some logic details that are needed. Fix colors on some blocks being black 2014-09-13 09:52:55 +12:00
Tiehuis 2dab267db2 Merge pull request #5 from AMDmi3/auto-color
Autodetect color support, allow override through arguments
2014-09-13 09:29:20 +12:00
Tiehuis 5781fc6c16 Merge pull request #4 from AMDmi3/highscore-handling
Fix highscore file handling
2014-09-13 09:28:28 +12:00
Dmitry Marakasov a49ed8dd36 Autodetect color support, allow override through arguments 2014-09-12 20:23:57 +04:00
Dmitry Marakasov f2aa753d49 Fix highscore file handling
Don't create highscore file in the current directory, instead
create in under $XDG_DATA_HOME/2048/highscore or
$HOME/.local/share/2048/highscore as modern apps should.
2014-09-12 20:22:52 +04:00
Tiehuis 37c1d3607e Fix logic error 2014-09-12 23:36:52 +12:00
Tiehuis 8843fcb658 Cleaned up source, directories, and added header file to improve general readability 2014-09-12 23:17:04 +12:00
Tiehuis 1bf0c51864 Merge pull request #3 from AMDmi3/makefile-fixes
Makefile fixes
2014-09-12 18:56:54 +12:00
Dmitry Marakasov ba0b92ea9a Add clean target 2014-09-09 00:26:41 +04:00