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

459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
darknight 8af720ff34 Merge pull request 'feature/move-camera' (#35) from feature/move-camera into dev 
Reviewed-on: Athena/game-source#35
 2021-05-13 13:35:11 +02:00
VAILLANT Jeremy 6728ee04ce Fix gyroscope feature 2021-05-13 13:31:14 +02:00
stilobique-surface e7cbb20bb4 Add props gabarit mesh 2021-05-13 12:19:41 +02:00
VAILLANT Jeremy 8915ebf03f Merge branch 'feature/move-camera' of dev.stilobique.com:Athena/game-source into feature/move-camera 2021-05-12 17:41:39 +02:00
VAILLANT Jeremy a5912e3705 Complete test gyroscope 2021-05-12 17:41:35 +02:00
stilobique-surface 207cdfc0e1 Fix shader Dagger and Parchment 2021-05-12 17:40:57 +02:00
VAILLANT Jeremy b8018bdffd Add test about gyroscope movement camera 2021-05-12 16:54:15 +02:00
VAILLANT Jeremy d6eeb9a86e Use translation for dialog quit 2021-05-12 14:55:59 +02:00
VAILLANT Jeremy 0b3ef7e137 Fix shader 2021-05-12 14:49:59 +02:00
stilobique-surface c31f00a87c Merge branch 'feature/props-ho' of dev.stilobique.com:Athena/game-source into feature/props-ho 2021-05-12 13:59:11 +02:00
stilobique-surface 1caee269ba Add prop spyglass 2021-05-12 13:58:53 +02:00
stilobique-surface 2fae2f2707 Add props "stack gold" 2021-05-12 13:58:52 +02:00
stilobique-surface 637342f30c Add props fiole placeholder 2021-05-12 13:58:52 +02:00
stilobique-surface 36c8138a87 Move dissolve test shader 2021-05-12 13:58:51 +02:00
darknight fe77466466 Merge pull request 'feature/find-object-in-scene' (#34) from feature/find-object-in-scene into dev 
Reviewed-on: Athena/game-source#34
 2021-05-12 13:53:40 +02:00
VAILLANT Jeremy eac8d2b408 Add script for dissolve dagger 2021-05-12 13:51:34 +02:00
VAILLANT Jeremy 710647b655 Fix size hint 2021-05-12 13:49:29 +02:00
stilobique-surface 6a584ef60b Add prop spyglass 2021-05-12 13:48:00 +02:00
stilobique-surface 5ea5712b58 Add props "stack gold" 2021-05-12 13:28:25 +02:00
VAILLANT Jeremy 2461542ac6 Recalcul lightmap 2021-05-12 13:17:54 +02:00
VAILLANT Jeremy 1d0f94f39a Move files warcraft scene to folder 2021-05-12 13:10:56 +02:00