Commits · b99c40872d58c0680831a5a364cb1aae565ebcb1 · brendah5 / gamedev_project

Dec 03, 2023
- completed level 2 · b99c4087
  mkseay2 authored 1 year ago
  
  b99c4087
- Merge branch 'melanie_navMeshBound' into 'main' · c3c8145b
  mkseay2 authored 1 year ago
  
  added nav mesh bound around all mazes and fixed player start orientation See merge request !31
  c3c8145b
- added nav mesh bound around all mazes and fixed player start orientation · b7d16efa
  mkseay2 authored 1 year ago
  
  b7d16efa
- Merge branch 'ap_ui_fixes' into 'main' · 38eb14d1
  anamivp2 authored 1 year ago
  
  ui fixes See merge request !30
  38eb14d1
- ui fixes · 18a309ac
  anpatel204 authored 1 year ago
  
  18a309ac
Dec 02, 2023
- Merge branch 'brenda_lights' into 'main' · 8b6c091a
  brendah5 authored 1 year ago
  
  fix lights See merge request !29
  8b6c091a
- fix lights · 3e322eb5
  brendah5 authored 1 year ago
  
  3e322eb5
- Merge branch 'melanie_level1_complete' into 'main' · 08fa9fe6
  mkseay2 authored 1 year ago
  
  placed enemies and health packs/serums throughout level 1 See merge request !28
  08fa9fe6
- placed enemies and health packs/serums throughout level 1 · 4a6d80a7
  mkseay2 authored 1 year ago
  
  4a6d80a7
Dec 01, 2023
- Merge branch 'ap_connect_game_over' into 'main' · 701c3784
  anamivp2 authored 1 year ago
  
  Connect game over functionality. Work on UI display alignment/aesthetic. See merge request !27
  701c3784
- Connect game over functionality. Work on UI display alignment/aesthetic. · a833803d
  anpatel204 authored 1 year ago
  
  a833803d
- Merge branch 'brenda_sky' into 'main' · a9bef90c
  brendah5 authored 1 year ago
  
  add lamps See merge request !26
  a9bef90c
- add lamps · 66bc2f6a
  brendah5 authored 1 year ago
  
  66bc2f6a
- Merge branch 'brenda_sky' into 'main' · f4338c7e
  brendah5 authored 1 year ago
  
  Brenda sky See merge request !25
  f4338c7e
- change sun speed to normal · 23a8aee1
  brendah5 authored 1 year ago
  
  23a8aee1
- gate done · 6a01c478
  brendah5 authored 1 year ago
  
  6a01c478
- Merge branch 'brenda_mesh' into 'main' · c89106ab
  brendah5 authored 1 year ago
  
  done with meshes and level 1 level 2 game completed screen See merge request !24
  c89106ab
- added game rules · 0bdccb63
  brendah5 authored 1 year ago
  
  0bdccb63
- done with meshes and level 1 level 2 game completed screen · 1536d3d2
  brendah5 authored 1 year ago
  
  1536d3d2
- Merge branch 'brenda_level1and2' into 'main' · b37f3cf1
  brendah5 authored 1 year ago
  
  finishing up map See merge request !23
  b37f3cf1
- finishing up map · 79654b1d
  brendah5 authored 1 year ago
  
  79654b1d
Nov 30, 2023
- Merge branch 'brenda_level1and2' into 'main' · b9408b81
  brendah5 authored 1 year ago
  
  done maze 1 and 2, maze 3 in progress See merge request !22
  b9408b81
- more hard · 7c50f7ee
  brendah5 authored 1 year ago
  
  7c50f7ee
- add some more woods · ca7b8542
  brendah5 authored 1 year ago
  
  ca7b8542
- done maze 1 and 2, maze 3 in progress · ff13a9dd
  brendah5 authored 1 year ago
  
  ff13a9dd
Nov 29, 2023
- Merge branch 'melanie_projectile_loot' into 'main' · 4a216e9e
  mkseay2 authored 1 year ago
  
  projectile/loot See merge request !21
  4a216e9e
- added projectile sound upon collision, added projectile destroy upon... · fddaafca
  mkseay2 authored 1 year ago
  
  added projectile sound upon collision, added projectile destroy upon collision, added ammo pack, and added loot drop upon enemy death
  fddaafca
Nov 28, 2023
- Merge branch 'ap_ui_screen_widgets' into 'main' · bee7561a
  anamivp2 authored 1 year ago
  
  Level and Restart Widgets, Game Instructions, Health Serum + Pack Sounds, Increase Score per Level See merge request !20
  bee7561a
- Level and Restart Widgets, Game Instructions, Health Serum + Pack Sounds, Increase Score per Level · a4ae0768
  anpatel204 authored 1 year ago
  
  a4ae0768
Nov 09, 2023
- Merge branch 'ms_ap_finishing_alpha' into 'main' · 15c8abca
  mkseay2 authored 1 year ago
  
  placed collectibles and enemies in the level See merge request !19
  15c8abca
- placed collectibles and enemies in the level · b27c464f
  mkseay2 authored 1 year ago
  
  b27c464f
- Merge branch 'ap_sidekick_follow_player' into 'main' · 3beb8313
  anamivp2 authored 1 year ago
  
  Fix sidekick follow player See merge request !18
  3beb8313
- Fix sidekick follow player · 92835088
  anpatel204 authored 1 year ago
  
  92835088
- Merge branch 'ms_ap_shoot_projectile' into 'main' · 0ec5ed09
  anamivp2 authored 1 year ago
  
  Shoot and Spawn Projectile when shooting See merge request !17
  0ec5ed09
- Shoot and Spawn Projectile when shooting · 7dcad83d
  anpatel204 authored 1 year ago
  
  7dcad83d
Nov 08, 2023
- Merge branch 'ap_projectilecount' into 'main' · ca20cf7e
  anamivp2 authored 1 year ago
  
  IncProjectileCount, HealthSerumCollision, IncreaseSidekickHealth, SidekickDeath See merge request !16
  ca20cf7e
- IncProjectileCount, HealthSerumCollision, IncreaseSidekickHealth, SidekickDeath · c32d4764
  anpatel204 authored 1 year ago
  
  c32d4764
- Merge branch 'ap_widgets' into 'main' · 49f97478
  anamivp2 authored 1 year ago
  
  Fix issues with accessing player variables See merge request !15
  49f97478
- FIX EVERYTHING · 9cc4f60d
  anpatel204 authored 1 year ago
  
  9cc4f60d
- Merge branch 'ap_sidekick_fixes' into 'main' · aba99063
  anamivp2 authored 1 year ago
  
  show widgets in viewport See merge request !14
  aba99063