Commit Graph

360 Commits

Author SHA1 Message Date
0fc5d4c6d4 Merge pull request 'Add tracking assimilate attacking behaviot' (#39) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/39
2022-04-12 21:35:54 +08:00
14037ecc93 Merge branch 'master' into dev-mrkbear 2022-04-12 21:35:47 +08:00
011084b8ec Add delay assimilate behavior 2022-04-12 18:41:15 +08:00
6c483317aa Add contact assimilate behavior 2022-04-12 17:44:51 +08:00
1b8f594ea2 Rename contact attacking 2022-04-12 17:05:45 +08:00
1927c922d7 Add attacking behavior 2022-04-11 23:16:25 +08:00
0afb0b6aee Add tracking target parameter 2022-04-11 17:33:56 +08:00
c3d4c13c10 Add parameter restore 2022-04-10 18:50:29 +08:00
5b9d59f8b3 Optim behavior icon 2022-04-10 18:14:16 +08:00
f0c006affa Optmi behavior icon & rename dynamic 2022-04-10 18:05:40 +08:00
a2499a5d3b Fix add behavior popup i18n Error 2022-04-10 17:51:55 +08:00
9979203fda Add parameter condition & dynamic behavior limit option 2022-04-10 17:46:24 +08:00
3351769106 Fix renderer view scroll & optmi behavior list padding style 2022-04-10 17:05:02 +08:00
0e1a070390 Add tracking behaviot & current label & Optmi running func & test fish scene 2022-04-10 16:51:13 +08:00
27d4b07b41 Merge pull request 'Optmi renderer model & renderer shape parameter' (#38) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/38
2022-04-09 17:50:38 +08:00
f8fbb70608 Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear 2022-04-09 17:48:30 +08:00
a0cf289bb5 Add renderer shape parameter 2022-04-09 17:48:26 +08:00
a31bb73faa Move the size parameter to the renderer control 2022-04-09 16:04:46 +08:00
ed8269ff50 Optmi renderer model 2022-04-09 15:07:45 +08:00
8ced3d82f3 Move objectID into model 2022-04-09 12:21:08 +08:00
0120a4972d Merge pull request 'Add combo input & color into parameter' (#37) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/37
2022-04-08 22:13:29 +08:00
a3c7e347ec Merge branch 'master' into dev-mrkbear 2022-04-08 22:13:25 +08:00
3026c463bd Add combo input into parameter 2022-04-08 21:46:33 +08:00
cb2501f1f0 Detach separates the combolist from the pickerlist 2022-04-08 20:40:07 +08:00
8cc8819cd3 Add color Parameter 2022-04-08 17:39:26 +08:00
aa8d35e5db Merge pull request 'Mod boundary constraint func & Separate parameter model & Add parameter component' (#36) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/36
2022-04-08 15:27:35 +08:00
3b255245f2 Merge branch 'master' into dev-mrkbear 2022-04-08 15:27:30 +08:00
47d097e94a Detach form components to a separate directory 2022-04-08 15:24:50 +08:00
7556ea983e Add parameter component 2022-04-08 14:00:32 +08:00
d7e15793b9 Mod group i18n terms 2022-04-07 17:18:21 +08:00
74b2df49ad Separate parameter model 2022-04-07 15:16:58 +08:00
dd1811a795 Mod boundary constraint func 2022-04-05 23:00:13 +08:00
fdeced803b Merge pull request 'Add behavior details panel & behavior object parameters are controlled' (#35) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/35
2022-04-05 16:41:26 +08:00
0b91f7bf7a Merge branch 'master' into dev-mrkbear 2022-04-05 16:40:13 +08:00
cad68e8b9b Add behavior details panel 2022-04-05 16:37:36 +08:00
1b1f5d1633 Behavior object parameters are controlled 2022-04-05 14:19:10 +08:00
7531a55cf3 Merge pull request 'Add behavior details panel & auto switch behavior details panels & mod behavior model add cache object' (#34) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/34
2022-04-04 22:24:45 +08:00
30ded6a016 Merge branch 'master' into dev-mrkbear 2022-04-04 22:24:36 +08:00
dec18361ef Mod behavior model add cache object 2022-04-04 22:22:16 +08:00
8607dcd3da Fix group details can focus deleted behavior 2022-04-04 20:37:01 +08:00
c10dd6e882 Add behavior attr panel basic props editer 2022-04-04 17:41:26 +08:00
4d818988f9 Auto switch behavior details panels 2022-04-04 16:52:42 +08:00
a23b5d62cc Optmi object list checkbox style 2022-04-04 16:44:16 +08:00
2cf9a22907 Add behavior details panel 2022-04-03 22:56:16 +08:00
fffea60cee Merge pull request 'Add behavior picker component' (#33) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/33
2022-04-02 21:01:50 +08:00
7fd22bb5fd Merge branch 'master' into dev-mrkbear 2022-04-02 19:29:16 +08:00
4a247dd870 Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear 2022-04-02 19:26:06 +08:00
555648dbb0 Add behavior picker component 2022-04-02 19:25:57 +08:00
3b6a18cdd7 Merge pull request 'Add behavior picker component & Fix fps bug search with lower case & Remove behavior list animate' (#32) from dev-mrkbear into master
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/32
2022-04-02 00:08:56 +08:00
215fb72cb8 Merge branch 'master' into dev-mrkbear 2022-04-02 00:08:50 +08:00