MrKBear/living-together
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
360 Commits 5 Branches 0 Tags
master
Commit Graph
90 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MrKBear 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
MrKBear 3e6bef2ee7 Merge branch 'master' into dev-mrkbear 2022-05-27 20:01:46 +08:00
MrKBear 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
MrKBear 8b35074fe8 Merge branch 'master' into dev-mrkbear 2022-05-20 14:45:22 +08:00
MrKBear 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
MrKBear 7e2281add1 Merge branch 'master' into dev-mrkbear 2022-05-12 20:23:16 +08:00
MrKBear 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
MrKBear e814f5e061 Merge branch 'master' into dev-mrkbear 2022-05-07 12:10:33 +08:00
MrKBear 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
MrKBear 456c21f6c2 Merge branch 'master' into dev-mrkbear 2022-05-06 11:36:31 +08:00
MrKBear 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
MrKBear 1825f3fc14 Merge branch 'master' into dev-mrkbear 2022-05-04 14:53:17 +08:00
MrKBear 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
MrKBear e11518ce8a Merge branch 'master' into dev-mrkbear 2022-05-02 23:56:48 +08:00
MrKBear 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
MrKBear 7002d49155 Merge branch 'master' into dev-mrkbear 2022-05-01 18:41:05 +08:00
MrKBear 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
MrKBear 6c6ea52eff Merge branch 'master' into dev-mrkbear 2022-04-30 20:51:25 +08:00
MrKBear 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
MrKBear 393e7e7fe2 Merge branch 'master' into dev-mrkbear 2022-04-26 20:48:06 +08:00
MrKBear 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
MrKBear 30b3e3f9a2 Merge branch 'master' into dev-mrkbear 2022-04-26 16:44:14 +08:00
MrKBear 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
MrKBear 4c014a7200 Merge branch 'master' into dev-mrkbear 2022-04-24 14:12:45 +08:00
MrKBear 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
MrKBear 980d8afa3c Merge branch 'master' into dev-mrkbear 2022-04-23 20:32:54 +08:00
MrKBear 0d7cbe135d Merge pull request 'Add group individual label archive function' (#43) from dev-mrkbear into master 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/43
 2022-04-23 16:56:07 +08:00
MrKBear 6063882192 Merge pull request 'Add parameter archive func & Add ctrl object archive function' (#42) from dev-mrkbear into master 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/42
 2022-04-21 19:49:19 +08:00
MrKBear 26837930fe Merge pull request 'Add auto bundle script' (#41) from dev-mrkbear into master 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/41
 2022-04-17 14:08:04 +08:00
MrKBear 77410dbf47 Merge pull request 'Add electron entry' (#40) from dev-mrkbear into master 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/40
 2022-04-15 20:20:38 +08:00
MrKBear 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
MrKBear 14037ecc93 Merge branch 'master' into dev-mrkbear 2022-04-12 21:35:47 +08:00
MrKBear 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
MrKBear 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
MrKBear a3c7e347ec Merge branch 'master' into dev-mrkbear 2022-04-08 22:13:25 +08:00
MrKBear 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
MrKBear 3b255245f2 Merge branch 'master' into dev-mrkbear 2022-04-08 15:27:30 +08:00
MrKBear 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
MrKBear 0b91f7bf7a Merge branch 'master' into dev-mrkbear 2022-04-05 16:40:13 +08:00
MrKBear 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
MrKBear 30ded6a016 Merge branch 'master' into dev-mrkbear 2022-04-04 22:24:36 +08:00
MrKBear 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
MrKBear 7fd22bb5fd Merge branch 'master' into dev-mrkbear 2022-04-02 19:29:16 +08:00
MrKBear 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
MrKBear 215fb72cb8 Merge branch 'master' into dev-mrkbear 2022-04-02 00:08:50 +08:00
MrKBear 7fbbcff965 Merge pull request 'Optmi behavior list style' (#31) from dev-mrkbear into master
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone Build was killed
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/31
 2022-03-31 22:15:46 +08:00
MrKBear b2ee80fe9b Merge branch 'master' into dev-mrkbear 2022-03-31 22:15:35 +08:00
MrKBear 0f7657ad83 Merge pull request 'Add actuator & dynamics behavior & brownian behavior & boundary constraint behavior' (#30) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/30
 2022-03-30 19:27:12 +08:00
MrKBear 005222bde5 Merge branch 'master' into dev-mrkbear 2022-03-30 19:27:06 +08:00
MrKBear 6b3a10070f Merge pull request 'Add behavior i18n & behavior can filter by name & behavior list panel' (#29) from dev-mrkbear into master
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/29
 2022-03-29 20:14:23 +08:00
MrKBear 6ac0b98d0f Merge pull request 'Use rainbow bg color to mark build in label & Add behavior select counter & Optim popup focus' (#28) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/28
 2022-03-28 23:17:33 +08:00
MrKBear 791b554ca0 Merge branch 'master' into dev-mrkbear 2022-03-28 23:17:25 +08:00
MrKBear 6f50c1da19 Merge pull request 'Add behavior list component' (#27) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/27
 2022-03-27 21:44:24 +08:00
MrKBear 126324bb0c Merge branch 'master' into dev-mrkbear 2022-03-27 21:44:19 +08:00
MrKBear b6e13fa296 Merge pull request 'Add behavior model & search box & setting add behavior popup' (#26) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/26
 2022-03-26 19:00:52 +08:00
MrKBear bb762c8273 Merge pull request 'Add pop-up system & delete confirmation pops up' (#25) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/25
 2022-03-24 17:33:45 +08:00
MrKBear 60286444fc Merge branch 'master' into dev-mrkbear 2022-03-24 17:29:28 +08:00
MrKBear 7923b2d802 Merge pull request 'Add popup & detail optimization' (#24) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/24
 2022-03-22 22:20:47 +08:00
MrKBear 8b44ae953e Merge branch 'master' into dev-mrkbear 2022-03-22 22:20:30 +08:00
MrKBear e8935403ea Merge pull request 'Add individuals gen function & do some optm' (#23) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/23
 2022-03-17 22:54:10 +08:00
MrKBear d1ffc85df4 Merge pull request 'Add group details gen & recode input with text field component' (#22) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/22
 2022-03-16 12:50:39 +08:00
MrKBear 1acc83e41c Merge branch 'master' into dev-mrkbear 2022-03-16 12:46:48 +08:00
MrKBear 2c329e9d17 Merge pull request 'Add combo input component' (#21) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/21
 2022-03-14 21:18:14 +08:00
MrKBear 901913a4de Merge branch 'master' into dev-mrkbear 2022-03-14 21:18:08 +08:00
MrKBear 06e68d31c5 Merge pull request 'Add group list panel' (#20) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/20
 2022-03-13 19:12:51 +08:00
MrKBear b420b3956f Merge branch 'master' into dev-mrkbear 2022-03-13 19:09:44 +08:00
MrKBear 51f11866a3 Merge pull request 'Add label list edit panel & add button on label list' (#19) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/19
 2022-03-12 21:14:43 +08:00
MrKBear 24728c9ef4 Merge pull request 'Add label details panel' (#18) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/18
 2022-03-10 20:19:57 +08:00
MrKBear edb24b27fb Merge pull request 'Add label list component & panel & message component' (#17) from dev-mrkbear into master
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/17
 2022-03-09 22:01:31 +08:00
MrKBear 27688b9471 Merge branch 'master' into dev-mrkbear 2022-03-09 17:29:28 +08:00
MrKBear f0a04875e4 Merge pull request 'Optimize attr inputer & Add color picker' (#16) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/16
 2022-03-08 16:56:53 +08:00
MrKBear 212c149b34 Merge branch 'master' into dev-mrkbear 2022-03-08 16:56:26 +08:00
MrKBear 41b29f61bc Merge pull request 'Add range details panel & Attrinput component' (#15) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/15
 2022-03-08 11:56:10 +08:00
MrKBear 99fa5c698a Merge pull request 'Add object list command bar & checkbox handel func' (#14) from dev-mrkbear into master
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/14
 2022-03-05 21:12:05 +08:00
MrKBear aae7e54557 Merge pull request 'Add object list component' (#13) from dev-mrkbear into master
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/13
 2022-03-04 17:39:56 +08:00
MrKBear e1a58d2cbe Merge pull request 'Add tab deep color param & mouse mod change handel' (#12) from dev-mrkbear into master
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/12
 2022-03-03 17:28:24 +08:00
MrKBear 9f59bd4b3a Merge branch 'master' into dev-mrkbear 2022-03-03 17:28:06 +08:00
MrKBear 2155824089 Merge pull request 'Add tab renderer panel & tooltips cancle outer tab & switch tab' (#11) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/11
 2022-03-02 21:05:08 +08:00
MrKBear bbeaa037ee Merge pull request 'Add panel drag resize ctrl' (#10) from dev-mrkbear into master
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/10
 2022-03-01 14:33:42 +08:00
MrKBear 0bc8bd0192 Merge branch 'master' into dev-mrkbear 2022-03-01 14:33:26 +08:00
MrKBear 24dc1dea3c Merge pull request 'Add layout model & style container bar' (#9) from dev-mrkbear into master
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/9
 2022-02-28 19:55:45 +08:00
MrKBear 8034368e61 Merge pull request 'Add command bar tooltips' (#8) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/8
 2022-02-28 10:52:52 +08:00
MrKBear 3afade70b9 Merge pull request 'Add command bar component' (#7) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/7
 2022-02-25 23:18:07 +08:00
MrKBear bed8e9fbc8 Merge pull request 'Add header bar component' (#6) from dev-mrkbear into master
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/6
 2022-02-25 16:31:21 +08:00
MrKBear 5ac9cb442a Merge pull request 'Add depends fluent ui' (#5) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/5
 2022-02-24 19:10:25 +08:00
MrKBear 938d5041e4 Merge pull request 'Webpack add simulator web entry' (#4) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/4
 2022-02-22 23:13:10 +08:00
MrKBear d0b7935f12 Merge pull request 'Add module render update' (#3) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/3
 2022-02-21 17:28:33 +08:00
MrKBear 407e3061df Merge branch 'master' into dev-mrkbear 2022-02-21 17:28:23 +08:00
MrKBear 647819dec6 Merge pull request 'Updata readme file' (#2) from dev-mrkbear into master
continuous-integration/drone/push Build was killed
Details
continuous-integration/drone Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/2
 2022-02-20 12:46:21 +08:00
MrKBear b1bec0cf1d Merge pull request 'Switch brnach with ci' (#1) from dev-mrkbear into master
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://git.mrkbear.com/MrKBear/living-together/pulls/1
 2022-02-20 12:07:03 +08:00