Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/game #2

Open
wants to merge 72 commits into
base: master
Choose a base branch
from
Open

Feature/game #2

wants to merge 72 commits into from

Conversation

qas612820704
Copy link

No description provided.

taichunmin and others added 30 commits August 31, 2015 00:39
@taichunmin
package init and install express, reds, socket.io.
721d19b
@qas612820704
獸人永不為奴git statusgit status
4d26d67
@qas612820704
Edit hackpad link
26c8ec5
@taichunmin
express generator init
51cbceb
@taichunmin
gitignore update by express generator
64507ec
@qas612820704
Socket.io test success
3c794c5
@taichunmin
Merge branch 'feature/express' into develop
d334ebc
@taichunmin
models card, hand, deck
7a5fd81
@qas612820704
Add models.js to feature/routes
64643fd
@qas612820704
Add route room, and views directory to split observer and player
b810b81
@taichunmin
Small fix of models.js
da3e8c2
@jd615645
🐈前端配置進行中...
11f701c
@taichunmin
重寫 models
5145b14
@taichunmin
改寫程式碼符合新架構，Deck 測試完成
8d90ebd
@taichunmin
Room model 初步完成
45b51f9
@taichunmin
rename from models.js to room.js
c4c401a
@taichunmin
Merge branch 'feature/models' into develop
2b54a73
@taichunmin
remove room.js debug code
b5da8c0
@qas612820704
Add route room, and views directory to split observer and player
612634a
@qas612820704
Done generate url QRcode, and solve mobile detect
c668650
@jd615645
🐈介面更新
b0f6e66
@jd615645
🐈全部介面初步配置完成
df18d8b
@qas612820704
🐹Solve global variable, and Done route ready to merge to develop
62f0306
@qas612820704
Merge feature/(routes|views) to develop and alreay to new branch 'fea…
32f7172 
…ture/game' and 'feature/startpage'
@qas612820704
🐹 Intergrate routes,Rm route/room.js, and start branch feature/game
d5b93a8
@qas612820704
🐹 Doing create room and redirect
134a677
@qas612820704
🐹Add views/test.jade
e0d68ad
@jd615645
🐈統整view
9e8e51a
@qas612820704
DONE create room routes,TODO websocket to create player and gamestart
7fb7996
@qas612820704
Edit package.json to solve conflict
9aeddf2
jd615645 and others added 30 commits September 5, 2015 20:20
@jd615645
🐈修正socket.js的錯誤
8e55070
@qas612820704
🐹 Add player and outcome
173122a
@qas612820704
🐹 Remove console.log on room.js
fb03984
@jd615645
🐈 drawObserver finished!
7d3da25
@qas612820704
🐹 Merge ❤️ 🐹
960e200
@qas612820704
🐹 Change players.length to pOrder.length
cfcff93
@jd615645
🐈顯示等待玩家ID
bd67c00
@jd615645
🐈暱稱提交頁面功能設置
4572e13
@qas612820704
🐹 Add Startbtn and drawWait
caee6f9
@qas612820704
Merge branch 'feature/game' of github.com:NCHUIT/blackjack-ws into fe…
eff4644 
…ature/game
@qas612820704
🐹 To chage outcome to drawWait
ce1996b
@jd615645
room change undefine, start-btn
851b8c7
@taichunmin
輪詢是否需要抽牌
b01927a 
outcome 修復
@taichunmin
🐌 add client hit, stand and askHitOrStand protocol
c6f3243
@taichunmin
add drawWin and drawLose
b42637b
@qas612820704
Edit AddPlayer and AddObserver
dca5a1b
@jd615645
🐈
2456b65
@jd615645
🐈
2430606
@jd615645
Merge branch 'feature/game' of github.com:NCHUIT/blackjack-ws into fe…
e250936 
…ature/game
@qas612820704
🐹 little fix
7ce2c19
@qas612820704
🐹 Solve senddata reference to origin data
2841ad5
@jd615645
🐈hit,Stand btn disabled
c75e3bf
@qas612820704
🐹 Resolve refrence data and little change determine method of card of…
8210d60 
… socket.js
@qas612820704
Merge branch 'feature/game' of github.com:NCHUIT/blackjack-ws into fe…
1d8ad01 
…ature/game
@jd615645
🐈Add msg
c3c1a99
@jd615645
🐈js錯誤修正
c932f5b
@jd615645
🐈js修正
5639b7e
@jd615645
🐈遊戲結果訊息
4edb2f3
@jd615645
🐈結束場景切換
5c0dc0e
@qas612820704
🐹 Prototype now can game play to end without restart
9c5340e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@qas612820704 @taichunmin @jd615645