Develop firstlevel - #8

Open

AdrianGPJ wants to merge 1061 commits into

CITM-UPC:mainfrom

Shadow-Wizard-Games:develop-firstlevel

This pull request is big! We're only showing the most recent 250 commits

Commits on May 7, 2024

prefab load fix
PauFusco
committed
4adcf77
Merge pull request #89 from Shadow-Wizard-Games/develop-fix-prefabload
xGauss05
authored
fe895f8
Merge branch 'development' into develop-rework-player-enemies
xGauss05
committed
2478206
Starting Abilty System
JanNetoLlorens
committed
dc7e811
Updated General Stuff
Luis González
committed
f0fc7f9
Added Adult, Red & White Xenomorph behaviour files
xGauss05
committed
7441164
healing adjustment
JanNetoLlorens
committed
da83692
.csproj settings
xGauss05
committed
9f6152f
restart particle pool at load + a few transparencies
VicMarBall
committed
930a157
added new anims
PauFusco
committed
5a82baf
added remaining anims
PauFusco
committed
5765dc9
Fixed LookAt function behaving weird
Ethanm-0371
committed
2ab8ee3
Merge branch 'bugfix-LookAt-development' into develop-new-queen-behaviour
Ethanm-0371
committed
1ec13aa
Updated queen to work with animation
Ethanm-0371
committed
14722ed
Uploaded new Queen scene
Ethanm-0371
committed
1fd3912
Update SK_MainCharacter.animator
PauFusco
committed
3721f3f
more particles
VicMarBall
committed
9c8807d
the rest of particles
VicMarBall
committed
3c7648f
Added audios in Wwise
softdrawss
committed
c5f7400
Revert "Updated General Stuff"
Luis González
committed
ab0e95a
General Update
Luis González
committed
0d80622
added grabitem animation
PauFusco
committed
e962f22
adrenaline rush and syringe fix
PauFusco
committed
9ec9fa3
Puto aleix como pones == en lugar de != 😭😭
Luis González
committed
96d7fd4
Merge pull request #90 from Shadow-Wizard-Games/bugfix-LookAt-development
softdrawss
authored
0934b6b
Credits Screen on Main Menu implemented
Luis González
committed
dcf59a6
main menu canvas done
Luis González
committed
c696724
Generated temporal soundbank
softdrawss
committed
cd1c2cd
Ability system done
JanNetoLlorens
committed
212e7ce

Commits on May 8, 2024

Right click to rename scene fix
Luis González
committed
596da8a
Panel Inspector UI Fix
Luis González
committed
ecd1698
Update PlayerScript.cs
PauFusco
committed
e0f092e
Uploaded some of the Queen animations and animator
Ethanm-0371
committed
f1408ff
commitlvl1
OscarEscF
committed
0b8371a
Abilities: dash, heal and shield first aproach
JanNetoLlorens
committed
7954afa
Credits update
Luis González
committed
5ebc46c
particles working while in editor
VicMarBall
committed
2ab37d7
Merge pull request #91 from Shadow-Wizard-Games/fix-particles-not-working-in-editor
Historn
authored
167b96c
Mission Menu canvas done
Luis González
committed
f20958f
Dialogue Canvas done
Luis González
committed
2cbdb73
room5
AdrianGPJ
committed
4b54bb5
Merge branch 'development' into develop-firstlevel
AdrianGPJ
committed
d60f871
Fixed path from SDL
softdrawss
committed
fe247df
Merge branch 'development' into develop-firstlevel
AdrianGPJ
committed
ba92cee
Canvas of Stats Screen done
Luis González
committed
ee2ba92
Panel inspector upgrade
Luis González
committed
0e85f76
Options Screen canvas in game done
Luis González
committed
3504080
Small fix
Luis González
committed
54a095f
Adapted ability system, finished some abilities
JanNetoLlorens
committed
9f31886

Commits on May 9, 2024

Merge branch 'development' into develop-rework-player-enemies
xGauss05
committed
7e3000c
now you can add textures to particles from the editor
faelion
committed
c414894
Merge branch 'development' into develop-particles-textures
faelion
committed
71a08dd
changed how the color works in order to be compatible with the anterior rendering
faelion
committed
2d0d25b
Fixed Build stuff, and some functions regarding Enemy behaviors
xGauss05
committed
8236074
Added AnimationHasFinished internal call
Ethanm-0371
committed
df8f365
room 5 finished
AdrianGPJ
committed
aef8a38
Modified Chestburster
xGauss05
committed
a4c4c8c
Merge remote-tracking branch 'origin/develop-new-queen-behaviour' into develop-rework-player-enemies
xGauss05
committed
d3c12bd
Merge pull request #92 from Shadow-Wizard-Games/develop-particles-textures
faelion
authored
f5d89d3
Chestburster behavior completed.
xGauss05
committed
82c4b90
Removed Debug lines in Chestburster
xGauss05
committed
96eb451
AdultXenomorph behavior finished.
xGauss05
committed
e9f64c2
Update AdultXenomorphTest.toe
xGauss05
committed
eb5353c
que alguien me libre de este sufrimiento
Luis González
committed
9e024af
Added Patrol & Implemented Red Xenomorph
xGauss05
committed
9fd9cce
INSPECTOR CANVAS DONE (AGAIN XD)
Luis González
committed
32d3343
Fixed Queen not showing texture. Added animations.
Ethanm-0371
committed
28d35fe
added main character sprite to inventory
Luis González
committed
2c561ec
Character sprite but in a better place.
Luis González
committed
f50738f
Added Icons to Abilities in inventory
Luis González
committed
3cbc2af
Updated sound bank with steps
softdrawss
committed
0bf1dc7
commitlvl1
OscarEscF
committed
e12f2b3
Merge branch 'develop-firstlevel' of https://github.com/Shadow-Wizard-Games/TheOneEngine into develop-firstlevel
OscarEscF
committed
ad49b71
Added VO to Wwise
softdrawss
committed
81fea84

Commits on May 10, 2024

Merge branch 'development' into develop-ui-dialogue-merge-to-development
Luis González
committed
ce35ec3
Merge pull request #93 from Shadow-Wizard-Games/develop-ui-dialogue-merge-to-development
VicMarBall
authored
6530ff5
Merge remote-tracking branch 'origin/develop-rework-player-enemies' into development-audio
softdrawss
committed
12753db
Merge branch 'development' into development-audio
softdrawss
committed
3b9caec
Canvas for Saving Progress and Picking item created
Luis González
committed
1d56624
Dash skill in progress
JanNetoLlorens
committed
a7798d5
Changed EventIDs to Events
softdrawss
committed
2a36ce6
Main Menu Basic Workflow
Luis González
committed
69ab946
Ui manager script update
Luis González
committed
ee3c885
Fixed some things, dash finished
JanNetoLlorens
committed
14329fa
Upgrade of HudPopUpmenus script
Luis González
committed
b1aac2a

Commits on May 11, 2024

Workflow script of pause menu done
Luis González
committed
89c32c8
Workflow script of inventory done
Luis González
committed
37e1769
Impaciente logic done
JanNetoLlorens
committed
47060c1
Added enum currentWeapon
JanNetoLlorens
committed
e8345c0
Workflow script of Stats menu done
Luis González
committed
3019def
flamethrower script
PauFusco
committed
372a10e
Updated Tail attacks to now work with animations.
Ethanm-0371
committed
6277329
Settings Menu Script done
Luis González
committed
501591c
Added Arnau's audios and Pau newer's audios
softdrawss
committed
6f29366
Workflow of settings done
Luis González
committed
1122f2f

Commits on May 12, 2024

Small upgrade on start stats menu
Luis González
committed
afd6abf
Grenade Launcher logic implemented
JanNetoLlorens
committed
671b301
AdultXenomorph animations implemented
xGauss05
committed
3a6df9f
Merge branch 'development' into develop-rework-player-enemies
xGauss05
committed
e86b295
Added Decals to Level 1 Room 1 (L1R12.toe)
AdriaPm
committed
377ad1e
Merge pull request #94 from Shadow-Wizard-Games/develop-rework-player-enemies
softdrawss
authored
1cef495
merged develop into mainchar-abilities branch
JanNetoLlorens
committed
975a87d
updated roll
PauFusco
committed
4336f67
Revert "updated roll"
PauFusco
committed
9103124
corrected player roll animation
PauFusco
committed
a743d73
Merge branch 'development' into scripts-particles-and-cleaning
VicMarBall
committed
4c29660
Merge branch 'development' into develop-animations
PauFusco
committed
368e55c
Merge branch 'develop-animations' into develop-mainchar-abilities
PauFusco
committed
9770ea4
Queen now does animaton on phase change.
Ethanm-0371
committed
2cff78e
small fixes
VicMarBall
committed
68d0793
Merge pull request #95 from Shadow-Wizard-Games/scripts-particles-and-cleaning
PauFusco
authored
6b34f9b
Fixes to grenadeLauncher
JanNetoLlorens
committed
6db8509
Script of HUD done
Luis González
committed
a88d995
Data write and reed interactions on GameData
kikofp02
committed
00f8901
Merge remote-tracking branch 'origin/develop-ui-dialogue' into develop-user-interfaces-fixes
kikofp02
committed
fe8c3e6
Merge conflicts Solved
kikofp02
committed
a09c0cd
Added Decals to Level 1 Room 2 (L1R22.toe)
AdriaPm
committed
9f4b038
Created events for Joel, Ethan, Alex and Xavi's events
softdrawss
committed
f49e24c
Added LFS for Soundbank
softdrawss
committed
6e3e992
Added decals to Level 1 Room 3 (L1R32.toe)
AdriaPm
committed
92de81f
Update PlayerScript.cs
PauFusco
committed
33435d8
Uploaded White & Red Xenomorph AS and T.
xGauss05
committed
8b2f369
Set up 3rd phase FSM.
Ethanm-0371
committed
fbefa15
Missed deleting a function call.
Ethanm-0371
committed
aef769c
Implemented Queen death.
Ethanm-0371
committed
095bb59

Commits on May 13, 2024

Implemented change of states for background music
softdrawss
committed
7b21e02
Forgot to update bool of the shield
JanNetoLlorens
committed
b8547bf
Merge remote-tracking branch 'origin/develop-mainchar-abilities' into development-audio
softdrawss
committed
9f49117
Added decals to Level 1 Room 4&5 (L1R42 + L1R52)
AdriaPm
committed
aabea67
Implemented Head Charge.
Ethanm-0371
committed
f30208c
Merge remote-tracking branch 'origin/develop-ui-dialogue' into development-audio
softdrawss
committed
b98bf5c
camp and level2
AdrianGPJ
committed
281d61a
Merge branch 'development' into develop-firstlevel
softdrawss
authored
ffc0c39
Merge pull request #96 from Shadow-Wizard-Games/develop-firstlevel
softdrawss
authored
c47835b
ability animations
PauFusco
committed
3b9bae2
Merge remote-tracking branch 'origin/develop-mainchar-abilities' into development-audio
softdrawss
committed
0b20f6d
Queen Jump implemented.
Ethanm-0371
committed
424f38b
Added AudioSource to all the canvas
softdrawss
committed
52afd09
xenomorph animations
PauFusco
committed
95b27ac
L1R1 and bugfix
VicMarBall
committed
f17ecb1
room 3 and 4
AdrianGPJ
committed
836bc00
Merge branch 'develop-firstlevel' of https://github.com/Shadow-Wizard-Games/TheOneEngine into develop-firstlevel
AdrianGPJ
committed
a965d95
more L1R1 particles and bugfix
VicMarBall
committed
0a7f85f
Added ScriptEvent to open popup menus
kikofp02
committed
7c51981
L1R2 and L1R3 particles
VicMarBall
committed
dad3e25
Added damage stat and Impaciente knockback
JanNetoLlorens
committed
d3193b3
Event Checkpoint add feedback
kikofp02
committed
b34f5d1
Last tweaks on the Adult, Red and White Xenomorphs
xGauss05
committed
8abfa76
Merge branch 'development' into develop-rework-player-enemies
xGauss05
committed
64ae8c2
Merge pull request #98 from Shadow-Wizard-Games/develop-rework-player-enemies
softdrawss
authored
f839962
Merge branch 'development-audio' into develop-mainchar-abilities
PauFusco
committed
f17a272
L1R4 and L1R5 particles
VicMarBall
committed
6db0ceb
Merge pull request #99 from Shadow-Wizard-Games/develop-first-level-particles
softdrawss
authored
5e13b8e
abilities audio fix
PauFusco
committed
cd51eb4
adult xenomorph particles
VicMarBall
committed
988d2b6
Merge branch 'development' into develop-mainchar-abilities
PauFusco
committed
3569b15
chestburster particles
VicMarBall
committed
058b140
lvl2 rooms
AdrianGPJ
committed
1c203e9
Merge branch 'development' into develop-firstlevel
AdrianGPJ
committed
97241ef
red and white xenomorphs particles
VicMarBall
committed
e783b6b
Implemented remaining animtions, check description
Ethanm-0371
committed
8e63968
Merge pull request #100 from Shadow-Wizard-Games/develop-enemy-particles
softdrawss
authored
82a3eec
updated l1r1
PauFusco
committed
67245ee
Update L1R32.toe
softdrawss
committed
ee79b90
library
AdrianGPJ
committed
8fa875d
Merge branch 'development' into develop-firstlevel
AdrianGPJ
committed
814767b
Fixed some animations not triggering correctly.
xGauss05
committed
94151b4
Update SK_MainCharacter.prefab
PauFusco
committed
2610161
Merge branch 'develop-mainchar-abilities' of https://github.com/Shadow-Wizard-Games/TheOneEngine into develop-mainchar-abilities
PauFusco
committed
ab1a2b3
Merge pull request #101 from Shadow-Wizard-Games/develop-firstlevel
softdrawss
authored
9fd35b7
Merge branch 'development' into develop-rework-player-enemies
xGauss05
committed
90ac83a
Update L1R52.toe
softdrawss
committed
5bc8bff
Update L1R22.toe
VicMarBall
committed
99ebe1c
Merge pull request #102 from Shadow-Wizard-Games/develop-rework-player-enemies
softdrawss
authored
1b37392
Merge pull request #103 from Shadow-Wizard-Games/develop-room-2-fix
softdrawss
authored
5bdcba0
Merge branch 'development' into develop-mainchar-abilities
PauFusco
committed
62251ee
Revert "Merge branch 'develop-mainchar-abilities' of https://github.com/Shadow-Wizard-Games/TheOneEngine into develop-mainchar-abilities"
PauFusco
committed
fb48a9c
updated library
PauFusco
committed
a579e0e
Added corrected library
softdrawss
committed
bcbdfef
lvl2 hierarchy
AdrianGPJ
committed
40f911c
Merge branch 'develop-mainchar-abilities' of https://github.com/Shadow-Wizard-Games/TheOneEngine into develop-mainchar-abilities
AdrianGPJ
committed
a3e2845
Merge branch 'development' into development-audio
softdrawss
committed
ee462e9
Update AnarchistBehaviour.cs
softdrawss
committed
f5cdc3f
Added AS_Xenomorph_TPose.fbx
softdrawss
committed
a02f946
modified level 1 r 1 2 3
PauFusco
committed
1e71400
Merge branch 'develop-mainchar-abilities' of https://github.com/Shadow-Wizard-Games/TheOneEngine into develop-mainchar-abilities
PauFusco
committed
a1d61fe
facehugger prefab
VicMarBall
committed
b276f04

Commits on May 14, 2024

Implemented Acid Phase 2 logic
Ethanm-0371
committed
d9efe7b
Merge branch 'development' into develop-new-queen-behaviour
Ethanm-0371
committed
930c5fe
Merge pull request #104 from Shadow-Wizard-Games/develop-facehugger-prefab
softdrawss
authored
4ad7301
Restored T_Xenomorph_BC.dds
Ethanm-0371
committed
31cd3d9
Merge pull request #105 from Shadow-Wizard-Games/develop-new-queen-behaviour
xGauss05
authored
5bb07ad
Create T_Queen_BC.dds
softdrawss
committed
231649c
Merge branch 'development' into development-audio
softdrawss
committed
2fd6464
Merge branch 'develop-mainchar-abilities' into development-audio
softdrawss
committed
24d76c2
almost completed l1 scenes
PauFusco
committed
c44035e
erased fbm folders
PauFusco
committed
09fc2c7
Merge branch 'development' into develop-mainchar-abilities
PauFusco
committed
783cbe1
Update L1R1.toe
PauFusco
committed
5f42436
Merge pull request #106 from Shadow-Wizard-Games/develop-mainchar-abilities
softdrawss
authored
a82f4c0
Corrected animator player
softdrawss
committed
d8aa3d1
Merge branch 'development' into development-audio
softdrawss
committed
3ccb3ef
Anarchist animator corrected
softdrawss
committed
51dc3d0
Changed scripts to avoid repeating music
softdrawss
committed
32e188c
added facehuggers
PauFusco
committed
deae823
Merge pull request #107 from Shadow-Wizard-Games/development-audio
softdrawss
authored
0783370

Commits on May 15, 2024

Update PlayerScript.cs
VicMarBall
committed
f12c681
Merge pull request #108 from Shadow-Wizard-Games/fix-player-direction
softdrawss
authored
ef29453

Commits on May 16, 2024

Intro scene and minor fixes
kikofp02
committed
29395a8
Update CollisionSolver.cpp
Historn
committed
c75498f
Delete WWise folder
Historn
committed
353808d
Remove more wise bnks
Historn
committed
048d1a0
Update .gitattributes
Historn
committed
64680b9
Separate banks for audio
Hekbas
committed
4c94c17
Anarchist animation fixed
PauFusco
committed
f6dacf7
Added max delta time on scripting
kikofp02
committed
52c740e
Merge branch 'development' into develop-user-interfaces-fixes
kikofp02
committed
f301fea
anarchist animations
PauFusco
committed
580559b
Merge corrections and others
kikofp02
committed
2014db4
Merge pull request #109 from Shadow-Wizard-Games/develop-user-interfaces-fixes
Historn
authored
8cef3d7
Merge branch 'development' into develop-fix-anarchist
PauFusco
committed
c355640
Changed RedXenomorph and WhiteXenomorph speed parameters.
xGauss05
committed
f4e0b87
Update L1R1.toe
PauFusco
committed
fe440a6
Corrected steps audio
softdrawss
committed
9b8208d
Merge branch 'develop-fix-anarchist' of https://github.com/Shadow-Wizard-Games/TheOneEngine into develop-fix-anarchist
softdrawss
committed
14cfa25
Merge branch 'development' into develop-fix-anarchist
softdrawss
committed
494a681
Update L1R1.toe
PauFusco
committed
0cc9376
Merge branch 'develop-fix-anarchist' of https://github.com/Shadow-Wizard-Games/TheOneEngine into develop-fix-anarchist
PauFusco
committed
f6f426c
Merge pull request #110 from Shadow-Wizard-Games/develop-fix-anarchist
softdrawss
authored
81e7331
Added audios to the intro and solved issues
kikofp02
committed
8382d6f
Merge branch 'development' into develop-user-interfaces-fixes
kikofp02
committed
0083b3f
Merge pull request #111 from Shadow-Wizard-Games/develop-user-interfaces-fixes
xGauss05
authored
8eefc1d

Commits on May 17, 2024

Changed controls for controller
softdrawss
committed
dbe9543
Merge branch 'development' into develop-fix-audio
softdrawss
committed
e709ca1
Merge pull request #112 from Shadow-Wizard-Games/develop-fix-audio
Historn
authored
088e4ab
Stopped audio from level one when you go back to main menu
softdrawss
committed
ed1f4de
Fixes for Release 4.0
Hekbas
committed
2b29e40
Fixed M4 Audio being played every single frame
Hekbas
committed
4fdfeba
Adjusted mp4ShootingCd and Player Shooting animation speed
Hekbas
committed
6674cf5

Commits on May 18, 2024

Updated Scripts
PauFusco
committed
263ab12
Update imgui.ini
PauFusco
committed
10846ee

Commits on May 19, 2024

Updated scripts
PauFusco
committed
5808447
Final fix
PauFusco
committed
3701ddc
Merge pull request #113 from Shadow-Wizard-Games/develop-fix-crash
xGauss05
authored
1fb35a5

Commits on May 20, 2024

easings in scripts and camera easings
VicMarBall
committed
e26c3e1

Commits on May 21, 2024

Commits on May 22, 2024

commit22/5
OscarEscF
committed
9f2a2a1
Merge branch 'development' into develop-firstlevel
softdrawss
committed
0fabbce