498 Commits

Author SHA1 Message Date
aozhiwei
5af648f6c0 1 2019-06-07 21:14:05 +08:00
aozhiwei
d1d5820e88 add GetAabbBox GetCircleBox 2019-06-07 21:07:17 +08:00
aozhiwei
2b119145c7 remove touch object 2019-06-07 21:01:38 +08:00
zhulongjun
da61f163bf 1 2019-06-06 19:04:03 +08:00
aozhiwei
b3fb8beff5 1 2019-06-06 14:48:33 +08:00
aozhiwei
714e755a96 1 2019-06-06 14:14:22 +08:00
aozhiwei
529ca37af4 添加机器人处理 2019-06-06 09:38:07 +08:00
aozhiwei
1e170d2c6c 1 2019-06-05 18:50:48 +08:00
aozhiwei
28825c7d9a merge master 2019-06-05 15:55:45 +08:00
aozhiwei
c0ead578bf add ssping sspong 2019-06-05 15:54:57 +08:00
aozhiwei
e786241149 master server ok 2019-06-05 14:42:14 +08:00
aozhiwei
8fc94f972f 1 2019-06-04 16:19:03 +08:00
aozhiwei
9a66bb86e2 1 2019-06-04 16:16:00 +08:00
aozhiwei
9d35a46c41 merge master 2019-06-04 16:10:39 +08:00
aozhiwei
b8a9a1a618 1 2019-06-04 16:05:54 +08:00
aozhiwei
e6231e0e49 merge master 2019-06-04 15:38:24 +08:00
aozhiwei
727352fb9c 修复武器问题 2019-06-04 15:31:03 +08:00
aozhiwei
4fdcfae520 1 2019-06-04 15:29:27 +08:00
aozhiwei
ca1093988a 添加在线数日志 2019-06-04 14:40:59 +08:00
aozhiwei
4cdcc694ac 添加技能timer初始化 2019-06-04 13:50:22 +08:00
aozhiwei
bc5b1ca1eb battleReport添加map_id map_tpl_name字段 2019-06-04 11:49:10 +08:00
aozhiwei
693f732864 机器人不发结算 2019-06-04 11:28:41 +08:00
aozhiwei
eb3b0f4e9b merge master 2019-06-04 10:41:29 +08:00
aozhiwei
027a3de2ea 房间内所有玩家下线后自动释放房间对象 2019-06-04 10:37:46 +08:00
aozhiwei
87ac55c041 结算添加日志 2019-06-04 09:49:46 +08:00
aozhiwei
f20fd2a1cd 1 2019-06-04 09:27:56 +08:00
aozhiwei
8934f22818 1 2019-06-03 19:52:46 +08:00
aozhiwei
d2b770c9fb 1 2019-06-03 17:02:39 +08:00
aozhiwei
3de8c89359 1 2019-06-03 16:53:30 +08:00
aozhiwei
c4febfc0bc 修复碰撞检测问题 2019-06-03 15:36:57 +08:00
aozhiwei
cb711bea74 1 2019-06-03 14:56:17 +08:00
aozhiwei
a1b76d66ad 1 2019-06-03 14:55:13 +08:00
aozhiwei
14f81a4ddf 添加-n参数 2019-06-03 14:31:54 +08:00
aozhiwei
131eff7f83 添加射击时速度减速 2019-06-03 14:13:04 +08:00
aozhiwei
bea8882743 1 2019-06-03 10:33:53 +08:00
aozhiwei
4535e53309 机器人ok 2019-06-03 09:50:10 +08:00
aozhiwei
ccbacb5efd 1 2019-06-03 09:39:13 +08:00
aozhiwei
d3bc4bba6a 1 2019-06-02 19:42:14 +08:00
aozhiwei
285694826f 1 2019-06-02 19:28:20 +08:00
aozhiwei
4f72b8dba2 1 2019-06-02 15:36:08 +08:00
aozhiwei
9cca8c139c add virtualclientmgr 2019-06-02 15:33:33 +08:00
aozhiwei
6951fd6f8f 1 2019-06-02 15:06:53 +08:00
aozhiwei
3776467e61 merge master 2019-06-02 15:03:34 +08:00
aozhiwei
d633be263f 1 2019-05-31 15:19:49 +08:00
aozhiwei
c087df8fcc 1 2019-05-31 11:52:45 +08:00
aozhiwei
7eac337db4 1 2019-05-31 11:42:59 +08:00
aozhiwei
3f4e713ce8 1 2019-05-31 10:25:43 +08:00
aozhiwei
d26da80c4b masterserver ci script ok 2019-05-31 09:13:41 +08:00
aozhiwei
30f3a37b5a ok 2019-05-31 09:10:21 +08:00
aozhiwei
171592ad77 不能打队友 2019-05-30 20:55:20 +08:00