Commit Graph

Select branches

Hide Pull Requests

Alpha0.0.1

Alpha0.1.5

Alpha0.2.1

dev-mrkbear

master

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#6

#7

#8

#9

Mono Color

• a13e1a3ec0 Optmize file load func dev-mrkbear MrKBear 2022-06-02 10:57:11 +08:00
• 8ede304664 Merge pull request 'Add statistics panel' (#56) from dev-mrkbear into master master MrKBear 2022-05-27 20:02:00 +08:00
• 3e6bef2ee7 Merge branch 'master' into dev-mrkbear MrKBear 2022-05-27 20:01:46 +08:00
• bd8a9d1cdb Add statistics panel MrKBear 2022-05-26 21:47:42 +08:00
• 4ea3c9e1f4 Add statistics panel MrKBear 2022-05-26 17:08:04 +08:00
• 2dbbd0952a Add statistics panel MrKBear 2022-05-25 22:00:13 +08:00
• ce99b17fcb Add statistics panel MrKBear 2022-05-24 14:07:47 +08:00
• fcbe646b67 Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear MrKBear 2022-05-24 11:39:06 +08:00
• a8b1c21ed6 Fix ZH_CN I18N num error MrKBear 2022-05-24 11:38:56 +08:00
• 7adadb6d46 Merge pull request 'Add setting option' (#55) from dev-mrkbear into master MrKBear 2022-05-20 14:45:26 +08:00
• 8b35074fe8 Merge branch 'master' into dev-mrkbear 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 MrKBear 2022-05-20 14:44:00 +08:00
• 70ff9fa0ad Add setting option Alpha0.2.1 MrKBear 2022-05-20 14:41:52 +08:00
• ac0fef2901 Merge pull request 'Add ant behavior' (#54) from dev-mrkbear into master MrKBear 2022-05-12 20:23:20 +08:00
• 7e2281add1 Merge branch 'master' into dev-mrkbear MrKBear 2022-05-12 20:23:16 +08:00
• 4eb6637062 fix brownian behavior MrKBear 2022-05-12 20:22:18 +08:00
• 8670b577f9 Add sample tracking behavior MrKBear 2022-05-11 13:09:51 +08:00
• 4768667803 Add sample tracking behavior MrKBear 2022-05-11 11:43:41 +08:00
• 571e80d542 Fix boundary logic & Add wastage behavior MrKBear 2022-05-10 14:55:45 +08:00
• da493bc6ae Contact Attacking behavior add assimilate & Tracking add view range MrKBear 2022-05-09 23:26:17 +08:00
• 904de02140 Brownian behavior add limit by range MrKBear 2022-05-09 21:24:28 +08:00
• 4ade5d4bc3 Add manufacture behavior MrKBear 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 MrKBear 2022-05-07 12:10:39 +08:00
• e814f5e061 Merge branch 'master' into dev-mrkbear MrKBear 2022-05-07 12:10:33 +08:00
• dfb3905c9b Add central cluster behavior MrKBear 2022-05-07 12:09:05 +08:00
• 974cd2951d Add direction cluster behavior MrKBear 2022-05-06 23:12:00 +08:00
• f660aefa4c Add avoidance behavior MrKBear 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 MrKBear 2022-05-06 11:36:35 +08:00
• 456c21f6c2 Merge branch 'master' into dev-mrkbear 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 MrKBear 2022-05-06 00:04:50 +08:00
• dcd2d10147 Add line info into spline first point MrKBear 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 MrKBear 2022-05-04 14:53:24 +08:00
• 1825f3fc14 Merge branch 'master' into dev-mrkbear MrKBear 2022-05-04 14:53:17 +08:00
• 904dee9e86 Add parse to obj function MrKBear 2022-05-04 11:13:54 +08:00
• 73b68e1eac Bind clip recoder & loader event MrKBear 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 MrKBear 2022-05-02 23:57:00 +08:00
• e11518ce8a Merge branch 'master' into dev-mrkbear MrKBear 2022-05-02 23:56:48 +08:00
• 2b53ccea2b Add clip archive function & optmize clip frame structor MrKBear 2022-05-02 23:55:06 +08:00
• e3681f2f32 Add clip details panel MrKBear 2022-05-02 16:09:02 +08:00
• c86ff9ef1a Merge pull request 'Add clip player & offline renderer' (#49) from dev-mrkbear into master MrKBear 2022-05-01 18:41:11 +08:00
• 7002d49155 Merge branch 'master' into dev-mrkbear MrKBear 2022-05-01 18:41:05 +08:00
• a689d23b5f Add offline renderer function & offline pop component MrKBear 2022-05-01 18:37:56 +08:00
• be22102f95 Add command bar start action handel MrKBear 2022-05-01 13:28:28 +08:00
• 53ae625c92 Bind slider handel function MrKBear 2022-05-01 13:03:49 +08:00
• a0547095e2 Add clip player logic MrKBear 2022-05-01 12:34:03 +08:00
• a0a1b52b3f Add clip player logic MrKBear 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 MrKBear 2022-04-30 20:51:30 +08:00
• 6c6ea52eff Merge branch 'master' into dev-mrkbear MrKBear 2022-04-30 20:51:25 +08:00
• c067088157 Add clip list component MrKBear 2022-04-30 20:40:02 +08:00
• 53e6c9db9c Merge branch 'dev-mrkbear' of http://git.mrkbear.com/MrKBear/living-together into dev-mrkbear MrKBear 2022-04-30 13:59:29 +08:00
• 41fe51ec9c Add clip list component MrKBear 2022-04-30 13:59:22 +08:00
• 5a3ec7d2af Add record function MrKBear 2022-04-29 22:10:45 +08:00
• 776a5f571e Add record model into actuator MrKBear 2022-04-29 14:32:00 +08:00
• bc67782365 Add clip player MrKBear 2022-04-29 12:12:06 +08:00
• c923efcd99 Add cilp model; MrKBear 2022-04-27 16:22:30 +08:00
• 0a5bcd76f0 Merge pull request 'Add loading page' (#47) from dev-mrkbear into master MrKBear 2022-04-26 20:48:11 +08:00
• 393e7e7fe2 Merge branch 'master' into dev-mrkbear 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 MrKBear 2022-04-26 20:47:23 +08:00
• fea2a9af16 Add loading page MrKBear 2022-04-26 19:26:54 +08:00
• 39a514b2cc Merge pull request 'Add save and load function' (#46) from dev-mrkbear into master MrKBear 2022-04-26 16:44:39 +08:00
• 30b3e3f9a2 Merge branch 'master' into dev-mrkbear MrKBear 2022-04-26 16:44:14 +08:00
• 23ebbeb120 Rebuild commond bar component MrKBear 2022-04-26 16:42:02 +08:00
• ec3aaa5e3a Add desktop save function MrKBear 2022-04-26 15:17:24 +08:00
• 0ab53c1800 Add file load UI MrKBear 2022-04-25 21:32:50 +08:00
• 8a272a9626 Set new file default save state true MrKBear 2022-04-25 09:57:46 +08:00
• 4137362501 Add drag layer MrKBear 2022-04-24 20:16:03 +08:00
• 396b128a2c Add demo Alpha0.1.5 MrKBear 2022-04-24 14:45:17 +08:00
• 298688269c Release pre MrKBear 2022-04-24 14:27:25 +08:00
• 1f08a4885b Merge pull request 'Add archive save component & shutdown hendel' (#45) from dev-mrkbear into master MrKBear 2022-04-24 14:13:17 +08:00
• 4c014a7200 Merge branch 'master' into dev-mrkbear MrKBear 2022-04-24 14:12:45 +08:00
• b5ecf0bb0d Add loadfile layer MrKBear 2022-04-24 14:10:39 +08:00
• 87ed157340 Add block shutdown hendel MrKBear 2022-04-24 13:24:55 +08:00
• 56151c9e75 Add archive save component MrKBear 2022-04-24 12:55:00 +08:00
• 03f0b9fd16 Add file download function MrKBear 2022-04-23 23:28:11 +08:00
• 5914a9f531 Merge pull request 'Add model & behavior archive function' (#44) from dev-mrkbear into master MrKBear 2022-04-23 20:33:01 +08:00
• 980d8afa3c Merge branch 'master' into dev-mrkbear MrKBear 2022-04-23 20:32:54 +08:00
• b498f0e0a4 Add archive event MrKBear 2022-04-23 20:32:04 +08:00
• 430d8a7254 Add model archive function MrKBear 2022-04-23 19:52:56 +08:00
• 74bda21072 Add behavior archive function MrKBear 2022-04-23 17:42:02 +08:00
• 0d7cbe135d Merge pull request 'Add group individual label archive function' (#43) from dev-mrkbear into master MrKBear 2022-04-23 16:56:07 +08:00
• 068acb19a8 Add label archive function MrKBear 2022-04-22 23:48:10 +08:00
• 276c8c63a1 Add group & individual archive function MrKBear 2022-04-22 20:48:53 +08:00
• d11fd2d328 Add group archive function MrKBear 2022-04-21 23:22:38 +08:00
• 6063882192 Merge pull request 'Add parameter archive func & Add ctrl object archive function' (#42) from dev-mrkbear into master MrKBear 2022-04-21 19:49:19 +08:00
• de0dd57a04 Optmize archive function type ben.qin 2022-04-21 17:25:25 +08:00
• 1d36aac37d Add range object archive function ben.qin 2022-04-21 17:20:03 +08:00
• 597c7e9493 Add ctrl object archive function ben.qin 2022-04-21 17:03:01 +08:00
• 21960778f5 Add parameter archive func MrKBear 2022-04-20 23:23:51 +08:00
• a2b1819dd8 Change object id into uuid MrKBear 2022-04-18 17:23:30 +08:00
• 26837930fe Merge pull request 'Add auto bundle script' (#41) from dev-mrkbear into master MrKBear 2022-04-17 14:08:04 +08:00
• a788968525 Add bundle script MrKBear 2022-04-17 13:50:43 +08:00
• 4f6b1ebbf2 Add auto bundle script MrKBear 2022-04-17 01:26:05 +08:00
• 8b29654fdf Bind windows api MrKBear 2022-04-16 13:54:56 +08:00
• 4f175a5505 Add electron api context MrKBear 2022-04-15 22:51:38 +08:00
• 77410dbf47 Merge pull request 'Add electron entry' (#40) from dev-mrkbear into master MrKBear 2022-04-15 20:20:38 +08:00
• 7e4fee3fe5 Add electron minthread MrKBear 2022-04-15 17:42:29 +08:00
• ff88c7047e Add electron min thread entry MrKBear 2022-04-15 15:31:47 +08:00
• 61e590df4d Add electron package MrKBear 2022-04-15 12:43:02 +08:00
• 6bea46204d Add simulator desktop entry MrKBear 2022-04-15 10:56:43 +08:00
• 76bb20d5ab Change package rimraf into fse MrKBear 2022-04-15 09:38:13 +08:00