Skip to content

Commit

Permalink
V7 (#80)
Browse files Browse the repository at this point in the history
* initial checking v7

* latest code for all

* new version of mnew

* slim down  a bit

* tweaks

* more tweaks

* more shaping

* yet another new version

* added belly overhang for transwarp

* pull bakc nacelle and bogger scout bridge

* added aux hangars on transwarp part

* new shuttlepod

* new shuttlepod 2

* added small shuttle

* added medium shuttle

* added large shuttle and scale diagram

* added fighter craft

* added fighter

* added runabout

* added tactical runabout

* added heavy runabout

* added attack vessel

* addec science ships

* added diplomatic vessel

* folder rename

* Revert "folder rename"

This reverts commit adb9b36.

* make heavy runabout less pregnant

* folder rename

* changes to mothership images makefile

* makefile

* more makefile modifications

* modified images

* modified stls

* misc deletions

* updated image paths

* added aux stl files and makefile

* hosuecleaning

* added aux images and makefile

* housecleaning

* updated makefiles at parent level

* more hosuekeeping

* modified scale images

* modified

* added history

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* added attack ship to readme

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md
  • Loading branch information
prasannax1 committed Jul 9, 2021
1 parent 676be65 commit 82ba4de
Show file tree
Hide file tree
Showing 238 changed files with 573,663 additions and 853,901 deletions.
1,220 changes: 513 additions & 707 deletions README.md

Large diffs are not rendered by default.

14 changes: 3 additions & 11 deletions images/Makefile
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
IMG += icp_images
IMG += macs_images
IMG += misc_images
IMG += aux_images
IMG += mother_images

all: $(IMG)

mother_images: $(wildcard ../src/mother/*.scad)
@$(MAKE) -C mothership

icp_images: $(wildcard ../src/icp/*.scad)
@$(MAKE) -C icp

macs_images: $(wildcard ../src/macs/*.scad)
@$(MAKE) -C macs

misc_images: $(wildcard ../src/misc/*.scad)
@$(MAKE) -C misc
aux_images: $(wildcard ../src/aux/*.scad)
@$(MAKE) -C aux

95 changes: 95 additions & 0 deletions images/aux/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
IMG += attack-primary.png
IMG += attack.png
IMG += attack-secondary.png
IMG += diplomat.png
IMG += fighter.png
IMG += heavy-runabout.png
IMG += runabout.png
IMG += science.png
IMG += shuttle-large.png
IMG += shuttle-medium.png
IMG += shuttlepod.png
IMG += shuttle-small.png
IMG += tactical-runabout.png

all: $(IMG)

attack-primary.png: ../../src/lib/util.scad ../../src/aux/attack-primary.scad
../../bin/render.sh \
-i ../../src/aux/$(basename $(notdir $@)).scad \
-p $@ \
-t Sunset

attack.png: attack-primary.png attack-secondary.png
../../bin/render.sh \
-i ../../src/aux/$(basename $(notdir $@)).scad \
-p $@ \
-t Sunset

attack-secondary.png: ../../src/lib/util.scad ../../src/aux/attack-secondary.scad
../../bin/render.sh \
-i ../../src/aux/$(basename $(notdir $@)).scad \
-p $@ \
-t Sunset

diplomat.png: ../../src/lib/util.scad ../../src/aux/diplomat.scad
../../bin/render.sh \
-i ../../src/aux/$(basename $(notdir $@)).scad \
-p $@ \
-t Metallic

fighter.png: ../../src/lib/util.scad ../../src/aux/fighter.scad
../../bin/render.sh \
-i ../../src/aux/$(basename $(notdir $@)).scad \
-p $@ \
-t Solarized

heavy-runabout.png: ../../src/lib/util.scad ../../src/aux/heavy-runabout.scad
../../bin/render.sh \
-i ../../src/aux/$(basename $(notdir $@)).scad \
-p $@ \
-t BeforeDawn

runabout.png: ../../src/lib/util.scad ../../src/aux/runabout.scad
../../bin/render.sh \
-i ../../src/aux/$(basename $(notdir $@)).scad \
-p $@ \
-t BeforeDawn

science.png: ../../src/lib/util.scad ../../src/aux/science.scad
../../bin/render.sh \
-i ../../src/aux/$(basename $(notdir $@)).scad \
-p $@ \
-t BeforeDawn

shuttle-large.png: ../../src/lib/util.scad ../../src/aux/shuttle-large.scad
../../bin/render.sh \
-i ../../src/aux/$(basename $(notdir $@)).scad \
-p $@ \
-t DeepOcean

shuttle-medium.png: ../../src/lib/util.scad ../../src/aux/shuttle-medium.scad
../../bin/render.sh \
-i ../../src/aux/$(basename $(notdir $@)).scad \
-p $@ \
-t DeepOcean

shuttlepod.png: ../../src/lib/util.scad ../../src/aux/shuttlepod.scad
../../bin/render.sh \
-i ../../src/aux/$(basename $(notdir $@)).scad \
-p $@ \
-t DeepOcean

shuttle-small.png: ../../src/lib/util.scad ../../src/aux/shuttle-small.scad
../../bin/render.sh \
-i ../../src/aux/$(basename $(notdir $@)).scad \
-p $@ \
-t DeepOcean

tactical-runabout.png: ../../src/lib/util.scad ../../src/aux/tactical-runabout.scad
../../bin/render.sh \
-i ../../src/aux/$(basename $(notdir $@)).scad \
-p $@ \
-t Solarized


Binary file added images/aux/attack-primary.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/aux/attack-secondary.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/aux/attack.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/aux/diplomat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/aux/fighter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/aux/heavy-runabout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/aux/runabout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/aux/science.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/aux/shuttle-large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/aux/shuttle-medium.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/aux/shuttle-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/aux/shuttlepod.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/aux/tactical-runabout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 0 additions & 70 deletions images/icp/Makefile

This file was deleted.

Binary file removed images/icp/attack.png
Binary file not shown.
Binary file removed images/icp/destroyer.png
Binary file not shown.
Binary file removed images/icp/diplomat.png
Binary file not shown.
Binary file removed images/icp/explorer.png
Binary file not shown.
Binary file removed images/icp/long-yacht.png
Binary file not shown.
Binary file removed images/icp/observer.png
Binary file not shown.
Binary file removed images/icp/runabout.png
Binary file not shown.
Binary file removed images/icp/science.png
Binary file not shown.
Binary file removed images/icp/tactical-runabout.png
Binary file not shown.
Binary file removed images/icp/yacht.png
Binary file not shown.
131 changes: 0 additions & 131 deletions images/macs/Makefile

This file was deleted.

Binary file removed images/macs/cutter.png
Binary file not shown.
Binary file removed images/macs/disk.png
Binary file not shown.
Binary file removed images/macs/extension.png
Diff not rendered.
Binary file removed images/macs/fighter.png
Diff not rendered.
Binary file removed images/macs/freighter.png
Diff not rendered.
Binary file removed images/macs/habitat.png
Diff not rendered.
Binary file removed images/macs/heavy-runabout.png
Diff not rendered.
Binary file removed images/macs/hospital.png
Diff not rendered.
Binary file removed images/macs/large-warp-harness.png
Diff not rendered.
Binary file removed images/macs/pod.png
Diff not rendered.
Binary file removed images/macs/shuttle.png
Diff not rendered.
Binary file removed images/macs/small-pod.png
Diff not rendered.
Binary file removed images/macs/small-runabout.png
Diff not rendered.
Binary file removed images/macs/small-warp-harness.png
Diff not rendered.
Binary file removed images/macs/tactical-harness.png
Diff not rendered.
Binary file removed images/macs/tactical-runabout.png
Diff not rendered.
26 changes: 0 additions & 26 deletions images/misc/Makefile

This file was deleted.

Binary file removed images/misc/cruiser.png
Diff not rendered.
Binary file removed images/misc/cruiser2.png
Diff not rendered.
Binary file removed images/misc/cruiser3.png
Diff not rendered.
Loading

0 comments on commit 82ba4de

Please sign in to comment.