Commit Graph

404 Commits

Author SHA1 Message Date
VAILLANT Jeremy 9128dcb966 Don't close apps when press back abdroid button 2021-05-08 20:23:04 +02:00
VAILLANT Jeremy c88339e076 Use fonts for main menu 2021-05-08 20:23:04 +02:00
VAILLANT Jeremy bea510de38 Add asset for menu 2021-05-08 20:23:04 +02:00
stilobique 30b06fcbae Merge pull request 'feature/populate-warcraft' (#5) from feature/populate-warcraft into dev
Reviewed-on: Athena/game-source#5
2021-05-08 20:21:07 +02:00
stilobique-surface 0c46660d92 Update warcraft scene, popupale env, add a basic light env (lighting and default post process). 2021-05-08 20:13:56 +02:00
stilobique-surface f33cb03ce3 Update size texture defaut 2021-05-08 20:11:46 +02:00
stilobique-surface 585cf2f261 Setup a rendering to be compatible with Android 2021-05-08 20:10:21 +02:00
VAILLANT Jeremy aa59d45fef Use fonts for main menu 2021-05-08 19:47:14 +02:00
VAILLANT Jeremy e7119dd0f7 Add asset for menu 2021-05-08 19:46:54 +02:00
stilobique-surface ab8e189048 Godot settings, remove the borderless option 2021-05-08 19:06:29 +02:00
darknight a8ec672071 Merge pull request 'feature/menus' (#4) from feature/menus into dev
Reviewed-on: Athena/game-source#4
2021-05-08 17:28:29 +02:00
VAILLANT Jeremy ab465d668b Merge branch 'feature/menus' of dev.stilobique.com:Athena/game-source into feature/menus 2021-05-08 17:25:18 +02:00
VAILLANT Jeremy 1e3e757287 Configure android 2021-05-08 17:25:15 +02:00
VAILLANT Jeremy bcd947f334 Refacto open scene UI 2021-05-08 17:25:15 +02:00
VAILLANT Jeremy dae99aa9e3 Add thumb about warcraft scene 2021-05-08 17:25:15 +02:00
VAILLANT Jeremy 165055110b Change position x 2021-05-08 17:25:15 +02:00
VAILLANT Jeremy ce10988747 Customize fast menu main 2021-05-08 17:25:14 +02:00
stilobique 062b2189c1 Merge pull request 'feature/import-assets' (#3) from feature/import-assets into dev
Reviewed-on: Athena/game-source#3
2021-05-08 17:23:22 +02:00
VAILLANT Jeremy 45c9535d43 Configure android 2021-05-08 17:08:51 +02:00
stilobique-surface b67960ea93 Merge branch 'feature/import-assets' of dev.stilobique.com:Athena/game-source into feature/import-assets
# Conflicts:
#	assets/props/rock floor/rock floor.gltf
#	assets/props/rock floor/rock floor.material
2021-05-08 16:44:26 +02:00
stilobique-surface ec1fc57a81 Add candles props, misc candle variation and a candlestick 2021-05-08 16:42:31 +02:00
stilobique-surface 1d84be3985 Fixed duplicated mesh on import (wood parchment) 2021-05-08 16:31:02 +02:00
stilobique-surface 9871ff0410 Add props "table" 2021-05-08 16:20:31 +02:00
VAILLANT Jeremy 9fcbe5a516 Refacto open scene UI 2021-05-08 16:00:51 +02:00
stilobique-surface c3eaa2953f Fix texture on material "rock floor" 2021-05-08 15:47:34 +02:00
stilobique-surface 96188beac3 Add props "growler" 2021-05-08 15:45:59 +02:00
stilobique-surface b1e3f8cff8 Add props "Parchment", concern a "wood piece" and "paper" 2021-05-08 15:45:47 +02:00
stilobique-surface ad960fb252 Add textures "rock floor" 2021-05-08 15:44:59 +02:00
stilobique-surface 7b98f0eb4e Add props "stool a" (asset not finish) 2021-05-08 15:44:36 +02:00
stilobique-surface e1e84cff60 Add props "stool b" 2021-05-08 15:44:06 +02:00
VAILLANT Jeremy ae75a91632 Add thumb about warcraft scene 2021-05-08 15:16:51 +02:00
VAILLANT Jeremy 72a9186e13 Change position x 2021-05-08 15:16:28 +02:00
VAILLANT Jeremy c27dc60587 Customize fast menu main 2021-05-08 15:12:37 +02:00
stilobique-surface 120ee2e4a2 Add "rock floor" assets 2021-05-08 14:33:36 +02:00
stilobique-surface 6b142e16f8 Add asset "godet" 2021-05-08 14:33:35 +02:00
stilobique-surface 8367c2278f Clear unused textures 2021-05-08 14:33:35 +02:00
stilobique-surface 351790f3ce Add asset "dagger" 2021-05-08 14:33:34 +02:00
stilobique 5a14c74e7c Add book asset 2021-05-08 14:33:34 +02:00
stilobique-surface b923f15898 Add "rock floor" assets 2021-05-08 13:56:08 +02:00
stilobique-surface 76523d6824 Add asset "godet" 2021-05-08 13:54:03 +02:00
darknight 20c483333b Merge pull request 'feature/create-interfaces' (#1) from feature/create-interfaces into dev
Reviewed-on: Athena/game-source#1
2021-05-08 13:48:43 +02:00
VAILLANT Jeremy b683302b2b Complete menu navigation 2021-05-08 13:44:51 +02:00
VAILLANT Jeremy 4bd3daa747 Link about scenes 2021-05-08 13:22:37 +02:00
stilobique-surface 26b2704567 Clear unused textures 2021-05-08 13:20:12 +02:00
stilobique-surface b0870c50d8 Add asset "dagger" 2021-05-08 13:19:39 +02:00
VAILLANT Jeremy e164cef2c2 Quit the game 2021-05-08 13:16:13 +02:00
stilobique 2ddb836902 Add book asset 2021-05-08 13:01:32 +02:00
VAILLANT Jeremy 3de364623b Add scene for warcraft scene 2021-05-08 12:55:27 +02:00
VAILLANT Jeremy 28142b2545 Add screne interfaces 2021-05-08 12:51:30 +02:00
VAILLANT Jeremy 2c1f5a0f93 Add basic scene interface 2021-05-08 12:49:27 +02:00