Skip to content

Joey #36

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
jamschutz wants to merge 110 commits into
base: main
Choose a base branch
from
Open

Joey #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
b8850fa
fixed merge conflicts in evie/Scenes/CityBlockout
jaschutz Oct 23, 2021
b57653a
Merge pull request #15 from jamschutz/joey
jamschutz Oct 23, 2021
fbe992e
working on building colliders
jaschutz Oct 23, 2021
15968fb
adding colliders
jaschutz Oct 23, 2021
b241899
colliders are in place
jaschutz Oct 23, 2021
506ee53
moved my prefab to Assets/SHARED
jaschutz Oct 23, 2021
afed8f1
Merge pull request #16 from jamschutz/joey
jamschutz Oct 23, 2021
3311d33
rotate dialog to face player
jaschutz Oct 23, 2021
07b3a23
tst
egfus Oct 23, 2021
c49c094
maybe the terrain is better?
jaschutz Oct 24, 2021
f7736b3
Added ocean sounds
jaschutz Oct 24, 2021
198c423
some probs on street
egfus Oct 24, 2021
948b3ba
argh, working on sound
jaschutz Oct 24, 2021
74d5e9f
Merge pull request #17 from jamschutz/evie
jamschutz Oct 24, 2021
a342c9b
merged with latest dev
jaschutz Oct 24, 2021
92b94cd
add more posters
egfus Oct 25, 2021
aa6a8c4
many music attempts -- maybe it's okay now?
jaschutz Oct 25, 2021
40f89f6
Merge pull request #18 from jamschutz/joey
jamschutz Oct 25, 2021
18958c1
latest level flow
jaschutz Oct 25, 2021
bfc7e26
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into evie
egfus Oct 25, 2021
ee19cfe
beach and benches
egfus Oct 25, 2021
13e26c8
people poses
LorgSan Oct 25, 2021
ffc7d10
Merge pull request #19 from jamschutz/evie
jamschutz Oct 25, 2021
594fd5c
evie and lorg changes merge
LorgSan Oct 25, 2021
4c8875c
Merge pull request #20 from jamschutz/lorg
jamschutz Oct 25, 2021
5ea088f
Added rainbow texture
jamschutz Oct 25, 2021
e1a4472
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into joey
jamschutz Oct 25, 2021
ef1f545
putting real people models in
jamschutz Oct 25, 2021
0f1e679
basic dialog is in
jamschutz Oct 25, 2021
00c07bd
putting people around in the scene
jamschutz Oct 25, 2021
0ae42be
messing with model placement
jamschutz Oct 25, 2021
123577c
Added in crush
jamschutz Oct 25, 2021
801aae1
added colliders to railing
jamschutz Oct 25, 2021
e9580bb
Added colliders to people
jamschutz Oct 25, 2021
2b8a06e
Adjusting bad colliders
jamschutz Oct 25, 2021
b6a53b1
Merge pull request #21 from jamschutz/joey
jamschutz Oct 25, 2021
3c4aed3
Added in pier fencing
jamschutz Oct 25, 2021
60a7ccd
beach terrian and some props
egfus Oct 25, 2021
55024bf
created prefabs for my stuff
jamschutz Oct 25, 2021
e445412
Merge pull request #22 from jamschutz/evie
jamschutz Oct 25, 2021
8f364e8
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into joey
jamschutz Oct 25, 2021
cb727f4
Merge pull request #23 from jamschutz/joey
jamschutz Oct 25, 2021
54ef428
moved bench guy back
jamschutz Oct 25, 2021
7830d1f
renaming dialog objects to actually make sense
jamschutz Oct 25, 2021
225744c
updating dialog flow
jamschutz Oct 25, 2021
b116914
Merge pull request #24 from jamschutz/joey
jamschutz Oct 25, 2021
d6c5b0e
another sitting pose and a moon textures
LorgSan Oct 25, 2021
863f9bd
dev merge
LorgSan Oct 25, 2021
20d8b43
bar scene
egfus Oct 25, 2021
464e84d
fixed dialog pacing
jamschutz Oct 25, 2021
6550e5b
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into joey
jamschutz Oct 25, 2021
e9f9ba9
Merge pull request #25 from jamschutz/evie
jamschutz Oct 25, 2021
3be3144
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into joey
jamschutz Oct 25, 2021
ccdbef2
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into lorg
LorgSan Oct 25, 2021
b8e1623
using evie's bar prefab
jamschutz Oct 25, 2021
cef43a8
fix bar scence
egfus Oct 25, 2021
6b43a1a
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into evie
egfus Oct 25, 2021
c51eb80
Merge pull request #26 from jamschutz/evie
jamschutz Oct 25, 2021
24f5893
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into joey
jamschutz Oct 25, 2021
96bd012
loop music; fade to black
jamschutz Oct 26, 2021
cf511e1
tweaking moon growth stuff
jamschutz Oct 26, 2021
9ab0054
apocprop prefab
LorgSan Oct 26, 2021
403f26e
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into lorg
LorgSan Oct 26, 2021
76d38df
player freezes at end!
jamschutz Oct 26, 2021
6bcf7f2
beach scene prefab
egfus Oct 26, 2021
e89d036
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into evie
egfus Oct 26, 2021
22c3f7f
Merge pull request #27 from jamschutz/evie
jamschutz Oct 26, 2021
94a0b2e
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into joey
jamschutz Oct 26, 2021
27f2566
Merge pull request #28 from jamschutz/joey
jamschutz Oct 26, 2021
dfebf82
added colliders to bar scene
jamschutz Oct 26, 2021
88187c1
merged with dev
jamschutz Oct 26, 2021
cb28c76
Merge pull request #29 from jamschutz/lorg
jamschutz Oct 26, 2021
e58016c
uhhh idk user settings changed
jamschutz Oct 26, 2021
fd6df78
merged with dev
jamschutz Oct 26, 2021
7b3cde1
colliders with evie's beach scene
jamschutz Oct 26, 2021
a116370
obstacles in tunnel
egfus Oct 26, 2021
0a445f5
Added tree colliders
jamschutz Oct 26, 2021
51d277e
changed moon material
jamschutz Oct 26, 2021
bce3961
rose
egfus Oct 26, 2021
fad0a85
added moon sound
jamschutz Oct 26, 2021
f1e9169
Merge pull request #31 from jamschutz/evie
jamschutz Oct 26, 2021
106ae61
merged with dev
jamschutz Oct 26, 2021
20df374
rose
egfus Oct 26, 2021
f8ed769
Merge pull request #32 from jamschutz/evie
jamschutz Oct 26, 2021
c45931f
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into joey
jamschutz Oct 26, 2021
1bd7377
hold the rose
jamschutz Oct 26, 2021
8cdddac
updated the prefab i guess
jamschutz Oct 26, 2021
ee1c97e
Merge pull request #30 from jamschutz/joey
jamschutz Oct 26, 2021
d005283
put my dude back in the starting place
jamschutz Oct 26, 2021
9157d8d
beach collider
egfus Oct 26, 2021
6501c9d
Merge pull request #33 from jamschutz/evie
jamschutz Oct 26, 2021
78fcb22
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into joey
jamschutz Oct 26, 2021
0d33e66
beach collision is in
jamschutz Oct 26, 2021
3367c95
Better rose
jamschutz Oct 26, 2021
1fe9de9
slower end dialog
jamschutz Oct 26, 2021
14a9cf0
arrange beach stuff
egfus Oct 26, 2021
431b482
apparently i changed the prefab
jamschutz Oct 26, 2021
5ce0589
Merge pull request #34 from jamschutz/evie
jamschutz Oct 26, 2021
8bbb60c
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into joey
jamschutz Oct 26, 2021
8f9edef
additional dialogues and camera shake script
LorgSan Oct 26, 2021
5dd0473
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into lorg
LorgSan Oct 26, 2021
fe11c14
readjusted rose guy
jamschutz Oct 26, 2021
5a8e60c
dialogue prefab
LorgSan Oct 26, 2021
e9b876f
Merge pull request #35 from jamschutz/lorg
jamschutz Oct 26, 2021
b96de9f
Merge branch 'dev' of https://github.com/jamschutz/Walking-Sim into joey
jamschutz Oct 26, 2021
976afcc
shaking is in a good place
jamschutz Oct 26, 2021
4eeeec5
everything is in place except audio
jamschutz Oct 26, 2021
4e8535b
finalizing things
jamschutz Oct 26, 2021
b12cce0
i guess i didn't push at the end oops
jamschutz Nov 9, 2021
48900be
created a text file called test
jamschutz Nov 9, 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
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions Assets/BarrelPalletBox.meta
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions Assets/BarrelPalletBox/Barrel1.fbx
View file
Open in desktop
Git LFS file not shown
123 changes: 123 additions & 0 deletions Assets/BarrelPalletBox/Barrel1.fbx.meta
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions Assets/BarrelPalletBox/Barrel2.fbx
View file
Open in desktop
Git LFS file not shown
123 changes: 123 additions & 0 deletions Assets/BarrelPalletBox/Barrel2.fbx.meta
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions Assets/BarrelPalletBox/Barrel3.fbx
View file
Open in desktop
Git LFS file not shown
123 changes: 123 additions & 0 deletions Assets/BarrelPalletBox/Barrel3.fbx.meta
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions Assets/BarrelPalletBox/Barrel4.fbx
View file
Open in desktop
Git LFS file not shown
Loading