Code/grigoriy af/doll room - #164

Open

Art1Alen wants to merge 77 commits into

code/grigoriy-af/doll-room

Commits on Feb 24, 2021

Merge pull request #21 from FitiLsan/code/anton-zub/team-b-gameplay
MSnihurska
authored
2c42b0d

Commits on Mar 23, 2021

code/team-b/reactive-prototyping
K06a-S
committed
6c88307
Merge pull request #135 from K06a-S/RP
TonyZub
authored
e4ab23d

Commits on Mar 29, 2021

Merge pull request #22 from FitiLsan/code/anton-zub/team-b-gameplay
MSnihurska
authored
0af5e22

Commits on Apr 5, 2021

add ballista
Sainell
committed
ae2fb51
fix
Sainell
committed
447d841

Commits on Apr 6, 2021

add bolt attached
Sainell
committed
6d2d322
fix ballista
Sainell
committed
7e78293

Commits on Apr 16, 2021

add Ballista interaction
Sainell
committed
3bf507e
changed aiming system
TonyZub
committed
4e38958
Merge remote-tracking branch 'upstream/master' into master-test
TonyZub
committed
17241c3

Commits on Apr 17, 2021

interacted ballista fix
Sainell
committed
2a0048e

Commits on Apr 19, 2021

add ControlTransferringState
Sainell
committed
7ad713d
ballista added to intaraction Object
Sainell
committed
bbca8b0

Commits on Apr 21, 2021

ballista fix
Sainell
committed
d28d547
fix
Sainell
committed
975775f
level-design/alexander-ch/main-scene
Lisander52
committed
cfc3e4a
Merge pull request #143 from Lisander52/game-design/alex-cher/trent-location
TonyZub
authored
e4422a4
upd Effects and BuffServiceLogic
Sainell
committed
936ffbb

Commits on Apr 22, 2021

test buf
Sainell
committed
3af31ca
combine effects
Sainell
committed
2574c2e

Commits on Apr 24, 2021

add effect manager
Sainell
committed
a87f9ba

Commits on Apr 25, 2021

fix effect combination
Sainell
committed
f70e3a1

Commits on Apr 26, 2021

add new effects
Sainell
committed
0ffd986
new effects fix
Sainell
committed
b1b672f

Commits on Apr 27, 2021

add combine effects and add resistances in Stats
Sainell
committed
9f07a51
change attack service with new resistance and power elements
Sainell
committed
a321bdf
add buffService Probability
Sainell
committed
35180e6
Update LocationData.asset
Sainell
committed
96b7330
Update LocationData.asset
Sainell
committed
e50fd01
Update FireDebuffData.asset
Sainell
committed
4729164
dummy Test effects
Sainell
committed
b5e2b95

Commits on Apr 29, 2021

add buffDamage
Sainell
committed
e406e1e
fixed weapon with new damage
Sainell
committed
159f0bd

Commits on May 4, 2021

fix manager
Sainell
committed
c8667d3

Commits on May 5, 2021

Improved camera controls
TonyZub
committed
62a4996
Merge branch 'code/anton-zub/team-b-gameplay' into code/anton-z/camera-controls
TonyZub
committed
d41c062
Camera settings save changed
TonyZub
committed
df7f835
Merge pull request #145 from Sainell/code/grigory-af/boss-effects
TonyZub
authored
cde25a6
added gamecontroller parameters
TonyZub
committed
fafebf9
Merge branch 'code/anton-zub/team-b-gameplay' into code/anton-z/camera-controls
TonyZub
committed
de3b179
refactoreed effect tester class
TonyZub
committed
adfb560
Merge pull request #146 from TonyZub/code/anton-z/camera-controls
TonyZub
authored
ca5059e

Commits on May 6, 2021

Changed save place of cameras settings
TonyZub
committed
b0dada4
Merge pull request #147 from TonyZub/code/anton-z/camera-controls
TonyZub
authored
d338cf4

Commits on May 19, 2021

Commits on Jun 16, 2021

Merge branch 'code/grigory-af/ballista-test' into code/grigory-af/ballista-refactoring
gafanasyev
committed
78c800f

Commits on Jun 22, 2021

add new input for ballista
gafanasyev
committed
9330308
Update PlayerInteractionCatch.cs
gafanasyev
committed
19c2339

Commits on Jun 23, 2021

fix ballista
gafanasyev
committed
1ab3f82

Commits on Jun 30, 2021

ballista fixed
gafanasyev
committed
732dc6b
fix for build
gafanasyev
committed
6893705
Update Services.cs
gafanasyev
committed
184b826

Commits on Jul 1, 2021

Merge pull request #149 from Sainell/code/grigory-af/ballista-refactoring
TonyZub
authored
a24d441

Commits on Jul 5, 2021

added Photon
gafanasyev
committed
bde0c10
delete old scenes
gafanasyev
committed
2a06342
Create Photon.meta
gafanasyev
committed
52bdbb9
added new test scene with Cubs
gafanasyev
committed
08f4b3f

Commits on Jul 14, 2021

added multiplayer sync
gafanasyev
committed
3af4dbc
Update CharacterBaseState.cs
gafanasyev
committed
8d7b430
Update TreeEntController.controller
gafanasyev
committed
3e28355

Commits on Aug 18, 2021

Merge pull request #154 from Sainell/code/grigory-af/multiplayer-prototype
TonyZub
authored
490eddd

Commits on Sep 14, 2021

Commits on Nov 3, 2021

fixed
gafanasyev
committed
1b1cdc8
fixed weaponWheel view
gafanasyev
committed
32cb997

Commits on Nov 23, 2021

TrapsAmount -> TrapsAmountCurrent
lifead
committed
54f145b

Commits on Dec 15, 2021

fix: init to method
lifead
committed
53ad9ad

Commits on Dec 29, 2021

Merge pull request #160 from lifead/code/anton-zub/team-b-gameplay
Sainell
authored
a552fec
add trent puppet master
gafanasyev
committed
5ca0e3e
Merge pull request #162 from Sainell/code/grigoriy-af/trent-pm
Sainell
authored
ff30625

Commits on Jan 12, 2022

added longJump
gafanasyev
committed
075c33b

Commits on Jan 18, 2022

added special attack
gafanasyev
committed
79835ce

Commits on Jan 19, 2022

AddResist
Ku6epnec
committed
1a9e93b

Commits on Feb 9, 2022

Merge pull request #166 from Ku6epnec/code/grigoriy-af/doll-room
Sainell
authored
98bcda4