Conjure/creative-jam-20
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
133 Commits 11 Branches 0 Tags
Commit Graph

133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
louishorlaville
570de063c8 merge conflict resolved 2022-05-15 15:30:10 -04:00
craftwill
a2f21477f5 Push problematic .meta 2022-05-15 15:03:33 -04:00
William Gingras 01
f4d7ae18a5 Pull request #31: Added gain currency animation; Added EventManager; Fixes to Dimensions prefabs 
Merge in CEGJ/creative-jam-20 from integration2 to main

* commit '860ed467b082a174310ef720e6f3124f4848da22':
  Added gain currency animation; Added EventManager; Fixes to Dimensions prefabs
 2022-05-15 19:01:45 +00:00
craftwill
860ed467b0 Fixed problems due to textmeshpro font 2022-05-15 15:01:17 -04:00
naomi-rc
264797d801 add prefabs for alerts 2022-05-15 14:52:27 -04:00
louishorlaville
cdacdf23a5 enemies balanced 2022-05-15 14:51:34 -04:00
naomi-rc
3b412d8bff Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 2022-05-15 14:45:58 -04:00
naomi-rc
789e474b64 start of high scores 2022-05-15 14:45:13 -04:00
craftwill
51cea5fd10 Added gain currency animation; Added EventManager; Fixes to Dimensions prefabs 2022-05-15 14:43:27 -04:00
Soulaha
5906b58a83 Pull request #29: Revamp main menu 
Merge in CEGJ/creative-jam-20 from Soulaha to main

* commit '61cf67f7bfd52384cec3808de84f81f24568acfd':
  revamp main menu Add tmp extras
 2022-05-15 18:01:19 +00:00
Soulaha Balde
61cf67f7bf Merge remote-tracking branch 'origin/main' into Soulaha 2022-05-15 13:59:51 -04:00
Soulaha Balde
ee5fe3d613 Merge remote-tracking branch 'origin/main' into Soulaha 2022-05-15 13:55:59 -04:00
Louis Horlaville
abef9cb903 Pull request #28: forgor to save oops 
Merge in CEGJ/creative-jam-20 from Louis to main

* commit 'e041d2deeca49f574f12dd43d5227ae105d6448b':
  forgor to save oops
 2022-05-15 17:55:25 +00:00
louishorlaville
e041d2deec Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis 2022-05-15 13:54:27 -04:00
louishorlaville
509efc9755 forgor to save oops 2022-05-15 13:53:42 -04:00
Louis Horlaville
200bcdab6a Pull request #27: Louis 
Merge in CEGJ/creative-jam-20 from Louis to main

* commit 'c69ef9734e537d10f3c50a348bf0e387a52f2bcf':
  clean up enemy
  dimension enemies separated
  merge conflicts resolved
  raycast layer ignore turret
  cant see enemies in different dimensions
 2022-05-15 17:52:54 +00:00
louishorlaville
c69ef9734e Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis 2022-05-15 13:50:38 -04:00
louishorlaville
6abff695cb clean up enemy 2022-05-15 13:50:27 -04:00
Soulaha Balde
b93deec12c revamp main menu 
Add tmp extras
 2022-05-15 13:46:58 -04:00
William Gingras 01
bb4c35606e Pull request #26: Added textmeshpro extension 
Merge in CEGJ/creative-jam-20 from art/HUDFont to main

* commit '61c226581bbf7c83206368c0c5f58205a82e6040':
  Added textmeshpro extension
 2022-05-15 17:43:51 +00:00
craftwill
61c226581b Merge branch 'main' into art/HUDFont 2022-05-15 13:42:28 -04:00
craftwill
8f3ab61510 Added textmeshpro extension 2022-05-15 13:41:33 -04:00
louishorlaville
1e575d842c dimension enemies separated 2022-05-15 13:40:08 -04:00
louishorlaville
9bb1e6a985 Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis 2022-05-15 13:38:30 -04:00
Jason Durand 01
5089aa9feb Pull request #25: Jason 
Merge in CEGJ/creative-jam-20 from jason to main

* commit 'ec52c18cef44ababca2a71c1227cf8350af2c87a':
  Can jump through multiple dimensions
  Fixed quad height
 2022-05-15 17:37:07 +00:00
misabiko
ec52c18cef Merge branch 'main' into jason 
# Conflicts:
#	Assets/Scripts/WorldSwitcher.cs
 2022-05-15 13:35:23 -04:00
misabiko
bdc545832f Can jump through multiple dimensions 2022-05-15 13:24:19 -04:00
Soulaha
8185a2da38 Pull request #24: fix reticle alignement 
Merge in CEGJ/creative-jam-20 from Soulaha to main

* commit 'dabc50ed8dfec30bce3679f431f79fe26129f2c3':
  fix reticle alignement
 2022-05-15 17:16:17 +00:00
Soulaha Balde
dabc50ed8d Merge remote-tracking branch 'origin/main' into Soulaha 2022-05-15 13:12:58 -04:00
louishorlaville
3b5e1800ae merge conflicts resolved 2022-05-15 13:08:52 -04:00
louishorlaville
bad5bb7f04 raycast layer ignore turret 2022-05-15 13:06:15 -04:00
louishorlaville
b8171e1538 Merge branch 'main' into Louis 2022-05-15 13:04:35 -04:00
William Gingras 01
f6c2784f09 Pull request #23: Feature/healthBars 
Merge in CEGJ/creative-jam-20 from feature/healthBars to main

* commit '8c7ea4ff9f38d7af82c5ca3c2361151dbcede55e':
  HealtBars and Dimension1.prefab fix
  Health bars code
 2022-05-15 17:03:29 +00:00
craftwill
8c7ea4ff9f HealtBars and Dimension1.prefab fix 2022-05-15 13:02:35 -04:00
louishorlaville
21ee9cae61 Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis 2022-05-15 12:35:46 -04:00
louishorlaville
f4b87a6d6e cant see enemies in different dimensions 2022-05-15 12:32:59 -04:00
Soulaha Balde
0e3f108594 fix reticle alignement 2022-05-15 12:31:54 -04:00
craftwill
66145b2112 Merge with main 2022-05-15 12:28:07 -04:00
craftwill
d167c0e913 Health bars code 2022-05-15 12:16:03 -04:00
Soulaha
5b457ef5ae Pull request #22: Soulaha 
Merge in CEGJ/creative-jam-20 from Soulaha to main

* commit 'ce8a5ea092dfabb9016f47347ac4880cd3543987':
  Remove pause menu was already done
  Rework hitscaning on cannon fire
  Add MainMenu and pause menu Transitions between menus work
  Added mainmenu
 2022-05-15 16:09:11 +00:00
Soulaha Balde
ce8a5ea092 Merge remote-tracking branch 'origin/main' into Soulaha 2022-05-15 12:06:17 -04:00
Louis Horlaville
8a06ca01a4 Pull request #21: fixed gamemanager 
Merge in CEGJ/creative-jam-20 from Louis to main

* commit '0657b8a2237c6a3d73119b55316426326d8fedc5':
  fixed gamemanager
 2022-05-15 16:04:59 +00:00
louishorlaville
0657b8a223 fixed gamemanager 2022-05-15 12:04:19 -04:00
Soulaha Balde
9a4f2771c0 Merge remote-tracking branch 'origin/main' into Soulaha 2022-05-15 11:57:06 -04:00
Louis Horlaville
6ff9007a1d Pull request #20: Louis 
Merge in CEGJ/creative-jam-20 from Louis to main

* commit 'e3e73bf64f34ae459dfcaf081b726bf4f51fc59a':
  lfs pull
  dimension swap integration
  removed useless event system
  fixed enemy death overtime
  updated turret model in prefab
 2022-05-15 15:54:40 +00:00
misabiko
57c9a8f643 Fixed quad height 2022-05-15 11:54:02 -04:00
louishorlaville
e3e73bf64f lfs pull 2022-05-15 11:53:53 -04:00
louishorlaville
52bd27651e resolved merge conflict 2022-05-15 11:52:52 -04:00
louishorlaville
d51b42a22d dimension swap integration 2022-05-15 11:42:18 -04:00
William Gingras 01
f308098371 Pull request #19: Added 3 enemies with animations 
Merge in CEGJ/creative-jam-20 from art/enemies to main

* commit '3843cad7e4918be4d6531bb602dffd97a7cddd11':
  Added 3 enemies with animations
 2022-05-15 15:30:09 +00:00