Skip to content

Commit ea65729

Browse files
Tyago-TeoiTyago-Teoi
authored
Merge pull request #207 from Re-G3X/fix/quest-experiment-merge-with-develop
Fix/quest experiment merge with develop
2 parents df3570c + b5b9488 commit ea65729

File tree

367 files changed

+8417
-3172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

367 files changed

+8417
-3172
lines changed

‎Assets/Animations/fitness/FitnessAnimation.anim‎

Lines changed: 0 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,15 @@ AnimationClip:
2323
- serializedVersion: 3
2424
time: -1
2525
value: 0
26-
<<<<<<< HEAD
27-
inSlope: 4.5243287
28-
outSlope: 4.5243287
29-
=======
3026
inSlope: 0.32372805
3127
outSlope: 0.32372805
32-
>>>>>>> Develop
3328
tangentMode: 0
3429
weightedMode: 0
3530
inWeight: 0.33333334
3631
outWeight: 0.33333334
3732
- serializedVersion: 3
3833
time: 0
39-
<<<<<<< HEAD
40-
value: 4.5243287
41-
=======
4234
value: 0.32372805
43-
>>>>>>> Develop
4435
inSlope: 0.5
4536
outSlope: 0.5
4637
tangentMode: 0
@@ -50,24 +41,14 @@ AnimationClip:
5041
- serializedVersion: 3
5142
time: 1
5243
value: 1
53-
<<<<<<< HEAD
54-
inSlope: -1.6243408
55-
outSlope: -1.6243408
56-
=======
5744
inSlope: 0
5845
outSlope: 0
59-
>>>>>>> Develop
6046
tangentMode: 0
6147
weightedMode: 0
6248
inWeight: 0.33333334
6349
outWeight: 0.33333334
6450
- serializedVersion: 3
6551
time: 2
66-
<<<<<<< HEAD
67-
value: 1.2756472
68-
inSlope: 0.27564716
69-
outSlope: 0.27564716
70-
=======
7152
value: 0.32372805
7253
inSlope: -0.37711877
7354
outSlope: -0.37711877
@@ -2721,7 +2702,6 @@ AnimationClip:
27212702
value: 0.019055326
27222703
inSlope: 0
27232704
outSlope: 0
2724-
>>>>>>> Develop
27252705
tangentMode: 0
27262706
weightedMode: 0
27272707
inWeight: 0.33333334
@@ -2737,55 +2717,35 @@ AnimationClip:
27372717
serializedVersion: 2
27382718
m_Curve:
27392719
- serializedVersion: 3
2740-
<<<<<<< HEAD
2741-
time: -1
2742-
value: 0
2743-
=======
27442720
time: 45
27452721
value: 0.019055326
2746-
>>>>>>> Develop
27472722
inSlope: 0
27482723
outSlope: 0
27492724
tangentMode: 0
27502725
weightedMode: 0
27512726
inWeight: 0.33333334
27522727
outWeight: 0.33333334
27532728
- serializedVersion: 3
2754-
<<<<<<< HEAD
2755-
time: 0
2756-
value: 0
2757-
=======
27582729
time: 46
27592730
value: 0.019055326
2760-
>>>>>>> Develop
27612731
inSlope: 0
27622732
outSlope: 0
27632733
tangentMode: 0
27642734
weightedMode: 0
27652735
inWeight: 0.33333334
27662736
outWeight: 0.33333334
27672737
- serializedVersion: 3
2768-
<<<<<<< HEAD
2769-
time: 1
2770-
value: 0
2771-
=======
27722738
time: 47
27732739
value: 0.019055326
2774-
>>>>>>> Develop
27752740
inSlope: 0
27762741
outSlope: 0
27772742
tangentMode: 0
27782743
weightedMode: 0
27792744
inWeight: 0.33333334
27802745
outWeight: 0.33333334
27812746
- serializedVersion: 3
2782-
<<<<<<< HEAD
2783-
time: 2
2784-
value: 0
2785-
=======
27862747
time: 48
27872748
value: 0.019055326
2788-
>>>>>>> Develop
27892749
inSlope: 0
27902750
outSlope: 0
27912751
tangentMode: 0
@@ -2803,61 +2763,35 @@ AnimationClip:
28032763
serializedVersion: 2
28042764
m_Curve:
28052765
- serializedVersion: 3
2806-
<<<<<<< HEAD
2807-
time: -1
2808-
value: 0
2809-
inSlope: 1.851249
2810-
outSlope: 1.851249
2811-
=======
28122766
time: 49
28132767
value: 0.019055326
28142768
inSlope: 0
28152769
outSlope: 0
2816-
>>>>>>> Develop
28172770
tangentMode: 0
28182771
weightedMode: 0
28192772
inWeight: 0.33333334
28202773
outWeight: 0.33333334
28212774
- serializedVersion: 3
2822-
<<<<<<< HEAD
2823-
time: 0
2824-
value: 1.851249
2825-
inSlope: 0.118540764
2826-
outSlope: 0.118540764
2827-
=======
28282775
time: 50
28292776
value: 0.019055326
28302777
inSlope: 0
28312778
outSlope: 0
2832-
>>>>>>> Develop
28332779
tangentMode: 0
28342780
weightedMode: 0
28352781
inWeight: 0.33333334
28362782
outWeight: 0.33333334
28372783
- serializedVersion: 3
2838-
<<<<<<< HEAD
2839-
time: 1
2840-
value: 0.2370815
2841-
inSlope: -0.8070837
2842-
outSlope: -0.8070837
2843-
=======
28442784
time: 51
28452785
value: 0.019055326
28462786
inSlope: 0
28472787
outSlope: 0
2848-
>>>>>>> Develop
28492788
tangentMode: 0
28502789
weightedMode: 0
28512790
inWeight: 0.33333334
28522791
outWeight: 0.33333334
28532792
- serializedVersion: 3
2854-
<<<<<<< HEAD
2855-
time: 2
2856-
value: 0.2370815
2857-
=======
28582793
time: 52
28592794
value: 0.019055326
2860-
>>>>>>> Develop
28612795
inSlope: 0
28622796
outSlope: 0
28632797
tangentMode: 0
@@ -2875,61 +2809,35 @@ AnimationClip:
28752809
serializedVersion: 2
28762810
m_Curve:
28772811
- serializedVersion: 3
2878-
<<<<<<< HEAD
2879-
time: -1
2880-
value: 0
2881-
inSlope: 0.396294
2882-
outSlope: 0.396294
2883-
=======
28842812
time: 53
28852813
value: 0.019055326
28862814
inSlope: 0
28872815
outSlope: 0
2888-
>>>>>>> Develop
28892816
tangentMode: 0
28902817
weightedMode: 0
28912818
inWeight: 0.33333334
28922819
outWeight: 0.33333334
28932820
- serializedVersion: 3
2894-
<<<<<<< HEAD
2895-
time: 0
2896-
value: 0.396294
2897-
inSlope: 0.40124807
2898-
outSlope: 0.40124807
2899-
=======
29002821
time: 54
29012822
value: 0.019055326
29022823
inSlope: 0
29032824
outSlope: 0
2904-
>>>>>>> Develop
29052825
tangentMode: 0
29062826
weightedMode: 0
29072827
inWeight: 0.33333334
29082828
outWeight: 0.33333334
29092829
- serializedVersion: 3
2910-
<<<<<<< HEAD
2911-
time: 1
2912-
value: 0.80249614
2913-
inSlope: 0.20310107
2914-
outSlope: 0.20310107
2915-
=======
29162830
time: 55
29172831
value: 0.019055326
29182832
inSlope: 0
29192833
outSlope: 0
2920-
>>>>>>> Develop
29212834
tangentMode: 0
29222835
weightedMode: 0
29232836
inWeight: 0.33333334
29242837
outWeight: 0.33333334
29252838
- serializedVersion: 3
2926-
<<<<<<< HEAD
2927-
time: 2
2928-
value: 0.80249614
2929-
=======
29302839
time: 56
29312840
value: 0.019055326
2932-
>>>>>>> Develop
29332841
inSlope: 0
29342842
outSlope: 0
29352843
tangentMode: 0
@@ -2947,61 +2855,35 @@ AnimationClip:
29472855
serializedVersion: 2
29482856
m_Curve:
29492857
- serializedVersion: 3
2950-
<<<<<<< HEAD
2951-
time: -1
2952-
value: 0
2953-
inSlope: 0.7589286
2954-
outSlope: 0.7589286
2955-
=======
29562858
time: 57
29572859
value: 0.019055326
29582860
inSlope: 0
29592861
outSlope: 0
2960-
>>>>>>> Develop
29612862
tangentMode: 0
29622863
weightedMode: 0
29632864
inWeight: 0.33333334
29642865
outWeight: 0.33333334
29652866
- serializedVersion: 3
2966-
<<<<<<< HEAD
2967-
time: 0
2968-
value: 0.7589286
2969-
inSlope: 0.039344937
2970-
outSlope: 0.039344937
2971-
=======
29722867
time: 58
29732868
value: 0.019055326
29742869
inSlope: 0
29752870
outSlope: 0
2976-
>>>>>>> Develop
29772871
tangentMode: 0
29782872
weightedMode: 0
29792873
inWeight: 0.33333334
29802874
outWeight: 0.33333334
29812875
- serializedVersion: 3
2982-
<<<<<<< HEAD
2983-
time: 1
2984-
value: 0.07868984
2985-
inSlope: -0.34011936
2986-
outSlope: -0.34011936
2987-
=======
29882876
time: 59
29892877
value: 0.019055326
29902878
inSlope: 0
29912879
outSlope: 0
2992-
>>>>>>> Develop
29932880
tangentMode: 0
29942881
weightedMode: 0
29952882
inWeight: 0.33333334
29962883
outWeight: 0.33333334
29972884
- serializedVersion: 3
2998-
<<<<<<< HEAD
2999-
time: 2
3000-
value: 0.07868984
3001-
=======
30022885
time: 60
30032886
value: 0.019055326
3004-
>>>>>>> Develop
30052887
inSlope: 0
30062888
outSlope: 0
30072889
tangentMode: 0
@@ -3029,11 +2911,7 @@ AnimationClip:
30292911
m_AdditiveReferencePoseClip: {fileID: 0}
30302912
m_AdditiveReferencePoseTime: 0
30312913
m_StartTime: 0
3032-
<<<<<<< HEAD
3033-
m_StopTime: 2
3034-
=======
30352914
m_StopTime: 60
3036-
>>>>>>> Develop
30372915
m_OrientationOffsetY: 0
30382916
m_Level: 0
30392917
m_CycleOffset: 0

‎Assets/PlayerData/PlayerData.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎Assets/Prefabs/Bullets/Bullet.prefab‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)