Merge branch 'master' of github.com:kingargyle/xstreamer

NineWorlds · Nov 10, 2016 · df830db · df830db
2 parents 2521d13 + c67f3fd
commit df830db
Show file tree

Hide file tree

Showing 1,417 changed files with 922 additions and 25 deletions.
diff --git a/config/xstreamer.properties b/config/xstreamer.properties
@@ -3,3 +3,7 @@ xstreamer.squad.player2.xws = player2.json
 xstreamer.squad.player1.file = player1.html
 xstreamer.squad.player2.file = player2.html
 xstreamer.timer.file = timer.txt
+
+# Template files. Location is relevant to the templates directory
+xstreamer.template.player1.squad = squadOverlay.ftl
+xstreamer.template.player2.squad = squadOverlay2.ftl
diff --git a/images/3'x3' - Starfield - Deep Space.jpg b/images/3'x3' - Starfield - Deep Space.jpg
diff --git a/images/3'x3' - Starfield - Light.jpg b/images/3'x3' - Starfield - Light.jpg
diff --git a/images/3'x3' - Teal Nebula.jpg b/images/3'x3' - Teal Nebula.jpg
diff --git a/images/3'x6' (Epic) - Starfield.jpg b/images/3'x6' (Epic) - Starfield.jpg
diff --git a/images/3x3 -Starfield.jpg b/images/3x3 -Starfield.jpg
diff --git a/images/6'x3' (Epic) - Starfield.jpg b/images/6'x3' (Epic) - Starfield.jpg
diff --git a/images/Action-Barrel_Roll.png b/images/Action-Barrel_Roll.png
diff --git a/images/Action-Bomb.png b/images/Action-Bomb.png
diff --git a/images/Action-Boost.png b/images/Action-Boost.png
diff --git a/images/Action-Cloak.png b/images/Action-Cloak.png
diff --git a/images/Action-Coordinate.png b/images/Action-Coordinate.png
diff --git a/images/Action-Crew.png b/images/Action-Crew.png
diff --git a/images/Action-Elite.png b/images/Action-Elite.png
diff --git a/images/Action-Evade.png b/images/Action-Evade.png
diff --git a/images/Action-Focus.png b/images/Action-Focus.png
diff --git a/images/Action-Illicit.png b/images/Action-Illicit.png
diff --git a/images/Action-Jam.png b/images/Action-Jam.png
diff --git a/images/Action-Mech.png b/images/Action-Mech.png
diff --git a/images/Action-Recover.png b/images/Action-Recover.png
diff --git a/images/Action-Reinforce.png b/images/Action-Reinforce.png
diff --git a/images/Action-Rotate_Arc.png b/images/Action-Rotate_Arc.png
diff --git a/images/Action-SLAM.png b/images/Action-SLAM.png
diff --git a/images/Action-Target_Lock.png b/images/Action-Target_Lock.png
diff --git a/images/Added_Atk_Blank_Result.png b/images/Added_Atk_Blank_Result.png
diff --git a/images/Added_Atk_Focus_Result.png b/images/Added_Atk_Focus_Result.png
diff --git a/images/Added_Crit_Result.png b/images/Added_Crit_Result.png
diff --git a/images/Added_Def_Blank_Result.png b/images/Added_Def_Blank_Result.png
diff --git a/images/Added_Def_Focus_Result.png b/images/Added_Def_Focus_Result.png
diff --git a/images/Added_Evade_Result.png b/images/Added_Evade_Result.png
diff --git a/images/Added_Hit_Result.png b/images/Added_Hit_Result.png
diff --git a/images/AltArc_Imperial.png b/images/AltArc_Imperial.png
diff --git a/images/AltArc_Imperial.svg b/images/AltArc_Imperial.svg
diff --git a/images/AltArc_Imperial_Aux.svg b/images/AltArc_Imperial_Aux.svg
diff --git a/images/AltArc_Rebel.png b/images/AltArc_Rebel.png
diff --git a/images/AltArc_Rebel.svg b/images/AltArc_Rebel.svg
diff --git a/images/AltArc_Rebel_Aux.svg b/images/AltArc_Rebel_Aux.svg
diff --git a/images/AltArc_Scum.png b/images/AltArc_Scum.png
diff --git a/images/AltArc_Scum.svg b/images/AltArc_Scum.svg
diff --git a/images/AltArc_Scum_Aux.svg b/images/AltArc_Scum_Aux.svg
diff --git a/images/AltLock_Imperial.png b/images/AltLock_Imperial.png
diff --git a/images/AltLock_Rebel.png b/images/AltLock_Rebel.png
diff --git a/images/AltLock_Scum.png b/images/AltLock_Scum.png
diff --git a/images/Asteroid1_TL.png b/images/Asteroid1_TL.png
diff --git a/images/Asteroid1_f_TL.png b/images/Asteroid1_f_TL.png
diff --git a/images/Asteroid2_TL.png b/images/Asteroid2_TL.png
diff --git a/images/Asteroid2_f_TL.png b/images/Asteroid2_f_TL.png
diff --git a/images/Asteroid3_TL.png b/images/Asteroid3_TL.png
diff --git a/images/Asteroid3_f_TL.png b/images/Asteroid3_f_TL.png
diff --git a/images/Asteroid4_TL.png b/images/Asteroid4_TL.png
diff --git a/images/Asteroid4_f_TL.png b/images/Asteroid4_f_TL.png
diff --git a/images/Asteroid5_TL.png b/images/Asteroid5_TL.png
diff --git a/images/Asteroid5_f_TL.png b/images/Asteroid5_f_TL.png
diff --git a/images/Asteroid6_TL.png b/images/Asteroid6_TL.png
diff --git a/images/Asteroid6_f_TL.png b/images/Asteroid6_f_TL.png
diff --git a/images/Asteroid_10b.png b/images/Asteroid_10b.png
diff --git a/images/Asteroid_10b_range.png b/images/Asteroid_10b_range.png
diff --git a/images/Asteroid_10fb.png b/images/Asteroid_10fb.png
diff --git a/images/Asteroid_10fb_range.png b/images/Asteroid_10fb_range.png
diff --git a/images/Asteroid_11b.png b/images/Asteroid_11b.png
diff --git a/images/Asteroid_11b_range.png b/images/Asteroid_11b_range.png
diff --git a/images/Asteroid_11fb.png b/images/Asteroid_11fb.png
diff --git a/images/Asteroid_11fb_range.png b/images/Asteroid_11fb_range.png
diff --git a/images/Asteroid_12b.png b/images/Asteroid_12b.png
diff --git a/images/Asteroid_12b_range.png b/images/Asteroid_12b_range.png
diff --git a/images/Asteroid_12fb.png b/images/Asteroid_12fb.png
diff --git a/images/Asteroid_12fb_range.png b/images/Asteroid_12fb_range.png
diff --git a/images/Asteroid_1b.png b/images/Asteroid_1b.png
diff --git a/images/Asteroid_1fb.png b/images/Asteroid_1fb.png
diff --git a/images/Asteroid_2b.png b/images/Asteroid_2b.png
diff --git a/images/Asteroid_2fb.png b/images/Asteroid_2fb.png
diff --git a/images/Asteroid_3b.png b/images/Asteroid_3b.png
diff --git a/images/Asteroid_3fb.png b/images/Asteroid_3fb.png
diff --git a/images/Asteroid_4b.png b/images/Asteroid_4b.png
diff --git a/images/Asteroid_4fb.png b/images/Asteroid_4fb.png
diff --git a/images/Asteroid_5b.png b/images/Asteroid_5b.png
diff --git a/images/Asteroid_5fb.png b/images/Asteroid_5fb.png
diff --git a/images/Asteroid_6b.png b/images/Asteroid_6b.png
diff --git a/images/Asteroid_6fb.png b/images/Asteroid_6fb.png
diff --git a/images/Asteroid_7b.png b/images/Asteroid_7b.png
diff --git a/images/Asteroid_7b_range.png b/images/Asteroid_7b_range.png
diff --git a/images/Asteroid_7fb.png b/images/Asteroid_7fb.png
diff --git a/images/Asteroid_7fb_range.png b/images/Asteroid_7fb_range.png
diff --git a/images/Asteroid_8b.png b/images/Asteroid_8b.png
diff --git a/images/Asteroid_8b_range.png b/images/Asteroid_8b_range.png
diff --git a/images/Asteroid_8fb.png b/images/Asteroid_8fb.png
diff --git a/images/Asteroid_8fb_range.png b/images/Asteroid_8fb_range.png
diff --git a/images/Asteroid_9b.png b/images/Asteroid_9b.png
diff --git a/images/Asteroid_9b_range.png b/images/Asteroid_9b_range.png
diff --git a/images/Asteroid_9fb.png b/images/Asteroid_9fb.png
diff --git a/images/Asteroid_9fb_range.png b/images/Asteroid_9fb_range.png
diff --git a/images/Atk-Dice-Button.png b/images/Atk-Dice-Button.png
diff --git a/images/Atk-die1.png b/images/Atk-die1.png
diff --git a/images/Atk-die2.png b/images/Atk-die2.png
diff --git a/images/Atk-die3.png b/images/Atk-die3.png
diff --git a/images/Atk-die4.png b/images/Atk-die4.png
diff --git a/images/Atk-die5.png b/images/Atk-die5.png
diff --git a/images/Atk-die6.png b/images/Atk-die6.png
diff --git a/images/Atk-die7.png b/images/Atk-die7.png
diff --git a/images/Atk-die8.png b/images/Atk-die8.png
diff --git a/images/Big-Mirror-Dot.png b/images/Big-Mirror-Dot.png
diff --git a/images/Big-Mirror-Dot_2.png b/images/Big-Mirror-Dot_2.png
diff --git a/images/Big-Mirror-Dot_3.png b/images/Big-Mirror-Dot_3.png
diff --git a/images/Big-Mirror-Dot_4.png b/images/Big-Mirror-Dot_4.png
diff --git a/images/Big-Mirror-Dot_5.png b/images/Big-Mirror-Dot_5.png
diff --git a/images/Big-Mirror-Dot_6.png b/images/Big-Mirror-Dot_6.png
diff --git a/images/Big-Mirror-Dot_7.png b/images/Big-Mirror-Dot_7.png
diff --git a/images/Big_Firing-Arc_Imperial.png b/images/Big_Firing-Arc_Imperial.png
diff --git a/images/Big_Firing-Arc_Imperial.svg b/images/Big_Firing-Arc_Imperial.svg
diff --git a/images/Big_Firing-Arc_Imperial_Aux.svg b/images/Big_Firing-Arc_Imperial_Aux.svg
diff --git a/images/Big_Firing-Arc_Rebel.png b/images/Big_Firing-Arc_Rebel.png
diff --git a/images/Big_Firing-Arc_Rebel.svg b/images/Big_Firing-Arc_Rebel.svg
diff --git a/images/Big_Firing-Arc_Rebel_Aux.svg b/images/Big_Firing-Arc_Rebel_Aux.svg
diff --git a/images/Big_Firing-Arc_Scum.png b/images/Big_Firing-Arc_Scum.png
diff --git a/images/Big_Firing-Arc_Scum.svg b/images/Big_Firing-Arc_Scum.svg