Commit graph

145 commits

Author SHA1 Message Date
Jonatan Pålsson
8bd87d349a Fulhack to fix concurrentcy issues 2011-04-13 16:52:27 +02:00
Jonatan Pålsson
e3152576a2 Added some join magic 2011-04-13 16:37:10 +02:00
Jeena Paradies
d9e95b2508 fixed problem with two concurrent players 2011-04-13 16:31:11 +02:00
Jeena Paradies
f013e75b5c fixed problem with two concurrent players 2011-04-13 16:25:50 +02:00
Jonatan Pålsson
231bbfdf16 Added hackfix for join_table hangups 2011-04-13 15:32:10 +02:00
Jonatan Pålsson
901d4b724c Now we have multi-table support. !!!CAP IS AT 2 PLAYERS!!! 2011-04-13 11:38:36 +02:00
Jeena Paradies
16045afb21 working pong-bot 2011-04-13 03:44:00 +02:00
Jeena Paradies
5bcd7260d3 pong-bot bugfixes 2011-04-12 18:29:47 +02:00
Jeena Paradies
865c963ad6 fixed pong with new protocol 2011-04-12 00:58:29 +02:00
Jeena Paradies
739939dfac added more pong to gitignore 2011-04-11 20:12:23 +02:00
Jeena Paradies
087dde8916 removed fsm name 2011-04-11 17:33:33 +02:00
Jeena Paradies
a885d2c2e2 merge with jeenas branch 2011-04-11 16:52:01 +02:00
Jeena Paradies
135caff0e9 changed player to gen_server 2011-04-11 16:48:40 +02:00
Jonatan Pålsson
cb24e00c6e Replaced old protocol with gen_fsm protocol parser 2011-04-11 16:27:53 +02:00
Jeena Paradies
da67b0a977 added stash 2011-04-11 10:54:18 +02:00
Jeena Paradies
0718031e22 merge 2011-04-11 10:53:47 +02:00
Jeena Paradies
ac4036dfc8 added sound to pong and fixed some bugs 2011-03-06 05:25:35 +01:00
Jeena Paradies
c7919309e9 added pong vm 2011-03-06 01:11:28 +01:00
Jeena Paradies
e53c2a82c4 fixed js syntax errors and changed to ggs_gamevm 2011-02-28 14:39:38 +01:00
Jonatan Pålsson
6986bc269f Now most of GGSChat uses the GGS protocol both ways 2011-02-28 13:00:39 +01:00
Jonatan Pålsson
9ff48a90b3 Now all the tokens work 2011-02-28 11:45:09 +01:00
Jonatan Pålsson
83cddf1c09 Now gga_gamevm_e uses tokens to identify tables 2011-02-26 00:01:49 +01:00
Jonatan Pålsson
a20f9351d4 Added tool to kill GGS subsystems, added ggs_coordinator:get_all_players 2011-02-25 20:46:45 +01:00
Jeena Paradies
bf972de0b5 changed user to player and added first try of the javascript api 2011-02-25 20:01:40 +01:00
Jonatan Pålsson
7de4fc58cd Added user list + some cosmetics to GGSChat 2011-02-25 00:05:28 +01:00
Jonatan Pålsson
c4f244e778 Now ggs_gamevm_e uses ggs_db so store/lookup nicks. 2011-02-24 23:07:58 +01:00
Jonatan Pålsson
87df33fd47 Now we can crash ggs_coordinator without it affecting the clients. 2011-02-24 22:33:16 +01:00
Jonatan Pålsson
f6bb2328a1 Merge branch 'jonte_rewrite'
Conflicts:
	erlang_js
2011-02-24 13:40:54 +01:00
Jeena Paradies
191c464220 added ggs_gamevm: 2011-02-24 12:58:16 +01:00
Jonatan Pålsson
97c7e39b4a Merge branch 'master' into jonte_rewrite
Conflicts:
	src/ggs_coordinator.erl
	src/ggs_gamevm_e.erl
	src/ggs_table.erl
2011-02-24 11:38:36 +01:00
niklas
0aac25cd42 Fixed getItem in ggs_db 2011-02-23 22:29:10 +01:00
Jeena Paradies
8a1a520ac0 moved tests to own file 2011-02-22 19:49:57 +01:00
Jeena Paradies
2a884cb9a7 fixed problem with getItem() 2011-02-22 16:09:53 +01:00
Kallfaktorn
3751ba8c95 Bad code. 2011-02-22 16:44:39 +01:00
Kallfaktorn
059948d7c3 merge. 2011-02-22 15:08:25 +01:00
Jeena Paradies
ce7b7d2764 removed init from export 2011-02-22 13:57:07 +01:00
Jeena Paradies
dcc1a6086f removed io 2011-02-22 13:56:27 +01:00
Kallfaktorn
873e88eefd Removed init from ggs_db. 2011-02-22 12:42:22 +01:00
Kallfaktorn
0c530dde5d clear(GameToken) aded. 2011-02-22 12:36:36 +01:00
Kallfaktorn
597070f2d6 added ggs_db.hrl to src 2011-02-22 11:18:13 +01:00
Jeena Paradies
8953d23dca Merge branch 'master' of github.com:jeena/GGS 2011-02-22 03:11:47 +01:00
Jeena Paradies
6ee945379f added makefile, fixed problems with tests 2011-02-22 03:11:35 +01:00
Kallfaktorn
bf4d743923 ggs_db.erl only init and stop left to do.
ggs_db.test.erl only init and stop left todo.
Everything else is done with these two files.
2011-02-22 01:09:55 +01:00
Jeena Paradies
073c4d49b0 merged rewrite and master 2011-02-22 00:35:54 +01:00
Jeena Paradies
183e628e8d Merge branch 'rewrite' 2011-02-22 00:22:10 +01:00
Jonatan Pålsson
dfc17729d6 Merge branch 'rewrite' into jonte_rewrite 2011-02-22 00:17:46 +01:00
Jeena Paradies
ac550f616e Merge branch 'master' of github.com:jeena/GGS 2011-02-22 00:16:43 +01:00
Jeena Paradies
e03f3cf69d better js_erlang_test 2011-02-22 00:15:21 +01:00
Jeena Paradies
08e0be70e2 fixed test with js callback 2011-02-21 20:54:43 +01:00
Jeena Paradies
b3d8c5ba99 added more test 2011-02-21 15:43:39 +01:00