Skip to content
Snippets Groups Projects
Commit 1da5caa5 authored by Sida Wang's avatar Sida Wang :juggling_tone1:
Browse files

fixing gan merge issue by pushing

parents 111ef323 291ca099
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 51 additions and 13 deletions
.DS_Store
+ 0
− 0
View file @ 1da5caa5
No preview for this file type
ProjectSchedule/.DS_Store 0 → 100644
+ 0
− 0
View file @ 1da5caa5
File added
ProjectSchedule/ProjectSchedule_3XA3_307.gan → ProjectSchedule/ProjectSchedule_ProjectSchedule_3XA3_307 (1).gan
+ 45
− 13
View file @ 1da5caa5
<?xml version="1.0" encoding="UTF-8"?><project name="3XA3 ProjectSchedule" company="3XA3 Group 307" webLink="https://gitlab.cas.mcmaster.ca/wangs132/minecraft/blob/master/ProjectSchedule/ProjectSchedule_3XA3_307.gan" view-date="2020-01-05" view-index="0" gantt-divider-location="628" resource-divider-location="300" version="2.8.10" locale="en_US">
<?xml version="1.0" encoding="UTF-8"?><project name="3XA3 MileStone" company="3XA3 Group 213" webLink="https://gitlab.cas.mcmaster.ca/khana172/3xa3-project/blob/master/ProjectSchedule/3XA3-ProjSched.gan" view-date="2020-01-05" view-index="0" gantt-divider-location="628" resource-divider-location="300" version="2.8.10" locale="en_US">
<description/>
<view zooming-state="default:6" id="gantt-chart">
<field id="tpd3" name="Name" width="390" order="0"/>
......@@ -7,8 +7,8 @@
<option id="color.recent"><![CDATA[#0000ff]]></option>
</view>
<view id="resource-table">
<field id="0" name="Name" width="210" order="0"/>
<field id="1" name="Default role" width="86" order="1"/>
<field id="0" name="Name" width="199" order="0"/>
<field id="1" name="Default role" width="82" order="1"/>
</view>
<!-- -->
<calendars>
......@@ -64,19 +64,28 @@
<task id="146" name="Revision" color="#8cb6ce" meeting="false" start="2020-01-31" duration="1" complete="100" thirdDate="2020-01-26" thirdDate-constraint="0" expand="true"/>
</task>
<task id="147" name="Requirements Document Revision 0" color="#8cb6ce" meeting="false" start="2020-02-01" duration="9" complete="100" thirdDate="2019-12-22" thirdDate-constraint="0" expand="true"/>
<task id="2" name="Proof of Concept Demonstration" color="#8cb6ce" meeting="false" start="2020-02-11" duration="3" complete="0" thirdDate="2020-01-26" thirdDate-constraint="0" expand="true"/>
<task id="151" name="Test Plan Revision 0" color="#8cb6ce" meeting="false" start="2020-02-17" duration="12" complete="0" thirdDate="2019-12-22" thirdDate-constraint="0" expand="true"/>
<task id="2" name="Proof of Concept Demonstration" color="#8cb6ce" meeting="false" start="2020-02-11" duration="3" complete="100" thirdDate="2020-01-26" thirdDate-constraint="0" expand="true"/>
<task id="151" name="Test Plan Revision 0" color="#8cb6ce" meeting="false" start="2020-02-17" duration="12" complete="50" thirdDate="2019-12-22" thirdDate-constraint="0" expand="true"/>
<task id="154" name="Design &amp; Document Revision 0" color="#8cb6ce" meeting="false" start="2020-03-01" duration="13" complete="0" thirdDate="2019-12-22" thirdDate-constraint="0" expand="true"/>
<task id="5" name="Revision 0 Demonstration" color="#8cb6ce" meeting="false" start="2020-03-16" duration="4" complete="0" thirdDate="2020-01-26" thirdDate-constraint="0" expand="true">
<notes><![CDATA[6%]]></notes>
</task>
<task id="7" name="Final Demonstration (Revision 1)" color="#8cb6ce" meeting="false" start="2020-03-30" duration="4" complete="0" thirdDate="2020-01-26" thirdDate-constraint="0" expand="true">
<notes><![CDATA[25%]]></notes>
<task id="156" name="Test Schedule" color="#8cb6ce" meeting="false" start="2020-03-01" duration="29" complete="0" thirdDate="2020-01-05" thirdDate-constraint="0" expand="true">
<task id="182" name="Unit Testing" color="#8cb6ce" meeting="false" start="2020-03-01" duration="15" complete="0" thirdDate="2020-01-05" thirdDate-constraint="0" expand="true">
<task id="193" name="loadsource class" color="#8cb6ce" meeting="false" start="2020-03-01" duration="2" complete="0" thirdDate="2020-01-05" thirdDate-constraint="0" expand="true"/>
<task id="194" name="algorithms class" color="#8cb6ce" meeting="false" start="2020-03-01" duration="2" complete="0" thirdDate="2020-01-05" thirdDate-constraint="0" expand="true"/>
<task id="195" name="block calss" color="#8cb6ce" meeting="false" start="2020-03-01" duration="3" complete="0" thirdDate="2020-01-05" thirdDate-constraint="0" expand="true"/>
<task id="196" name="view class" color="#8cb6ce" meeting="false" start="2020-03-03" duration="4" complete="0" thirdDate="2020-01-05" thirdDate-constraint="0" expand="true"/>
<task id="198" name="world calss" color="#8cb6ce" meeting="false" start="2020-03-06" duration="5" complete="0" thirdDate="2020-01-05" thirdDate-constraint="0" expand="true"/>
<task id="203" name="game class" color="#8cb6ce" meeting="false" start="2020-03-10" duration="6" complete="0" thirdDate="2020-01-05" thirdDate-constraint="0" expand="true"/>
</task>
<task id="173" name="Integreation Testing" color="#8cb6ce" meeting="false" start="2020-03-10" duration="11" complete="0" thirdDate="2020-01-05" thirdDate-constraint="0" expand="true"/>
<task id="172" name="System Testing" color="#8cb6ce" meeting="false" start="2020-03-20" duration="10" complete="0" thirdDate="2020-01-05" thirdDate-constraint="0" expand="true">
<task id="212" name="FR Testing" color="#8cb6ce" meeting="false" start="2020-03-20" duration="5" complete="0" thirdDate="2020-01-05" thirdDate-constraint="0" expand="true"/>
<task id="214" name="NFR Testing" color="#8cb6ce" meeting="false" start="2020-03-25" duration="5" complete="0" thirdDate="2020-01-05" thirdDate-constraint="0" expand="true"/>
</task>
</task>
<task id="5" name="Revision 0 Demonstration" color="#8cb6ce" meeting="false" start="2020-03-16" duration="4" complete="0" thirdDate="2020-01-26" thirdDate-constraint="0" expand="true"/>
<task id="7" name="Final Demonstration (Revision 1)" color="#8cb6ce" meeting="false" start="2020-03-30" duration="4" complete="0" thirdDate="2020-01-26" thirdDate-constraint="0" expand="true"/>
<task id="155" name="Peer Evaluation" color="#8cb6ce" meeting="false" start="2020-03-30" duration="4" complete="0" thirdDate="2019-12-22" thirdDate-constraint="0" expand="true"/>
<task id="9" name="Final Documentation (Revision 1)" color="#8cb6ce" meeting="false" start="2020-04-01" duration="6" complete="0" thirdDate="2020-01-26" thirdDate-constraint="0" expand="true">
<notes><![CDATA[30%]]></notes>
</task>
<task id="9" name="Final Documentation (Revision 1)" color="#8cb6ce" meeting="false" start="2020-04-01" duration="6" complete="0" thirdDate="2020-01-26" thirdDate-constraint="0" expand="true"/>
</tasks>
<resources>
<resource id="3" name="Weidong Yang" function="SoftwareDevelopment:2" contacts="" phone=""/>
......@@ -95,6 +104,14 @@
<allocation task-id="155" resource-id="3" function="SoftwareDevelopment:2" responsible="true" load="33.0"/>
<allocation task-id="9" resource-id="3" function="SoftwareDevelopment:2" responsible="true" load="33.0"/>
<allocation task-id="0" resource-id="3" function="SoftwareDevelopment:2" responsible="true" load="30.0"/>
<allocation task-id="173" resource-id="3" function="SoftwareDevelopment:2" responsible="true" load="30.0"/>
<allocation task-id="193" resource-id="3" function="SoftwareDevelopment:2" responsible="true" load="50.0"/>
<allocation task-id="196" resource-id="3" function="SoftwareDevelopment:2" responsible="true" load="50.0"/>
<allocation task-id="198" resource-id="3" function="SoftwareDevelopment:2" responsible="true" load="30.0"/>
<allocation task-id="203" resource-id="3" function="SoftwareDevelopment:2" responsible="true" load="40.0"/>
<allocation task-id="214" resource-id="3" function="SoftwareDevelopment:2" responsible="true" load="30.0"/>
<allocation task-id="212" resource-id="3" function="SoftwareDevelopment:2" responsible="true" load="30.0"/>
<allocation task-id="195" resource-id="3" function="SoftwareDevelopment:2" responsible="true" load="50.0"/>
<allocation task-id="112" resource-id="4" function="SoftwareDevelopment:2" responsible="false" load="38.0"/>
<allocation task-id="140" resource-id="4" function="SoftwareDevelopment:2" responsible="false" load="25.0"/>
<allocation task-id="147" resource-id="4" function="SoftwareDevelopment:2" responsible="true" load="40.0"/>
......@@ -106,6 +123,14 @@
<allocation task-id="155" resource-id="4" function="SoftwareDevelopment:2" responsible="true" load="34.0"/>
<allocation task-id="9" resource-id="4" function="SoftwareDevelopment:2" responsible="false" load="33.0"/>
<allocation task-id="0" resource-id="4" function="SoftwareDevelopment:2" responsible="true" load="40.0"/>
<allocation task-id="173" resource-id="4" function="SoftwareDevelopment:2" responsible="true" load="40.0"/>
<allocation task-id="196" resource-id="4" function="SoftwareDevelopment:2" responsible="true" load="50.0"/>
<allocation task-id="198" resource-id="4" function="SoftwareDevelopment:2" responsible="true" load="30.0"/>
<allocation task-id="203" resource-id="4" function="SoftwareDevelopment:2" responsible="true" load="30.0"/>
<allocation task-id="214" resource-id="4" function="SoftwareDevelopment:2" responsible="true" load="40.0"/>
<allocation task-id="212" resource-id="4" function="SoftwareDevelopment:2" responsible="true" load="30.0"/>
<allocation task-id="193" resource-id="4" function="SoftwareDevelopment:2" responsible="true" load="50.0"/>
<allocation task-id="194" resource-id="4" function="SoftwareDevelopment:2" responsible="true" load="50.0"/>
<allocation task-id="112" resource-id="5" function="SoftwareDevelopment:2" responsible="true" load="34.0"/>
<allocation task-id="140" resource-id="5" function="SoftwareDevelopment:2" responsible="true" load="50.0"/>
<allocation task-id="147" resource-id="5" function="SoftwareDevelopment:2" responsible="true" load="30.0"/>
......@@ -117,6 +142,13 @@
<allocation task-id="155" resource-id="5" function="SoftwareDevelopment:2" responsible="true" load="33.0"/>
<allocation task-id="9" resource-id="5" function="SoftwareDevelopment:2" responsible="false" load="34.0"/>
<allocation task-id="0" resource-id="5" function="SoftwareDevelopment:2" responsible="true" load="30.0"/>
<allocation task-id="173" resource-id="5" function="SoftwareDevelopment:2" responsible="true" load="30.0"/>
<allocation task-id="195" resource-id="5" function="SoftwareDevelopment:2" responsible="true" load="50.0"/>
<allocation task-id="198" resource-id="5" function="SoftwareDevelopment:2" responsible="true" load="40.0"/>
<allocation task-id="203" resource-id="5" function="SoftwareDevelopment:2" responsible="true" load="30.0"/>
<allocation task-id="214" resource-id="5" function="SoftwareDevelopment:2" responsible="true" load="30.0"/>
<allocation task-id="212" resource-id="5" function="SoftwareDevelopment:2" responsible="true" load="40.0"/>
<allocation task-id="194" resource-id="5" function="SoftwareDevelopment:2" responsible="true" load="50.0"/>
</allocations>
<vacations/>
<previous/>
......
src/.DS_Store
+ 0
− 0
View file @ 1da5caa5
No preview for this file type
src/__pycache__/game.cpython-37.pyc
+ 0
− 0
View file @ 1da5caa5
No preview for this file type
src/__pycache__/loadSource.cpython-37.pyc
+ 0
− 0
View file @ 1da5caa5
No preview for this file type
src/makefile 0 → 100644
+ 6
− 0
View file @ 1da5caa5
main: main.py
python main.py
@touch main.tmp
clean:
@rm -f *.tmp
src/texture/.DS_Store
+ 0
− 0
View file @ 1da5caa5
No preview for this file type
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment