Commit graph

169 commits

Author SHA1 Message Date
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
Jonatan Pålsson
daf48fd606 Merge branch 'rewrite' into jonte_rewrite
Conflicts:
	src/ggs_gamevm.erl
2011-02-21 15:12:27 +01:00
Jonatan Pålsson
7412087d4a worked more on chat 2011-02-21 15:11:28 +01:00
Jonatan Pålsson
507081c234 Now we have a /lusers command in chat ;) 2011-02-20 01:58:48 +01:00
Jonatan Pålsson
67567fe263 Added some more ggsvm_e functionality and also a chat client 2011-02-20 01:41:40 +01:00
Jonatan Pålsson
5bc862c6f9 Merge branch 'jonte_rewrite' into rewrite
Conflicts:
	src/ggs_table.erl
2011-02-17 23:22:25 +01:00
Jonatan Pålsson
883cf9e9d7 Now we have some myltiplayer action! 2011-02-17 23:17:04 +01:00
Jeena Paradies
dd9b92bf43 fixed escaping problem 2011-02-17 20:14:45 +01:00
Jeena Paradies
44d26278cc rewrite to gen_server and added tests 2011-02-17 20:05:12 +01:00
Jeena Paradies
041fee2441 removed Token and Socket 2011-02-17 14:14:32 +01:00
Jonatan Pålsson
3f41769233 Now we have join_table, create_table and join_lobby + test cases 2011-02-17 12:57:41 +01:00
Jonatan Pålsson
818205e19b Now we store the tables when they are created 2011-02-17 12:12:12 +01:00
Jonatan Pålsson
391af1a96a Added more tests & functionality. (failing join table, create_table_test with force) 2011-02-17 10:08:27 +01:00
Jonatan Pålsson
654aa837dd Added some tests for coordinator 2011-02-17 09:35:39 +01:00
Jonatan Pålsson
94d9dc6d7f ggs_logger got lost somewhere? I added it again, also replaced all references to helpers with ggs_logger 2011-02-17 08:33:55 +01:00
Jeena Paradies
ea1557e2d7 added a notify test 2011-02-17 02:28:14 +01:00
Jeena Paradies
d018034b7f added another test 2011-02-17 01:57:29 +01:00
Jeena Paradies
6865e73684 changed from stop/1 to stop/2 in export 2011-02-17 01:57:09 +01:00
Jeena Paradies
8a780adb2d changed to a gen_server 2011-02-17 01:01:54 +01:00
Kallfaktorn
e8db6fb211 Merge branch 'rewrite' of github.com:jeena/GGS into rewrite 2011-02-16 21:19:48 +01:00
Kallfaktorn
2455f5582c Added ggs_player_test skeleton. Return in player start_link is now {ok, Pid} | {error, Reason}. 2011-02-16 21:18:32 +01:00
Jeena Paradies
5b0e133043 merged with jonte 2011-02-16 20:59:44 +01:00
Jeena Paradies
4be808049e added ggs_logger module and implemented some ggs_table stuff 2011-02-16 20:53:36 +01:00
Jonatan Pålsson
c63e243564 Merge branch 'jonte_rewrite' into rewrite
Conflicts:
	src/ggs_coordinator.erl
	src/ggs_dispatcher.erl
	src/ggs_player.erl
2011-02-16 20:08:43 +01:00
Jonatan Pålsson
ec78283a46 Added some basic echo functionality 2011-02-16 20:06:03 +01:00
Jonatan Pålsson
9e3ad5fa9b Merge branch 'jonte_rewrite' into rewrite
Conflicts:
	src/ggs_coordinator.erl
	src/ggs_dispatcher.erl
	src/ggs_player.erl
2011-02-16 20:00:30 +01:00
Jonatan Pålsson
70a6beb8b9 Added some basic echo functionality 2011-02-16 19:49:43 +01:00