aboutsummaryrefslogtreecommitdiff
path: root/assets/images
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-24 12:08:49 -0800
committerPushkar Joshi2012-02-24 12:08:49 -0800
commit03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch)
treec51112223ceb9121cd595a60335eb2795215590f /assets/images
parentfcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff)
parent053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff)
downloadninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz
Merge branch 'pentool' into brushtool
Conflicts: imports/codemirror/mode/scheme/scheme.js js/tools/BrushTool.js
Diffstat (limited to 'assets/images')
-rwxr-xr-x[-rw-r--r--]assets/images/BoxB2_AO.pngbin86244 -> 86244 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/BoxB2_DM.pngbin86470 -> 86470 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/black.pngbin2791 -> 2791 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/blue.pngbin2796 -> 2796 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/cubelight.pngbin33154 -> 33154 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/grey.pngbin935 -> 935 bytes
-rw-r--r--assets/images/irredecentENV.pngbin103121 -> 0 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/material_paint.pngbin8450 -> 8450 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/metal.pngbin696663 -> 696663 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/normalMap.pngbin105161 -> 105161 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/random_normal.pngbin9356 -> 9356 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/rocky-diffuse.jpgbin262144 -> 262144 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/rocky-normal.jpgbin262144 -> 262144 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/rocky-spec.jpgbin316095 -> 316095 bytes
-rw-r--r--assets/images/scales_normal.pngbin113789 -> 0 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/silver.pngbin46756 -> 46756 bytes
-rw-r--r--assets/images/stitchStroke.pngbin8054 -> 0 bytes
-rw-r--r--assets/images/stitchStroke_N.pngbin2868 -> 0 bytes
-rwxr-xr-x[-rw-r--r--]assets/images/white.pngbin2794 -> 2794 bytes
19 files changed, 0 insertions, 0 deletions
diff --git a/assets/images/BoxB2_AO.png b/assets/images/BoxB2_AO.png
index b2ca502e..b2ca502e 100644..100755
--- a/assets/images/BoxB2_AO.png
+++ b/assets/images/BoxB2_AO.png
Binary files differ
diff --git a/assets/images/BoxB2_DM.png b/assets/images/BoxB2_DM.png
index a493ec54..a493ec54 100644..100755
--- a/assets/images/BoxB2_DM.png
+++ b/assets/images/BoxB2_DM.png
Binary files differ
diff --git a/assets/images/black.png b/assets/images/black.png
index 10318dc4..10318dc4 100644..100755
--- a/assets/images/black.png
+++ b/assets/images/black.png
Binary files differ
diff --git a/assets/images/blue.png b/assets/images/blue.png
index ee029b55..ee029b55 100644..100755
--- a/assets/images/blue.png
+++ b/assets/images/blue.png
Binary files differ
diff --git a/assets/images/cubelight.png b/assets/images/cubelight.png
index 53ff1bf3..53ff1bf3 100644..100755
--- a/assets/images/cubelight.png
+++ b/assets/images/cubelight.png
Binary files differ
diff --git a/assets/images/grey.png b/assets/images/grey.png
index b1ebe069..b1ebe069 100644..100755
--- a/assets/images/grey.png
+++ b/assets/images/grey.png
Binary files differ
diff --git a/assets/images/irredecentENV.png b/assets/images/irredecentENV.png
deleted file mode 100644
index 21c1c9ce..00000000
--- a/assets/images/irredecentENV.png
+++ /dev/null
Binary files differ
diff --git a/assets/images/material_paint.png b/assets/images/material_paint.png
index 38c695f5..38c695f5 100644..100755
--- a/assets/images/material_paint.png
+++ b/assets/images/material_paint.png
Binary files differ
diff --git a/assets/images/metal.png b/assets/images/metal.png
index ab36aaac..ab36aaac 100644..100755
--- a/assets/images/metal.png
+++ b/assets/images/metal.png
Binary files differ
diff --git a/assets/images/normalMap.png b/assets/images/normalMap.png
index 04ae6008..04ae6008 100644..100755
--- a/assets/images/normalMap.png
+++ b/assets/images/normalMap.png
Binary files differ
diff --git a/assets/images/random_normal.png b/assets/images/random_normal.png
index 62ca9d4d..62ca9d4d 100644..100755
--- a/assets/images/random_normal.png
+++ b/assets/images/random_normal.png
Binary files differ
diff --git a/assets/images/rocky-diffuse.jpg b/assets/images/rocky-diffuse.jpg
index 485b9665..485b9665 100644..100755
--- a/assets/images/rocky-diffuse.jpg
+++ b/assets/images/rocky-diffuse.jpg
Binary files differ
diff --git a/assets/images/rocky-normal.jpg b/assets/images/rocky-normal.jpg
index 386a2e4c..386a2e4c 100644..100755
--- a/assets/images/rocky-normal.jpg
+++ b/assets/images/rocky-normal.jpg
Binary files differ
diff --git a/assets/images/rocky-spec.jpg b/assets/images/rocky-spec.jpg
index 906919c3..906919c3 100644..100755
--- a/assets/images/rocky-spec.jpg
+++ b/assets/images/rocky-spec.jpg
Binary files differ
diff --git a/assets/images/scales_normal.png b/assets/images/scales_normal.png
deleted file mode 100644
index 87cc77dc..00000000
--- a/assets/images/scales_normal.png
+++ /dev/null
Binary files differ
diff --git a/assets/images/silver.png b/assets/images/silver.png
index ed7f029e..ed7f029e 100644..100755
--- a/assets/images/silver.png
+++ b/assets/images/silver.png
Binary files differ
diff --git a/assets/images/stitchStroke.png b/assets/images/stitchStroke.png
deleted file mode 100644
index 7808e81f..00000000
--- a/assets/images/stitchStroke.png
+++ /dev/null
Binary files differ
diff --git a/assets/images/stitchStroke_N.png b/assets/images/stitchStroke_N.png
deleted file mode 100644
index 34fa97d4..00000000
--- a/assets/images/stitchStroke_N.png
+++ /dev/null
Binary files differ
diff --git a/assets/images/white.png b/assets/images/white.png
index 58148a5d..58148a5d 100644..100755
--- a/assets/images/white.png
+++ b/assets/images/white.png
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 12:05:38 +0000