485 Commits

Author SHA1 Message Date
VAILLANT Jeremy e50c0e7b6f Add ambiant sound level warcraft 2021-05-23 13:28:05 +02:00
VAILLANT Jeremy 7a4a4db2d7 Add missing label_id 2021-05-23 12:57:44 +02:00
stilobique-i7 6bb67a488c Fix default column material and lightmap 2021-05-23 12:25:48 +02:00
stilobique-i7 0704b17125 Merge branch 'feature/lightmap-ho' of dev.stilobique.com:Athena/game-source into feature/lightmap-ho
# Conflicts:
#	assets/props/column/sm_column.mesh
2021-05-18 12:11:14 +02:00
stilobique-i7 28da0dd613 WIP lightmap Warcraft scene 2021-05-18 12:10:56 +02:00
stilobique-i7 12ba465f50 Reimport spyglass 2021-05-18 12:10:46 +02:00
stilobique-i7 86d82145d6 Fix lightmap size and material default 2021-05-18 12:10:45 +02:00
stilobique-i7 dd44fe97d3 Remove fucking Spyglass case error 2021-05-18 12:09:36 +02:00
stilobique-surface 98ee4249c5 Fix material default to HO item 2021-05-18 12:09:34 +02:00
stilobique-surface 58eb0624d2 Update HO props with a lightmap setup 2021-05-18 12:09:33 +02:00
stilobique-surface 24500ac039 Reduce polycount about the Rock Floor mesh 2021-05-18 12:09:33 +02:00
stilobique-i7 0c4391359a WIP lightmap Warcraft scene 2021-05-18 12:08:55 +02:00
stilobique-i7 ae406f0c1f Reimport spyglass 2021-05-18 12:08:15 +02:00
stilobique-i7 f812812f43 Fix lightmap size and material default 2021-05-18 11:50:18 +02:00
stilobique-i7 2f9df975d6 Remove fucking Spyglass case error 2021-05-18 11:19:10 +02:00
stilobique 15de38a004 Merge pull request 'feature/link-hud-to-code' (#49) from feature/link-hud-to-code into dev
Reviewed-on: Athena/game-source#49
2021-05-18 10:52:27 +02:00
stilobique 242f58e119 Merge branch 'dev' into feature/link-hud-to-code 2021-05-18 10:51:24 +02:00
VAILLANT Jeremy 557444f89d Refactor scene instance for HUD 2021-05-17 10:38:45 +02:00
VAILLANT Jeremy 367ee388da Fix list object 2021-05-15 20:40:16 +02:00
stilobique-surface 1e66e0e8dc Fix material default to HO item 2021-05-15 20:15:17 +02:00
stilobique-surface 34a43d1c0b Update HO props with a lightmap setup 2021-05-15 18:50:04 +02:00
stilobique-surface 8bf2faa332 Reduce polycount about the Rock Floor mesh 2021-05-15 17:56:09 +02:00
stilobique e2d8af0973 Merge pull request 'Update select scene item, clean old button reset and add *button reset* and *button large*.' (#48) from feature/polish-ui-select-level into dev
Reviewed-on: Athena/game-source#48
2021-05-15 17:31:24 +02:00
stilobique-surface 73d811a35b Update select scene item, clean old button reset and add *button reset* and *button large*. 2021-05-15 17:29:18 +02:00
VAILLANT Jeremy 890931faa8 Link back button to quit code main menu 2021-05-15 17:17:12 +02:00
darknight 1265684c53 Merge pull request 'feature/save-state-scene' (#47) from feature/save-state-scene into dev
Reviewed-on: Athena/game-source#47
2021-05-15 16:43:05 +02:00
darknight 3d37ec00a6 Merge branch 'dev' into feature/save-state-scene 2021-05-15 16:42:32 +02:00
VAILLANT Jeremy 9d9ca0a283 Add env base 2021-05-15 16:40:14 +02:00
VAILLANT Jeremy 6980458eec Get count element 2021-05-15 16:37:52 +02:00
stilobique 3428b0b980 Merge pull request 'feature/interface-list' (#46) from feature/interface-list into dev
Reviewed-on: Athena/game-source#46
2021-05-15 16:37:48 +02:00
VAILLANT Jeremy 233da48acb Remove useless var 2021-05-15 16:37:06 +02:00
VAILLANT Jeremy 196cf39e18 Fix when collider is empty 2021-05-15 16:36:49 +02:00
VAILLANT Jeremy 90fce7425a Fix base bdd 2021-05-15 16:36:28 +02:00
stilobique-surface 9cb97f9d41 Push again, and again !! And AGAIN !!!! (spoon spyglass) 2021-05-15 16:31:10 +02:00
stilobique-surface c85c878ba7 Interface list :
- generate a subscene to control the list HO
- add back button on Warcraft Scene
2021-05-15 16:27:05 +02:00
stilobique-surface 7001aa2391 Update ignore rule 2021-05-15 16:25:47 +02:00
VAILLANT Jeremy 22ec15f1a3 Add texture to button reset/score 2021-05-15 15:46:03 +02:00
VAILLANT Jeremy 0148703274 Add background to button select level 2021-05-15 14:30:00 +02:00
VAILLANT Jeremy 7fa7228232 Create method for labels and button to template 2021-05-15 14:14:17 +02:00
VAILLANT Jeremy 6b9e476b00 Use dbb for levels 2021-05-15 14:05:09 +02:00
VAILLANT Jeremy b2fc1b63a3 Remove useless var/print 2021-05-15 13:04:39 +02:00
darknight c3b107a66b Merge pull request 'Fix spyglass path' (#45) from bugfix/path-spyglass into dev
Reviewed-on: Athena/game-source#45
2021-05-15 12:56:35 +02:00
Vaillant Jeremy c0e83803e9 Fix spyglass path 2021-05-15 12:55:38 +02:00
darknight 23d86d474d Merge pull request 'feature/theme-interface' (#44) from feature/theme-interface into dev
Reviewed-on: Athena/game-source#44
2021-05-15 12:15:07 +02:00
Vaillant Jeremy 0c7f57884a Merge branch 'feature/theme-interface' of dev.stilobique.com:Athena/game-source into feature/theme-interface 2021-05-15 12:14:26 +02:00
Vaillant Jeremy b4fe5828ea Remove test scene 2021-05-15 12:14:13 +02:00
Vaillant Jeremy ae31945fd8 Fix template select scene 2021-05-15 12:13:37 +02:00
Vaillant Jeremy d013e3130f Change margin 2021-05-15 12:13:24 +02:00
Vaillant Jeremy 7561cfadf7 Change pointer mouse in button 2021-05-15 12:13:24 +02:00
Vaillant Jeremy ad3886d484 Add margin container 2021-05-15 12:13:23 +02:00