diff --git a/flats/flat1_1.gif b/flats/flat1_1.gif deleted file mode 120000 index de0bacfd..00000000 --- a/flats/flat1_1.gif +++ /dev/null @@ -1 +0,0 @@ -jond/flat1_1.gif \ No newline at end of file diff --git a/flats/flat1_1.gif b/flats/flat1_1.gif new file mode 100644 index 00000000..8f855a22 Binary files /dev/null and b/flats/flat1_1.gif differ diff --git a/flats/flat1_2.gif b/flats/flat1_2.gif deleted file mode 120000 index d00de1fa..00000000 --- a/flats/flat1_2.gif +++ /dev/null @@ -1 +0,0 @@ -jond/flat1_2.gif \ No newline at end of file diff --git a/flats/flat1_2.gif b/flats/flat1_2.gif new file mode 100644 index 00000000..71b25b0b Binary files /dev/null and b/flats/flat1_2.gif differ diff --git a/flats/flat1_3.gif b/flats/flat1_3.gif deleted file mode 120000 index 7b4c9c90..00000000 --- a/flats/flat1_3.gif +++ /dev/null @@ -1 +0,0 @@ -jond/flat1_3.gif \ No newline at end of file diff --git a/flats/flat1_3.gif b/flats/flat1_3.gif new file mode 100644 index 00000000..bc58b993 Binary files /dev/null and b/flats/flat1_3.gif differ diff --git a/flats/floor4_1.gif b/flats/floor4_1.gif deleted file mode 120000 index b86497aa..00000000 --- a/flats/floor4_1.gif +++ /dev/null @@ -1 +0,0 @@ -jond/floor4_1.gif \ No newline at end of file diff --git a/flats/floor4_1.gif b/flats/floor4_1.gif new file mode 100644 index 00000000..02e109f7 Binary files /dev/null and b/flats/floor4_1.gif differ diff --git a/flats/floor4_5.gif b/flats/floor4_5.gif deleted file mode 120000 index 14f64cd9..00000000 --- a/flats/floor4_5.gif +++ /dev/null @@ -1 +0,0 @@ -jond/floor4_5.gif \ No newline at end of file diff --git a/flats/floor4_5.gif b/flats/floor4_5.gif new file mode 100644 index 00000000..0f150444 Binary files /dev/null and b/flats/floor4_5.gif differ diff --git a/flats/jond/blah.txt b/flats/jond/blah.txt deleted file mode 100644 index 330a2d67..00000000 --- a/flats/jond/blah.txt +++ /dev/null @@ -1 +0,0 @@ -I'll almost certainly change the rw28_1 texture a lot when I update all the concrete ones but it'll do for now. I do like flat1_3 a lot... good work Jon! :P flat1_2 coming soon (should be quick) - Jon jon@frad.org \ No newline at end of file diff --git a/flats/jond/flat1_1.gif b/flats/jond/flat1_1.gif deleted file mode 100644 index 8f855a22..00000000 Binary files a/flats/jond/flat1_1.gif and /dev/null differ diff --git a/flats/jond/flat1_2.gif b/flats/jond/flat1_2.gif deleted file mode 100644 index 71b25b0b..00000000 Binary files a/flats/jond/flat1_2.gif and /dev/null differ diff --git a/flats/jond/flat1_3.gif b/flats/jond/flat1_3.gif deleted file mode 100644 index bc58b993..00000000 Binary files a/flats/jond/flat1_3.gif and /dev/null differ diff --git a/flats/jond/floor4_1.gif b/flats/jond/floor4_1.gif deleted file mode 100644 index 02e109f7..00000000 Binary files a/flats/jond/floor4_1.gif and /dev/null differ diff --git a/flats/jond/floor4_5.gif b/flats/jond/floor4_5.gif deleted file mode 100644 index 0f150444..00000000 Binary files a/flats/jond/floor4_5.gif and /dev/null differ diff --git a/flats/jond/rrock17.gif b/flats/jond/rrock17.gif deleted file mode 100644 index a2c1fce0..00000000 Binary files a/flats/jond/rrock17.gif and /dev/null differ diff --git a/flats/jond/rrock17.txt b/flats/jond/rrock17.txt deleted file mode 100644 index 50b78847..00000000 --- a/flats/jond/rrock17.txt +++ /dev/null @@ -1,2 +0,0 @@ -rrock17.. hm yes. might need to brighten this one up -- jon@frad.org \ No newline at end of file diff --git a/flats/jond/rrock18.gif b/flats/jond/rrock18.gif deleted file mode 100644 index 992fb45e..00000000 Binary files a/flats/jond/rrock18.gif and /dev/null differ diff --git a/flats/rrock17.gif b/flats/rrock17.gif deleted file mode 120000 index c4ec4f0a..00000000 --- a/flats/rrock17.gif +++ /dev/null @@ -1 +0,0 @@ -jond/rrock17.gif \ No newline at end of file diff --git a/flats/rrock17.gif b/flats/rrock17.gif new file mode 100644 index 00000000..a2c1fce0 Binary files /dev/null and b/flats/rrock17.gif differ diff --git a/flats/rrock18.gif b/flats/rrock18.gif deleted file mode 120000 index ccf8c577..00000000 --- a/flats/rrock18.gif +++ /dev/null @@ -1 +0,0 @@ -jond/rrock18.gif \ No newline at end of file diff --git a/flats/rrock18.gif b/flats/rrock18.gif new file mode 100644 index 00000000..992fb45e Binary files /dev/null and b/flats/rrock18.gif differ diff --git a/levels/c1m1.wad b/levels/c1m1.wad deleted file mode 120000 index f61706b7..00000000 --- a/levels/c1m1.wad +++ /dev/null @@ -1 +0,0 @@ -jond/c1m1.wad \ No newline at end of file diff --git a/levels/c1m1.wad b/levels/c1m1.wad new file mode 100644 index 00000000..d7bd9b80 Binary files /dev/null and b/levels/c1m1.wad differ diff --git a/levels/jond/c1m1.wad b/levels/jond/c1m1.wad deleted file mode 100644 index d7bd9b80..00000000 Binary files a/levels/jond/c1m1.wad and /dev/null differ diff --git a/levels/jond/c1m1_updated.txt b/levels/jond/c1m1_updated.txt deleted file mode 100644 index 849b59d6..00000000 --- a/levels/jond/c1m1_updated.txt +++ /dev/null @@ -1 +0,0 @@ -Minor cosmetic changes mostly, a little structural work and some fixed triggers. Almost done :) - Jon \ No newline at end of file diff --git a/levels/jond/map14.wad b/levels/jond/map14.wad deleted file mode 100644 index 3e2355fd..00000000 Binary files a/levels/jond/map14.wad and /dev/null differ diff --git a/levels/jond/map14_fix.txt b/levels/jond/map14_fix.txt deleted file mode 100644 index 55f7088b..00000000 --- a/levels/jond/map14_fix.txt +++ /dev/null @@ -1,11 +0,0 @@ -map14_fix.wad - -This is a version of Freedoom MAP14 (a.k.a. Lift Tension from 10 Sectors), -with all the extraneous exit lines in the exit room removed. It also adds -co-op starting positions to the first room. - -Enjoy! - -- Eric "The Green Herring" Baker - -- eabaker@san.rr.com - -- March 14, 2008 - \ No newline at end of file diff --git a/levels/map14.wad b/levels/map14.wad deleted file mode 120000 index 514ab5fd..00000000 --- a/levels/map14.wad +++ /dev/null @@ -1 +0,0 @@ -jond/map14.wad \ No newline at end of file diff --git a/levels/map14.wad b/levels/map14.wad new file mode 100644 index 00000000..3e2355fd Binary files /dev/null and b/levels/map14.wad differ diff --git a/lumps/c_end.lmp b/lumps/c_end.lmp deleted file mode 120000 index ae1fa443..00000000 --- a/lumps/c_end.lmp +++ /dev/null @@ -1 +0,0 @@ -jond/c_end.lmp \ No newline at end of file diff --git a/lumps/c_end.lmp b/lumps/c_end.lmp new file mode 100644 index 00000000..e69de29b diff --git a/lumps/c_start.lmp b/lumps/c_start.lmp deleted file mode 120000 index a7005978..00000000 --- a/lumps/c_start.lmp +++ /dev/null @@ -1 +0,0 @@ -jond/c_start.lmp \ No newline at end of file diff --git a/lumps/c_start.lmp b/lumps/c_start.lmp new file mode 100644 index 00000000..e69de29b diff --git a/lumps/jond/c_end.lmp b/lumps/jond/c_end.lmp deleted file mode 100644 index e69de29b..00000000 diff --git a/lumps/jond/c_start.lmp b/lumps/jond/c_start.lmp deleted file mode 100644 index e69de29b..00000000 diff --git a/patches/glass1.gif b/patches/glass1.gif deleted file mode 120000 index cc696af9..00000000 --- a/patches/glass1.gif +++ /dev/null @@ -1 +0,0 @@ -jond/glass1.gif \ No newline at end of file diff --git a/patches/glass1.gif b/patches/glass1.gif new file mode 100644 index 00000000..e934aad0 Binary files /dev/null and b/patches/glass1.gif differ diff --git a/patches/glass1b.gif b/patches/glass1b.gif deleted file mode 120000 index 1cc46d59..00000000 --- a/patches/glass1b.gif +++ /dev/null @@ -1 +0,0 @@ -jond/glass1b.gif \ No newline at end of file diff --git a/patches/glass1b.gif b/patches/glass1b.gif new file mode 100644 index 00000000..6c02ba89 Binary files /dev/null and b/patches/glass1b.gif differ diff --git a/patches/glass2.gif b/patches/glass2.gif deleted file mode 120000 index b97158a4..00000000 --- a/patches/glass2.gif +++ /dev/null @@ -1 +0,0 @@ -jond/glass2.gif \ No newline at end of file diff --git a/patches/glass2.gif b/patches/glass2.gif new file mode 100644 index 00000000..fcab429c Binary files /dev/null and b/patches/glass2.gif differ diff --git a/patches/glass2b.gif b/patches/glass2b.gif deleted file mode 120000 index d44015d7..00000000 --- a/patches/glass2b.gif +++ /dev/null @@ -1 +0,0 @@ -jond/glass2b.gif \ No newline at end of file diff --git a/patches/glass2b.gif b/patches/glass2b.gif new file mode 100644 index 00000000..9157741e Binary files /dev/null and b/patches/glass2b.gif differ diff --git a/patches/jond/glass1.gif b/patches/jond/glass1.gif deleted file mode 100644 index e934aad0..00000000 Binary files a/patches/jond/glass1.gif and /dev/null differ diff --git a/patches/jond/glass1b.gif b/patches/jond/glass1b.gif deleted file mode 100644 index 6c02ba89..00000000 Binary files a/patches/jond/glass1b.gif and /dev/null differ diff --git a/patches/jond/glass2.gif b/patches/jond/glass2.gif deleted file mode 100644 index fcab429c..00000000 Binary files a/patches/jond/glass2.gif and /dev/null differ diff --git a/patches/jond/glass2b.gif b/patches/jond/glass2b.gif deleted file mode 100644 index 9157741e..00000000 Binary files a/patches/jond/glass2b.gif and /dev/null differ diff --git a/patches/jond/rw11_3.gif b/patches/jond/rw11_3.gif deleted file mode 100644 index 8fec43d2..00000000 Binary files a/patches/jond/rw11_3.gif and /dev/null differ diff --git a/patches/jond/rw28_1.gif b/patches/jond/rw28_1.gif deleted file mode 100644 index 7cb8c1e7..00000000 Binary files a/patches/jond/rw28_1.gif and /dev/null differ diff --git a/patches/jond/rw7_1.gif b/patches/jond/rw7_1.gif deleted file mode 100644 index eb2d1e1a..00000000 Binary files a/patches/jond/rw7_1.gif and /dev/null differ diff --git a/patches/jond/wall52_1.gif b/patches/jond/wall52_1.gif deleted file mode 100644 index 37bbacd7..00000000 Binary files a/patches/jond/wall52_1.gif and /dev/null differ diff --git a/patches/jond/wall52_2.gif b/patches/jond/wall52_2.gif deleted file mode 100644 index 7f277ee8..00000000 Binary files a/patches/jond/wall52_2.gif and /dev/null differ diff --git a/patches/jond/wall53_1.gif b/patches/jond/wall53_1.gif deleted file mode 100644 index 9df193e8..00000000 Binary files a/patches/jond/wall53_1.gif and /dev/null differ diff --git a/patches/jond/wall54_1.gif b/patches/jond/wall54_1.gif deleted file mode 100644 index 53dc52db..00000000 Binary files a/patches/jond/wall54_1.gif and /dev/null differ diff --git a/patches/jond/wall54_2.gif b/patches/jond/wall54_2.gif deleted file mode 100644 index 55892d3b..00000000 Binary files a/patches/jond/wall54_2.gif and /dev/null differ diff --git a/patches/jond/wall55_1.gif b/patches/jond/wall55_1.gif deleted file mode 100644 index bc021556..00000000 Binary files a/patches/jond/wall55_1.gif and /dev/null differ diff --git a/patches/jond/wall5x_x.txt b/patches/jond/wall5x_x.txt deleted file mode 100644 index 187bee9a..00000000 --- a/patches/jond/wall5x_x.txt +++ /dev/null @@ -1 +0,0 @@ -jon^d jon@frad.org \ No newline at end of file diff --git a/patches/rw11_3.gif b/patches/rw11_3.gif deleted file mode 120000 index 7f373442..00000000 --- a/patches/rw11_3.gif +++ /dev/null @@ -1 +0,0 @@ -jond/rw11_3.gif \ No newline at end of file diff --git a/patches/rw11_3.gif b/patches/rw11_3.gif new file mode 100644 index 00000000..8fec43d2 Binary files /dev/null and b/patches/rw11_3.gif differ diff --git a/patches/rw28_1.gif b/patches/rw28_1.gif deleted file mode 120000 index 622b4d1e..00000000 --- a/patches/rw28_1.gif +++ /dev/null @@ -1 +0,0 @@ -jond/rw28_1.gif \ No newline at end of file diff --git a/patches/rw28_1.gif b/patches/rw28_1.gif new file mode 100644 index 00000000..7cb8c1e7 Binary files /dev/null and b/patches/rw28_1.gif differ diff --git a/patches/rw7_1.gif b/patches/rw7_1.gif deleted file mode 120000 index c299fff6..00000000 --- a/patches/rw7_1.gif +++ /dev/null @@ -1 +0,0 @@ -jond/rw7_1.gif \ No newline at end of file diff --git a/patches/rw7_1.gif b/patches/rw7_1.gif new file mode 100644 index 00000000..eb2d1e1a Binary files /dev/null and b/patches/rw7_1.gif differ diff --git a/patches/wall52_1.gif b/patches/wall52_1.gif deleted file mode 120000 index 544b6063..00000000 --- a/patches/wall52_1.gif +++ /dev/null @@ -1 +0,0 @@ -jond/wall52_1.gif \ No newline at end of file diff --git a/patches/wall52_1.gif b/patches/wall52_1.gif new file mode 100644 index 00000000..37bbacd7 Binary files /dev/null and b/patches/wall52_1.gif differ diff --git a/patches/wall52_2.gif b/patches/wall52_2.gif deleted file mode 120000 index e4e6a47b..00000000 --- a/patches/wall52_2.gif +++ /dev/null @@ -1 +0,0 @@ -jond/wall52_2.gif \ No newline at end of file diff --git a/patches/wall52_2.gif b/patches/wall52_2.gif new file mode 100644 index 00000000..7f277ee8 Binary files /dev/null and b/patches/wall52_2.gif differ diff --git a/patches/wall53_1.gif b/patches/wall53_1.gif deleted file mode 120000 index 9563a020..00000000 --- a/patches/wall53_1.gif +++ /dev/null @@ -1 +0,0 @@ -jond/wall53_1.gif \ No newline at end of file diff --git a/patches/wall53_1.gif b/patches/wall53_1.gif new file mode 100644 index 00000000..9df193e8 Binary files /dev/null and b/patches/wall53_1.gif differ diff --git a/patches/wall54_1.gif b/patches/wall54_1.gif deleted file mode 120000 index 4d37d2b6..00000000 --- a/patches/wall54_1.gif +++ /dev/null @@ -1 +0,0 @@ -jond/wall54_1.gif \ No newline at end of file diff --git a/patches/wall54_1.gif b/patches/wall54_1.gif new file mode 100644 index 00000000..53dc52db Binary files /dev/null and b/patches/wall54_1.gif differ diff --git a/patches/wall54_2.gif b/patches/wall54_2.gif deleted file mode 120000 index e7386a7e..00000000 --- a/patches/wall54_2.gif +++ /dev/null @@ -1 +0,0 @@ -jond/wall54_2.gif \ No newline at end of file diff --git a/patches/wall54_2.gif b/patches/wall54_2.gif new file mode 100644 index 00000000..55892d3b Binary files /dev/null and b/patches/wall54_2.gif differ diff --git a/patches/wall55_1.gif b/patches/wall55_1.gif deleted file mode 120000 index 16b8a66d..00000000 --- a/patches/wall55_1.gif +++ /dev/null @@ -1 +0,0 @@ -jond/wall55_1.gif \ No newline at end of file diff --git a/patches/wall55_1.gif b/patches/wall55_1.gif new file mode 100644 index 00000000..bc021556 Binary files /dev/null and b/patches/wall55_1.gif differ diff --git a/sprites/jond/placeholder/Makefile b/sprites/jond/placeholder/Makefile deleted file mode 100644 index e4542171..00000000 --- a/sprites/jond/placeholder/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# generates placeholder sprites for monsters -# -SPRITEDIR = ../.. - -# use the AOD skeleton for humanoid monsters -SKELDIR = $(SPRITEDIR)/linguica/aoddoom_skeletons -SKELSRC = $(wildcard $(SKELDIR)/sarg*) -VILEDEST = $(notdir $(SKELSRC)) - -BSPISRC = $(wildcard $(SPRITEDIR)/bspi*) - -ALLSRC = $(BSPISRC) -TARGETS = $(notdir $(ALLSRC)) - -DUMMY =../../dummy.gif -# TODO: if dst's width is < src's, src is clipped. Try to prevent this. -ARGS=-compose Over -gravity center - -foo: $(VILEDEST) $(TARGETS) - -clean: - rm -f $(VILEDEST) $(TARGETS) - -$(TARGETS): $(DUMMY) Makefile - composite $(ARGS) $(DUMMY) $(SPRITEDIR)/$@ $@ - -# special case since the source isn't in $(SPRITEDIR) -$(VILEDEST): $(DUMMY) Makefile - composite $(ARGS) $(DUMMY) $(SKELDIR)/$@ $@ - -test: - echo $(BSPISRC) -.PHONY: foo clean