Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
73ff6c3
Merge pull request #3 from FitiLsan/master
MSnihurska Apr 15, 2020
31c79ab
add QuestIndicator
May 6, 2020
30bcc3e
add QuestIndicator Controller
May 7, 2020
8390c0d
fix show indicator
May 7, 2020
e72e34a
Merge pull request #8 from FitiLsan/MVP/April
MSnihurska May 8, 2020
bc5e3b2
finish questIndicator
May 8, 2020
7697b30
add debug tasks info
May 8, 2020
fcd6b76
fix for dialogue generation and QuestIndicator
May 10, 2020
08dd73f
fix dialogueGeneration
May 10, 2020
d8c5895
Merge remote-tracking branch 'upstream/MVP/may' into code/grigory-a/q…
May 10, 2020
b2f6f95
add questlog UI
May 10, 2020
4f72708
added questlog prefab
May 12, 2020
8202543
Add QuestJournal
May 14, 2020
c5a45ab
technical
TonyZub May 14, 2020
c69ddec
Merge remote-tracking branch 'upstream/code/rina-marina/rabbit-ai' in…
TonyZub May 14, 2020
6a2486b
fix questJournal
May 14, 2020
74b1f0b
Merge pull request #10 from FitiLsan/code/rina-marina/base-npc
MSnihurska May 15, 2020
f9ade0c
fix test dialogs
May 15, 2020
d33d11a
fix questIndicator
May 15, 2020
861a6a8
fix dialogShow, QuestIndicator
May 17, 2020
d37f136
refactoring by codeconvention
May 17, 2020
4202ea0
fixes
May 18, 2020
5db781d
Improved state machine
TonyZub May 18, 2020
fb5e2c3
Merge branch 'NPC-test' into code/anton-z/character-refactoring
TonyZub May 18, 2020
352e52b
technical commit
TonyZub May 18, 2020
8306676
Merge branch 'TempMergeBranch' into code/anton-z/character-refactoring
TonyZub May 18, 2020
3476c9a
fix questJournal prefabs
May 18, 2020
bd7733c
Merge pull request #1 from TonyZub/code/anton-z/character-refactoring
Sainell May 18, 2020
a91f992
fix after merge
May 18, 2020
34274db
Merge branch 'code/grigory-a/questslog-ui' into TempMergeBranch
May 18, 2020
7240246
fix
May 18, 2020
59e8b99
fix questJournal
May 20, 2020
b9df877
changes on scene
May 20, 2020
8a94ae8
Created branch only for sphere test
TonyZub May 20, 2020
0dc108f
Merge pull request #41 from TonyZub/code/anton-z/sphere-example
FitiLsan May 20, 2020
245c88e
add repetable quest, add quest with Optional task
May 20, 2020
db3c370
Merge pull request #42 from Sainell/code/grigory-a/questslog-ui
GameLineEntertainment May 21, 2020
b6e8f9c
Added ITakeDamage to rabbit
MSnihurska May 21, 2020
0f4bc5b
Merge branch 'NPC-test' into Code/rina-s/rabbit-killable
MSnihurska May 21, 2020
4d1dcaf
repair sphere triggers
May 22, 2020
9a0fb7e
Merge pull request #43 from Sainell/example/sphere1
FitiLsan May 22, 2020
8f8cb1a
Updated rabbit scripts. Made rabbit killable
MSnihurska May 28, 2020
e287909
Updated rabbit scripts. Made rabbit killable
MSnihurska May 28, 2020
423b82d
WIP: Added butterfly model
ProdavecBurrito May 29, 2020
ec3d8f7
WIP: Added classes: ButterflyData, ButterflyController, ButterflyMode…
ProdavecBurrito May 29, 2020
2368ba4
WIP: Added creating butterfly
ProdavecBurrito Jun 1, 2020
77e35fc
WIP: Almost finished
ProdavecBurrito Jun 3, 2020
1fe3b5f
Npc refactoring + example
MSnihurska Jun 3, 2020
d39834e
New Night scene
FitiLsan Jun 3, 2020
181e53c
/vs deleted
FitiLsan Jun 3, 2020
c652cd2
WIP: wip
ProdavecBurrito Jun 10, 2020
64854a2
WIP: Finished spawner
ProdavecBurrito Jun 12, 2020
3447342
Finished creating enums
ProdavecBurrito Jun 14, 2020
df0eb69
Finished npc. Created NpcStats
MSnihurska Jun 16, 2020
623561a
Finished npc. Created NpcStats
MSnihurska Jun 16, 2020
04f7e34
Removed the butterfly
ProdavecBurrito Jun 18, 2020
99233f8
Renamed scene
ProdavecBurrito Jun 18, 2020
4f8dcd3
WIP: Updated enums
ProdavecBurrito Jun 20, 2020
a12e7ba
WIP: Fixes
ProdavecBurrito Jun 22, 2020
a5c8e24
Merge branch 'code/anton-zub/team-b-gameplay' into code/Shipov/Enums
ProdavecBurrito Jun 23, 2020
956e9ac
Merge remote-tracking branch 'BaseBeastHunt/code/anton-zub/team-b-gam…
MSnihurska Jun 24, 2020
94c3688
Merge pull request #54 from ProdavecBurrito/code/Shipov/Enums
FitiLsan Jun 24, 2020
3a4f5a9
Merge branch 'code/anton-zub/team-b-gameplay' into Code/rina-s/npc-ex…
MSnihurska Jun 24, 2020
d47eba9
Updated example
MSnihurska Oct 24, 2020
52eb8b9
Update to Unity 2020.2.1f1
MSnihurska Mar 10, 2021
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
  •  
  •  
  •  
Binary file removed .vs/VanHelsing/v16/Server/sqlite3/storage.ide
Binary file not shown.
6 changes: 6 additions & 0 deletions .vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,7 @@ BlendTree:
m_DirectBlendParameter: MovementSpeed
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: a34ca3f7a1f5a6d468d6a9dc3f8db3f7, type: 3}
m_Motion: {fileID: 7400000, guid: 9427e65a1ad93d94a8071ac43808e1c5, type: 3}
m_Threshold: 0
m_Position: {x: 0, y: 0}
m_TimeScale: 1
Expand Down Expand Up @@ -1092,71 +1092,71 @@ BlendTree:
m_Name: Blend Tree
m_Childs:
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 38d950ecf8ee061498d6479837d21d77, type: 3}
m_Motion: {fileID: 7400000, guid: acbd8f9ef088d1f448b9640e40278752, type: 3}
m_Threshold: 0.14285715
m_Position: {x: -1, y: -1}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: AxisY
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: af2453d50b96fc949891d7b278aaf733, type: 3}
m_Motion: {fileID: 7400000, guid: 5138183205551c5448d78f2f2e6aaa56, type: 3}
m_Threshold: 0.22857144
m_Position: {x: -1, y: 0}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: AxisY
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 443693849a2f4e741afac059a470e10e, type: 3}
m_Motion: {fileID: 7400000, guid: 6d4445dc5e9a1244583189ebc92cc474, type: 3}
m_Threshold: 0.31428573
m_Position: {x: -1, y: 1}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: AxisY
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: e3ce9218d72c10841bbd95cd901792d4, type: 3}
m_Motion: {fileID: 7400000, guid: 49c8b0222c69c4441a9b6a085641e4eb, type: 3}
m_Threshold: 0.40000004
m_Position: {x: 0, y: -1}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: AxisY
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 94c75858633b4e04f9e28db3b52b2bba, type: 3}
m_Motion: {fileID: 7400000, guid: 8370b4128ccb08c4a8944d3f0d66cebc, type: 3}
m_Threshold: 0.48571432
m_Position: {x: 0, y: 0}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: MoveSpeed
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: a3c7daf5dbba19245938db35245052fa, type: 3}
m_Motion: {fileID: 7400000, guid: bcdf2d620dd35934e916526972be7006, type: 3}
m_Threshold: 0.5714286
m_Position: {x: 0, y: 1}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: AxisY
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 7cb280337cb0fdd4399af55c6ab24dc7, type: 3}
m_Motion: {fileID: 7400000, guid: 0b57817742a7a134a8e4ff2c3594632d, type: 3}
m_Threshold: 0.6571429
m_Position: {x: 1, y: -1}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: AxisY
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 6cbfc0656c630a3449739ce9ddffed2f, type: 3}
m_Motion: {fileID: 7400000, guid: 9f2cd5651f41077488b70ee6fb92ad24, type: 3}
m_Threshold: 0.74285716
m_Position: {x: 1, y: 0}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: AxisY
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 35ea729f36e02794d8cf0b418642050a, type: 3}
m_Motion: {fileID: 7400000, guid: e4b4867631827db41850aae9ad2a4014, type: 3}
m_Threshold: 0.82857144
m_Position: {x: 1, y: 1}
m_TimeScale: 1
Expand Down Expand Up @@ -1265,15 +1265,15 @@ BlendTree:
m_Name: BlendTree
m_Childs:
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 8d21a4032c375344093254ff3493a82f, type: 3}
m_Motion: {fileID: 7400000, guid: 2a17928493a4ca444af1e5c34dab944c, type: 3}
m_Threshold: -1
m_Position: {x: 0, y: 0}
m_TimeScale: 1
m_CycleOffset: 0
m_DirectBlendParameter: MovementSpeed
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 6f9d9b5dde069034282820e10db8b748, type: 3}
m_Motion: {fileID: 7400000, guid: 685f155e179a82d4f9e5aca467ad4a0e, type: 3}
m_Threshold: 1
m_Position: {x: 0, y: 0}
m_TimeScale: 1
Expand Down Expand Up @@ -1419,7 +1419,7 @@ BlendTree:
m_DirectBlendParameter: MovementSpeed
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 7400000, guid: 7a4cfa3380fcb524c9233ff11170833e, type: 3}
m_Motion: {fileID: 7400000, guid: f58224593ab6ad849b37d203364c1ce4, type: 3}
m_Threshold: 0
m_Position: {x: 0, y: 0}
m_TimeScale: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PolyAdventureMaterial_Water_01
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
m_LightmapFlags: 5
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
Expand Down Expand Up @@ -61,11 +62,15 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _EmissionScaleUI: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: FX_Water_Sewer
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
m_LightmapFlags: 5
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
Expand Down Expand Up @@ -62,11 +62,15 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _EmissionScaleUI: 0
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,25 +120,25 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BodyArt_Amount: 0.14783156
- _BodyArt_Amount: 0.43529147
- _Emission: 0
- _Metallic: 0
- _Smoothness: 0.2
- _Tattoo_Amount: 1
- __dirty: 0
m_Colors:
- _Color1: {r: 0.2283196, g: 0.5822246, b: 0.7573529, a: 1}
- _Color_BodyArt: {r: 0.5294118, g: 0.30980393, b: 0.64705884, a: 0}
- _Color_BodyArt: {r: 0.86666673, g: 0.77647066, b: 0.25490198, a: 0}
- _Color_Eyes: {r: 0, g: 0, b: 0, a: 1}
- _Color_Hair: {r: 0.61960787, g: 0.61960787, b: 0.61960787, a: 0}
- _Color_Hair: {r: 0.24313727, g: 0.20392159, b: 0.14509805, a: 0}
- _Color_Leather_Primary: {r: 0.30882353, g: 0.21390574, b: 0.1589533, a: 0}
- _Color_Leather_Secondary: {r: 0.372549, g: 0.3294118, b: 0.2784314, a: 0}
- _Color_Metal_Dark: {r: 0.1660359, g: 0.21904722, b: 0.27205884, a: 0}
- _Color_Metal_Primary: {r: 0.5568628, g: 0.62352943, b: 0.6, a: 0}
- _Color_Metal_Secondary: {r: 0.4784314, g: 0.5176471, b: 0.54509807, a: 0}
- _Color_Primary: {r: 0.68235296, g: 0.43921572, b: 0.21960786, a: 0}
- _Color_Scar: {r: 0.69803923, g: 0.54509807, b: 0.40000004, a: 0}
- _Color_Secondary: {r: 0.16470589, g: 0.16470589, b: 0.16470589, a: 0}
- _Color_Skin: {r: 0.8196079, g: 0.63529414, b: 0.45882356, a: 0}
- _Color_Stubble: {r: 0.65882355, g: 0.57254905, b: 0.46274513, a: 0}
- _Color_Primary: {r: 0.28627452, g: 0.40000004, b: 0.49411768, a: 0}
- _Color_Scar: {r: 0.42352945, g: 0.31764707, b: 0.28235295, a: 0}
- _Color_Secondary: {r: 0.2392157, g: 0.2509804, b: 0.18823531, a: 0}
- _Color_Skin: {r: 0.5647059, g: 0.40784317, b: 0.3137255, a: 0}
- _Color_Stubble: {r: 0.38823533, g: 0.2901961, b: 0.24705884, a: 0}
- _Color_Tertiary: {r: 0.7352941, g: 0.20004326, b: 0.20004326, a: 1}
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FantasyRivals_01_A
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
Expand Down

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

Loading