projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1a22e8b
)
replaced ILBM graphics source files in repository with converted PNG files
author
Holger Schemel
<info@artsoft.org>
Wed, 17 Jun 2020 17:16:23 +0000
(19:16 +0200)
committer
Holger Schemel
<info@artsoft.org>
Wed, 17 Jun 2020 22:45:55 +0000
(
00:45
+0200)
46 files changed:
.gitignore
patch
|
blob
|
history
graphics/gfx_classic/Makefile
patch
|
blob
|
history
graphics/gfx_classic/RocksBusy.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksBusy.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksCE-template.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksCE.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksDC.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksDC.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksDC2.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksDC2.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksDF.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksDF.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksDoor.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksDoor.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksDoor2.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksDoor2.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksDoorMM.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksDoorMM.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksEMC.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksEMC.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksElements.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksElements.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksFontBig.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksFontBig.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksFontDC.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksFontDC.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksFontEM.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksFontEM.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksFontMedium.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksFontMedium.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksFontSmall.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksFontSmall.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksHeroes.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksHeroes.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksMM.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksMM.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksMore.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksMore.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksSP.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksSP.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksScreen.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksScreen.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksToons.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksToons.png
[new file with mode: 0644]
patch
|
blob
graphics/gfx_classic/RocksTouch.ilbm
[deleted file]
patch
|
blob
|
history
graphics/gfx_classic/RocksTouch.png
[new file with mode: 0644]
patch
|
blob
diff --git
a/.gitignore
b/.gitignore
index decee6886bb05643e3f9e541865bdf03dd99ae1f..e884cfc1140dcee76744a987e1d6db4367f2ef71 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-22,9
+22,6
@@
src/conf_g2s.c
src/conf_g2m.c
src/conf_var.c
src/conf_act.c
src/conf_g2m.c
src/conf_var.c
src/conf_act.c
-graphics/gfx_classic/*.png
-graphics/gfx_classic/RocksCE.ilbm
-graphics/gfx_classic/overlay/VirtualButtons.png
# ignore compiled executable files
rocksndiamonds
# ignore compiled executable files
rocksndiamonds
diff --git
a/graphics/gfx_classic/Makefile
b/graphics/gfx_classic/Makefile
index d38d1b001788807c4bfe3f9cf92db7a9dc22d795..66e897f85898d442402aab6baacf2b34125d461d 100644
(file)
--- a/
graphics/gfx_classic/Makefile
+++ b/
graphics/gfx_classic/Makefile
@@
-57,10
+57,14
@@
all: $(FILES)
%.png: %.ilbm
ilbmtoppm $< | pnmtopng > $@
%.png: %.ilbm
ilbmtoppm $< | pnmtopng > $@
-RocksCE.ilbm: RocksCE-template.ilbm
+RocksCE.png: RocksCE-template.ilbm
+ifneq ("$(wildcard RocksCE-template.ilbm)","")
$(RND) -e "create CE image ."
$(RND) -e "create CE image ."
- bmptoppm RocksCE.bmp | p
pmtoilbm > RocksCE.ilbm
+ bmptoppm RocksCE.bmp | p
nmtopng > $@
$(RM) RocksCE.bmp
$(RM) RocksCE.bmp
+endif
+
+RocksCE-template.ilbm:
clean:
@for i in $(FILES); do \
clean:
@for i in $(FILES); do \
diff --git
a/graphics/gfx_classic/RocksBusy.ilbm
b/graphics/gfx_classic/RocksBusy.ilbm
deleted file mode 100644
(file)
index
a5cad7e
..0000000
Binary files a/graphics/gfx_classic/RocksBusy.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksBusy.png
b/graphics/gfx_classic/RocksBusy.png
new file mode 100644
(file)
index 0000000..
cb92799
Binary files /dev/null and b/graphics/gfx_classic/RocksBusy.png differ
diff --git
a/graphics/gfx_classic/RocksCE-template.ilbm
b/graphics/gfx_classic/RocksCE-template.ilbm
deleted file mode 100644
(file)
index
7e1a1d3
..0000000
Binary files a/graphics/gfx_classic/RocksCE-template.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksCE.png
b/graphics/gfx_classic/RocksCE.png
new file mode 100644
(file)
index 0000000..
72bbb0a
Binary files /dev/null and b/graphics/gfx_classic/RocksCE.png differ
diff --git
a/graphics/gfx_classic/RocksDC.ilbm
b/graphics/gfx_classic/RocksDC.ilbm
deleted file mode 100644
(file)
index
695ff63
..0000000
Binary files a/graphics/gfx_classic/RocksDC.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksDC.png
b/graphics/gfx_classic/RocksDC.png
new file mode 100644
(file)
index 0000000..
dcc2e6e
Binary files /dev/null and b/graphics/gfx_classic/RocksDC.png differ
diff --git
a/graphics/gfx_classic/RocksDC2.ilbm
b/graphics/gfx_classic/RocksDC2.ilbm
deleted file mode 100644
(file)
index
29cb2db
..0000000
Binary files a/graphics/gfx_classic/RocksDC2.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksDC2.png
b/graphics/gfx_classic/RocksDC2.png
new file mode 100644
(file)
index 0000000..
a33c2a4
Binary files /dev/null and b/graphics/gfx_classic/RocksDC2.png differ
diff --git
a/graphics/gfx_classic/RocksDF.ilbm
b/graphics/gfx_classic/RocksDF.ilbm
deleted file mode 100644
(file)
index
ad2353d
..0000000
Binary files a/graphics/gfx_classic/RocksDF.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksDF.png
b/graphics/gfx_classic/RocksDF.png
new file mode 100644
(file)
index 0000000..
e8ea18d
Binary files /dev/null and b/graphics/gfx_classic/RocksDF.png differ
diff --git
a/graphics/gfx_classic/RocksDoor.ilbm
b/graphics/gfx_classic/RocksDoor.ilbm
deleted file mode 100644
(file)
index
f241683
..0000000
Binary files a/graphics/gfx_classic/RocksDoor.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksDoor.png
b/graphics/gfx_classic/RocksDoor.png
new file mode 100644
(file)
index 0000000..
3d045d6
Binary files /dev/null and b/graphics/gfx_classic/RocksDoor.png differ
diff --git
a/graphics/gfx_classic/RocksDoor2.ilbm
b/graphics/gfx_classic/RocksDoor2.ilbm
deleted file mode 100644
(file)
index
ad78316
..0000000
Binary files a/graphics/gfx_classic/RocksDoor2.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksDoor2.png
b/graphics/gfx_classic/RocksDoor2.png
new file mode 100644
(file)
index 0000000..
73efd72
Binary files /dev/null and b/graphics/gfx_classic/RocksDoor2.png differ
diff --git
a/graphics/gfx_classic/RocksDoorMM.ilbm
b/graphics/gfx_classic/RocksDoorMM.ilbm
deleted file mode 100644
(file)
index
a169056
..0000000
Binary files a/graphics/gfx_classic/RocksDoorMM.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksDoorMM.png
b/graphics/gfx_classic/RocksDoorMM.png
new file mode 100644
(file)
index 0000000..
e948ec2
Binary files /dev/null and b/graphics/gfx_classic/RocksDoorMM.png differ
diff --git
a/graphics/gfx_classic/RocksEMC.ilbm
b/graphics/gfx_classic/RocksEMC.ilbm
deleted file mode 100644
(file)
index
834d1d5
..0000000
Binary files a/graphics/gfx_classic/RocksEMC.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksEMC.png
b/graphics/gfx_classic/RocksEMC.png
new file mode 100644
(file)
index 0000000..
6406fcb
Binary files /dev/null and b/graphics/gfx_classic/RocksEMC.png differ
diff --git
a/graphics/gfx_classic/RocksElements.ilbm
b/graphics/gfx_classic/RocksElements.ilbm
deleted file mode 100644
(file)
index
f56d9cf
..0000000
Binary files a/graphics/gfx_classic/RocksElements.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksElements.png
b/graphics/gfx_classic/RocksElements.png
new file mode 100644
(file)
index 0000000..
8b0d40f
Binary files /dev/null and b/graphics/gfx_classic/RocksElements.png differ
diff --git
a/graphics/gfx_classic/RocksFontBig.ilbm
b/graphics/gfx_classic/RocksFontBig.ilbm
deleted file mode 100644
(file)
index
b3a2c84
..0000000
Binary files a/graphics/gfx_classic/RocksFontBig.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksFontBig.png
b/graphics/gfx_classic/RocksFontBig.png
new file mode 100644
(file)
index 0000000..
e388e2c
Binary files /dev/null and b/graphics/gfx_classic/RocksFontBig.png differ
diff --git
a/graphics/gfx_classic/RocksFontDC.ilbm
b/graphics/gfx_classic/RocksFontDC.ilbm
deleted file mode 100644
(file)
index
626a556
..0000000
Binary files a/graphics/gfx_classic/RocksFontDC.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksFontDC.png
b/graphics/gfx_classic/RocksFontDC.png
new file mode 100644
(file)
index 0000000..
3cf2506
Binary files /dev/null and b/graphics/gfx_classic/RocksFontDC.png differ
diff --git
a/graphics/gfx_classic/RocksFontEM.ilbm
b/graphics/gfx_classic/RocksFontEM.ilbm
deleted file mode 100644
(file)
index
dae0347
..0000000
Binary files a/graphics/gfx_classic/RocksFontEM.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksFontEM.png
b/graphics/gfx_classic/RocksFontEM.png
new file mode 100644
(file)
index 0000000..
87beca0
Binary files /dev/null and b/graphics/gfx_classic/RocksFontEM.png differ
diff --git
a/graphics/gfx_classic/RocksFontMedium.ilbm
b/graphics/gfx_classic/RocksFontMedium.ilbm
deleted file mode 100644
(file)
index
50607da
..0000000
Binary files a/graphics/gfx_classic/RocksFontMedium.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksFontMedium.png
b/graphics/gfx_classic/RocksFontMedium.png
new file mode 100644
(file)
index 0000000..
728e7b5
Binary files /dev/null and b/graphics/gfx_classic/RocksFontMedium.png differ
diff --git
a/graphics/gfx_classic/RocksFontSmall.ilbm
b/graphics/gfx_classic/RocksFontSmall.ilbm
deleted file mode 100644
(file)
index
7fa7dcc
..0000000
Binary files a/graphics/gfx_classic/RocksFontSmall.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksFontSmall.png
b/graphics/gfx_classic/RocksFontSmall.png
new file mode 100644
(file)
index 0000000..
5e2f13e
Binary files /dev/null and b/graphics/gfx_classic/RocksFontSmall.png differ
diff --git
a/graphics/gfx_classic/RocksHeroes.ilbm
b/graphics/gfx_classic/RocksHeroes.ilbm
deleted file mode 100644
(file)
index
b542155
..0000000
Binary files a/graphics/gfx_classic/RocksHeroes.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksHeroes.png
b/graphics/gfx_classic/RocksHeroes.png
new file mode 100644
(file)
index 0000000..
00c20bd
Binary files /dev/null and b/graphics/gfx_classic/RocksHeroes.png differ
diff --git
a/graphics/gfx_classic/RocksMM.ilbm
b/graphics/gfx_classic/RocksMM.ilbm
deleted file mode 100644
(file)
index
a00cdde
..0000000
Binary files a/graphics/gfx_classic/RocksMM.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksMM.png
b/graphics/gfx_classic/RocksMM.png
new file mode 100644
(file)
index 0000000..
b2b816e
Binary files /dev/null and b/graphics/gfx_classic/RocksMM.png differ
diff --git
a/graphics/gfx_classic/RocksMore.ilbm
b/graphics/gfx_classic/RocksMore.ilbm
deleted file mode 100644
(file)
index
4a8a9eb
..0000000
Binary files a/graphics/gfx_classic/RocksMore.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksMore.png
b/graphics/gfx_classic/RocksMore.png
new file mode 100644
(file)
index 0000000..
b3b9f11
Binary files /dev/null and b/graphics/gfx_classic/RocksMore.png differ
diff --git
a/graphics/gfx_classic/RocksSP.ilbm
b/graphics/gfx_classic/RocksSP.ilbm
deleted file mode 100644
(file)
index
d366873
..0000000
Binary files a/graphics/gfx_classic/RocksSP.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksSP.png
b/graphics/gfx_classic/RocksSP.png
new file mode 100644
(file)
index 0000000..
3ec7083
Binary files /dev/null and b/graphics/gfx_classic/RocksSP.png differ
diff --git
a/graphics/gfx_classic/RocksScreen.ilbm
b/graphics/gfx_classic/RocksScreen.ilbm
deleted file mode 100644
(file)
index
171e2a8
..0000000
Binary files a/graphics/gfx_classic/RocksScreen.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksScreen.png
b/graphics/gfx_classic/RocksScreen.png
new file mode 100644
(file)
index 0000000..
b70bbab
Binary files /dev/null and b/graphics/gfx_classic/RocksScreen.png differ
diff --git
a/graphics/gfx_classic/RocksToons.ilbm
b/graphics/gfx_classic/RocksToons.ilbm
deleted file mode 100644
(file)
index
1432b14
..0000000
Binary files a/graphics/gfx_classic/RocksToons.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksToons.png
b/graphics/gfx_classic/RocksToons.png
new file mode 100644
(file)
index 0000000..
1aef21c
Binary files /dev/null and b/graphics/gfx_classic/RocksToons.png differ
diff --git
a/graphics/gfx_classic/RocksTouch.ilbm
b/graphics/gfx_classic/RocksTouch.ilbm
deleted file mode 100644
(file)
index
07d04a4
..0000000
Binary files a/graphics/gfx_classic/RocksTouch.ilbm and /dev/null differ
diff --git a/graphics/gfx_classic/RocksTouch.png
b/graphics/gfx_classic/RocksTouch.png
new file mode 100644
(file)
index 0000000..
4cb63e9
Binary files /dev/null and b/graphics/gfx_classic/RocksTouch.png differ