Skip to content

Fix/quest experiment merge with develop #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Sep 16, 2025
Merged

Fix/quest experiment merge with develop #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
039a16f
fix: merge with develop
luizatvieira Feb 1, 2025
037846a
feat: experiment loop; fix: fitness animation merge conflicts
Feb 6, 2025
f62d18d
feat: add firebase google services file
Feb 6, 2025
b0ca469
feat: experiment loop; fix: key distribuition, npc in final room
Jun 17, 2025
be8e3fb
fix: game type
Jun 17, 2025
67de8f0
fix: game scale
Jun 17, 2025
9f08302
feat: adjust experiment event calls; fix: enemies not spawning
Jun 18, 2025
169224c
fix: item placement in dungeon
Jun 19, 2025
e62f5b0
fix: adjust player profile update during experiment
Jun 19, 2025
9915c9c
refact: centralize IsInPortuguese bool
Jun 19, 2025
4d28e2c
fix: create quest real time
Jun 22, 2025
3f50355
feat: add npc in charge for exchange quest completion;feat: new scrip…
Jun 22, 2025
70e26b3
refact: dialogue generation translation
Jun 23, 2025
254b893
feat: add translated text to multiple objects and use GameManagerSing…
Jun 24, 2025
8db4f80
fix: profile weight calculation, tell the player which quest is being…
Jun 24, 2025
001f309
fix: make quest checkpoint dialogue be added by event just like exhca…
Jul 1, 2025
dc7f836
fix: comment unecessary lines for testing
Jul 3, 2025
cf187fd
feat: add gamex questinare
Aug 25, 2025
e306f53
feat: remove complementary profile test and add adapt vs not adapt test
Sep 8, 2025
aca1dce
fix: try fix complete questlne
Sep 8, 2025
c6ca2b6
fix: remove unecessary changes from file
Sep 8, 2025
c0c4593
fix: remove unecessary changes from file
Sep 8, 2025
b478987
fix: remove unecessary changes from file
Sep 8, 2025
3b392bb
Fix conflicts in Experiment and Narrative scripts
Tyago-Teoi Sep 9, 2025
a81b8a1
fix: get quest string exeptions
Sep 10, 2025
ce2f723
Merge branch 'fix/quest-experiment-merge-with-develop' of https://git…
Sep 10, 2025
db16f12
fix: keep original dictionaries for dialogue
Sep 10, 2025
01e67d4
fix: merge conflicts
Sep 10, 2025
e1309fb
fix: merge conflicts in files
Sep 10, 2025
144514c
Fix KillQuestSo null reference
Tyago-Teoi Sep 16, 2025
b5b9488
Fix null reference to EnemiesKilledByType in PlayerData.cs
Tyago-Teoi Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
122 changes: 0 additions & 122 deletions Assets/Animations/fitness/FitnessAnimation.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,15 @@ AnimationClip:
- serializedVersion: 3
time: -1
value: 0
<<<<<<< HEAD
inSlope: 4.5243287
outSlope: 4.5243287
=======
inSlope: 0.32372805
outSlope: 0.32372805
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0
<<<<<<< HEAD
value: 4.5243287
=======
value: 0.32372805
>>>>>>> Develop
inSlope: 0.5
outSlope: 0.5
tangentMode: 0
Expand All @@ -50,24 +41,14 @@ AnimationClip:
- serializedVersion: 3
time: 1
value: 1
<<<<<<< HEAD
inSlope: -1.6243408
outSlope: -1.6243408
=======
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2
<<<<<<< HEAD
value: 1.2756472
inSlope: 0.27564716
outSlope: 0.27564716
=======
value: 0.32372805
inSlope: -0.37711877
outSlope: -0.37711877
Expand Down Expand Up @@ -2721,7 +2702,6 @@ AnimationClip:
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
Expand All @@ -2737,55 +2717,35 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: -1
value: 0
=======
time: 45
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 0
value: 0
=======
time: 46
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 1
value: 0
=======
time: 47
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 2
value: 0
=======
time: 48
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
Expand All @@ -2803,61 +2763,35 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: -1
value: 0
inSlope: 1.851249
outSlope: 1.851249
=======
time: 49
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 0
value: 1.851249
inSlope: 0.118540764
outSlope: 0.118540764
=======
time: 50
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 1
value: 0.2370815
inSlope: -0.8070837
outSlope: -0.8070837
=======
time: 51
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 2
value: 0.2370815
=======
time: 52
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
Expand All @@ -2875,61 +2809,35 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: -1
value: 0
inSlope: 0.396294
outSlope: 0.396294
=======
time: 53
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 0
value: 0.396294
inSlope: 0.40124807
outSlope: 0.40124807
=======
time: 54
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 1
value: 0.80249614
inSlope: 0.20310107
outSlope: 0.20310107
=======
time: 55
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 2
value: 0.80249614
=======
time: 56
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
Expand All @@ -2947,61 +2855,35 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
<<<<<<< HEAD
time: -1
value: 0
inSlope: 0.7589286
outSlope: 0.7589286
=======
time: 57
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 0
value: 0.7589286
inSlope: 0.039344937
outSlope: 0.039344937
=======
time: 58
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 1
value: 0.07868984
inSlope: -0.34011936
outSlope: -0.34011936
=======
time: 59
value: 0.019055326
inSlope: 0
outSlope: 0
>>>>>>> Develop
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
<<<<<<< HEAD
time: 2
value: 0.07868984
=======
time: 60
value: 0.019055326
>>>>>>> Develop
inSlope: 0
outSlope: 0
tangentMode: 0
Expand Down Expand Up @@ -3029,11 +2911,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
<<<<<<< HEAD
m_StopTime: 2
=======
m_StopTime: 60
>>>>>>> Develop
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/PlayerData/PlayerData.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Assets/Prefabs/Bullets/Bullet.prefab
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading