Commits · master · Game Jam / FGJ-19

27 Jan, 2019 28 commits
- some fixedoos done at 16:59 :-D · 4ee9fb58
  Mikko Lainio authored Jan 27, 2019
  
  4ee9fb58
- legacy materials brown and gray house yay!! · 3f03d60a
  Mikko Lainio authored Jan 27, 2019
  
  3f03d60a
- Merge branch 'master' of https://git.bitbybyte.fi/game-jam/fgj-19 into graphics-elperi · ed4a70fd
  Mikael Perilä authored Jan 27, 2019
  
  ed4a70fd
- - · 79eb352a
  Mikael Perilä authored Jan 27, 2019
  
  79eb352a
- Main Menu · 626521f4
  Mikael Perilä authored Jan 27, 2019
  
  626521f4
- ... · 455a24ba
  Mikko Lainio authored Jan 27, 2019
  
  455a24ba
- three tree models · 42e42491
  Petter Skult authored Jan 27, 2019
  
  42e42491
- Merge branch 'master' of https://git.bitbybyte.fi/game-jam/fgj-19 into graphics-elperi · d52a6ccd
  Mikael Perilä authored Jan 27, 2019
  
  d52a6ccd
- - · a2fe7560
  Mikael Perilä authored Jan 27, 2019
  
  a2fe7560
- splash · c2ac14c8
  Mikael Perilä authored Jan 27, 2019
  
  c2ac14c8
- Merge branch 'house' of git.bitbybyte.fi:game-jam/fgj-19 · 3b049356
  Mikko Lainio authored Jan 27, 2019
```
# Conflicts:
#	GetOffMyLawn/Assets/Data/AgentData/Agent_Priest.asset
#	GetOffMyLawn/Assets/Data/AgentData/Goth_Girl.asset
#	GetOffMyLawn/Assets/Data/AgentData/Goth_Man.asset
#	GetOffMyLawn/Assets/Data/AgentData/Mr_Boring.asset
#	GetOffMyLawn/Assets/Data/AgentData/Old_Lady.asset
```
  3b049356
- updated house · 0aff65b4
  Mikko Lainio authored Jan 27, 2019
  
  0aff65b4
- Added douchebag, and also changed the other narrative stuffs a little bit. · acc96d7b
  Petter Skult authored Jan 27, 2019
  
  acc96d7b
- Merge remote-tracking branch 'origin/graphics-elperi' into house · 2553163f
  Petter Skult authored Jan 27, 2019
  
  2553163f
- Merge branch 'house' of git.bitbybyte.fi:game-jam/fgj-19 · ddb88fbe
  Mikko Lainio authored Jan 27, 2019
```
# Conflicts:
#	GetOffMyLawn/Assets/Prefabs/House.prefab
```
  ddb88fbe
- Added furniture etc. for all kinds of things · 38837de0
  Petter Skult authored Jan 27, 2019
  
  38837de0
- Randomized starting points.Tweaked navmesh setingsh. · e7f68fc2
  Mikko Lainio authored Jan 27, 2019
  
  e7f68fc2
- ... · 178b592c
  Mikko Lainio authored Jan 27, 2019
  
  178b592c
- added furniture to house · 851d2976
  Petter Skult authored Jan 27, 2019
  
  851d2976
- Victory and lose conditions. Some sthit. · 3ba76dd1
  Mikko Lainio authored Jan 27, 2019
  
  3ba76dd1
- Merge branch 'master' of https://git.bitbybyte.fi/game-jam/fgj-19 into graphics-elperi · 2edd4044
  Mikael Perilä authored Jan 27, 2019
  
  2edd4044
- Douchebag · 094d88e5
  Mikael Perilä authored Jan 27, 2019
  
  094d88e5
- new house. Agent follow. exit. game loop works! · 47c2fcc4
  Mikko Lainio authored Jan 27, 2019
  
  47c2fcc4
- game scene check. outdoor crap etc. · 387b7755
  Mikko Lainio authored Jan 27, 2019
  
  387b7755
- ... · 7c9551cf
  Mikko Lainio authored Jan 27, 2019
  
  7c9551cf
- added plain house prefab without any waypoints etc. · 0cdc79bc
  Mikko Lainio authored Jan 27, 2019
  
  0cdc79bc
- assets, music, sounds, stuff. · 9e1130d5
  Mikko Lainio authored Jan 27, 2019
  
  9e1130d5
- Added some basic reactions to the triggers to everyone. Did not yet add any... · b9912cd8
  Petter Skult authored Jan 27, 2019
```
Added some basic reactions to the triggers to everyone. Did not yet add any room-specific ones (except for mr. boring).
```
  b9912cd8
26 Jan, 2019 12 commits
- Added priest agent · efe62faf
  Petter Skult authored Jan 27, 2019
  
  efe62faf
- Merge remote-tracking branch 'origin/graphics-elperi' into narrative_stuff · bb8681e0
  Petter Skult authored Jan 27, 2019
  
  bb8681e0
- Priest · 8152799d
  Mikael Perilä authored Jan 27, 2019
  
  8152799d
- Merge remote-tracking branch 'origin/mikko' into narrative_stuff · 81f168ab
  Petter Skult authored Jan 27, 2019
```
# Conflicts:
#	GetOffMyLawn/Assets/Prefabs/Agent_Goth_Man.prefab
```
  81f168ab
- Added agentprefabs and data (with quick untested likes,dislikes,fears and a... · 33da8b9e
  Petter Skult authored Jan 27, 2019
```
Added agentprefabs and data (with quick untested likes,dislikes,fears and a basic room set) for all the available characters so far.
```
  33da8b9e
- Merge remote-tracking branch 'origin/graphics-elperi' into narrative_stuff · 39309587
  Petter Skult authored Jan 26, 2019
  
  39309587
- Old Lady · a5265ad6
  Mikael Perilä authored Jan 26, 2019
  
  a5265ad6
- Merge remote-tracking branch 'origin/graphics-elperi' into narrative_stuff · 8be6d329
  Petter Skult authored Jan 26, 2019
  
  8be6d329
- Candelier crash · 2f686458
  Mikko Lainio authored Jan 26, 2019
  
  2f686458
- Goth Gal and Old Man · fa743c5a
  Mikael Perilä authored Jan 26, 2019
  
  fa743c5a
- Merge branch 'graphics-elperi' of git.bitbybyte.fi:game-jam/fgj-19 into mikko · 25db7671
  Mikko Lainio authored Jan 26, 2019
  
  25db7671
- Merge branch 'narrative_stuff' of git.bitbybyte.fi:game-jam/fgj-19 into mikko · 8cd2bcde
  Mikko Lainio authored Jan 26, 2019
  
  8cd2bcde