Skip to content

UpdateAimCamera #173

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

Open
Art1Alen wants to merge 102 commits into
base: master
Choose a base branch
from
Open

UpdateAimCamera #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
2c42b0d
Merge pull request #21 from FitiLsan/code/anton-zub/team-b-gameplay
MSnihurska Feb 24, 2021
6c88307
code/team-b/reactive-prototyping
K06a-S Mar 23, 2021
e4ab23d
Merge pull request #135 from K06a-S/RP
TonyZub Mar 23, 2021
0af5e22
Merge pull request #22 from FitiLsan/code/anton-zub/team-b-gameplay
MSnihurska Mar 29, 2021
ae2fb51
add ballista
Sainell Apr 5, 2021
447d841
fix
Sainell Apr 5, 2021
6d2d322
add bolt attached
Sainell Apr 6, 2021
7e78293
fix ballista
Sainell Apr 6, 2021
3bf507e
add Ballista interaction
Sainell Apr 16, 2021
4e38958
changed aiming system
TonyZub Apr 16, 2021
17241c3
Merge remote-tracking branch 'upstream/master' into master-test
TonyZub Apr 16, 2021
2a0048e
interacted ballista fix
Sainell Apr 17, 2021
7ad713d
add ControlTransferringState
Sainell Apr 19, 2021
bbca8b0
ballista added to intaraction Object
Sainell Apr 19, 2021
d28d547
ballista fix
Sainell Apr 21, 2021
975775f
fix
Sainell Apr 21, 2021
cfc3e4a
level-design/alexander-ch/main-scene
Lisander52 Apr 21, 2021
e4422a4
Merge pull request #143 from Lisander52/game-design/alex-cher/trent-l…
TonyZub Apr 21, 2021
936ffbb
upd Effects and BuffServiceLogic
Sainell Apr 21, 2021
3af31ca
test buf
Sainell Apr 22, 2021
2574c2e
combine effects
Sainell Apr 22, 2021
a87f9ba
add effect manager
Sainell Apr 24, 2021
f70e3a1
fix effect combination
Sainell Apr 25, 2021
0ffd986
add new effects
Sainell Apr 26, 2021
b1b672f
new effects fix
Sainell Apr 26, 2021
9f07a51
add combine effects and add resistances in Stats
Sainell Apr 27, 2021
a321bdf
change attack service with new resistance and power elements
Sainell Apr 27, 2021
35180e6
add buffService Probability
Sainell Apr 27, 2021
96b7330
Update LocationData.asset
Sainell Apr 27, 2021
e50fd01
Update LocationData.asset
Sainell Apr 27, 2021
4729164
Update FireDebuffData.asset
Sainell Apr 27, 2021
b5e2b95
dummy Test effects
Sainell Apr 27, 2021
e406e1e
add buffDamage
Sainell Apr 29, 2021
159f0bd
fixed weapon with new damage
Sainell Apr 29, 2021
c8667d3
fix manager
Sainell May 4, 2021
62a4996
Improved camera controls
TonyZub May 5, 2021
d41c062
Merge branch 'code/anton-zub/team-b-gameplay' into code/anton-z/camer…
TonyZub May 5, 2021
df7f835
Camera settings save changed
TonyZub May 5, 2021
cde25a6
Merge pull request #145 from Sainell/code/grigory-af/boss-effects
TonyZub May 5, 2021
fafebf9
added gamecontroller parameters
TonyZub May 5, 2021
de3b179
Merge branch 'code/anton-zub/team-b-gameplay' into code/anton-z/camer…
TonyZub May 5, 2021
adfb560
refactoreed effect tester class
TonyZub May 5, 2021
ca5059e
Merge pull request #146 from TonyZub/code/anton-z/camera-controls
TonyZub May 5, 2021
b0dada4
Changed save place of cameras settings
TonyZub May 6, 2021
d338cf4
Merge pull request #147 from TonyZub/code/anton-z/camera-controls
TonyZub May 6, 2021
64e26fa
Spawner
MSnihurska May 19, 2021
8d14a1d
Merge remote-tracking branch 'BaseBeastHunt/code/anton-zub/team-b-gam…
MSnihurska May 19, 2021
f465ff1
Merge pull request #148 from RinaSatsu/Code/rina-s/location-data
FitiLsan May 19, 2021
78c800f
Merge branch 'code/grigory-af/ballista-test' into code/grigory-af/bal…
Jun 16, 2021
9330308
add new input for ballista
Jun 22, 2021
19c2339
Update PlayerInteractionCatch.cs
Jun 22, 2021
1ab3f82
fix ballista
Jun 23, 2021
732dc6b
ballista fixed
Jun 30, 2021
6893705
fix for build
Jun 30, 2021
184b826
Update Services.cs
Jun 30, 2021
a24d441
Merge pull request #149 from Sainell/code/grigory-af/ballista-refacto…
TonyZub Jul 1, 2021
bde0c10
added Photon
Jul 5, 2021
2a06342
delete old scenes
Jul 5, 2021
52bdbb9
Create Photon.meta
Jul 5, 2021
08f4b3f
added new test scene with Cubs
Jul 5, 2021
3af4dbc
added multiplayer sync
Jul 14, 2021
8d7b430
Update CharacterBaseState.cs
Jul 14, 2021
3e28355
Update TreeEntController.controller
Jul 14, 2021
490eddd
Merge pull request #154 from Sainell/code/grigory-af/multiplayer-prot…
TonyZub Aug 18, 2021
cf76b2f
Merge remote-tracking branch 'upstream/code/team-b/reactive-prototypi…
TonyZub Sep 14, 2021
b8ebc4b
Revert "Merge pull request #154 from Sainell/code/grigory-af/multipla…
TonyZub Sep 14, 2021
1b1cdc8
fixed
Nov 3, 2021
32cb997
fixed weaponWheel view
Nov 3, 2021
54f145b
TrapsAmount -> TrapsAmountCurrent
lifead Nov 23, 2021
53ad9ad
fix: init to method
lifead Dec 15, 2021
a552fec
Merge pull request #160 from lifead/code/anton-zub/team-b-gameplay
Sainell Dec 29, 2021
5ca0e3e
add trent puppet master
Dec 29, 2021
ff30625
Merge pull request #162 from Sainell/code/grigoriy-af/trent-pm
Sainell Dec 29, 2021
3d2d278
Merge pull request #1 from FitiLsan/MVP/november-21
lifead Jan 8, 2022
e7c4ee5
Fixed unnecessary copying of spawnpoint
Jan 12, 2022
075c33b
added longJump
Jan 12, 2022
79835ce
added special attack
Jan 18, 2022
fb2a3b8
Merge pull request #163 from lifead/MVP/november-21
Sainell Jan 18, 2022
28dd186
Merge branch 'MVP/november-21' into MVP/january-22
Jan 18, 2022
359d393
fixed aftermerge
Jan 18, 2022
3946d5c
Решение ошибок.
OlegBakulin Jan 19, 2022
8213335
Фикс багов
OlegBakulin Jan 19, 2022
1a9e93b
AddResist
Ku6epnec Jan 19, 2022
eb6d9f0
fixed long jump animation
Jan 19, 2022
007b0c5
THSword + Dagger
Ku6epnec Jan 26, 2022
b43dcfb
added attack vertical control by camera
Jan 26, 2022
dad1b7f
added vertical attack angel control by camera
Jan 29, 2022
48d1225
Add melee controllers
Ku6epnec Feb 4, 2022
cc05640
Delete ля.unity
Sainell Feb 9, 2022
d3487d8
Delete ля.unity.meta
Sainell Feb 9, 2022
95281e8
Delete EditorUserSettings.asset
Sainell Feb 9, 2022
54a9efb
Delete AimingCameraSettings
Sainell Feb 9, 2022
d30c6b3
Delete FreeLookCameraSettings
Sainell Feb 9, 2022
ac76424
Delete TargetingCameraSettings
Sainell Feb 9, 2022
5532c4b
Merge pull request #165 from OlegBakulin/code/oleg2-b/ballistic-bug
Sainell Feb 9, 2022
e96b30f
Merge branch 'pr/168' into MVP/january-22
Feb 9, 2022
b154e95
added vertical attack angel control by camera
Jan 29, 2022
6eff349
fix after merge
Feb 9, 2022
f4eb9f4
fix after merge 2
Feb 16, 2022
20bd2c4
Merge pull request #171 from Sainell/MVP/february-22
Sainell Feb 22, 2022
59970d1
fixed hp
Feb 22, 2022
aa4fdf9
Merge pull request #172 from Sainell/MVP/february-22
Sainell Feb 22, 2022
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
  •  
  •  
  •  
769 changes: 662 additions & 107 deletions Assets/AdditiveAssets/Animations/Controllers/CharacterAnimator.controller
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Assets/AdditiveAssets/Crossbow/Bolt/crossbow-bolt/source/Crossbow Bolt.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Rigidbody:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3660602131783454729}
serializedVersion: 2
m_Mass: 5
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
Expand Down
Binary file added ... FANTASY CREATURES FULL PACK/DEMONIC CREATURES PACK/TREE ENT/FBX Files/OAK_TREE_ENT 1.FBX
View file
Open in desktop
Binary file not shown.
Loading