BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: BTH/squidout:water
Branches Tags
BTH/squidout:master BTH/squidout:water BTH/squidout:Physics BTH/squidout:LevelSystemAndSuch BTH/squidout:Sound BTH/squidout:Tobias BTH/squidout:directx BTH/squidout:PowerUpSprites BTH/squidout:gui BTH/squidout:bugfix BTH/squidout:EGameStart BTH/squidout:Benchmarking BTH/squidout:FrameAttempt BTH/squidout:GLrenderer BTH/squidout:bgfx
...
pull from: BTH/squidout:master
Branches Tags
BTH/squidout:master BTH/squidout:water BTH/squidout:Physics BTH/squidout:LevelSystemAndSuch BTH/squidout:Sound BTH/squidout:Tobias BTH/squidout:directx BTH/squidout:PowerUpSprites BTH/squidout:gui BTH/squidout:bugfix BTH/squidout:EGameStart BTH/squidout:Benchmarking BTH/squidout:FrameAttempt BTH/squidout:GLrenderer BTH/squidout:bgfx

10 Commits
water ... master

Author SHA1 Message Date
PlatinumSkink 22349fe0a6 Fixed problems I ran into while playtesting. 2015-10-23 17:42:46 +02:00
PlatinumSkink e4aae9779e Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-23 16:59:24 +02:00
PlatinumSkink 5ba13c3b48 Merge remote-tracking branch 'origin/master' 2015-10-23 16:58:54 +02:00
PlatinumSkink 1beb873efc Fixed so ink does not damage boss, because that breaks current boss battle. 2015-10-23 16:46:45 +02:00
viktorljung 04ed2de2c3 saviours 2015-10-23 16:45:47 +02:00
tleety 825a4f5f95 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-23 16:16:26 +02:00
tleety ee413463a3 Kraken arm slider 2015-10-23 16:15:46 +02:00
viktorljung e2190630c5 Merge branch 'Physics' 2015-10-23 16:12:14 +02:00
viktorljung d91ad72a34 Jump fix 2015-10-23 16:11:45 +02:00
viktorljung a4c120764a Ball rotation fix 2015-10-23 16:01:22 +02:00
11 changed files with 121 additions and 67 deletions
Expand all files Collapse all files
assets/Models/Sid/Sid_Jump.dae
+17 -17
View File
@@ -5,8 +5,8 @@
<author>Blender User</author> <author>Blender User</author>
<authoring_tool>Blender 2.75.0 commit date:2015-07-07, commit time:14:56, hash:c27589e</authoring_tool> <authoring_tool>Blender 2.75.0 commit date:2015-07-07, commit time:14:56, hash:c27589e</authoring_tool>
</contributor> </contributor>
<created>2015-10-23T14:55:47</created> <created>2015-10-23T16:10:27</created>
<modified>2015-10-23T14:55:47</modified> <modified>2015-10-23T16:10:27</modified>
<unit name="meter" meter="1"/> <unit name="meter" meter="1"/>
<up_axis>Z_UP</up_axis> <up_axis>Z_UP</up_axis>
</asset> </asset>
@@ -157,7 +157,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_Head_pose_matrix-output"> <source id="Armature_002_Head_pose_matrix-output">
<float_array id="Armature_002_Head_pose_matrix-output-array" count="32">2.8213e-7 0 -1 0 0 -0.8 0 -0.305899 -1 0 -2.8213e-7 0 0 0 0 1 2.8213e-7 0 -1 0 0 -0.9999999 0 -0.305899 -1 0 -2.8213e-7 0 0 0 0 1</float_array> <float_array id="Armature_002_Head_pose_matrix-output-array" count="32">2.8213e-7 0 -1 0 0 -0.9999999 0 -0.305899 -1 0 -2.8213e-7 0 0 0 0 1 2.8213e-7 0 -1 0 0 -0.6999999 0 -0.305899 -1 0 -2.8213e-7 0 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_Head_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_Head_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -189,7 +189,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_Ear_L_pose_matrix-output"> <source id="Armature_002_Ear_L_pose_matrix-output">
<float_array id="Armature_002_Ear_L_pose_matrix-output-array" count="32">-4.53842e-7 0.6170548 0.7869204 0.1847505 1.46037e-7 -0.7869205 0.6170546 1.127367 1 8.9407e-8 2.73509e-7 -0.002287612 0 0 0 1 -4.39136e-7 0.5461221 0.8377058 0.1847505 1.58507e-7 -0.8377059 0.5461219 1.127367 1 6.76434e-8 2.61131e-7 -0.002287612 0 0 0 1</float_array> <float_array id="Armature_002_Ear_L_pose_matrix-output-array" count="32">-4.53842e-7 0.6170548 0.7869204 0.1847505 1.46037e-7 -0.7869204 0.6170546 1.127367 1 8.9407e-8 2.73509e-7 -0.002287612 0 0 0 1 -4.39136e-7 0.5461221 0.8377058 0.1847505 1.58507e-7 -0.8377059 0.5461219 1.127367 1 6.76434e-8 2.61131e-7 -0.002287612 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_Ear_L_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_Ear_L_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -221,7 +221,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_Ear_H_pose_matrix-output"> <source id="Armature_002_Ear_H_pose_matrix-output">
<float_array id="Armature_002_Ear_H_pose_matrix-output-array" count="32">-6.18379e-7 -0.6170548 -0.7869204 -0.1847505 3.71728e-7 -0.7869205 0.6170546 1.127367 -1 -2.08617e-7 7.33482e-7 -0.0022877 0 0 0 1 -6.46627e-7 -0.5461221 -0.8377058 -0.1847505 3.06338e-7 -0.8377059 0.5461219 1.127367 -1 -2.01547e-7 7.00461e-7 -0.0022877 0 0 0 1</float_array> <float_array id="Armature_002_Ear_H_pose_matrix-output-array" count="32">-6.18379e-7 -0.6170548 -0.7869204 -0.1847505 3.71728e-7 -0.7869204 0.6170546 1.127367 -1 -2.08617e-7 7.33482e-7 -0.0022877 0 0 0 1 -6.46627e-7 -0.5461221 -0.8377058 -0.1847505 3.06338e-7 -0.8377059 0.5461219 1.127367 -1 -2.01547e-7 7.00461e-7 -0.0022877 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_Ear_H_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_Ear_H_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -637,7 +637,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_Arm1_L_pose_matrix-output"> <source id="Armature_002_Arm1_L_pose_matrix-output">
<float_array id="Armature_002_Arm1_L_pose_matrix-output-array" count="32">-4.37114e-8 0 -1 3.93099e-4 -6.29212e-8 0.9999999 7.10543e-15 -0.2065513 1 6.29212e-8 -4.37114e-8 -0.170607 0 0 0 1 -4.93163e-8 0.08715574 -0.9961947 3.93099e-4 -6.54522e-8 0.9961947 0.08715573 -0.2065513 1 6.95013e-8 -4.34241e-8 -0.170607 0 0 0 1</float_array> <float_array id="Armature_002_Arm1_L_pose_matrix-output-array" count="32">-3.13422e-8 6.23634e-9 -1 3.93099e-4 0.08979136 0.9959605 3.39689e-9 -0.2065513 0.9959606 -0.08979137 -3.17755e-8 -0.170607 0 0 0 1 -4.93163e-8 0.08715574 -0.9961947 3.93099e-4 -6.54522e-8 0.9961947 0.08715573 -0.2065513 1 6.95013e-8 -4.34241e-8 -0.170607 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_Arm1_L_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_Arm1_L_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -669,7 +669,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_Arm2_L_pose_matrix-output"> <source id="Armature_002_Arm2_L_pose_matrix-output">
<float_array id="Armature_002_Arm2_L_pose_matrix-output-array" count="32">1 -6.29212e-8 1.19209e-7 0 6.29212e-8 1 0 0.2368225 -1.19209e-7 0 1 3.72529e-9 0 0 0 1 1 -5.99114e-8 1.13846e-7 0 4.97611e-8 0.9961947 0.08715574 0.2368225 -1.18635e-7 -0.08715574 0.9961947 3.72529e-9 0 0 0 1</float_array> <float_array id="Armature_002_Arm2_L_pose_matrix-output-array" count="32">0.9647611 -0.2631273 1.49274e-7 0 0.2631273 0.9647611 4.47035e-8 0.2368225 -1.58325e-7 0 1 3.72529e-9 0 0 0 1 1 -5.99114e-8 1.13846e-7 0 4.97611e-8 0.9961947 0.08715574 0.2368225 -1.18635e-7 -0.08715574 0.9961947 3.72529e-9 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_Arm2_L_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_Arm2_L_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -701,7 +701,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_Arm3_L_pose_matrix-output"> <source id="Armature_002_Arm3_L_pose_matrix-output">
<float_array id="Armature_002_Arm3_L_pose_matrix-output-array" count="32">1 -6.29212e-8 6.29211e-8 1.49012e-8 6.29212e-8 0.9999999 0 0.2368225 -6.29211e-8 -1.49012e-8 0.9999999 -1.49012e-8 0 0 0 1 1 -4.9761e-8 6.34957e-8 1.49012e-8 4.40376e-8 0.9961946 0.08715574 0.2368225 -6.75911e-8 -0.08715576 0.9961947 -1.49012e-8 0 0 0 1</float_array> <float_array id="Armature_002_Arm3_L_pose_matrix-output-array" count="32">0.9018104 -0.432132 9.99244e-8 1.49012e-8 0.432132 0.9018103 1.04308e-7 0.2368225 -1.41561e-7 -4.47035e-8 0.9999999 -1.49012e-8 0 0 0 1 1 -4.9761e-8 6.34957e-8 1.49012e-8 4.40376e-8 0.9961946 0.08715574 0.2368225 -6.75911e-8 -0.08715576 0.9961947 -1.49012e-8 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_Arm3_L_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_Arm3_L_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -733,7 +733,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_Arm4_L_pose_matrix-output"> <source id="Armature_002_Arm4_L_pose_matrix-output">
<float_array id="Armature_002_Arm4_L_pose_matrix-output-array" count="32">1 5.68864e-8 -6.13071e-8 0 -6.29211e-8 1 2.98023e-8 0.2368228 6.29211e-8 0 1 1.49012e-8 0 0 0 1 1 9.28881e-8 -4.82035e-8 0 -8.91413e-8 0.9848078 0.1736482 0.2368228 6.52151e-8 -0.1736482 0.9848078 1.49012e-8 0 0 0 1</float_array> <float_array id="Armature_002_Arm4_L_pose_matrix-output-array" count="32">0.9406103 -0.3394882 -2.46615e-8 0 0.3394883 0.9406103 8.9407e-8 0.2368228 1.49012e-8 -8.9407e-8 1 1.49012e-8 0 0 0 1 1 9.28881e-8 -4.82035e-8 0 -8.91413e-8 0.9848078 0.1736482 0.2368228 6.52151e-8 -0.1736482 0.9848078 1.49012e-8 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_Arm4_L_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_Arm4_L_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -765,7 +765,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_UpperHand_L_pose_matrix-output"> <source id="Armature_002_UpperHand_L_pose_matrix-output">
<float_array id="Armature_002_UpperHand_L_pose_matrix-output-array" count="32">1 -1.08477e-8 -2.40456e-7 0 3.55271e-15 0.9999999 0 0.2368225 2.38419e-7 2.98023e-8 1 0 0 0 0 1 1 4.21468e-8 -2.34937e-7 0 2.99004e-8 0.9396926 0.3420201 0.2368225 2.33146e-7 -0.3420201 0.9396927 0 0 0 0 1</float_array> <float_array id="Armature_002_UpperHand_L_pose_matrix-output-array" count="32">0.9033983 -0.4288025 -1.74397e-7 0 0.4288025 0.9033982 -2.98023e-8 0.2368225 1.78814e-7 2.98023e-8 1 0 0 0 0 1 1 4.21468e-8 -2.34937e-7 0 2.99004e-8 0.9396926 0.3420201 0.2368225 2.33146e-7 -0.3420201 0.9396927 0 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_UpperHand_L_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_UpperHand_L_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -797,7 +797,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_LowerHand_L_pose_matrix-output"> <source id="Armature_002_LowerHand_L_pose_matrix-output">
<float_array id="Armature_002_LowerHand_L_pose_matrix-output-array" count="32">1 3.55271e-15 0 1.49012e-8 3.55271e-15 0.9999999 2.98023e-8 0.147557 3.55271e-15 0 1 5.96046e-8 0 0 0 1 1 -1.51808e-8 -1.32815e-9 1.49012e-8 1.51808e-8 0.9848077 0.1736482 0.147557 -1.32815e-9 -0.1736482 0.9848077 5.96046e-8 0 0 0 1</float_array> <float_array id="Armature_002_LowerHand_L_pose_matrix-output-array" count="32">0.8926221 -0.4508057 6.9957e-8 1.49012e-8 0.4508057 0.8926221 2.98023e-8 0.147557 -2.98023e-8 8.9407e-8 1 5.96046e-8 0 0 0 1 1 -1.51808e-8 -1.32815e-9 1.49012e-8 1.51808e-8 0.9848077 0.1736482 0.147557 -1.32815e-9 -0.1736482 0.9848077 5.96046e-8 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_LowerHand_L_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_LowerHand_L_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -829,7 +829,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_Arm1_R_pose_matrix-output"> <source id="Armature_002_Arm1_R_pose_matrix-output">
<float_array id="Armature_002_Arm1_R_pose_matrix-output-array" count="32">-2.8213e-7 0 -1 3.93073e-4 6.29212e-8 0.9999999 -2.13163e-14 -0.2065513 1 -6.29212e-8 -2.8213e-7 0.170607 0 0 0 1 -2.86828e-7 -0.08715574 -0.9961947 3.93073e-4 4.46726e-8 0.9961947 -0.08715573 -0.2065513 1 -6.95013e-8 -2.81843e-7 0.170607 0 0 0 1</float_array> <float_array id="Armature_002_Arm1_R_pose_matrix-output-array" count="32">-2.93183e-7 -2.30214e-8 -1 3.93073e-4 -0.08979136 0.9959605 3.39687e-9 -0.2065513 0.9959606 0.08979136 -2.94066e-7 0.170607 0 0 0 1 -2.86828e-7 -0.08715574 -0.9961947 3.93073e-4 4.46726e-8 0.9961947 -0.08715573 -0.2065513 1 -6.95013e-8 -2.81843e-7 0.170607 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_Arm1_R_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_Arm1_R_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -861,7 +861,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_Arm2_R_pose_matrix-output"> <source id="Armature_002_Arm2_R_pose_matrix-output">
<float_array id="Armature_002_Arm2_R_pose_matrix-output-array" count="32">1 6.29212e-8 3.57628e-7 0 -6.29212e-8 1 0 0.2368225 -3.57628e-7 0 1 0 0 0 0 1 1 8.0691e-8 3.51358e-7 0 -4.9761e-8 0.9961947 -0.08715574 0.2368225 -3.57053e-7 0.08715574 0.9961947 0 0 0 0 1</float_array> <float_array id="Armature_002_Arm2_R_pose_matrix-output-array" count="32">0.9647611 0.2631273 3.27563e-7 0 -0.2631273 0.9647611 4.47035e-8 0.2368225 -3.05474e-7 -1.3411e-7 1 0 0 0 0 1 1 8.0691e-8 3.51358e-7 0 -4.9761e-8 0.9961947 -0.08715574 0.2368225 -3.57053e-7 0.08715574 0.9961947 0 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_Arm2_R_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_Arm2_R_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -893,7 +893,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_Arm3_R_pose_matrix-output"> <source id="Armature_002_Arm3_R_pose_matrix-output">
<float_array id="Armature_002_Arm3_R_pose_matrix-output-array" count="32">1 6.29212e-8 -6.29212e-8 -1.49012e-8 -6.29212e-8 0.9999999 0 0.2368225 6.29212e-8 1.49012e-8 0.9999999 1.49012e-8 0 0 0 1 1 4.9761e-8 -6.23466e-8 -1.49012e-8 -5.50055e-8 0.9961946 -0.08715574 0.2368225 5.77724e-8 0.08715576 0.9961947 1.49012e-8 0 0 0 1</float_array> <float_array id="Armature_002_Arm3_R_pose_matrix-output-array" count="32">0.9018104 0.432132 -9.99244e-8 -1.49012e-8 -0.432132 0.9018103 8.9407e-8 0.2368225 1.11759e-7 -5.96046e-8 0.9999999 1.49012e-8 0 0 0 1 1 4.9761e-8 -6.23466e-8 -1.49012e-8 -5.50055e-8 0.9961946 -0.08715574 0.2368225 5.77724e-8 0.08715576 0.9961947 1.49012e-8 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_Arm3_R_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_Arm3_R_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -925,7 +925,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_Arm4_R_pose_matrix-output"> <source id="Armature_002_Arm4_R_pose_matrix-output">
<float_array id="Armature_002_Arm4_R_pose_matrix-output-array" count="32">1 -6.9213e-8 6.54104e-8 -1.49012e-8 6.29211e-8 1 -2.98023e-8 0.2368228 -6.29212e-8 -2.98023e-8 1 -5.96046e-8 0 0 0 1 1 -7.64089e-8 7.17683e-8 -1.49012e-8 7.60813e-8 0.9961948 -0.0871558 0.2368228 -6.23466e-8 0.08715571 0.9961948 -5.96046e-8 0 0 0 1</float_array> <float_array id="Armature_002_Arm4_R_pose_matrix-output-array" count="32">0.9406103 0.3394883 2.87647e-8 -1.49012e-8 -0.3394884 0.9406103 1.49012e-8 0.2368228 7.45058e-9 -7.45058e-8 1 -5.96046e-8 0 0 0 1 1 -7.64089e-8 7.17683e-8 -1.49012e-8 7.60813e-8 0.9961948 -0.0871558 0.2368228 -6.23466e-8 0.08715571 0.9961948 -5.96046e-8 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_Arm4_R_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_Arm4_R_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -957,7 +957,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_UpperHand_R_pose_matrix-output"> <source id="Armature_002_UpperHand_R_pose_matrix-output">
<float_array id="Armature_002_UpperHand_R_pose_matrix-output-array" count="32">1 1.01416e-8 -2.33831e-7 -1.49012e-8 -1.77636e-15 0.9999999 2.98023e-8 0.2368226 2.38419e-7 2.98023e-8 1 2.98023e-8 0 0 0 1 1 -2.65734e-9 -2.34158e-7 -1.49012e-8 -7.61939e-9 0.9961946 -0.0871557 0.2368226 2.38086e-7 0.08715576 0.9961948 2.98023e-8 0 0 0 1</float_array> <float_array id="Armature_002_UpperHand_R_pose_matrix-output-array" count="32">0.9033983 0.4288025 -2.9989e-7 -1.49012e-8 -0.4288025 0.9033982 0 0.2368226 2.5332e-7 1.49012e-7 1 2.98023e-8 0 0 0 1 1 -2.65734e-9 -2.34158e-7 -1.49012e-8 -7.61939e-9 0.9961946 -0.0871557 0.2368226 2.38086e-7 0.08715576 0.9961948 2.98023e-8 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_UpperHand_R_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_UpperHand_R_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
@@ -989,7 +989,7 @@
</technique_common> </technique_common>
</source> </source>
<source id="Armature_002_LowerHand_R_pose_matrix-output"> <source id="Armature_002_LowerHand_R_pose_matrix-output">
<float_array id="Armature_002_LowerHand_R_pose_matrix-output-array" count="32">1 -7.00673e-10 -7.77575e-10 0 -3.55271e-15 1 -2.98023e-8 0.1475569 -1.77636e-15 2.98023e-8 1 2.98023e-8 0 0 0 1 1 1.43558e-8 -1.97223e-9 0 -1.51808e-8 0.9848078 -0.1736482 0.1475569 -1.32816e-9 0.1736482 0.9848077 2.98023e-8 0 0 0 1</float_array> <float_array id="Armature_002_LowerHand_R_pose_matrix-output-array" count="32">0.8926221 0.4508058 -7.07346e-8 0 -0.4508058 0.8926222 -5.96046e-8 0.1475569 4.47035e-8 8.9407e-8 1 2.98023e-8 0 0 0 1 1 1.43558e-8 -1.97223e-9 0 -1.51808e-8 0.9848078 -0.1736482 0.1475569 -1.32816e-9 0.1736482 0.9848077 2.98023e-8 0 0 0 1</float_array>
<technique_common> <technique_common>
<accessor source="#Armature_002_LowerHand_R_pose_matrix-output-array" count="2" stride="16"> <accessor source="#Armature_002_LowerHand_R_pose_matrix-output-array" count="2" stride="16">
<param name="TRANSFORM" type="float4x4"/> <param name="TRANSFORM" type="float4x4"/>
assets/Textures/GUI/KrakenSlider/KrakenArmSliderBackground.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

assets/Textures/GUI/KrakenSlider/SpaceHit.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

assets/Textures/GUI/KrakenSlider/SpaceSpam.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.9 KiB

include/Game/BallSystem.h
+1 -1
View File
@@ -105,7 +105,7 @@ private:
std::mt19937 m_RandomGenerator; std::mt19937 m_RandomGenerator;
float m_XMovementMultiplier = 2.f; float m_XMovementMultiplier = 2.f;
float m_EdgeX = 3.4f; //Actually 3.2, but anyways. float m_EdgeX = 3.2f;
float m_EdgeY = 5.2f; float m_EdgeY = 5.2f;
int m_MultiBalls = 0; int m_MultiBalls = 0;
bool m_ReplaceBall = false; bool m_ReplaceBall = false;
include/Game/EKrakenHit.h
+2
View File
@@ -6,6 +6,7 @@
#define DAYDREAM_EKRAKENHIT_H #define DAYDREAM_EKRAKENHIT_H
#include "Core/EventBroker.h" #include "Core/EventBroker.h"
#include "Core/CTransform.h"
namespace dd namespace dd
{ {
@@ -17,6 +18,7 @@ struct KrakenHit : Event
{ {
EntityID Kraken; EntityID Kraken;
EntityID Hitter; EntityID Hitter;
glm::vec3 PlaceHit;
int MaxHealth; int MaxHealth;
int CurrentHealth; int CurrentHealth;
int NewHealth; int NewHealth;
include/Game/GUI/HUD.h
+4 -2
View File
@@ -41,8 +41,10 @@ public:
m_FPSCounter = new GUI::FPSCounter(this, "FPSCounter"); m_FPSCounter = new GUI::FPSCounter(this, "FPSCounter");
m_KrakenAttackSlider = new Slider(this, "KrakenSlider"); m_KrakenAttackSlider = new Slider(this, "KrakenSlider");
m_KrakenAttackSlider->SetTexture("Textures/GUI/Menu/SliderBackground.png"); m_KrakenAttackSlider->SetTexture("Textures/GUI/KrakenSlider/KrakenArmSliderBackground.png");
m_KrakenAttackSlider->SetTextureReleased("Textures/GUI/Menu/SliderHandle.png"); m_KrakenAttackSlider->SetTextureReleased("Textures/GUI/KrakenSlider/SpaceSpam.png");
m_KrakenAttackSlider->SetTexturePressed("Textures/GUI/KrakenSlider/SpaceHit.png");
m_KrakenAttackSlider->SetLeft(Width / 2 - m_KrakenAttackSlider->Width / 2); m_KrakenAttackSlider->SetLeft(Width / 2 - m_KrakenAttackSlider->Width / 2);
m_KrakenAttackSlider->Y = 800; m_KrakenAttackSlider->Y = 800;
m_KrakenAttackSlider->Hide(); m_KrakenAttackSlider->Hide();
src/game/Game/BallSystem.cpp
+8 -7
View File
@@ -216,7 +216,8 @@ void dd::Systems::BallSystem::UpdateEntity(double dt, EntityID entity, EntityID
auto transform = m_World->GetComponent<Components::Transform>(entity); auto transform = m_World->GetComponent<Components::Transform>(entity);
glm::vec2 dir = glm::normalize(glm::vec2(transform->Velocity.x, transform->Velocity.y)); glm::vec2 dir = glm::normalize(glm::vec2(transform->Velocity.x, transform->Velocity.y));
glm::vec2 up = glm::vec2(0.f, 1.f); glm::vec2 up = glm::vec2(0.f, 1.f);
float angle = glm::acos(glm::dot<float>(dir, up)) * glm::sign(dir.x);
float angle = atan2(dir.x, dir.y);
transform->Orientation = glm::rotate(glm::quat(), angle, glm::vec3(0.f, 0.f, -1.f)); transform->Orientation = glm::rotate(glm::quat(), angle, glm::vec3(0.f, 0.f, -1.f));
} }
} }
@@ -470,17 +471,17 @@ bool dd::Systems::BallSystem::OnMultiBall(const dd::Events::MultiBall &event)
ball2->Waiting = false; ball2->Waiting = false;
auto padTransform = event.padTransform; auto padTransform = event.padTransform;
float x1 = padTransform->Position.x/* - 2*/, x2 = padTransform->Position.x/* + 2*/; float x1 = padTransform->Position.x/* - 2*/, x2 = padTransform->Position.x/* + 2*/;
if (x1 < -m_EdgeX) { if (x1 < -m_EdgeX + 0.4) {
x1 = m_EdgeX - 0.2; x1 = m_EdgeX - 0.7;
} }
if (x2 > m_EdgeX) { if (x2 > m_EdgeX - 0.4) {
x2 = -m_EdgeX + 0.2; x2 = -m_EdgeX + 0.7;
} }
transform1->Position = glm::vec3(x1, -5.5, -10); transform1->Position = glm::vec3(x1, -5.5, -10);
transform2->Position = glm::vec3(x2, -5.5, -10); transform2->Position = glm::vec3(x2, -5.5, -10);
transform1->Velocity = glm::normalize(glm::vec3(5, 5 ,0.f)) * ball1->Speed; transform1->Velocity = glm::normalize(glm::vec3(2.5, 5 ,0.f)) * ball1->Speed;
transform2->Velocity = glm::normalize(glm::vec3(-5, 5 ,0.f)) * ball2->Speed; transform2->Velocity = glm::normalize(glm::vec3(-2.5, 5 ,0.f)) * ball2->Speed;
SetMultiBalls(MultiBalls() + 2); SetMultiBalls(MultiBalls() + 2);
//std::cout << MultiBalls() << std::endl; //std::cout << MultiBalls() << std::endl;
src/game/Game/KrakenSystem.cpp
+17 -12
View File
@@ -247,16 +247,20 @@ bool dd::Systems::KrakenSystem::OnContact(const dd::Events::Contact &event)
auto projectile = m_World->GetComponent<Components::Projectile>(otherEntitiy); auto projectile = m_World->GetComponent<Components::Projectile>(otherEntitiy);
if (projectile != nullptr) { if (projectile != nullptr) {
Events::ScoreEvent es; if (m_RandomKraken) {
es.Score = 23; Events::ScoreEvent es;
EventBroker->Publish(es); es.Score = 23;
Events::KrakenHit e; EventBroker->Publish(es);
e.Kraken = krakenEntity; Events::KrakenHit e;
e.Hitter = otherEntitiy; e.Kraken = krakenEntity;
e.MaxHealth = kraken->MaxHealth; e.Hitter = otherEntitiy;
e.CurrentHealth = kraken->Health; auto transform = m_World->GetComponent<Components::Transform>(otherEntitiy);
e.NewHealth = kraken->Health - 1; e.PlaceHit = transform->Position;
EventBroker->Publish(e); e.MaxHealth = kraken->MaxHealth;
e.CurrentHealth = kraken->Health;
e.NewHealth = kraken->Health - 1;
EventBroker->Publish(e);
}
m_World->RemoveEntity(otherEntitiy); m_World->RemoveEntity(otherEntitiy);
return true; return true;
} }
@@ -273,6 +277,8 @@ bool dd::Systems::KrakenSystem::OnContact(const dd::Events::Contact &event)
Events::KrakenHit e; Events::KrakenHit e;
e.Kraken = krakenEntity; e.Kraken = krakenEntity;
e.Hitter = otherEntitiy; e.Hitter = otherEntitiy;
auto transform = m_World->GetComponent<Components::Transform>(otherEntitiy);
e.PlaceHit = transform->Position;
e.MaxHealth = kraken->MaxHealth; e.MaxHealth = kraken->MaxHealth;
e.CurrentHealth = kraken->Health; e.CurrentHealth = kraken->Health;
e.NewHealth = kraken->Health - 1; e.NewHealth = kraken->Health - 1;
@@ -317,7 +323,6 @@ bool dd::Systems::KrakenSystem::OnKrakenAttack(const dd::Events::KrakenAttack &e
bool dd::Systems::KrakenSystem::OnKrakenHit(const dd::Events::KrakenHit &event) bool dd::Systems::KrakenSystem::OnKrakenHit(const dd::Events::KrakenHit &event)
{ {
auto kraken = m_World->GetComponent<Components::Kraken>(event.Kraken); auto kraken = m_World->GetComponent<Components::Kraken>(event.Kraken);
auto transform = m_World->GetComponent<Components::Transform>(event.Hitter);
kraken->Health--; kraken->Health--;
kraken->CurrentAction = 3; kraken->CurrentAction = 3;
//kraken->Health -= 15; //kraken->Health -= 15;
@@ -332,7 +337,7 @@ bool dd::Systems::KrakenSystem::OnKrakenHit(const dd::Events::KrakenHit &event)
m_KrakenCurrentSecondsToAction = m_KrakenMaxSecondsToAction - (modifier * timeDifferenceBetweenMaxAndMin); m_KrakenCurrentSecondsToAction = m_KrakenMaxSecondsToAction - (modifier * timeDifferenceBetweenMaxAndMin);
// If modifier is 1, MaxSeconds is 15, MinSeconds is 5, then... 15 - (1 * 10), meaning 5. // If modifier is 1, MaxSeconds is 15, MinSeconds is 5, then... 15 - (1 * 10), meaning 5.
CreateBloodEffect(transform->Position); CreateBloodEffect(event.PlaceHit);
//std::cout << kraken->Health << std::endl; //std::cout << kraken->Health << std::endl;
//kraken->Health = -1; //kraken->Health = -1;
src/game/Game/LevelSystem.cpp
+10 -5
View File
@@ -733,7 +733,7 @@ void dd::Systems::LevelSystem::GetBrickSet(int set, int setCluster) // These are
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
6, 0, 1, 0, 1, 0, 6, 6, 0, 1, 0, 1, 0, 6,
0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0,
0, 0, 4, 1, 1, 0, 0, 0, 0, 5, 1, 1, 0, 0,
0, 0, 0, 1, 0, 0, 0 }; 0, 0, 0, 1, 0, 0, 0 };
color = color =
{b, b, b, b, b, b, b, {b, b, b, b, b, b, b,
@@ -856,7 +856,7 @@ void dd::Systems::LevelSystem::GetBrickSet(int set, int setCluster) // These are
0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0,
1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1,
3, 6, 1, 0, 1, 6, 1, 3, 6, 1, 0, 1, 6, 1,
1, 1, 1, 0, 1, 1, 1 }; 1, 1, 1, 0, 1, 1, 5 };
color = color =
{g, g, g, g, g, g, g, {g, g, g, g, g, g, g,
g, g, g, g, g, g, g, g, g, g, g, g, g, g,
@@ -1023,8 +1023,13 @@ void dd::Systems::LevelSystem::BrickHit(EntityID entityHitter, EntityID entityBr
if (kraken != nullptr) { if (kraken != nullptr) {
Events::KrakenAttack e; Events::KrakenAttack e;
e.ChargeUpdate = 0; e.ChargeUpdate = 0;
e.KrakenStrength = 0.1; if (m_KrakenBattle) {
e.PlayerStrength = 0.05; e.KrakenStrength = 0.1;
e.PlayerStrength = 0.12;
} else {
e.KrakenStrength = 0.1;
e.PlayerStrength = 0.05;
}
EventBroker->Publish(e); EventBroker->Publish(e);
} }
else { else {
@@ -1268,7 +1273,7 @@ void dd::Systems::LevelSystem::GetNextLevel()
level = level =
{0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 1}; 0, 0, 0, 0, 0, 0, 1};
src/game/Game/LifebuoySystem.cpp
+62 -23
View File
@@ -44,11 +44,16 @@ void dd::Systems::LifebuoySystem::Initialize()
void dd::Systems::LifebuoySystem::Update(double dt) void dd::Systems::LifebuoySystem::Update(double dt)
{ {
for (auto it = m_Lifebuoys.begin(); it != m_Lifebuoys.end();) { /*for (auto it = m_Lifebuoys.begin(); it != m_Lifebuoys.end();) { //Niklas note: Jag fortstatte få fel efter ni gick hem, och jag förstod inte det här så jag gjorde om som jag visste hur i UpdateEntity.
auto transformComponent = m_World->GetComponent<Components::Transform>(it->Entity); auto transformComponent = m_World->GetComponent<Components::Transform>(it->Entity);
auto lifebuoyComponent = m_World->GetComponent<Components::Lifebuoy>(it->Entity); auto lifebuoyComponent = m_World->GetComponent<Components::Lifebuoy>(it->Entity);
if (!m_World->ValidEntity(it->Entity)){
m_Lifebuoys.erase(it++);
}
if (transformComponent->Position.y < m_DownEdge) { if (transformComponent->Position.y < m_DownEdge) {
m_World->RemoveEntity(it->Entity); m_World->RemoveEntity(it->Entity);
m_Lifebuoys.erase(it++); m_Lifebuoys.erase(it++);
@@ -75,7 +80,7 @@ void dd::Systems::LifebuoySystem::Update(double dt)
++it; ++it;
} }
} }*/
if (IsPaused()) { if (IsPaused()) {
return; return;
@@ -98,6 +103,38 @@ void dd::Systems::LifebuoySystem::UpdateEntity(double dt, EntityID entity, Entit
} }
auto templateCheck = m_World->GetComponent<Components::Template>(entity); auto templateCheck = m_World->GetComponent<Components::Template>(entity);
if (templateCheck != nullptr){ return; } if (templateCheck != nullptr){ return; }
auto lifebuoyComponent = m_World->GetComponent<Components::Lifebuoy>(entity);
if (lifebuoyComponent != nullptr) {
auto transformComponent = m_World->GetComponent<Components::Transform>(entity);
if (transformComponent->Position.y < m_DownEdge) {
m_World->RemoveEntity(entity);
//m_Lifebuoys.erase(it++);
}
else {
if (transformComponent->Position.x > m_RightEdge) {
transformComponent->Position = glm::vec3(m_LeftEdge + 0.1f, transformComponent->Position.y, transformComponent->Position.z);
}
else if (transformComponent->Position.x < m_LeftEdge) {
transformComponent->Position = glm::vec3(m_RightEdge - 0.1f, transformComponent->Position.y, transformComponent->Position.z);
}
if (lifebuoyComponent->Hits <= 0) {
auto physicsComponent = m_World->GetComponent<Components::Physics>(entity);
physicsComponent->Mask = CollisionLayer::Type::LifeBuoy;
physicsComponent->GravityScale = 10.f;
auto modelComponent = m_World->GetComponent<Components::Model>(entity);
modelComponent->Color = glm::vec4(0.5f, 0.5f, 0.5f, 0.f);
}
if (transformComponent->Position.y < m_DownLimit && lifebuoyComponent->Hits > 0) {
transformComponent->Position.y = m_DownLimit;
}
}
}
} }
bool dd::Systems::LifebuoySystem::OnPause(const dd::Events::Pause &event) bool dd::Systems::LifebuoySystem::OnPause(const dd::Events::Pause &event)
@@ -155,28 +192,30 @@ bool dd::Systems::LifebuoySystem::OnLifebuoyHit(const dd::Events::LifebuoyHit &e
{ {
auto transformComponent = m_World->GetComponent<Components::Transform>(event.Lifebuoy); auto transformComponent = m_World->GetComponent<Components::Transform>(event.Lifebuoy);
auto lifebuoyComponent = m_World->GetComponent<Components::Lifebuoy>(event.Lifebuoy); auto lifebuoyComponent = m_World->GetComponent<Components::Lifebuoy>(event.Lifebuoy);
lifebuoyComponent->Hits -= 1; if (lifebuoyComponent != nullptr) {
auto modelComponent = m_World->GetComponent<Components::Model>(event.Lifebuoy); lifebuoyComponent->Hits -= 1;
modelComponent->ModelFile = "Models/Lifebuoy/Lifebuoy" + std::to_string(5 - lifebuoyComponent->Hits) + ".obj"; auto modelComponent = m_World->GetComponent<Components::Model>(event.Lifebuoy);
modelComponent->ModelFile = "Models/Lifebuoy/Lifebuoy" + std::to_string(5 - lifebuoyComponent->Hits) + ".obj";
Events::CreateParticleSequence e; Events::CreateParticleSequence e;
e.EmitterLifeTime = 4; e.EmitterLifeTime = 4;
e.EmittingAngle = glm::half_pi<float>(); e.EmittingAngle = glm::half_pi<float>();
e.Spread = 0.5f; e.Spread = 0.5f;
e.NumberOfTicks = 1; e.NumberOfTicks = 1;
e.ParticleLifeTime = 2.f; e.ParticleLifeTime = 2.f;
e.ParticlesPerTick = 1; e.ParticlesPerTick = 1;
e.Position = transformComponent->Position; e.Position = transformComponent->Position;
e.ScaleValues.clear(); e.ScaleValues.clear();
e.ScaleValues.push_back(glm::vec3(0.5f)); e.ScaleValues.push_back(glm::vec3(0.5f));
e.ScaleValues.push_back(glm::vec3(2.f, 2.f, 0.2f)); e.ScaleValues.push_back(glm::vec3(2.f, 2.f, 0.2f));
e.SpriteFile = "Textures/Particles/Cloud_Particle.png"; e.SpriteFile = "Textures/Particles/Cloud_Particle.png";
e.Color = glm::vec4(1, 0, 0, 1); e.Color = glm::vec4(1, 0, 0, 1);
e.AlphaValues.clear(); e.AlphaValues.clear();
e.AlphaValues.push_back(1.f); e.AlphaValues.push_back(1.f);
e.AlphaValues.push_back(0.f); e.AlphaValues.push_back(0.f);
e.Speed = 10.f; e.Speed = 10.f;
EventBroker->Publish(e); EventBroker->Publish(e);
}
return true; return true;
} }