From: sparky4 Date: Sun, 7 Dec 2014 00:18:39 +0000 (-0600) Subject: Merge branch 'master' of github.com:sparky4/16 X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=826bb2cb2cb8bf7397f2555b8a6b98eb0a838a3f;p=16.git Merge branch 'master' of github.com:sparky4/16 Conflicts: Project 16.bfproject scroll.exe --- 826bb2cb2cb8bf7397f2555b8a6b98eb0a838a3f diff --cc Project 16.bfproject index 83e32842,50d1fffb..663f35e0 --- a/Project 16.bfproject +++ b/Project 16.bfproject @@@ -1,73 -1,58 +1,131 @@@ ++<<<<<<< HEAD +c2e.convert_special: 0 +e2c.convert_num: 0 +openfiles: /dos/z/16/doc/project.txt:60:0:0: +openfiles: /dos/z/16/16.c:0:0:0: +openfiles: /dos/z/16/src/scroll.c:17553:16983:1: +openfiles: /dos/z/16/src/lib/scroll.c:359:0:0: +openfiles: /dos/z/16/src/lib/scroll.h:1961:241:0: +openfiles: /dos/z/16/src/v2/source/ENGINE/CONTROLS.C:2441:1179:0: +openfiles: /dos/z/16/src/lib/modex16.c:13778:13034:0: +openfiles: /dos/z/16/src/lib/modex16.h:2059:913:0: +openfiles: /dos/z/16/src/pcxtest.c:68:0:0: +openfiles: /dos/z/16/src/lib/dos_kb.c:3352:2801:0: +openfiles: /dos/z/16/src/lib/dos_kb.h:62:0:0: +openfiles: /dos/z/16/src/lib/lib_head.h:165:0:0: +openfiles: /dos/z/16/src/palettec.c:176:0:0: +openfiles: /dos/z/16/src/test.c:415:629:0: +openfiles: /dos/z/16/src/test2.c:18:0:0: +openfiles: /dos/z/16/src/lib/bitmap.c:59:0:0: +openfiles: /dos/z/16/src/lib/bitmap.h:125:0:0: +openfiles: /dos/z/16/src/lib/lib_head.cpp:0:0:0: +openfiles: /dos/z/16/src/lib/types.h:242:0:0: +openfiles: /dos/z/16/makefile:22:0:0: +openfiles: /dos/z/16/16/dos_gfx.cpp:6388:0:0: +openfiles: /dos/z/16/16/dos_gfx.h:175:233:0: +snr_recursion_level: 0 +convertcolumn_horizontally: 0 +adv_open_matchname: 0 +show_mbhl: 1 +view_line_numbers: 1 +fb_show_backup_f: 0 +htmlbar_thumbnailwidth: 300 +view_left_panel: 0 +default_mime_type: text/plain +e2c.convert_xml: 1 +c2e.convert_iso: 0 +opendir: file:///dos/z/16/src/v2/source/ENGINE +wrap_text_default: 0 +bookmarks_filename_mode: 1 +ssearch_text: UnPress( +snr_casesens: 1 +view_blocks: 1 +name: project 16 +replacelist: dest +replacelist: animatePlayer(bg, spri, +replacelist: qi=1 +replacelist: qi<=( +replacelist: \t\t\t\t +replacelist: animatePlayer(bg, spri, mask, 1 +replacelist: animatePlayer(bg, spri, mask, 0 +replacelist: modexShowPage(mask-> +replacelist: modexShowPage(spri +replacelist: player.tx == player.ty +replacelist: TRIGGY +replacelist: TRIGGX +replacelist: $(SRCLIB) +replacelist: $(SRC) +replacelist: play-> +fb_show_hidden_f: 0 +editor_tab_width: 4 +show_visible_spacing: 1 +view_statusbar: 1 +display_right_margin: 0 +c2e.IE_apos_workaround: 0 +outputb_scroll_mode: 0 +leftpanel_active_tab: 0 +enable_syntax_scan: 1 +ssearch_regex: 0 +e2c.convert_iso: 0 +ssearch_casesens: 0 +charmap_block: 1 ++======= + view_main_toolbar: 1 + bmarksearchmode: 0 + snr_scope: 0 + snr_type: 0 + view_cline: 0 + editor_indent_wspaces: 0 + c2e.convert_xml: 1 + snr_dotmatchall: 0 + c2e.convert_symbol: 0 + filegloblist: *.txt + filegloblist: *.shtml + filegloblist: *.py + filegloblist: *.pl + filegloblist: *.php + filegloblist: *.js + filegloblist: *.java + filegloblist: *.htm + filegloblist: *.html + filegloblist: *.h + filegloblist: *.css + filegloblist: *.cpp + filegloblist: *.cgi + filegloblist: *.c + filegloblist: * + fb_focus_follow: 1 + adv_open_recursive: 0 + recent_dirs: file:///dos/z/16/16 + encoding: UTF-8 + autoindent: 1 + e2c.convert_special: 0 + fb_viewmode: 0 + htmlbar_view: 0 + snippets_show_as_menu: 1 + bookmarks_show_mode: 0 + outputb_show_all_output: 0 + autocomplete: 1 + searchlist: mapDrawTile + searchlist: dxThresh + searchlist: PalFile + searchlist: src\\lib\\ + searchlist: player. + searchlist: src\\ + searchlist: void modexPalBlack(); + searchlist: oid modexPalBlack( + searchlist: id modexPalBlack( + searchlist: d modexPalBlack( + spell_lang: en + snr_escape_chars: 0 + view_blockstack: 1 + htmlbar_notebooktab: 0 + last_filefilter: + spell_insert_entities: 0 + spell_check_default: 1 + savedir: file:///dos/z/16/src + snr_replacetype: 0 ++>>>>>>> 3a2e65f55f3d4f720e9076f68f6292f702369391 recent_files: file:///dos/z/16/16/modex16/scroll.c recent_files: file:///dos/z/16/16/modex16/dos_kb.c recent_files: file:///dos/z/16/16/modex16/makefile