Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: uptop/JavaWebSocket
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ZS1994/JavaWebSocket
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 8 commits
  • 35 files changed
  • 1 contributor

Commits on Jun 30, 2017

  1. 初始化 

    Signed-off-by: ZS1994 <[email protected]>
    @ZS1994
    ZS1994 committed Jun 30, 2017
    Configuration menu
    Copy the full SHA
    5578ea1 View commit details
    Browse the repository at this point in the history

  2. 该版本可以直接运行 

    Signed-off-by: ZS1994 <[email protected]>
    @ZS1994
    ZS1994 committed Jun 30, 2017
    Configuration menu
    Copy the full SHA
    c21ec95 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2017

  1. 1132

    @ZS1994
    ZS1994 committed Jul 8, 2017
    Configuration menu
    Copy the full SHA
    f91a456 View commit details
    Browse the repository at this point in the history

  2. 谢了一些基础的类，单位类，半人马，增加了几个命令，上下左右移动，查看可移动2区域。 

    Signed-off-by: ZS1994 <[email protected]>
    @ZS1994
    ZS1994 committed Jul 8, 2017
    Configuration menu
    Copy the full SHA
    5cdafbb View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2017

  1. Merge branch 'master' of https://github.com/ZS1994/JavaWebSocket.git 

    # Conflicts:
#	JavaWebSocket/.settings/org.eclipse.jdt.core.prefs
#	JavaWebSocket/pom.xml
#	JavaWebSocket/src/main/java/com/zs/tools/Monitor.java
#	JavaWebSocket/src/main/java/com/zs/websocket/WebSocketTest.java
#	JavaWebSocket/src/main/webapp/index.jsp
    @ZS1994
    ZS1994 committed Jul 9, 2017
    Configuration menu
    Copy the full SHA
    28913db View commit details
    Browse the repository at this point in the history

  2. 修改了一些方法，另外页面渲染方法写了一个最简单的，可以查看当前的位置和可移动范围。 

    Signed-off-by: ZS1994 <[email protected]>
    @ZS1994
    ZS1994 committed Jul 9, 2017
    Configuration menu
    Copy the full SHA
    8fe3467 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2017

  1. jsp的table改为用循环语句来写，减少了很多代码 

    Signed-off-by: ZS1994 <[email protected]>
    @ZS1994
    ZS1994 committed Jul 10, 2017
    Configuration menu
    Copy the full SHA
    8969ce2 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2017

  1. 原bean包文件转到actor包下，bean包用来放数据封装，客户端handle取消，采用服务器端命令封装来控制，可实现不同客服端均能识别命令。 

    Signed-off-by: ZS1994 <[email protected]>
    @ZS1994
    ZS1994 committed Jul 11, 2017
    Configuration menu
    Copy the full SHA
    e3104a9 View commit details
    Browse the repository at this point in the history
Loading