Skip to content

Develop - greyboxing #1

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
KerrOrion wants to merge 219 commits into
base: main
from
Open

Develop - greyboxing #1

Changes from all commits
Commits
Show all changes
219 commits
Select commit Hold shift + click to select a range
2ba9b47
Created develop
Feb 19, 2024
85d615f
Merge branch 'main' into develop
Feb 19, 2024
82b139b
Base Headbutt (only destroy target)
Feb 20, 2024
d97172f
Sniff, part of ice statues
Feb 20, 2024
77093ad
Ice statues (only one effect for now, dissapearing)
Feb 20, 2024
25c9325
Sniff first implementation finished
Feb 23, 2024
d05a75b
Clock finished
Feb 23, 2024
1a67abc
Object that breaks when falling
Feb 23, 2024
12f3034
Wwise
Azaersyss Feb 23, 2024
ece83d4
Merge branch 'develop' into Wwise_Integration
Azaersyss Feb 23, 2024
385ecfb
greyboxing
KerrOrion Feb 23, 2024
a4f42b3
Updating Wwise
Azaersyss Feb 23, 2024
659a62b
Merge branch 'develop' into Wwise_Integration
Azaersyss Feb 24, 2024
330276f
Added Sounds/Attenuation
Azaersyss Feb 24, 2024
a6e44d9
Change inputs for controller
Feb 27, 2024
14c4a9b
Object push/pull mechanic changes
Feb 27, 2024
57eb7a0
Movement during jump, generall movement inconsistencies
Feb 27, 2024
624ff4b
added idle animation and a barebones animation controller (to extend …
Feb 27, 2024
3c4ba4c
Changeaxis -> changeaxisraw, configured the sniff and ice statue prefabs
Feb 28, 2024
fc23bbc
Audio con troller for dog and held item
Feb 28, 2024
68931c9
Wwise Work Commit
Azaersyss Feb 28, 2024
8c75a73
Merge branch 'develop' into Wwise_Integration
Azaersyss Feb 28, 2024
0b579bb
Integrated Sounds
Azaersyss Feb 28, 2024
56c279e
Sniff and drag audio controllers
Feb 28, 2024
82e38e2
Merge branch 'feature/Main_Mechanics' into develop
Feb 28, 2024
af63f25
Cleanup
Feb 28, 2024
ce6cc06
Merge branch 'develop' into feature/Main_Mechanics
Feb 28, 2024
674d655
Added WWise Sounds
Azaersyss Feb 28, 2024
63a7ab6
Drag audio fix
Feb 29, 2024
cd15138
Wwise changes/implementation.
Azaersyss Feb 29, 2024
229c881
melt audio control
Feb 29, 2024
7d84ea5
Wwise changes/implementation (Melting)
Azaersyss Feb 29, 2024
5c9115f
Wwise Integration
Azaersyss Mar 1, 2024
cb69509
Main Menu, pause manu, game manager, starting of cinematic
Mar 1, 2024
a92b3d9
Level
KerrOrion Mar 1, 2024
3fa4262
Keeping up to date
Azaersyss Mar 4, 2024
d4d0495
Added the two previous stages
KerrOrion Mar 4, 2024
480e2c5
Merge branch 'Wwise_Integration' into develop
Mar 5, 2024
5fb39a5
Added the previous two stages
KerrOrion Mar 5, 2024
0e5e9c5
Wwise Updating
Azaersyss Mar 6, 2024
648a7aa
Wwise Update
Azaersyss Mar 6, 2024
5692bf4
Wwise Updating
Azaersyss Mar 6, 2024
46b3bff
Merge branch 'Greybox' into develop
Mar 6, 2024
adc13c6
Conflicts and tracking
Mar 6, 2024
812e828
CollapsingCaveSequence
KerrOrion Mar 6, 2024
2b1e270
More stages greyboxed
KerrOrion Mar 7, 2024
1c0f5fe
Greybox Development
KerrOrion Mar 8, 2024
63d45c5
Fixed Text
KerrOrion Mar 8, 2024
eb5ade0
Wwise Additions/Changes
Azaersyss Mar 11, 2024
631d1d4
Wwise Additions/Changes
Azaersyss Mar 11, 2024
3565bed
Wwise Addition/Changes
Azaersyss Mar 11, 2024
9929c9c
Adjustments
KerrOrion Mar 12, 2024
129db8a
Merge branch 'Greybox' into develop
samgreenb Mar 12, 2024
f9ce46c
Merge branch 'Wwise_Integration' into develop
samgreenb Mar 12, 2024
26d4fec
Wwise Music Fix
Azaersyss Mar 13, 2024
09eff73
footstep switches restored
samgreenb Mar 13, 2024
2d01df5
RiseEffect
samgreenb Mar 13, 2024
2cd0f67
RiseEffect
samgreenb Mar 13, 2024
9572d2f
Added a simple script to cave collapsing and gazebo
KerrOrion Mar 13, 2024
3f73b55
Stalactites
samgreenb Mar 13, 2024
0918123
Updated text
KerrOrion Mar 13, 2024
577adbc
I forgot to make text invisible and centered
KerrOrion Mar 13, 2024
767dbc9
Wwise Additions
Azaersyss Mar 13, 2024
59c6819
Merge branch 'develop' into Greybox
KerrOrion Mar 13, 2024
4a83ac9
Added new scripts
KerrOrion Mar 13, 2024
b78f253
Falling Stalactites
KerrOrion Mar 13, 2024
92983ee
Minor map adjustments
KerrOrion Mar 13, 2024
c00455b
Merge branch 'Wwise_Integration' into develop
samgreenb Mar 15, 2024
396a4d6
Merge branch 'Greybox' into develop
samgreenb Mar 15, 2024
8679c91
movement changes (aligned with room, no weird model orientation when …
samgreenb Mar 15, 2024
dc2bf88
fRidays work so far
KerrOrion Mar 15, 2024
809dcb7
cinematics and menus
samgreenb Mar 15, 2024
27f337c
Merge branch 'Greybox' into develop
samgreenb Mar 15, 2024
53425b7
Merge branch 'feature/Main_Mechanics' into develop
samgreenb Mar 15, 2024
ab95b94
Merge branch 'develop' into Greybox
KerrOrion Mar 15, 2024
c195a29
Merge branch 'develop' into Greybox
KerrOrion Mar 15, 2024
99955cc
Cinematic added into intro
KerrOrion Mar 15, 2024
cb13ad8
Fixes
KerrOrion Mar 15, 2024
f8d141d
Another fix
KerrOrion Mar 15, 2024
06374e9
fix
samgreenb Mar 15, 2024
057b31e
Merge branch 'Greybox' into develop
samgreenb Mar 15, 2024
4eff6a7
Extra changed made
KerrOrion Mar 15, 2024
10e4e7a
Merge branch 'Greybox' into develop
samgreenb Mar 15, 2024
b443c02
Some trees
KerrOrion Mar 15, 2024
bc8a050
Merge branch 'Greybox' into develop
samgreenb Mar 17, 2024
3dd049f
Fix bug when a pushed cube falls
samgreenb Mar 17, 2024
98a0eb2
Cube drop fixes
samgreenb Mar 17, 2024
00f3602
Greyboxing
KerrOrion Mar 19, 2024
7feffe1
Green material
KerrOrion Mar 19, 2024
03a483b
From jeffs playtesting session earlier
KerrOrion Mar 19, 2024
cb8e113
Merge branch 'Greybox' into develop
samgreenb Mar 20, 2024
ea0ab42
Audio slots
samgreenb Mar 20, 2024
652a05e
Wwise Additions/Changes
Azaersyss Mar 20, 2024
e4a7af1
Merge branch 'develop' into Wwise_Integration
Azaersyss Mar 20, 2024
72effd8
Update
KerrOrion Mar 20, 2024
dd1eafd
Wwise Additions/Changes
Azaersyss Mar 20, 2024
5415ff4
Moving
KerrOrion Mar 20, 2024
87cd1a0
Merge branch 'Greybox' into develop
samgreenb Mar 21, 2024
6701af0
Merge branch 'Wwise_Integration' into develop
samgreenb Mar 21, 2024
d5970ab
Wwise Additions
Azaersyss Mar 21, 2024
be6891b
Update AkWwiseProjectData.asset
Azaersyss Mar 21, 2024
33cc9a7
Merge branch 'develop' into Wwise_Integration
Azaersyss Mar 21, 2024
a579da5
Merge branch 'Wwise_Integration' into develop
samgreenb Mar 21, 2024
a3e7aad
Crouch and stalactite fix
samgreenb Mar 21, 2024
a80dbdf
Update
KerrOrion Mar 21, 2024
7f929b5
Wwise Changes/Additions
Azaersyss Mar 21, 2024
5a589f2
Wwise Additions
Azaersyss Mar 21, 2024
f120048
Update
KerrOrion Mar 21, 2024
d8f2d6b
Update to lighting script
KerrOrion Mar 21, 2024
c7b6e73
Update
KerrOrion Mar 21, 2024
a1d1122
Merge branch 'Greybox' into develop
samgreenb Mar 22, 2024
de68c71
Merge branch 'Wwise_Integration' into develop
samgreenb Mar 22, 2024
f9c33d3
Wwise (No Changes)
Azaersyss Mar 22, 2024
131e8c1
lil save
KerrOrion Mar 22, 2024
5e0f7ef
Update
KerrOrion Mar 22, 2024
ba2cf61
Dog model and animations
samgreenb Mar 22, 2024
fde03cf
Merge branch 'Greybox' into develop
samgreenb Mar 22, 2024
2137e93
Merge branch 'Wwise_Integration' into develop
samgreenb Mar 22, 2024
4353014
Update
KerrOrion Mar 22, 2024
7f8f77f
Update
KerrOrion Mar 22, 2024
89c94f1
UPDATE
KerrOrion Mar 23, 2024
3b409b1
Sniff additional programming and animation tree. Better player hitbox…
samgreenb Mar 29, 2024
d8dbd4f
Collision fixes, interaction action fixes
samgreenb Mar 29, 2024
725fa1e
18/04/21 - 1
KerrOrion Apr 18, 2024
010addf
Level Design
KerrOrion Apr 19, 2024
b2ebd26
Changes to crouch and push, grid puzzle
samgreenb Apr 19, 2024
ca27ac1
Level
KerrOrion Apr 19, 2024
6240cb3
Merge branch 'Greybox' into develop
samgreenb Apr 19, 2024
c7f78fe
19/04/24 - 3
KerrOrion Apr 19, 2024
f047498
george
Apr 19, 2024
f58703c
Merge branch 'Greybox' into develop
samgreenb Apr 24, 2024
4e2b451
Merge branch 'Art' into develop
samgreenb Apr 24, 2024
0a33699
Merge branch 'feature/Main_Mechanics' into develop
samgreenb Apr 24, 2024
d1c2993
PushPuzzle finished
samgreenb Apr 24, 2024
d98ff87
Merge branch 'feature/Main_Mechanics' into develop
samgreenb Apr 24, 2024
b7a12df
24/04/21
KerrOrion Apr 24, 2024
7778052
Merge branch 'develop' into Greybox
KerrOrion Apr 24, 2024
ec9f8a0
push puzzle added
KerrOrion Apr 24, 2024
cb6c784
Added assets to cave entrance
KerrOrion Apr 24, 2024
bb72861
fleshing out
Apr 24, 2024
07538be
Merge remote-tracking branch 'origin/Greybox' into Art
Apr 24, 2024
fa27579
LevelDesign
KerrOrion Apr 24, 2024
9874e92
Merge remote-tracking branch 'origin/Art' into Greybox
KerrOrion Apr 24, 2024
5030e90
24/04/24 - 2
KerrOrion Apr 24, 2024
21cc19b
22/04/24 - 3
KerrOrion Apr 24, 2024
60118fe
terrain
Apr 24, 2024
d2ec3c6
Level Design
KerrOrion Apr 25, 2024
5fa92c9
More art assets
Apr 26, 2024
1dca190
PickUp animation
samgreenb Apr 26, 2024
e7e2269
Merge branch 'Greybox' into develop
samgreenb Apr 26, 2024
c28a96b
Merge branch 'feature/Main_Mechanics' into develop
samgreenb Apr 26, 2024
b5e3f93
Pushing and pulling animations
samgreenb Apr 26, 2024
7e57eac
Snow level nearly done
Apr 26, 2024
f000371
cavew
KerrOrion Apr 26, 2024
64489dd
More asset adding
Apr 29, 2024
f7b3db8
Tutorial Done
Apr 30, 2024
9a87809
30/04/24
KerrOrion Apr 30, 2024
1ed0263
More animations (jump, crouch)
samgreenb May 1, 2024
88d8648
Merge remote-tracking branch 'origin/Art' into Greybox
KerrOrion May 1, 2024
afd200c
pre greyboxmerge-
May 1, 2024
a472071
Merge remote-tracking branch 'origin/Greybox' into Art
May 1, 2024
cba0291
Light script update
KerrOrion May 1, 2024
1301709
Minor
May 1, 2024
5cb4b52
Merge remote-tracking branch 'origin/Greybox' into Art
May 1, 2024
e215968
Lighting Script
KerrOrion May 1, 2024
bf46651
minor lighting changes
May 1, 2024
58f7f2c
Merge remote-tracking branch 'origin/Greybox' into Art
May 1, 2024
97b26fc
Skybox script update
KerrOrion May 1, 2024
434bc91
lighting changes
May 1, 2024
0641511
Merge remote-tracking branch 'origin/Greybox' into Art
May 1, 2024
4a5ec07
Skybox script
KerrOrion May 1, 2024
b4687e9
art
May 1, 2024
66ae147
Merge remote-tracking branch 'origin/Greybox' into Art
May 1, 2024
7c98685
skybox script
KerrOrion May 1, 2024
fa28c03
Potential Fix
KerrOrion May 1, 2024
cfc8f83
lighting
May 1, 2024
c070978
Merge remote-tracking branch 'origin/Greybox' into Art
May 1, 2024
482f09f
skybox script
KerrOrion May 1, 2024
26545e9
lighting
May 1, 2024
9dcc643
Merge remote-tracking branch 'origin/Greybox' into Art
May 1, 2024
e804529
Minor
KerrOrion May 1, 2024
bbb8bbc
Updates to the trees and lighting
May 1, 2024
042405f
Lake Terrain
KerrOrion May 2, 2024
22cb121
Lake Terrain
KerrOrion May 2, 2024
601052c
Unpacked My UI package; Added MainMenu.scne to Build settings and set…
May 3, 2024
03bf0a6
Fully Functional Main Menu Scene (w/ SFX and Theme Music)
May 3, 2024
ad5248b
Merge branch 'Art' into develop
samgreenb May 3, 2024
1762041
Merge branch 'Greybox' into develop
samgreenb May 3, 2024
e37910d
Merge branch 'feature/Main_Mechanics' into develop
samgreenb May 3, 2024
18c3bfc
Merge branch 'Main_Menu' into develop
samgreenb May 3, 2024
92ff8b2
Ui scripts and trigger scripts with update to ui scenes
May 3, 2024
2fed3c7
Level + update to skybox script
KerrOrion May 3, 2024
3551244
Art
May 3, 2024
c328220
Merge remote-tracking branch 'origin/Greybox' into Art
May 3, 2024
130df73
Updates skybox code change
KerrOrion May 3, 2024
ed56570
Merge remote-tracking branch 'origin/Art' into Greybox
KerrOrion May 3, 2024
f6e189c
Update
KerrOrion May 3, 2024
f015b11
QUICK FIX
KerrOrion May 3, 2024
51bc921
Final things for now
KerrOrion May 3, 2024
87e9fa2
updated fences
KerrOrion May 3, 2024
580771a
Wwise Updating and Integration
Azaersyss May 3, 2024
ee727c1
Greyboxing testing
KerrOrion May 3, 2024
a865419
GreyboxingScene
KerrOrion May 3, 2024
7f45e21
art ass-ets
May 3, 2024
8ec065e
Merge remote-tracking branch 'origin/Art' into Greybox
KerrOrion May 3, 2024
aa8db5e
Tree
KerrOrion May 3, 2024
a94f96e
Last of the UI Assets and Prefabs. (Minus animation at the end)
May 3, 2024
5aa8c5c
No lie
KerrOrion May 3, 2024
ee9080c
Updated Button FOnt for MM and added an extra special thanks for end …
May 3, 2024
bf4bf3b
Merge branch 'Greybox' into develop
samgreenb May 4, 2024
ac26e7a
Merge branch 'Wwise_Integration' into develop
samgreenb May 4, 2024
c2e2139
Merge branch 'Main_Menu' into develop
samgreenb May 4, 2024
7cc4495
Skybox script fix
KerrOrion May 4, 2024
1b820cc
Merge branch 'Greybox' into develop
samgreenb May 4, 2024
d97f6b2
New Secret Ending backgound and new cutscene added to asset list. Not…
May 4, 2024
2d2f63f
Functional Credits scroll with fade (ignore previous prefab)
May 5, 2024
0ea6bad
Wwise Additions
Azaersyss May 5, 2024
73cb9bb
Merge branch 'Main_Menu' into develop
samgreenb May 5, 2024
8b8de03
Merge branch 'Wwise_Integration' into develop
samgreenb May 5, 2024

Sorry, this diff is taking too long to generate.

It may be too large to display on GitHub.