 wanggang
|
946c1f05cb
|
1.0.0-alpha.217
Former-commit-id: 936fda2fb14600b7a4917c00933673bfae2523b6
|
6 years ago |
|
wanggang
|
9eb7170270
|
update
Former-commit-id: 551dfde10a895ade048204bf16cceb248fa22b60
|
6 years ago |
|
wanggang
|
16cf409720
|
update
Former-commit-id: 9d5a0221e8a6c4db6a9370a0b7851512c4777dfc
|
6 years ago |
|
wanggang
|
a780f98c10
|
1.0.0-alpha.214
Former-commit-id: 774c30e1a4277afbb95a325367619ba5fe4ca762
|
6 years ago |
zhengpengju
|
f39f037fb1
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: 0b905b4af476374c094b1fbcd34fbb9e218911ef
|
6 years ago |
|
wanggang
|
443a7c65ff
|
update
Former-commit-id: 3a80454fe920bb637f1e149466027001d873585e
|
6 years ago |
|
wanggang
|
1b019064f6
|
1.标记当前版本为：1.0.0-alpha.213
2.开始重构：
（1）将定时器和触发器作为场景下级添加
（2）将定时器和触发器与命令的关联删除
（3）触发器条件修改为只能取数据值匹配，删除数据描述匹配部分
Former-commit-id: d373ec0ce4222572557e2d2a25f9cc6baeab511a
|
6 years ago |
|
zhengpengju
|
56067072e4
|
调整样式
Former-commit-id: 48acba1d77180652642f43e41f24979215cd7a4a
|
6 years ago |
|
zhengpengju
|
f8e81fa81f
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: 4e4c3383a97ef92651afc5d247253ebb6fff2f1c
|
6 years ago |
|
wanggang
|
7e28327c19
|
update
Former-commit-id: 814afb43a06f7e337f6e5f79f102eca529c34993
|
6 years ago |
|
wanggang
|
a281ca76b4
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: 6790dee5fada7df5411838822cdd16a429dff96d
|
6 years ago |
|
wanggang
|
36a8e8ebbd
|
update
Former-commit-id: bc6a271252f0f88ed19d524275d78a8b81519dcc
|
6 years ago |
|
zhengpengju
|
c1354bb34b
|
完成大部分页面的合并
Former-commit-id: 7b2c826f5083d273944f0f4befae7fbf0b9018df
|
6 years ago |
|
zhengpengju
|
2ef83f95fa
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: 4fbdc75dceb6931ec27dbbd977040b4c9a9d44af
|
6 years ago |
|
wanggang
|
f35fff40d0
|
EasyARDemo通过预制体动态加载多个ImageTarget
Former-commit-id: 571e65a9ab42244850a4a7a80e634be498932077
|
6 years ago |
|
zhengpengju
|
3226e69e8b
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: c1a6e2a57f9cef51ebe30015fa0f7c71d6562577
|
6 years ago |
|
wanggang
|
7f9ab1c65c
|
update
Former-commit-id: d8d7a836404917b116d8f7ba2f3f083aeb60eb97
|
6 years ago |
|
wanggang
|
ea260a4b17
|
update
Former-commit-id: 560193b819c37a3bd77bef08ef2147000212b381
|
6 years ago |
|
zhengpengju
|
b1f385caec
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: f76ca87d597dfba0f80c347f98390af1b4829e44
|
6 years ago |
|
zhengpengju
|
c8ef6accdc
|
合并了页面部分代码
Former-commit-id: 6f08e98110a25df0f85dd47f91bfa42056dd20f0
|
6 years ago |
|
wanggang
|
d4b3513b57
|
update
Former-commit-id: a8503b61e4005b3dc023c96b7944f7694dd126a2
|
6 years ago |
|
wanggang
|
eaddb73dbd
|
update
Former-commit-id: f669b6a67f417fd70e456a83f3b1112e898ee2ef
|
6 years ago |
|
wanggang
|
2fb1172e32
|
update
Former-commit-id: 83734de59e34fc93ca97ebcdd7b8335259ecb304
|
6 years ago |
|
wanggang
|
8416e15862
|
update
Former-commit-id: 1b6287957f2bf9986f293e46285bd83a04ea032d
|
6 years ago |
|
wanggang
|
3ee73d7e8a
|
update
Former-commit-id: ee4e0cf3066eabd616b141e861eb807d73a47cca
|
6 years ago |
|
wanggang
|
4f280ba71c
|
update
Former-commit-id: 880a740430af77047e3c419ce5c30830025e6c03
|
6 years ago |
|
wanggang
|
857f32bfb0
|
update
Former-commit-id: 9a3c4caf26cb9e5aa2022579f4e32fea9ee36a00
|
6 years ago |
|
wanggang
|
75f08d8023
|
update
Former-commit-id: 5f9997e16cae1b32cc5a1e7932874f738584e768
|
6 years ago |
|
wanggang
|
361bed687a
|
update
Former-commit-id: 9d8dbdbf3fad6892d04910727a7b7a7f61b518e3
|
6 years ago |
|
wanggang
|
009d715035
|
update
Former-commit-id: 137ed8a93b47c35e63a4fd71438121c89e215db9
|
6 years ago |
|
wanggang
|
708e3cd306
|
update
Former-commit-id: 1a6c29338bfacbe85433f4c8e1f2c5440cc03066
|
6 years ago |
|
wanggang
|
24d05fb183
|
update
Former-commit-id: e44a298cfe79ab7e3e98e3dc71416b0c79edc33a
|
6 years ago |
|
wanggang
|
8db6e8cf52
|
update
Former-commit-id: 23b255257590f3d8449c331e684f73bf4e4bb3ae
|
6 years ago |
|
wanggang
|
47eea34449
|
update
Former-commit-id: c68614bf3161e4b89b1a9e8878229d5762527175
|
6 years ago |
|
wanggang
|
a1112bb4d9
|
update
Former-commit-id: 9bc65034b78640034a401ed8f296f3f7ce471808
|
6 years ago |
|
wanggang
|
c7a53774a1
|
update
Former-commit-id: 89df38104994886a4b160da3f71513832b8f2632
|
6 years ago |
|
wanggang
|
ed455a622f
|
update
Former-commit-id: 846d49426dc1f2767e56544774a2013d58f08a47
|
6 years ago |
|
wanggang
|
f4dcc0eb2b
|
update
Former-commit-id: 4160dc04a7c78d6d802d5ff5c5150c195054ed7c
|
6 years ago |
|
wanggang
|
b3f9604d1f
|
update
Former-commit-id: a6c4d73bab4992dcc5550d1ae551e186c214402c
|
6 years ago |
|
wanggang
|
dcfcba32a4
|
update
Former-commit-id: fa109cd6f96edf7255b12674f5effa2a52a21bb2
|
6 years ago |
|
wanggang
|
c2a2602ed5
|
update
Former-commit-id: 58fad84103c6cdbfec85c6f143a4c4bb440d97de
|
6 years ago |
|
wanggang
|
b4295675a2
|
update
Former-commit-id: 878359daf5278a1705aecb0352c9b495d4b72caa
|
6 years ago |
|
wanggang
|
e196877aa1
|
update
Former-commit-id: 8d700465214a24588dfb8cf196fe18331c53549a
|
6 years ago |
|
wanggang
|
10d69bdae8
|
update
Former-commit-id: 9b233907acc2ae9b000cefce47bde59e1a6092fb
|
6 years ago |
|
wanggang
|
27dc638c34
|
update
Former-commit-id: a328c73864dc6a4965f37aca9e47009fbc337971
|
6 years ago |
|
wanggang
|
bd5c7f0ab4
|
update
Former-commit-id: ee9a2f124d7f34d8e9fb0b58ff835c832e600bf7
|
6 years ago |
|
wanggang
|
1889f6cf42
|
update
Former-commit-id: 63162f2374109ccd7310199b50dc7586ad3c0368
|
6 years ago |
|
wanggang
|
492ae7c15e
|
update
Former-commit-id: 9c9369de6cb81fcb866e0408ddbefb8390a55a74
|
6 years ago |
|
wanggang
|
d1b050e840
|
update
Former-commit-id: cfe8abac5ade5b38d0afb61dfe0e9e4ad4e3829d
|
6 years ago |
|
wanggang
|
8f7399d532
|
update
Former-commit-id: 016170bf020d16960fdfe4654fb42d317b217e80
|
6 years ago |
