25 Commits

Author SHA1 Message Date
Yumahey
631596387e More walls, dungeon props 2022-10-19 21:54:29 -04:00
Yumahey
0b065bcb5e Thief and a few other models 2022-10-19 09:13:54 -04:00
Jean Lamarre 01
f64e3df9e5 Pull request #3: UI MainMenu
Merge in CEGJ/32bit_jam_conjure from UI-MainMenu to master

* commit '2c0005464fe86fdee28b6c7026a979157026a4f3':
  Conjure logo
  button prefab and preliminare credits
  main menu first draft
  Tiled test
  testSprite
2022-10-17 17:27:11 +00:00
Jean Lamarre
2c0005464f Conjure logo 2022-10-17 12:39:02 -04:00
Jean Lamarre
f5cd8ae63e button prefab and preliminare credits 2022-10-17 12:25:35 -04:00
Jean Lamarre
c665f8d0a7 main menu first draft 2022-10-17 12:17:56 -04:00
Jean Lamarre
97facc06fd Merge branch 'master' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into UI-MainMenu 2022-10-17 12:07:12 -04:00
Jean Lamarre 01
2984c76dd5 Pull request #2: addded tmp
Merge in CEGJ/32bit_jam_conjure from TMP to master

* commit 'f8bd21101d7b1b52a7e5c2aff403e1946b3e7c57':
  addded tmp
2022-10-17 16:06:41 +00:00
Jean Lamarre
f8bd21101d addded tmp 2022-10-17 12:05:46 -04:00
Jean Lamarre
954d089fa3 Tiled test 2022-10-17 12:04:26 -04:00
Jean Lamarre
0bb5f15109 testSprite 2022-10-17 12:03:14 -04:00
Jean Lamarre 01
4e58c1783c Pull request #1: Add main scene and new input system
Merge in CEGJ/32bit_jam_conjure from InputSystem to master

* commit '2ff07ca50cd5f99e54a814e74472c6999238967e':
  Add main scene and new input system
2022-10-17 16:00:52 +00:00
Jean Lamarre
2ff07ca50c Add main scene and new input system 2022-10-17 11:33:39 -04:00
Yumahey
0fe9882f8f gitignore .vscode folder 2022-10-16 19:34:25 -04:00
Jean Lamarre
78799ac51a remove tutorial info 2022-10-16 19:16:33 -04:00
Jean Lamarre
7db1f2cb05 ignore 2022-10-16 19:15:38 -04:00
Jean Lamarre
6cae3f47fe ignore .idea and .vs 2022-10-16 19:15:14 -04:00
Jean Lamarre
1964b5af14 Merge branch 'init-project' 2022-10-16 19:04:46 -04:00
Jean Lamarre
653e970336 Revert "remove gitattribute"
This reverts commit 83c29567496fad60274ff35e5683ab78ac46b21c.
2022-10-16 19:03:40 -04:00
Jean Lamarre
83c2956749 remove gitattribute 2022-10-16 19:00:46 -04:00
Jean Lamarre
c7cc75108d remove gitattributte 2022-10-16 18:58:29 -04:00
Jean Lamarre
a882e9f1d9 settings unity 2022-10-16 18:57:37 -04:00
Jean Lamarre
2ceef3c9e5 unity init 2022-10-16 18:49:46 -04:00
Jean Lamarre
30b24c5ffd gitattribute 2022-10-16 18:26:29 -04:00
Jean Lamarre
114c4b6c98 gitignore 2022-10-16 18:25:05 -04:00