diff --git a/assets/voxygen b/assets/voxygen index 25346c1ead..b5c4e96c49 160000 --- a/assets/voxygen +++ b/assets/voxygen @@ -1 +1 @@ -Subproject commit 25346c1ead7d03b11f7f4403332f2288824c6ca9 +Subproject commit b5c4e96c490667d4aef061f5e1792c196b9c88d0 diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index a8d1f55c48..8ff6e1bee3 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -633,13 +633,18 @@ impl Hud { //Image::new(self.imgs.mmap_frame_bg) //.w_h(1750.0 / 8.0, 1650.0 / 8.0) //.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) - //.set(self.ids.mmap_frame_bg, ui_widgets); + //.set(self.ids.mmap_frame_bg, ui_widgets); + Image::new(self.imgs.mmap_frame) - .w_h(1750.0 / 8.0, 1650.0 / 8.0) + .w_h(100.0*2.5, 100.0*2.5) .top_right_with_margins_on(ui_widgets.window, 5.0, 5.0) .set(self.ids.mmap_frame, ui_widgets); + Rectangle::fill_with([92.0*2.5, 82.0*2.5], color::RED) + .mid_top_with_margin_on(self.ids.mmap_frame, 13.0*2.5+2.5) + .set(self.ids.mmap_frame_bg, ui_widgets); + // Title // Make it display the actual location Text::new("Uncanny Valley") @@ -1236,7 +1241,7 @@ impl Hud { } // Title Text::new("Social") - .mid_top_with_margin_on(self.ids.social_frame, 16.0) + .mid_top_with_margin_on(self.ids.social_frame, 17.0) .font_id(self.font_metamorph) .font_size(14) .color(TEXT_COLOR) diff --git a/voxygen/test_assets/body.vox b/voxygen/test_assets/body.vox deleted file mode 100644 index d6c7aa48dc..0000000000 Binary files a/voxygen/test_assets/body.vox and /dev/null differ diff --git a/voxygen/test_assets/dragon_body.vox b/voxygen/test_assets/dragon_body.vox deleted file mode 100644 index c1d20584d9..0000000000 Binary files a/voxygen/test_assets/dragon_body.vox and /dev/null differ diff --git a/voxygen/test_assets/dragon_lfoot.vox b/voxygen/test_assets/dragon_lfoot.vox deleted file mode 100644 index 80828a7137..0000000000 Binary files a/voxygen/test_assets/dragon_lfoot.vox and /dev/null differ diff --git a/voxygen/test_assets/dragon_rfoot.vox b/voxygen/test_assets/dragon_rfoot.vox deleted file mode 100644 index 1e2bcfe32d..0000000000 Binary files a/voxygen/test_assets/dragon_rfoot.vox and /dev/null differ diff --git a/voxygen/test_assets/dragon_tail.vox b/voxygen/test_assets/dragon_tail.vox deleted file mode 100644 index 050f21c65a..0000000000 Binary files a/voxygen/test_assets/dragon_tail.vox and /dev/null differ diff --git a/voxygen/test_assets/dragon_wingL_in.vox b/voxygen/test_assets/dragon_wingL_in.vox deleted file mode 100644 index aa0a7eedb2..0000000000 Binary files a/voxygen/test_assets/dragon_wingL_in.vox and /dev/null differ diff --git a/voxygen/test_assets/dragon_wingL_out.vox b/voxygen/test_assets/dragon_wingL_out.vox deleted file mode 100644 index 879372f6d8..0000000000 Binary files a/voxygen/test_assets/dragon_wingL_out.vox and /dev/null differ diff --git a/voxygen/test_assets/dragon_wingR_in.vox b/voxygen/test_assets/dragon_wingR_in.vox deleted file mode 100644 index 6dd9f1cd88..0000000000 Binary files a/voxygen/test_assets/dragon_wingR_in.vox and /dev/null differ diff --git a/voxygen/test_assets/dragon_wingR_out.vox b/voxygen/test_assets/dragon_wingR_out.vox deleted file mode 100644 index 8774a6798a..0000000000 Binary files a/voxygen/test_assets/dragon_wingR_out.vox and /dev/null differ diff --git a/voxygen/test_assets/dragonhead.vox b/voxygen/test_assets/dragonhead.vox deleted file mode 100644 index 0de9789f15..0000000000 Binary files a/voxygen/test_assets/dragonhead.vox and /dev/null differ diff --git a/voxygen/test_assets/foot_BL.vox b/voxygen/test_assets/foot_BL.vox deleted file mode 100644 index 90c9d7d6d9..0000000000 Binary files a/voxygen/test_assets/foot_BL.vox and /dev/null differ diff --git a/voxygen/test_assets/foot_BR.vox b/voxygen/test_assets/foot_BR.vox deleted file mode 100644 index 073a55c9e0..0000000000 Binary files a/voxygen/test_assets/foot_BR.vox and /dev/null differ diff --git a/voxygen/test_assets/foot_FL.vox b/voxygen/test_assets/foot_FL.vox deleted file mode 100644 index 23eab56821..0000000000 Binary files a/voxygen/test_assets/foot_FL.vox and /dev/null differ diff --git a/voxygen/test_assets/foot_FR.vox b/voxygen/test_assets/foot_FR.vox deleted file mode 100644 index 33ba935091..0000000000 Binary files a/voxygen/test_assets/foot_FR.vox and /dev/null differ diff --git a/voxygen/test_assets/lionhead.vox b/voxygen/test_assets/lionhead.vox deleted file mode 100644 index 7d6727d685..0000000000 Binary files a/voxygen/test_assets/lionhead.vox and /dev/null differ diff --git a/voxygen/test_assets/sabremale.vox b/voxygen/test_assets/sabremale.vox deleted file mode 100644 index 05e0ec245c..0000000000 Binary files a/voxygen/test_assets/sabremale.vox and /dev/null differ