485 Commits

Author SHA1 Message Date
Vaillant jeremy ba971e8d97 Change environment inject 2021-08-01 12:56:09 +02:00
Vaillant jeremy 013f231969 Configure env for butler 2021-08-01 12:43:46 +02:00
Vaillant jeremy 7892b0a617 Remove icon 2021-08-01 12:43:30 +02:00
Vaillant jeremy 8d1497bfe8 Change pCI for build & push windows debug version 2021-08-01 12:33:50 +02:00
Vaillant jeremy 88ab86a0cd Update sources packages 2021-07-31 18:32:28 +02:00
Vaillant jeremy 994dcbe30d Download keystore to pcloud 2021-07-31 18:26:36 +02:00
Vaillant jeremy dc22fe29cd Change container for android 2021-07-31 17:54:58 +02:00
darknight 1b430a3369 feature/jenkins (#1)
Co-authored-by: stilobique-i7 <aurelienvlt@free.fr>
Co-authored-by: Aurelien Vaillant <a.vaillant.moderlab@gmail.com>
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Co-authored-by: Vaillant jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#1
Co-authored-by: darknight <vaillant.jeremy.loic@gmail.com>
Co-committed-by: darknight <vaillant.jeremy.loic@gmail.com>
2021-07-24 18:09:55 +02:00
darknight d48940296f Merge pull request 'Fix anim HUD' (#84) from bugfix/hud-object-list-anim into dev
Reviewed-on: Athena/game-source#84
2021-06-26 15:59:05 +02:00
VAILLANT Jeremy 301ef3f916 Fix anim HUD 2021-06-26 15:42:02 +02:00
darknight a33ecafb81 feature/shader-animation (#83)
Co-authored-by: Vaillant Jeremy <vaillant.jeremy@dev-crea.com>
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#83
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-26 15:33:34 +02:00
darknight 34612f83a8 Add number version (#79)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#79
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-06 19:11:21 +02:00
darknight fcff613a93 bugfix/android-database (#78)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#78
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-06 18:54:25 +02:00
darknight 1883355678 feature/connect-level-and-reset-btn (#77)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#77
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-06 16:54:38 +02:00
stilobique d3ded14020 Merge pull request 'Add gdignore on release folder' (#76) from feature/ignore-folder into dev
Reviewed-on: Athena/game-source#76
2021-06-05 14:47:33 +02:00
stilobique-i7 9325a591a6 Add gdignore on release folder 2021-06-05 14:46:18 +02:00
stilobique 9712f13365 feature/packages (#75)
Branche dédié pour la generation des packages

Co-authored-by: stilobique-i7 <aurelienvlt@free.fr>
Reviewed-on: Athena/game-source#75
Co-authored-by: stilobique <aurelienvlt@free.fr>
Co-committed-by: stilobique <aurelienvlt@free.fr>
2021-06-05 14:13:44 +02:00
darknight 213847e95c feature/templating-level (#74)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#74
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-05 14:11:47 +02:00
stilobique dee1ee5b1b feature/select-puzzle-update (#72)
Si tu peut regarder pour finir la pull request pour l'écran de selection des puzzles !

Co-authored-by: stilobique-i7 <aurelienvlt@free.fr>
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#72
Co-authored-by: stilobique <aurelienvlt@free.fr>
Co-committed-by: stilobique <aurelienvlt@free.fr>
2021-06-04 17:54:23 +02:00
darknight 6f1ac4d03f Fix loading scenes (#70)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#70
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-03 23:17:53 +02:00
darknight d1bf0f76d8 Fix case and move single script in folder scripts (#69)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#69
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-03 22:53:49 +02:00
darknight 0debe0d2d3 feature/update-main-ui (#66)
Co-authored-by: stilobique-i7 <aurelienvlt@free.fr>
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#66
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-06-03 22:18:50 +02:00
darknight 1c45fac8cb Disconnect signal if exist (#62)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#62
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-05-31 08:52:05 +02:00
darknight 0f2540613b feature/count-object-finding (#61)
Co-authored-by: Vaillant Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#61
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-05-30 15:04:33 +02:00
darknight ed20465f39 feature/list-object-counter (#60)
Co-authored-by: VAILLANT Jeremy <vaillant.jeremy@dev-crea.com>
Reviewed-on: Athena/game-source#60
Co-authored-by: darknight <vaillant.jeremy@dev-crea.com>
Co-committed-by: darknight <vaillant.jeremy@dev-crea.com>
2021-05-29 21:09:10 +02:00
stilobique 80890cbdce Merge pull request 'Update the Spyglass mesh, push textures and all lods' (#59) from feature/spyglass into dev
Reviewed-on: Athena/game-source#59
2021-05-27 23:01:17 +02:00
stilobique-i7 04d41abc90 Update the Spyglass mesh, push textures and all lods 2021-05-27 22:59:53 +02:00
stilobique 3c64e287e8 Merge pull request 'feature/convert-props-lods' (#58) from feature/convert-props-lods into dev
Reviewed-on: Athena/game-source#58
2021-05-27 11:01:49 +02:00
stilobique-i7 50a14a482f Fix fiole lightmap 2021-05-27 10:44:52 +02:00
stilobique-i7 c3eb95f872 Fix Warcraft scene and clean stool 2 props 2021-05-27 10:41:57 +02:00
VAILLANT Jeremy ddb031185d Revert scene war 2021-05-27 09:47:18 +02:00
VAILLANT Jeremy 892c417338 Merge branch 'feature/convert-props-lods' of dev.stilobique.com:Athena/game-source into feature/convert-props-lods 2021-05-27 09:36:13 +02:00
stilobique-i7 b74ac4744d Clear bad method on Parchment script 2021-05-27 09:35:57 +02:00
stilobique-i7 385d0437ec Increase lightmap (table, book and candle) and fix UV2 fiole 2021-05-27 09:35:57 +02:00
stilobique-i7 d9bd8c5ec3 Parchment props, make an editable instance scene 2021-05-27 09:35:57 +02:00
stilobique-i7 a43be5179d Replace stool b with a LOD setup 2021-05-27 09:35:56 +02:00
stilobique-i7 721197ae1d Change table LOD default mesh 2021-05-27 09:35:56 +02:00
stilobique-i7 f61df80818 Replace candles meshes and candlestick 2021-05-27 09:35:56 +02:00
stilobique-i7 813e27c828 WIP Parchment, make an editor script and set value on Warcraft scene 2021-05-27 09:35:56 +02:00
stilobique-i7 f330135fa8 Replace growler mesh with a lod setup 2021-05-27 09:35:47 +02:00
stilobique-i7 c50f14a882 Props godet, make all LOD and update scene with this new object 2021-05-27 09:35:47 +02:00
stilobique-i7 69ea236583 Parchment, update mesh wood and paper, make a specific scene to control it ; and bake a new lightmap 2021-05-27 09:35:47 +02:00
stilobique-i7 5dde1d56ca Clear bad method on Parchment script 2021-05-25 19:30:48 +02:00
stilobique-i7 7d1d5f219d Increase lightmap (table, book and candle) and fix UV2 fiole 2021-05-25 19:24:52 +02:00
stilobique-i7 52f9372469 Parchment props, make an editable instance scene 2021-05-25 19:24:19 +02:00
stilobique-i7 51e94757c5 Replace stool b with a LOD setup 2021-05-25 17:39:21 +02:00
stilobique-i7 9f65d6eeef Change table LOD default mesh 2021-05-25 17:38:50 +02:00
stilobique-i7 6ff95f6c1e Replace candles meshes and candlestick 2021-05-25 17:18:56 +02:00
stilobique-i7 d8e1f4721c WIP Parchment, make an editor script and set value on Warcraft scene 2021-05-25 16:44:55 +02:00
darknight a2d94e0cbd Merge pull request 'Fix rebase missing audio nodes' (#57) from bugfix/sounds into dev
Reviewed-on: Athena/game-source#57
2021-05-25 14:39:18 +02:00