Skip to content

Commit 732ab08

Browse files
Jake0303Jake0303
committed
Merge remote-tracking branch 'origin/master'
Conflicts: Commando/Commando.csproj Commando/Scripts/_references.js Commando/Scripts/game.js Commando/Scripts/game.js.map Commando/Scripts/game.ts Commando/index.html
2 parents 1d3cf42 + d9e4de3 commit 732ab08

9 files changed

+515
-0
lines changed

‎Commando/Assets/Timages/coin/coin.tps~HEAD

+213
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<data version="1.0">
3+
<struct type="Settings">
4+
<key>fileFormatVersion</key>
5+
<int>3</int>
6+
<key>texturePackerVersion</key>
7+
<string>3.5.3</string>
8+
<key>fileName</key>
9+
<string>/Users/thomas/Courses/COMP397 Web Game Programming/Lesson 10 - Final Project/box2d/assets/coin/coin.tps</string>
10+
<key>autoSDSettings</key>
11+
<array>
12+
<struct type="AutoSDSettings">
13+
<key>scale</key>
14+
<double>1</double>
15+
<key>extension</key>
16+
<string></string>
17+
<key>spriteFilter</key>
18+
<string></string>
19+
<key>acceptFractionalValues</key>
20+
<false/>
21+
<key>maxTextureSize</key>
22+
<QSize>
23+
<key>width</key>
24+
<int>-1</int>
25+
<key>height</key>
26+
<int>-1</int>
27+
</QSize>
28+
</struct>
29+
</array>
30+
<key>allowRotation</key>
31+
<false/>
32+
<key>premultiplyAlpha</key>
33+
<false/>
34+
<key>shapeDebug</key>
35+
<false/>
36+
<key>dpi</key>
37+
<uint>72</uint>
38+
<key>dataFormat</key>
39+
<string>easeljs</string>
40+
<key>textureFileName</key>
41+
<filename>coinAtlas.png</filename>
42+
<key>flipPVR</key>
43+
<false/>
44+
<key>pvrCompressionQuality</key>
45+
<enum type="SettingsBase::PvrCompressionQuality">PVR_QUALITY_NORMAL</enum>
46+
<key>mipMapMinSize</key>
47+
<uint>32768</uint>
48+
<key>etc1CompressionQuality</key>
49+
<enum type="SettingsBase::Etc1CompressionQuality">ETC1_QUALITY_LOW_PERCEPTUAL</enum>
50+
<key>dxtCompressionMode</key>
51+
<enum type="SettingsBase::DxtCompressionMode">DXT_PERCEPTUAL</enum>
52+
<key>jxrColorFormat</key>
53+
<enum type="SettingsBase::JpegXrColorMode">JXR_YUV444</enum>
54+
<key>jxrTrimFlexBits</key>
55+
<uint>0</uint>
56+
<key>jxrCompressionLevel</key>
57+
<uint>0</uint>
58+
<key>ditherType</key>
59+
<enum type="SettingsBase::DitherType">NearestNeighbour</enum>
60+
<key>backgroundColor</key>
61+
<uint>0</uint>
62+
<key>libGdx</key>
63+
<struct type="LibGDX">
64+
<key>filtering</key>
65+
<struct type="LibGDXFiltering">
66+
<key>x</key>
67+
<enum type="LibGDXFiltering::Filtering">Linear</enum>
68+
<key>y</key>
69+
<enum type="LibGDXFiltering::Filtering">Linear</enum>
70+
</struct>
71+
</struct>
72+
<key>shapePadding</key>
73+
<uint>2</uint>
74+
<key>jpgQuality</key>
75+
<uint>80</uint>
76+
<key>pngOptimizationLevel</key>
77+
<uint>1</uint>
78+
<key>webpQualityLevel</key>
79+
<uint>101</uint>
80+
<key>textureSubPath</key>
81+
<string></string>
82+
<key>textureFormat</key>
83+
<enum type="SettingsBase::TextureFormat">png</enum>
84+
<key>borderPadding</key>
85+
<uint>2</uint>
86+
<key>maxTextureSize</key>
87+
<QSize>
88+
<key>width</key>
89+
<int>2048</int>
90+
<key>height</key>
91+
<int>2048</int>
92+
</QSize>
93+
<key>fixedTextureSize</key>
94+
<QSize>
95+
<key>width</key>
96+
<int>-1</int>
97+
<key>height</key>
98+
<int>-1</int>
99+
</QSize>
100+
<key>reduceBorderArtifacts</key>
101+
<false/>
102+
<key>algorithmSettings</key>
103+
<struct type="AlgorithmSettings">
104+
<key>algorithm</key>
105+
<enum type="AlgorithmSettings::AlgorithmId">MaxRects</enum>
106+
<key>freeSizeMode</key>
107+
<enum type="AlgorithmSettings::AlgorithmFreeSizeMode">Best</enum>
108+
<key>sizeConstraints</key>
109+
<enum type="AlgorithmSettings::SizeConstraints">AnySize</enum>
110+
<key>forceSquared</key>
111+
<false/>
112+
<key>forceWordAligned</key>
113+
<false/>
114+
<key>maxRects</key>
115+
<struct type="AlgorithmMaxRectsSettings">
116+
<key>heuristic</key>
117+
<enum type="AlgorithmMaxRectsSettings::Heuristic">Best</enum>
118+
</struct>
119+
<key>basic</key>
120+
<struct type="AlgorithmBasicSettings">
121+
<key>sortBy</key>
122+
<enum type="AlgorithmBasicSettings::SortBy">Best</enum>
123+
<key>order</key>
124+
<enum type="AlgorithmBasicSettings::Order">Ascending</enum>
125+
</struct>
126+
</struct>
127+
<key>andEngine</key>
128+
<struct type="AndEngine">
129+
<key>minFilter</key>
130+
<enum type="AndEngine::MinFilter">Linear</enum>
131+
<key>packageName</key>
132+
<string>Texture</string>
133+
<key>wrap</key>
134+
<struct type="AndEngineWrap">
135+
<key>s</key>
136+
<enum type="AndEngineWrap::Wrap">Clamp</enum>
137+
<key>t</key>
138+
<enum type="AndEngineWrap::Wrap">Clamp</enum>
139+
</struct>
140+
<key>magFilter</key>
141+
<enum type="AndEngine::MagFilter">MagLinear</enum>
142+
</struct>
143+
<key>dataFileNames</key>
144+
<map type="GFileNameMap">
145+
<key>json</key>
146+
<struct type="DataFile">
147+
<key>name</key>
148+
<filename>coinAtlas.json</filename>
149+
</struct>
150+
</map>
151+
<key>multiPack</key>
152+
<false/>
153+
<key>forceIdenticalLayout</key>
154+
<false/>
155+
<key>outputFormat</key>
156+
<enum type="SettingsBase::OutputFormat">RGBA8888</enum>
157+
<key>contentProtection</key>
158+
<struct type="ContentProtection">
159+
<key>key</key>
160+
<string></string>
161+
</struct>
162+
<key>autoAliasEnabled</key>
163+
<true/>
164+
<key>trimSpriteNames</key>
165+
<false/>
166+
<key>prependSmartFolderName</key>
167+
<false/>
168+
<key>cleanTransparentPixels</key>
169+
<true/>
170+
<key>globalSpriteSettings</key>
171+
<struct type="SpriteSettings">
172+
<key>scale</key>
173+
<double>1</double>
174+
<key>scaleMode</key>
175+
<enum type="ScaleMode">Smooth</enum>
176+
<key>innerPadding</key>
177+
<uint>0</uint>
178+
<key>extrude</key>
179+
<uint>0</uint>
180+
<key>trimThreshold</key>
181+
<uint>1</uint>
182+
<key>trimMode</key>
183+
<enum type="SpriteSettings::TrimMode">None</enum>
184+
<key>heuristicMask</key>
185+
<false/>
186+
<key>pivotPoint</key>
187+
<enum type="SpriteSettings::PivotPoint">Center</enum>
188+
</struct>
189+
<key>fileList</key>
190+
<array>
191+
<filename>../../../../../COMP1050 Animation 2D Tools/Lessons/Lesson 10/CitrusDemo/assets/coin/coin01.png</filename>
192+
<filename>../../../../../COMP1050 Animation 2D Tools/Lessons/Lesson 10/CitrusDemo/assets/coin/coin02.png</filename>
193+
<filename>../../../../../COMP1050 Animation 2D Tools/Lessons/Lesson 10/CitrusDemo/assets/coin/coin03.png</filename>
194+
<filename>../../../../../COMP1050 Animation 2D Tools/Lessons/Lesson 10/CitrusDemo/assets/coin/coin04.png</filename>
195+
<filename>../../../../../COMP1050 Animation 2D Tools/Lessons/Lesson 10/CitrusDemo/assets/coin/coin05.png</filename>
196+
<filename>../../../../../COMP1050 Animation 2D Tools/Lessons/Lesson 10/CitrusDemo/assets/coin/coin06.png</filename>
197+
<filename>../../../../../COMP1050 Animation 2D Tools/Lessons/Lesson 10/CitrusDemo/assets/coin/coin07.png</filename>
198+
<filename>../../../../../COMP1050 Animation 2D Tools/Lessons/Lesson 10/CitrusDemo/assets/coin/coin08.png</filename>
199+
<filename>../../../../../COMP1050 Animation 2D Tools/Lessons/Lesson 10/CitrusDemo/assets/coin/coin09.png</filename>
200+
<filename>../../../../../COMP1050 Animation 2D Tools/Lessons/Lesson 10/CitrusDemo/assets/coin/coin10.png</filename>
201+
</array>
202+
<key>ignoreFileList</key>
203+
<array/>
204+
<key>replaceList</key>
205+
<array/>
206+
<key>ignoredWarnings</key>
207+
<array/>
208+
<key>commonDivisorX</key>
209+
<uint>1</uint>
210+
<key>commonDivisorY</key>
211+
<uint>1</uint>
212+
</struct>
213+
</data>

0 commit comments

Comments
 (0)