darknight/puzzle-quest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
430 Commits 3 Branches 0 Tags
994dcbe30d9e2e17e0fdfb3b9d184e596721a6ca
Commit Graph

430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stilobique 0fa2759b14 Merge branch 'dev' into feature/props-ho 2021-05-14 11:03:28 +02:00
VAILLANT Jeremy 26198da247 Add import thumb develop scene 2021-05-14 10:37:12 +02:00
stilobique-surface 1f33c4a0cd Update rendering 2021-05-13 23:59:14 +02:00
stilobique-surface 7825436628 Fix parchment paper lightmap and make a new baking 2021-05-13 23:49:53 +02:00
darknight 5c3f72b031 Merge pull request 'feature/database' (#39) from feature/database into dev 
Reviewed-on: Athena/game-source#39
 2021-05-13 23:22:36 +02:00
VAILLANT Jeremy d63871e864 Merge branch 'feature/database' of dev.stilobique.com:Athena/game-source into feature/database 2021-05-13 23:21:25 +02:00
VAILLANT Jeremy b6466e10cd Remove verbose log mode 2021-05-13 23:20:56 +02:00
VAILLANT Jeremy 23e8bef1b8 Use BDD for list scenes 2021-05-13 23:20:56 +02:00
VAILLANT Jeremy 8dbbbe7629 Compete data about scenes and levels 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy 26528412f9 Complete data in BDD 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy 3c8c500035 Fix translations 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy 3238c76822 Configure gyroscope and settings 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy 9ef437a558 Remove useless spaces 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy 41d4307c0d Remove useless node 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy 3a2bf4138b Load database when start game 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy aa8340d8ff Add database 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy e8edc134e1 Add addon database 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy 5791514d43 Replace scene about by settings 2021-05-13 23:20:27 +02:00
VAILLANT Jeremy 5fb311f69d Remove verbose log mode 2021-05-13 23:16:17 +02:00
VAILLANT Jeremy 26a0c8f33d Use BDD for list scenes 2021-05-13 23:15:05 +02:00
VAILLANT Jeremy a9809c2bc7 Compete data about scenes and levels 2021-05-13 23:11:57 +02:00
stilobique-surface 30ed3e41ab Update Warcraft scene props placement, and update building set 
(cherry picked from commit a7ab52406857035daf5cae03380d18293e4fa87b)
 2021-05-13 22:54:02 +02:00
stilobique bb78ffea94 Merge pull request 'Clean files' (#38) from bugfixe/fix-merge into dev 
Reviewed-on: Athena/game-source#38
 2021-05-13 22:05:18 +02:00
stilobique-surface 6301d6f63f Clean files 2021-05-13 22:00:14 +02:00
stilobique 9143b9db84 Merge pull request 'feature/props-ho' (#37) from feature/props-ho into dev 
Reviewed-on: Athena/game-source#37
 2021-05-13 20:33:44 +02:00
stilobique-surface 71d6a87fb0 Merge branch 'feature/props-ho' of dev.stilobique.com:Athena/game-source into feature/props-ho 
# Conflicts:
#	assets/props/book/materials/MAT_book.material
#	assets/props/candle/sm_candle_a.mesh
#	assets/props/godet/materials/godet.material
#	assets/props/godet/sm_godet.mesh
#	assets/props/parchment/materials/PaperParchment.material
#	assets/props/parchment/sm_paper_parcment.mesh
#	assets/props/parchment/sm_wood_parchment.mesh
#	assets/props/rock floor/sm_floor.mesh
#	assets/props/stool b/sm_stool_b.mesh
#	assets/props/table/sm_table.mesh
#	scenes/levels/warcraft/WarCraft.gd
#	scenes/levels/warcraft/WarCraft.tscn
 2021-05-13 20:32:47 +02:00
stilobique-surface 92f1fc6f4f Solve conflict #2 2021-05-13 20:31:47 +02:00
stilobique-surface 5cc53fca02 Solved conflict #1 2021-05-13 20:30:04 +02:00
stilobique-surface 87bd230306 Add prop apple 2021-05-13 20:29:08 +02:00
stilobique-surface 6a3d9376b0 Add props beer pinte 2021-05-13 20:29:08 +02:00
stilobique-surface ae2e007ad6 Add prop weapon -placeholder 2021-05-13 20:29:08 +02:00
stilobique-surface ff16049072 Add props gabarit mesh 2021-05-13 20:29:08 +02:00
stilobique-surface 4e24b7dbf3 Add prop spyglass 2021-05-13 20:29:06 +02:00
stilobique-surface 4f760b1705 Add props "stack gold" 2021-05-13 20:29:06 +02:00
stilobique-surface dc741c30b3 Add props fiole placeholder 2021-05-13 20:29:06 +02:00
stilobique-surface 1766b1d71c Move dissolve test shader 2021-05-13 20:29:06 +02:00
VAILLANT Jeremy e626c5a4c3 Complete data in BDD 2021-05-13 20:22:59 +02:00
VAILLANT Jeremy 2db912fe7b Fix translations 2021-05-13 20:10:43 +02:00
VAILLANT Jeremy 9dbe9648d1 Configure gyroscope and settings 2021-05-13 20:10:16 +02:00
stilobique-surface a9de0551c3 Warcraft scene : 
- small camera reorientation
- Reforce mesh update (lightmap setting)
- Fix material name with "MA" prefix
 2021-05-13 19:37:03 +02:00
stilobique-surface cba9c50d90 Warcraft scene : 
- add some props, socle fiole and HO materials
- setup collicion shape on HO items
- setup signal and function to hide HO
 2021-05-13 18:57:12 +02:00
VAILLANT Jeremy 6e18eabfd4 Remove useless spaces 2021-05-13 16:40:32 +02:00
stilobique-surface 6eeea5c6af Add prop apple 2021-05-13 16:30:02 +02:00
stilobique-surface 5506771dda Add props beer pinte 2021-05-13 16:29:19 +02:00
VAILLANT Jeremy 0d453a0d1e Remove useless node 2021-05-13 15:57:00 +02:00
VAILLANT Jeremy 82c40172e0 Load database when start game 2021-05-13 15:53:17 +02:00
stilobique-surface 41623bc2b0 Add prop weapon -placeholder 2021-05-13 15:48:56 +02:00
VAILLANT Jeremy d5440e11c1 Add database 2021-05-13 15:46:46 +02:00
VAILLANT Jeremy f1b7f939af Add addon database 2021-05-13 15:39:31 +02:00
VAILLANT Jeremy 4afe0ceb2e Replace scene about by settings 2021-05-13 15:39:15 +02:00