Merge branch 'develop'

WaldemarLehner · Nov 1, 2018 · e9f92c3 · e9f92c3
2 parents 0eae591 + a1d999d
commit e9f92c3
Show file tree

Hide file tree

Showing 87 changed files with 570 additions and 389 deletions.
diff --git a/frontend/.jshintrc → .jshintrc b/frontend/.jshintrc → .jshintrc
diff --git a/frontend/.sass-lint.yml → .sass-lint.yml b/frontend/.sass-lint.yml → .sass-lint.yml
diff --git a/frontend/README.md → README.md b/frontend/README.md → README.md
diff --git a/frontend/src/css/_colorVars.scss b/frontend/src/css/_colorVars.scss
diff --git a/frontend/src/js/canvasInterface.js b/frontend/src/js/canvasInterface.js
diff --git a/frontend/index.html → index.html b/frontend/index.html → index.html
diff --git a/frontend/src/css/_browserreset.scss → src/css/_browserreset.scss b/frontend/src/css/_browserreset.scss → src/css/_browserreset.scss
diff --git a/frontend/src/css/_canvas.scss → src/css/_canvas.scss b/frontend/src/css/_canvas.scss → src/css/_canvas.scss
diff --git a/src/css/_colorVars.scss b/src/css/_colorVars.scss
@@ -0,0 +1,5 @@
+
+
+$backgroundColor: #eaeaea;
+$loaderColor: #232323;
+$borderColor: #cccccc;
diff --git a/frontend/src/css/_global.scss → src/css/_global.scss b/frontend/src/css/_global.scss → src/css/_global.scss
diff --git a/frontend/src/css/_mixins.scss → src/css/_mixins.scss b/frontend/src/css/_mixins.scss → src/css/_mixins.scss
diff --git a/frontend/src/css/_preloader.scss → src/css/_preloader.scss b/frontend/src/css/_preloader.scss → src/css/_preloader.scss
diff --git a/frontend/src/css/_settings.scss → src/css/_settings.scss b/frontend/src/css/_settings.scss → src/css/_settings.scss
diff --git a/frontend/src/css/style.css → src/css/style.css b/frontend/src/css/style.css → src/css/style.css
diff --git a/frontend/src/css/style.scss → src/css/style.scss b/frontend/src/css/style.scss → src/css/style.scss
diff --git a/frontend/src/img/skybox/down.png → src/img/skybox/down.png b/frontend/src/img/skybox/down.png → src/img/skybox/down.png
diff --git a/frontend/src/img/skybox/east.png → src/img/skybox/east.png b/frontend/src/img/skybox/east.png → src/img/skybox/east.png
diff --git a/frontend/src/img/skybox/galplane.png → src/img/skybox/galplane.png b/frontend/src/img/skybox/galplane.png → src/img/skybox/galplane.png
diff --git a/frontend/src/img/skybox/north.png → src/img/skybox/north.png b/frontend/src/img/skybox/north.png → src/img/skybox/north.png
diff --git a/frontend/src/img/skybox/south.png → src/img/skybox/south.png b/frontend/src/img/skybox/south.png → src/img/skybox/south.png
diff --git a/frontend/src/img/skybox/up.png → src/img/skybox/up.png b/frontend/src/img/skybox/up.png → src/img/skybox/up.png
diff --git a/frontend/src/img/skybox/west.png → src/img/skybox/west.png b/frontend/src/img/skybox/west.png → src/img/skybox/west.png
diff --git a/frontend/src/img/ui/focus/arrow_pan.png → src/img/ui/focus/arrow_pan.png b/frontend/src/img/ui/focus/arrow_pan.png → src/img/ui/focus/arrow_pan.png
diff --git a/frontend/src/img/ui/focus/arrow_vertical.png → src/img/ui/focus/arrow_vertical.png b/frontend/src/img/ui/focus/arrow_vertical.png → src/img/ui/focus/arrow_vertical.png
diff --git a/frontend/src/img/ui/focus/focus_circle.png → src/img/ui/focus/focus_circle.png b/frontend/src/img/ui/focus/focus_circle.png → src/img/ui/focus/focus_circle.png
diff --git a/frontend/src/img/ui/markers/bookmark.png → src/img/ui/markers/bookmark.png b/frontend/src/img/ui/markers/bookmark.png → src/img/ui/markers/bookmark.png
diff --git a/frontend/src/img/ui/markers/bookmark.svg → src/img/ui/markers/bookmark.svg b/frontend/src/img/ui/markers/bookmark.svg → src/img/ui/markers/bookmark.svg
diff --git a/...tend/src/img/ui/markers/bookmark_aqua.png → src/img/ui/markers/bookmark_aqua.png b/...tend/src/img/ui/markers/bookmark_aqua.png → src/img/ui/markers/bookmark_aqua.png
diff --git a/...tend/src/img/ui/markers/bookmark_aqua.svg → src/img/ui/markers/bookmark_aqua.svg b/...tend/src/img/ui/markers/bookmark_aqua.svg → src/img/ui/markers/bookmark_aqua.svg
diff --git a/...end/src/img/ui/markers/bookmark_green.png → src/img/ui/markers/bookmark_green.png b/...end/src/img/ui/markers/bookmark_green.png → src/img/ui/markers/bookmark_green.png
diff --git a/...end/src/img/ui/markers/bookmark_green.svg → src/img/ui/markers/bookmark_green.svg b/...end/src/img/ui/markers/bookmark_green.svg → src/img/ui/markers/bookmark_green.svg
diff --git a/...tend/src/img/ui/markers/bookmark_lime.png → src/img/ui/markers/bookmark_lime.png b/...tend/src/img/ui/markers/bookmark_lime.png → src/img/ui/markers/bookmark_lime.png
diff --git a/...tend/src/img/ui/markers/bookmark_lime.svg → src/img/ui/markers/bookmark_lime.svg b/...tend/src/img/ui/markers/bookmark_lime.svg → src/img/ui/markers/bookmark_lime.svg
diff --git a/...end/src/img/ui/markers/bookmark_peach.png → src/img/ui/markers/bookmark_peach.png b/...end/src/img/ui/markers/bookmark_peach.png → src/img/ui/markers/bookmark_peach.png
diff --git a/...end/src/img/ui/markers/bookmark_peach.svg → src/img/ui/markers/bookmark_peach.svg b/...end/src/img/ui/markers/bookmark_peach.svg → src/img/ui/markers/bookmark_peach.svg
diff --git a/...tend/src/img/ui/markers/bookmark_pink.png → src/img/ui/markers/bookmark_pink.png b/...tend/src/img/ui/markers/bookmark_pink.png → src/img/ui/markers/bookmark_pink.png
diff --git a/...tend/src/img/ui/markers/bookmark_pink.svg → src/img/ui/markers/bookmark_pink.svg b/...tend/src/img/ui/markers/bookmark_pink.svg → src/img/ui/markers/bookmark_pink.svg
diff --git a/frontend/src/img/ui/markers/bookmark_red.png → src/img/ui/markers/bookmark_red.png b/frontend/src/img/ui/markers/bookmark_red.png → src/img/ui/markers/bookmark_red.png
diff --git a/frontend/src/img/ui/markers/bookmark_red.svg → src/img/ui/markers/bookmark_red.svg b/frontend/src/img/ui/markers/bookmark_red.svg → src/img/ui/markers/bookmark_red.svg
diff --git a/...nd/src/img/ui/markers/bookmark_violet.png → src/img/ui/markers/bookmark_violet.png b/...nd/src/img/ui/markers/bookmark_violet.png → src/img/ui/markers/bookmark_violet.png
diff --git a/...nd/src/img/ui/markers/bookmark_violet.svg → src/img/ui/markers/bookmark_violet.svg b/...nd/src/img/ui/markers/bookmark_violet.svg → src/img/ui/markers/bookmark_violet.svg
diff --git a/...end/src/img/ui/markers/bookmark_white.png → src/img/ui/markers/bookmark_white.png b/...end/src/img/ui/markers/bookmark_white.png → src/img/ui/markers/bookmark_white.png
diff --git a/...end/src/img/ui/markers/bookmark_white.svg → src/img/ui/markers/bookmark_white.svg b/...end/src/img/ui/markers/bookmark_white.svg → src/img/ui/markers/bookmark_white.svg
diff --git a/...nd/src/img/ui/markers/bookmark_yellow.png → src/img/ui/markers/bookmark_yellow.png b/...nd/src/img/ui/markers/bookmark_yellow.png → src/img/ui/markers/bookmark_yellow.png
diff --git a/...nd/src/img/ui/markers/bookmark_yellow.svg → src/img/ui/markers/bookmark_yellow.svg b/...nd/src/img/ui/markers/bookmark_yellow.svg → src/img/ui/markers/bookmark_yellow.svg
diff --git a/...tend/src/img/ui/markers/communitygoal.png → src/img/ui/markers/communitygoal.png b/...tend/src/img/ui/markers/communitygoal.png → src/img/ui/markers/communitygoal.png
diff --git a/...tend/src/img/ui/markers/communitygoal.svg → src/img/ui/markers/communitygoal.svg b/...tend/src/img/ui/markers/communitygoal.svg → src/img/ui/markers/communitygoal.svg
diff --git a/frontend/src/img/ui/markers/engineer.png → src/img/ui/markers/engineer.png b/frontend/src/img/ui/markers/engineer.png → src/img/ui/markers/engineer.png
diff --git a/frontend/src/img/ui/markers/engineer.svg → src/img/ui/markers/engineer.svg b/frontend/src/img/ui/markers/engineer.svg → src/img/ui/markers/engineer.svg
diff --git a/.../src/img/ui/markers/expedition_finish.png → src/img/ui/markers/expedition_finish.png b/.../src/img/ui/markers/expedition_finish.png → src/img/ui/markers/expedition_finish.png
diff --git a/.../src/img/ui/markers/expedition_finish.svg → src/img/ui/markers/expedition_finish.svg b/.../src/img/ui/markers/expedition_finish.svg → src/img/ui/markers/expedition_finish.svg
diff --git a/.../src/img/ui/markers/expedition_member.png → src/img/ui/markers/expedition_member.png b/.../src/img/ui/markers/expedition_member.png → src/img/ui/markers/expedition_member.png
diff --git a/.../src/img/ui/markers/expedition_member.svg → src/img/ui/markers/expedition_member.svg b/.../src/img/ui/markers/expedition_member.svg → src/img/ui/markers/expedition_member.svg
diff --git a/...d/src/img/ui/markers/expedition_start.png → src/img/ui/markers/expedition_start.png b/...d/src/img/ui/markers/expedition_start.png → src/img/ui/markers/expedition_start.png
diff --git a/...d/src/img/ui/markers/expedition_start.svg → src/img/ui/markers/expedition_start.svg b/...d/src/img/ui/markers/expedition_start.svg → src/img/ui/markers/expedition_start.svg
diff --git a/...rc/img/ui/markers/expedition_waypoint.png → src/img/ui/markers/expedition_waypoint.png b/...rc/img/ui/markers/expedition_waypoint.png → src/img/ui/markers/expedition_waypoint.png
diff --git a/...rc/img/ui/markers/expedition_waypoint.svg → src/img/ui/markers/expedition_waypoint.svg b/...rc/img/ui/markers/expedition_waypoint.svg → src/img/ui/markers/expedition_waypoint.svg
diff --git a/frontend/src/img/ui/markers/friends.png → src/img/ui/markers/friends.png b/frontend/src/img/ui/markers/friends.png → src/img/ui/markers/friends.png
diff --git a/frontend/src/img/ui/markers/friends.svg → src/img/ui/markers/friends.svg b/frontend/src/img/ui/markers/friends.svg → src/img/ui/markers/friends.svg
diff --git a/frontend/src/img/ui/markers/mission.png → src/img/ui/markers/mission.png b/frontend/src/img/ui/markers/mission.png → src/img/ui/markers/mission.png
diff --git a/frontend/src/img/ui/markers/mission.svg → src/img/ui/markers/mission.svg b/frontend/src/img/ui/markers/mission.svg → src/img/ui/markers/mission.svg
diff --git a/frontend/src/img/ui/markers/ship.png → src/img/ui/markers/ship.png b/frontend/src/img/ui/markers/ship.png → src/img/ui/markers/ship.png
diff --git a/frontend/src/img/ui/markers/ship.svg → src/img/ui/markers/ship.svg b/frontend/src/img/ui/markers/ship.svg → src/img/ui/markers/ship.svg
diff --git a/frontend/src/img/ui/markers/wing.png → src/img/ui/markers/wing.png b/frontend/src/img/ui/markers/wing.png → src/img/ui/markers/wing.png
diff --git a/frontend/src/img/ui/markers/wing.svg → src/img/ui/markers/wing.svg b/frontend/src/img/ui/markers/wing.svg → src/img/ui/markers/wing.svg