tiennm99/caro
1
0
Fork 0
mirror of https://github.com/tiennm99/caro.git synced 2026-09-20 03:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
120 Commits 6 Branches 12 Tags
fbcff5fdcccb365e4a55664ff11e5f107eb7a2fd
Commit Graph
120 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
NicoandGitHub fbcff5fdcc Merge pull request #50 from ZuoFuhong/hotfix-49 
Fix #49
 2020-05-19 21:23:00 +08:00
zfh 49b7edef7f Fix #49 2020-05-19 17:08:36 +08:00
NicoandGitHub 25a6ed214d Merge pull request #48 from ZuoFuhong/hotfix-47 
Fix #47
 2020-05-11 16:50:51 +08:00
zfh 5445fb1971 Fix #47 2020-05-11 16:32:02 +08:00
NicoandGitHub 03b62bf459 Merge pull request #45 from ZeroDream-CN/master 
Update serverlist.json
 2020-04-02 20:29:36 +08:00
NicoandGitHub 8681d9fdc6 Merge pull request #41 from kebyn/master 
增加 docker 部署方式
 2020-04-02 20:27:54 +08:00
Akkariin MeikoandGitHub 4fc609249b Update serverlist.json 2020-04-02 20:07:52 +08:00
kebyn 264efc3a08 Supplementary documentation 2020-04-02 18:47:32 +08:00
NicoandGitHub 8f6e804a30 Update serverlist.json 2020-04-02 18:33:19 +08:00
NicoandGitHub d0d9f8d040 Merge pull request #43 from TheZihanGu/patch-1 
Add a game server.
 2020-04-02 18:32:00 +08:00
TheZihanGuandGitHub 41745abcf9 add a game server. 2020-04-02 18:01:57 +08:00
kebyn ba9beb0186 export server port 2020-04-02 13:08:41 +08:00
kebyn b51a6bd848 Add docker deployment scheme 2020-04-02 12:36:23 +08:00
nico 2b330f8192 update. 2020-03-23 10:29:23 +08:00
Nico f65c48c76e fix pom version. 2020-03-22 17:12:35 +08:00
Nico 6d51a4c453 Update version. 2020-03-15 18:26:56 +08:00
NicoandGitHub d0ecfa491a Merge pull request #35 from DoyuTu/master 
fixed epoll event loop
v1.2.1 		2019-09-11 16:00:35 +08:00
DoyuTu ce11513abd fixed epoll event loop 2019-09-11 15:57:30 +08:00
Nico 695c289df8 added junit dependency 2019-07-27 22:08:33 +08:00
NicoandGitHub b8461c7792 Merge pull request #31 from Diffblue-benchmarks/add-diffblue-tests 
Add unit tests for PokerHelper
 2019-04-16 22:06:05 +08:00
Eric Hettiaratchi 1e6aa94ed7 Add unit tests for org.nico.ratel.landlords.helper.PokerHelper 
These tests were written using Diffblue Cover.
 2019-04-16 14:57:41 +01:00
NicoandGitHub a4744ca9e8 Merge pull request #30 from DoyuTu/master 
use epoll event loop
 2019-04-03 10:57:36 +08:00
DoyuTu 08b5002088 use epoll event loop 2019-04-03 01:27:08 +08:00
NicoandGitHub 7343b8ba10 Merge pull request #28 from ainilili/dev-1.2.0 
Dev 1.2.0
 2019-01-06 23:30:09 +08:00
nico a9807f63cf Remove the yellow warning 2019-01-06 23:27:35 +08:00
nico 9390d8105c fix #27 2019-01-06 23:27:07 +08:00
NicoandGitHub 17309154fc Merge pull request #26 from ainilili/dev-1.2.0 
Dev 1.2.0
 2018-12-05 09:20:19 +08:00
nico dad841590a fix #25 2018-12-05 09:18:11 +08:00
nico 83e6ba3b91 Squashed commit of the following: 
commit a7542998da
Author: nico <ainililia@.com>
Date:   Mon Nov 19 11:44:48 2018 +0800

    If last sell client is current client, replace it to robot id

commit 694147cf2a
Author: nico <ainililia@.com>
Date:   Mon Nov 19 11:37:35 2018 +0800

    调整房间死亡时间为20分钟

commit 84398ea317
Author: nico <ainililia@.com>
Date:   Sat Nov 17 18:34:27 2018 +0800

    Add PROTOCO_CN.md
 2018-11-19 11:45:23 +08:00
nico a7542998da If last sell client is current client, replace it to robot id 2018-11-19 11:44:48 +08:00
nico 694147cf2a 调整房间死亡时间为20分钟 2018-11-19 11:37:35 +08:00
nico 84398ea317 Add PROTOCO_CN.md 2018-11-17 18:34:27 +08:00
nico f1be744d02 client bug fix 2018-11-17 15:29:08 +08:00
nico 6e5b5c3526 Merge branch 'dev-1.2.0' 2018-11-17 15:11:37 +08:00
nico 54f578644b Squashed commit of the following: 
commit b465e268e6
Author: nico <ainililia@.com>
Date:   Sat Nov 17 15:10:17 2018 +0800

    Squashed commit of the following:

    commit 25eddcf393
    Author: nico <ainililia@.com>
    Date:   Sat Nov 17 15:08:49 2018 +0800

        robot monitoring log

    commit 684c533493
    Author: nico <ainililia@.com>
    Date:   Sat Nov 17 12:27:15 2018 +0800

        server list [dont exist] marked words

    commit 53e7664c76
    Author: nico <ainililia@.com>
    Date:   Sat Nov 17 12:20:06 2018 +0800

        Simple robot fix

    commit 7b56b3348f
    Merge: cf1dfe0 a1c1fda
    Author: nico <ainililia@.com>
    Date:   Sat Nov 17 11:49:06 2018 +0800

        Merge branch 'master' into dev-1.2.0

        # Conflicts:
        #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener.java
        #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_CREATE_SUCCESS.java
        #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_SUCCESS.java

    commit cf1dfe06ca
    Author: nico <ainililia@.com>
    Date:   Sat Nov 17 11:29:50 2018 +0800

        Client according to optimization

    commit fa6afdaff6
    Author: nico <ainililia@.com>
    Date:   Fri Nov 16 21:06:34 2018 +0800

        fix #22

    commit 617c7242f7
    Author: nico <ainililia@.com>
    Date:   Fri Nov 16 20:43:09 2018 +0800

        fix robot syncope

    # Conflicts:
    #	landlords-common/src/main/java/org/nico/ratel/landlords/helper/PokerHelper.java

commit c0eb3b77c4
Author: nico <ainililia@.com>
Date:   Sat Nov 17 12:27:50 2018 +0800

    Squashed commit of the following:

    commit 684c533493
    Author: nico <ainililia@.com>
    Date:   Sat Nov 17 12:27:15 2018 +0800

        server list [dont exist] marked words

    commit 53e7664c76
    Author: nico <ainililia@.com>
    Date:   Sat Nov 17 12:20:06 2018 +0800

        Simple robot fix

    commit 7b56b3348f
    Merge: cf1dfe0 a1c1fda
    Author: nico <ainililia@.com>
    Date:   Sat Nov 17 11:49:06 2018 +0800

        Merge branch 'master' into dev-1.2.0

        # Conflicts:
        #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener.java
        #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_CREATE_SUCCESS.java
        #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_SUCCESS.java

    commit cf1dfe06ca
    Author: nico <ainililia@.com>
    Date:   Sat Nov 17 11:29:50 2018 +0800

        Client according to optimization

    commit fa6afdaff6
    Author: nico <ainililia@.com>
    Date:   Fri Nov 16 21:06:34 2018 +0800

        fix #22

    commit 617c7242f7
    Author: nico <ainililia@.com>
    Date:   Fri Nov 16 20:43:09 2018 +0800

        fix robot syncope

commit be3b02d718
Author: nico <ainililia@.com>
Date:   Sat Nov 17 12:20:49 2018 +0800

    Squashed commit of the following:

    commit 53e7664c76
    Author: nico <ainililia@.com>
    Date:   Sat Nov 17 12:20:06 2018 +0800

        Simple robot fix

    commit 7b56b3348f
    Merge: cf1dfe0 a1c1fda
    Author: nico <ainililia@.com>
    Date:   Sat Nov 17 11:49:06 2018 +0800

        Merge branch 'master' into dev-1.2.0

        # Conflicts:
        #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener.java
        #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_CREATE_SUCCESS.java
        #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_SUCCESS.java

    commit cf1dfe06ca
    Author: nico <ainililia@.com>
    Date:   Sat Nov 17 11:29:50 2018 +0800

        Client according to optimization

    commit fa6afdaff6
    Author: nico <ainililia@.com>
    Date:   Fri Nov 16 21:06:34 2018 +0800

        fix #22

    commit 617c7242f7
    Author: nico <ainililia@.com>
    Date:   Fri Nov 16 20:43:09 2018 +0800

        fix robot syncope

# Conflicts:
#	landlords-common/src/main/java/org/nico/ratel/landlords/helper/PokerHelper.java
 2018-11-17 15:11:10 +08:00
nico b465e268e6 Squashed commit of the following: 
commit 25eddcf393
Author: nico <ainililia@.com>
Date:   Sat Nov 17 15:08:49 2018 +0800

    robot monitoring log

commit 684c533493
Author: nico <ainililia@.com>
Date:   Sat Nov 17 12:27:15 2018 +0800

    server list [dont exist] marked words

commit 53e7664c76
Author: nico <ainililia@.com>
Date:   Sat Nov 17 12:20:06 2018 +0800

    Simple robot fix

commit 7b56b3348f
Merge: cf1dfe0 a1c1fda
Author: nico <ainililia@.com>
Date:   Sat Nov 17 11:49:06 2018 +0800

    Merge branch 'master' into dev-1.2.0

    # Conflicts:
    #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener.java
    #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_CREATE_SUCCESS.java
    #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_SUCCESS.java

commit cf1dfe06ca
Author: nico <ainililia@.com>
Date:   Sat Nov 17 11:29:50 2018 +0800

    Client according to optimization

commit fa6afdaff6
Author: nico <ainililia@.com>
Date:   Fri Nov 16 21:06:34 2018 +0800

    fix #22

commit 617c7242f7
Author: nico <ainililia@.com>
Date:   Fri Nov 16 20:43:09 2018 +0800

    fix robot syncope

# Conflicts:
#	landlords-common/src/main/java/org/nico/ratel/landlords/helper/PokerHelper.java
 2018-11-17 15:10:17 +08:00
nico 25eddcf393 robot monitoring log 2018-11-17 15:08:49 +08:00
nico c0eb3b77c4 Squashed commit of the following: 
commit 684c533493
Author: nico <ainililia@.com>
Date:   Sat Nov 17 12:27:15 2018 +0800

    server list [dont exist] marked words

commit 53e7664c76
Author: nico <ainililia@.com>
Date:   Sat Nov 17 12:20:06 2018 +0800

    Simple robot fix

commit 7b56b3348f
Merge: cf1dfe0 a1c1fda
Author: nico <ainililia@.com>
Date:   Sat Nov 17 11:49:06 2018 +0800

    Merge branch 'master' into dev-1.2.0

    # Conflicts:
    #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener.java
    #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_CREATE_SUCCESS.java
    #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_SUCCESS.java

commit cf1dfe06ca
Author: nico <ainililia@.com>
Date:   Sat Nov 17 11:29:50 2018 +0800

    Client according to optimization

commit fa6afdaff6
Author: nico <ainililia@.com>
Date:   Fri Nov 16 21:06:34 2018 +0800

    fix #22

commit 617c7242f7
Author: nico <ainililia@.com>
Date:   Fri Nov 16 20:43:09 2018 +0800

    fix robot syncope
 2018-11-17 12:27:50 +08:00
nico 684c533493 server list [dont exist] marked words 2018-11-17 12:27:15 +08:00
nico be3b02d718 Squashed commit of the following: 
commit 53e7664c76
Author: nico <ainililia@.com>
Date:   Sat Nov 17 12:20:06 2018 +0800

    Simple robot fix

commit 7b56b3348f
Merge: cf1dfe0 a1c1fda
Author: nico <ainililia@.com>
Date:   Sat Nov 17 11:49:06 2018 +0800

    Merge branch 'master' into dev-1.2.0

    # Conflicts:
    #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener.java
    #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_CREATE_SUCCESS.java
    #	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_SUCCESS.java

commit cf1dfe06ca
Author: nico <ainililia@.com>
Date:   Sat Nov 17 11:29:50 2018 +0800

    Client according to optimization

commit fa6afdaff6
Author: nico <ainililia@.com>
Date:   Fri Nov 16 21:06:34 2018 +0800

    fix #22

commit 617c7242f7
Author: nico <ainililia@.com>
Date:   Fri Nov 16 20:43:09 2018 +0800

    fix robot syncope
 2018-11-17 12:20:49 +08:00
nico 53e7664c76 Simple robot fix 2018-11-17 12:20:06 +08:00
nico 7b56b3348f Merge branch 'master' into dev-1.2.0 
# Conflicts:
#	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener.java
#	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_CREATE_SUCCESS.java
#	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_ROOM_JOIN_SUCCESS.java
 2018-11-17 11:49:06 +08:00
nico a1c1fdaab9 last sell info clear 2018-11-17 11:46:03 +08:00
nico 7a8f4da356 Squashed commit of the following: 
commit cf1dfe06ca
Author: nico <ainililia@.com>
Date:   Sat Nov 17 11:29:50 2018 +0800

    Client according to optimization

commit fa6afdaff6
Author: nico <ainililia@.com>
Date:   Fri Nov 16 21:06:34 2018 +0800

    fix #22

commit 617c7242f7
Author: nico <ainililia@.com>
Date:   Fri Nov 16 20:43:09 2018 +0800

    fix robot syncope

# Conflicts:
#	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_INVALID.java
#	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_LESS.java
#	landlords-client/src/main/java/org/nico/ratel/landlords/client/event/ClientEventListener_CODE_GAME_POKER_PLAY_MISMATCH.java
 2018-11-17 11:36:03 +08:00
nico cf1dfe06ca Client according to optimization 2018-11-17 11:29:50 +08:00
nico 789fd9703d Squashed commit of the following: 
commit fa6afdaff6
Author: nico <ainililia@.com>
Date:   Fri Nov 16 21:06:34 2018 +0800

    fix #22

commit 617c7242f7
Author: nico <ainililia@.com>
Date:   Fri Nov 16 20:43:09 2018 +0800

    fix robot syncope
 2018-11-16 21:09:42 +08:00
nico fa6afdaff6 fix #22 2018-11-16 21:06:34 +08:00
nico 617c7242f7 fix robot syncope 2018-11-16 20:43:09 +08:00
nico b2f25bea3a Delete invalid import 2018-11-16 15:52:17 +08:00
nico 1f8cd73017 modify waitingStatusInterval & startingStatusInterval -> 100s 2018-11-16 15:50:05 +08:00