From 010f829485d570afb66c630026504fec63f93cdd Mon Sep 17 00:00:00 2001 From: Joshua Rahm Date: Tue, 10 Dec 2013 19:19:26 -0700 Subject: Almost finished working commit --- objects/textures/areo_texture.jpg | Bin 0 -> 10201 bytes objects/textures/crate.bmp | Bin 196662 -> 0 bytes objects/textures/crate.jpg | Bin 0 -> 30226 bytes objects/textures/earth.bmp | Bin 25165962 -> 0 bytes objects/textures/earth.jpg | Bin 0 -> 2266862 bytes objects/textures/engine.jpg | Bin 0 -> 829289 bytes objects/textures/industrial.jpg | Bin 0 -> 751136 bytes objects/textures/leaf.bmp | Bin 3210 -> 0 bytes objects/textures/leaf.jpg | Bin 0 -> 606 bytes objects/textures/metal.bmp | Bin 3145866 -> 0 bytes objects/textures/metal.jpg | Bin 0 -> 332744 bytes objects/textures/moon.jpg | Bin 0 -> 173959 bytes objects/textures/star.bmp | Bin 786570 -> 0 bytes objects/textures/star.jpg | Bin 0 -> 35099 bytes objects/textures/stars.bmp | Bin 786554 -> 0 bytes objects/textures/stars.jpg | Bin 0 -> 46956 bytes objects/textures/windows.bmp | Bin 196746 -> 0 bytes objects/textures/windows.jpg | Bin 0 -> 26850 bytes 18 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 objects/textures/areo_texture.jpg delete mode 100644 objects/textures/crate.bmp create mode 100644 objects/textures/crate.jpg delete mode 100644 objects/textures/earth.bmp create mode 100644 objects/textures/earth.jpg create mode 100644 objects/textures/engine.jpg create mode 100644 objects/textures/industrial.jpg delete mode 100644 objects/textures/leaf.bmp create mode 100644 objects/textures/leaf.jpg delete mode 100644 objects/textures/metal.bmp create mode 100644 objects/textures/metal.jpg create mode 100644 objects/textures/moon.jpg delete mode 100644 objects/textures/star.bmp create mode 100644 objects/textures/star.jpg delete mode 100644 objects/textures/stars.bmp create mode 100644 objects/textures/stars.jpg delete mode 100644 objects/textures/windows.bmp create mode 100644 objects/textures/windows.jpg (limited to 'objects/textures') diff --git a/objects/textures/areo_texture.jpg b/objects/textures/areo_texture.jpg new file mode 100644 index 0000000..412ec39 Binary files /dev/null and b/objects/textures/areo_texture.jpg differ diff --git a/objects/textures/crate.bmp b/objects/textures/crate.bmp deleted file mode 100644 index 652ff7e..0000000 Binary files a/objects/textures/crate.bmp and /dev/null differ diff --git a/objects/textures/crate.jpg b/objects/textures/crate.jpg new file mode 100644 index 0000000..a924875 Binary files /dev/null and b/objects/textures/crate.jpg differ diff --git a/objects/textures/earth.bmp b/objects/textures/earth.bmp deleted file mode 100644 index 3985db0..0000000 Binary files a/objects/textures/earth.bmp and /dev/null differ diff --git a/objects/textures/earth.jpg b/objects/textures/earth.jpg new file mode 100644 index 0000000..0f1840d Binary files /dev/null and b/objects/textures/earth.jpg differ diff --git a/objects/textures/engine.jpg b/objects/textures/engine.jpg new file mode 100644 index 0000000..89c6068 Binary files /dev/null and b/objects/textures/engine.jpg differ diff --git a/objects/textures/industrial.jpg b/objects/textures/industrial.jpg new file mode 100644 index 0000000..db24063 Binary files /dev/null and b/objects/textures/industrial.jpg differ diff --git a/objects/textures/leaf.bmp b/objects/textures/leaf.bmp deleted file mode 100644 index ef666a4..0000000 Binary files a/objects/textures/leaf.bmp and /dev/null differ diff --git a/objects/textures/leaf.jpg b/objects/textures/leaf.jpg new file mode 100644 index 0000000..d516cb4 Binary files /dev/null and b/objects/textures/leaf.jpg differ diff --git a/objects/textures/metal.bmp b/objects/textures/metal.bmp deleted file mode 100644 index 48a3b2e..0000000 Binary files a/objects/textures/metal.bmp and /dev/null differ diff --git a/objects/textures/metal.jpg b/objects/textures/metal.jpg new file mode 100644 index 0000000..0f5ff94 Binary files /dev/null and b/objects/textures/metal.jpg differ diff --git a/objects/textures/moon.jpg b/objects/textures/moon.jpg new file mode 100644 index 0000000..c396652 Binary files /dev/null and b/objects/textures/moon.jpg differ diff --git a/objects/textures/star.bmp b/objects/textures/star.bmp deleted file mode 100644 index 297d8fb..0000000 Binary files a/objects/textures/star.bmp and /dev/null differ diff --git a/objects/textures/star.jpg b/objects/textures/star.jpg new file mode 100644 index 0000000..e20d32d Binary files /dev/null and b/objects/textures/star.jpg differ diff --git a/objects/textures/stars.bmp b/objects/textures/stars.bmp deleted file mode 100644 index 352ab57..0000000 Binary files a/objects/textures/stars.bmp and /dev/null differ diff --git a/objects/textures/stars.jpg b/objects/textures/stars.jpg new file mode 100644 index 0000000..6d31956 Binary files /dev/null and b/objects/textures/stars.jpg differ diff --git a/objects/textures/windows.bmp b/objects/textures/windows.bmp deleted file mode 100644 index 3426951..0000000 Binary files a/objects/textures/windows.bmp and /dev/null differ diff --git a/objects/textures/windows.jpg b/objects/textures/windows.jpg new file mode 100644 index 0000000..def3135 Binary files /dev/null and b/objects/textures/windows.jpg differ -- cgit