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

23 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
craftwill
961fa91133 Fix materials folder wrong meta file 2022-05-14 13:14:58 -04:00
Louis Horlaville
8bd51353fc Pull request #6: Louis 
Merge in CEGJ/creative-jam-20 from Louis to main

* commit '247a14a5bce9beecdc89c1c65fd27dc21bdd639c':
  added spawn manager, enemy, and enemy spawn animation
  stage materials
 2022-05-14 14:14:41 +00:00
louishorlaville
247a14a5bc Merge branch 'main' of https://bitbucket.clubconjure.com/scm/cegj/creative-jam-20 into Louis 2022-05-14 09:41:44 -04:00
Soulaha
0a88803604 Pull request #5: Soulaha 
Merge in CEGJ/creative-jam-20 from Soulaha to main

* commit '872fb4de7443e0899ab649d0a67f77ecc34a7f1d':
  Fix warping  on cannon WIP Ammo types skeleton
  Add firerate and possible to hold down btn to fire
 2022-05-14 05:57:41 +00:00
Soulaha Balde
872fb4de74 Merge remote-tracking branch 'origin/main' into Soulaha 2022-05-14 01:52:11 -04:00
Soulaha Balde
197674fc1b Fix warping on cannon 
WIP Ammo types skeleton
 2022-05-14 01:41:55 -04:00
Soulaha Balde
7f18c76d4b Add firerate and possible to hold down btn to fire 2022-05-14 01:25:42 -04:00
louishorlaville
645ba526df added spawn manager, enemy, and enemy spawn animation 2022-05-14 00:52:00 -04:00
William Gingras 01
9c5bde79d6 Pull request #4: Art/setupDimension1 
Merge in CEGJ/creative-jam-20 from art/setupDimension1 to main

* commit '0ced9716a55f1509ebe3fcaf09547307342c1705':
  Test turret in art scene
  Put skyboxes into lfs Art folder
  progress on dimension1 planet look
 2022-05-14 03:22:10 +00:00
craftwill
0ced9716a5 Test turret in art scene 2022-05-13 23:20:41 -04:00
craftwill
eef3a76c35 Merge branch 'main' into art/setupDimension1 2022-05-13 23:09:51 -04:00
Soulaha
392b9578d9 Pull request #3: Soulaha 
Merge in CEGJ/creative-jam-20 from Soulaha to main

* commit '0e76928816ec159ed46b3c5f9859f2e0d744401c':
  Cannon follows cursor/fires projectile on click
  init branch
 2022-05-14 03:08:02 +00:00
Soulaha Balde
0e76928816 Merge remote-tracking branch 'origin/main' into Soulaha 2022-05-13 23:06:01 -04:00
craftwill
e797afc077 Put skyboxes into lfs Art folder 2022-05-13 23:04:38 -04:00
craftwill
2db3485f81 progress on dimension1 planet look 2022-05-13 23:02:07 -04:00
Soulaha Balde
fff4b8afbc Cannon follows cursor/fires projectile on click 2022-05-13 23:01:23 -04:00
louishorlaville
5d23c09942 stage materials 2022-05-13 23:00:55 -04:00
William Gingras 01
2331d5f84e Pull request #2: Fixed renderer type to 3D and created art scene and cleaned unseless scenes 
Merge in CEGJ/creative-jam-20 from art/setupDimension1 to main

* commit '3b15bbd152a8c731f219bec83d93b2b191e5d277':
  Fixed renderer type to 3D and created art scene and cleaned unseless scenes
 2022-05-14 01:46:43 +00:00
craftwill
3b15bbd152 Fixed renderer type to 3D and created art scene and cleaned unseless scenes 2022-05-13 21:44:36 -04:00
Soulaha Balde
9b08f86013 init branch 2022-05-13 21:12:31 -04:00
William Gingras 01
0e360684be Pull request #1: Fixed folder structure problem and added content in template scene (problems with 2D renderer) 
Merge in CEGJ/creative-jam-20 from will/foldersFix to main

* commit 'dc864d3b7ae94219fe93c15d6863677f3eade4f4':
  Fixed folder structure problem and added content in template scene (problems with 2D renderer)
 2022-05-14 01:11:08 +00:00
craftwill
dc864d3b7a Fixed folder structure problem and added content in template scene (problems with 2D renderer) 2022-05-13 21:09:09 -04:00
misabiko
847159cced Initial commit 2022-05-13 17:51:57 -04:00