Commit Graph

7 Commits

Author SHA1 Message Date
Vadim Grigoruk b41b0436ab Merge branch '#320'
# Conflicts:
#	.gitignore
#	.travis.yml
#	Makefile
#	bin/assets/config.tic.dat
#	bin/assets/fenneldemo.tic.dat
#	bin/assets/tic.js.dat
#	build.sh
#	build/windows/example/example.vcxproj
#	build/windows/sdl-gpu/sdl-gpu.vcxproj
#	build/windows/studio/studio.vcxproj
#	build/windows/tic/tic.aps
#	build/windows/tic/tic.rc
#	build/windows/tic80/tic80.vcxproj
#	build/windows/zlib/zlib.vcxproj
#	build/windows/zlib/zlib.vcxproj.filters
#	include/tic80_config.h
2018-09-04 11:13:20 +03:00
RudenkoArts 3032dd0816 fix mingw build 2018-07-11 13:03:03 +03:00
Vadim Grigoruk fe26225c7d #320: generate demo files for embedding with bin2txt 2018-06-28 21:50:19 +03:00
BADIM-PC\Vadim dc1e939d9c no message 2018-02-10 11:21:21 +03:00
BADIM-PC\Vadim 8b02b29a84 bin2txt/makefile uses old 3rd-party libs paths #504 2018-01-11 11:42:31 +03:00
BADIM-PC\Vadim 2c1b7a456d compilation fix 2017-09-26 13:13:46 +03:00
BADIM-PC\Vadim e502b89a1d opening TIC-80 sources 2017-09-26 09:59:34 +03:00