|
|
8ede304664
|
Merge pull request 'Add statistics panel' (#56) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/56
|
2022-05-27 20:02:00 +08:00 |
|
|
|
3e6bef2ee7
|
Merge branch 'master' into dev-mrkbear
|
2022-05-27 20:01:46 +08:00 |
|
|
|
bd8a9d1cdb
|
Add statistics panel
|
2022-05-26 21:47:42 +08:00 |
|
|
|
4ea3c9e1f4
|
Add statistics panel
|
2022-05-26 17:08:04 +08:00 |
|
|
|
2dbbd0952a
|
Add statistics panel
|
2022-05-25 22:00:13 +08:00 |
|
|
|
ce99b17fcb
|
Add statistics panel
|
2022-05-24 14:07:47 +08:00 |
|
|
|
fcbe646b67
|
Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear
|
2022-05-24 11:39:06 +08:00 |
|
|
|
a8b1c21ed6
|
Fix ZH_CN I18N num error
|
2022-05-24 11:38:56 +08:00 |
|
|
|
7adadb6d46
|
Merge pull request 'Add setting option' (#55) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/55
|
2022-05-20 14:45:26 +08:00 |
|
|
|
8b35074fe8
|
Merge branch 'master' into dev-mrkbear
|
2022-05-20 14:45:22 +08:00 |
|
|
|
c582388317
|
Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear
|
2022-05-20 14:44:00 +08:00 |
|
|
|
70ff9fa0ad
|
Add setting option
|
2022-05-20 14:41:52 +08:00 |
|
|
|
ac0fef2901
|
Merge pull request 'Add ant behavior' (#54) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/54
|
2022-05-12 20:23:20 +08:00 |
|
|
|
7e2281add1
|
Merge branch 'master' into dev-mrkbear
|
2022-05-12 20:23:16 +08:00 |
|
|
|
4eb6637062
|
fix brownian behavior
|
2022-05-12 20:22:18 +08:00 |
|
|
|
8670b577f9
|
Add sample tracking behavior
|
2022-05-11 13:09:51 +08:00 |
|
|
|
4768667803
|
Add sample tracking behavior
|
2022-05-11 11:43:41 +08:00 |
|
|
|
571e80d542
|
Fix boundary logic & Add wastage behavior
|
2022-05-10 14:55:45 +08:00 |
|
|
|
da493bc6ae
|
Contact Attacking behavior add assimilate & Tracking add view range
|
2022-05-09 23:26:17 +08:00 |
|
|
|
904de02140
|
Brownian behavior add limit by range
|
2022-05-09 21:24:28 +08:00 |
|
|
|
4ade5d4bc3
|
Add manufacture behavior
|
2022-05-08 21:33:38 +08:00 |
|
|
|
920958b1a2
|
Merge pull request 'Add avoidance behavior & direction cluster behavior & central cluster behavior' (#53) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/53
|
2022-05-07 12:10:39 +08:00 |
|
|
|
e814f5e061
|
Merge branch 'master' into dev-mrkbear
|
2022-05-07 12:10:33 +08:00 |
|
|
|
dfb3905c9b
|
Add central cluster behavior
|
2022-05-07 12:09:05 +08:00 |
|
|
|
974cd2951d
|
Add direction cluster behavior
|
2022-05-06 23:12:00 +08:00 |
|
|
|
f660aefa4c
|
Add avoidance behavior
|
2022-05-06 18:55:31 +08:00 |
|
|
|
c6b0f84cef
|
Merge pull request 'Add line info into spline first point' (#52) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/52
|
2022-05-06 11:36:35 +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 |
|
