Skip to content

Please help #1

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
I hope this works
par13002 committed Sep 29, 2015
commit 5e08eb8f9f079f03122477d55f067b66a59e2158
1 change: 1 addition & 0 deletions MegaMek/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
2 changes: 2 additions & 0 deletions MegaMek/MegaMek2015.uml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_XUjs8GVEEeWSTb8N53rHlA" name="MegaMek2015"/>
4 changes: 4 additions & 0 deletions MegaMek/MegaMek2015.umlcd
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<com.yattasolutions.uml.diagrams.classifier:ClassDiagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:com.yattasolutions.uml.diagrams.classifier="http://ns.yatta-solutions.com/umllab/diagrams/classifier/1.1.0" xmi:id="_XlhhIGVEEeWSTb8N53rHlA">
<modelElement href="platform:/resource/MegaMek2015/MegaMek2015.uml#_XUjs8GVEEeWSTb8N53rHlA"/>
</com.yattasolutions.uml.diagrams.classifier:ClassDiagram>
Binary file modified MegaMek/data/mechfiles/units.cache
Binary file not shown.
8 changes: 7 additions & 1 deletion MegaMek/mmconf/clientsettings.xml
Original file line number Diff line number Diff line change
@@ -3,11 +3,17 @@
<store name="ClientSettings">
<preference name="LastPlayerCamoName" value="Blue"/>
<preference name="LastPlayerCategory" value="-- No Camo --"/>
<preference name="LastPlayerName" value="h"/>
<preference name="LastPlayerColor" value="0"/>
<preference name="LastPlayerName" value="test"/>
<preference name="megamek.megamek.metaservername" value="http://stormy-light-2818.herokuapp.com/announce"/>
<preference name="LastServerPass" value="test"/>
</store>
<store name="megamek.client.ui.swing.ButtonOrderPreferences">
</store>
<store name="megamek.client.ui.swing.GUIPreferences">
<preference name="WindowSizeHeight" value="876"/>
<preference name="WindowPosY" value="-8"/>
<preference name="WindowPosX" value="-8"/>
<preference name="WindowSizeWidth" value="1616"/>
</store>
</MegaMekSettings>
45 changes: 45 additions & 0 deletions MegaMek/src/AggregationDiagram.ucls
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<class-diagram version="1.1.8" icons="true" always-add-relationships="false" generalizations="true" realizations="true"
associations="true" dependencies="false" nesting-relationships="true">
<class id="1" language="java" name="megamek.common.EjectedCrew" project="MegaMek2015"
file="/MegaMek2015/src/megamek/common/EjectedCrew.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="4444" y="3970"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="2" language="java" name="megamek.common.Infantry" project="MegaMek2015"
file="/MegaMek2015/src/megamek/common/Infantry.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="4890" y="2240"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="3" language="java" name="megamek.common.MechWarrior" project="MegaMek2015"
file="/MegaMek2015/src/megamek/common/MechWarrior.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="4446" y="4343"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<generalization id="4">
<end type="SOURCE" refId="1"/>
<end type="TARGET" refId="2"/>
</generalization>
<generalization id="5">
<end type="SOURCE" refId="3"/>
<end type="TARGET" refId="1"/>
</generalization>
<classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</classifier-display>
<association-display labels="true" multiplicity="true"/>
</class-diagram>
71 changes: 71 additions & 0 deletions MegaMek/src/InterfaceDiagram.ucls
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<class-diagram version="1.1.8" icons="true" always-add-relationships="false" generalizations="true" realizations="true"
associations="true" dependencies="false" nesting-relationships="true">
<class id="1" language="java" name="megamek.common.weapons.AmmoWeaponHandler" project="MegaMek2015"
file="/MegaMek2015/src/megamek/common/weapons/AmmoWeaponHandler.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="1845" y="1900"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="2" language="java" name="megamek.common.weapons.WeaponHandler" project="MegaMek2015"
file="/MegaMek2015/src/megamek/common/weapons/WeaponHandler.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="1835" y="975"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<interface id="3" language="java" name="megamek.common.weapons.AttackHandler" project="MegaMek2015"
file="/MegaMek2015/src/megamek/common/weapons/AttackHandler.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="1826" y="36"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</interface>
<class id="4" language="java" name="megamek.common.weapons.ACAPHandler" project="MegaMek2015"
file="/MegaMek2015/src/megamek/common/weapons/ACAPHandler.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="1832" y="2098"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<class id="5" language="java" name="megamek.common.weapons.EnergyWeaponHandler" project="MegaMek2015"
file="/MegaMek2015/src/megamek/common/weapons/EnergyWeaponHandler.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="2270" y="1867"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</display>
</class>
<generalization id="6">
<end type="SOURCE" refId="5"/>
<end type="TARGET" refId="2"/>
</generalization>
<generalization id="7">
<end type="SOURCE" refId="1"/>
<end type="TARGET" refId="2"/>
</generalization>
<generalization id="8">
<end type="SOURCE" refId="4"/>
<end type="TARGET" refId="1"/>
</generalization>
<realization id="9">
<end type="SOURCE" refId="2"/>
<end type="TARGET" refId="3"/>
</realization>
<classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/>
<operations public="true" package="true" protected="true" private="true" static="true"/>
</classifier-display>
<association-display labels="true" multiplicity="true"/>
</class-diagram>
Loading