|
f660aefa4c
|
Add avoidance behavior
|
2022-05-06 18:55:31 +08:00 |
|
|
456c21f6c2
|
Merge branch 'master' into dev-mrkbear
|
2022-05-06 11:36:31 +08:00 |
|
|
436ba7b3d9
|
Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear
|
2022-05-06 00:04:50 +08:00 |
|
|
dcd2d10147
|
Add line info into spline first point
|
2022-05-06 00:04:46 +08:00 |
|
|
658765141c
|
Merge pull request 'Add parse to obj function & Bind clip recoder & loader event' (#51) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/51
|
2022-05-04 14:53:24 +08:00 |
|
|
1825f3fc14
|
Merge branch 'master' into dev-mrkbear
|
2022-05-04 14:53:17 +08:00 |
|
|
904dee9e86
|
Add parse to obj function
|
2022-05-04 11:13:54 +08:00 |
|
|
73b68e1eac
|
Bind clip recoder & loader event
|
2022-05-03 14:57:32 +08:00 |
|
|
6c23ce62ff
|
Merge pull request 'Add clip archive function & optmize clip frame structor & clip details panel' (#50) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/50
|
2022-05-02 23:57:00 +08:00 |
|
|
e11518ce8a
|
Merge branch 'master' into dev-mrkbear
|
2022-05-02 23:56:48 +08:00 |
|
|
2b53ccea2b
|
Add clip archive function & optmize clip frame structor
|
2022-05-02 23:55:06 +08:00 |
|
|
e3681f2f32
|
Add clip details panel
|
2022-05-02 16:09:02 +08:00 |
|
|
c86ff9ef1a
|
Merge pull request 'Add clip player & offline renderer' (#49) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/49
|
2022-05-01 18:41:11 +08:00 |
|
|
7002d49155
|
Merge branch 'master' into dev-mrkbear
|
2022-05-01 18:41:05 +08:00 |
|
|
a689d23b5f
|
Add offline renderer function & offline pop component
|
2022-05-01 18:37:56 +08:00 |
|
|
be22102f95
|
Add command bar start action handel
|
2022-05-01 13:28:28 +08:00 |
|
|
53ae625c92
|
Bind slider handel function
|
2022-05-01 13:03:49 +08:00 |
|
|
a0547095e2
|
Add clip player logic
|
2022-05-01 12:34:03 +08:00 |
|
|
a0a1b52b3f
|
Add clip player logic
|
2022-04-30 22:20:18 +08:00 |
|
|
5b0635270c
|
Merge pull request 'Add clip model & clipList component & recoder panel' (#48) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/48
|
2022-04-30 20:51:30 +08:00 |
|
|
6c6ea52eff
|
Merge branch 'master' into dev-mrkbear
|
2022-04-30 20:51:25 +08:00 |
|
|
c067088157
|
Add clip list component
|
2022-04-30 20:40:02 +08:00 |
|
|
53e6c9db9c
|
Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear
|
2022-04-30 13:59:29 +08:00 |
|
|
41fe51ec9c
|
Add clip list component
|
2022-04-30 13:59:22 +08:00 |
|
|
5a3ec7d2af
|
Add record function
|
2022-04-29 22:10:45 +08:00 |
|
|
776a5f571e
|
Add record model into actuator
|
2022-04-29 14:32:00 +08:00 |
|
|
bc67782365
|
Add clip player
|
2022-04-29 12:12:06 +08:00 |
|
|
c923efcd99
|
Add cilp model;
|
2022-04-27 16:22:30 +08:00 |
|
|
0a5bcd76f0
|
Merge pull request 'Add loading page' (#47) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/47
|
2022-04-26 20:48:11 +08:00 |
|
|
393e7e7fe2
|
Merge branch 'master' into dev-mrkbear
|
2022-04-26 20:48:06 +08:00 |
|
|
d53acf0146
|
Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear
|
2022-04-26 20:47:23 +08:00 |
|
|
fea2a9af16
|
Add loading page
|
2022-04-26 19:26:54 +08:00 |
|
|
39a514b2cc
|
Merge pull request 'Add save and load function' (#46) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/46
|
2022-04-26 16:44:39 +08:00 |
|
|
30b3e3f9a2
|
Merge branch 'master' into dev-mrkbear
|
2022-04-26 16:44:14 +08:00 |
|
|
23ebbeb120
|
Rebuild commond bar component
|
2022-04-26 16:42:02 +08:00 |
|
|
ec3aaa5e3a
|
Add desktop save function
|
2022-04-26 15:17:24 +08:00 |
|
|
0ab53c1800
|
Add file load UI
|
2022-04-25 21:32:50 +08:00 |
|
|
8a272a9626
|
Set new file default save state true
|
2022-04-25 09:57:46 +08:00 |
|
|
4137362501
|
Add drag layer
|
2022-04-24 20:16:03 +08:00 |
|
|
1f08a4885b
|
Merge pull request 'Add archive save component & shutdown hendel' (#45) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/45
|
2022-04-24 14:13:17 +08:00 |
|
|
4c014a7200
|
Merge branch 'master' into dev-mrkbear
|
2022-04-24 14:12:45 +08:00 |
|
|
b5ecf0bb0d
|
Add loadfile layer
|
2022-04-24 14:10:39 +08:00 |
|
|
87ed157340
|
Add block shutdown hendel
|
2022-04-24 13:24:55 +08:00 |
|
|
56151c9e75
|
Add archive save component
|
2022-04-24 12:55:00 +08:00 |
|
|
03f0b9fd16
|
Add file download function
|
2022-04-23 23:28:11 +08:00 |
|
|
5914a9f531
|
Merge pull request 'Add model & behavior archive function' (#44) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/44
|
2022-04-23 20:33:01 +08:00 |
|
|
980d8afa3c
|
Merge branch 'master' into dev-mrkbear
|
2022-04-23 20:32:54 +08:00 |
|
|
b498f0e0a4
|
Add archive event
|
2022-04-23 20:32:04 +08:00 |
|
|
430d8a7254
|
Add model archive function
|
2022-04-23 19:52:56 +08:00 |
|
|
74bda21072
|
Add behavior archive function
|
2022-04-23 17:42:02 +08:00 |
|