7b74529a2b
Refactor chat button click-handler to be a closure.
...
This will support having multiple handlers, one per game, in the future.
Signed-off-by: Matt Mullins <mmullins@mmlx.us>
2013-02-23 14:18:13 -08:00
9594b542f6
Replace id= with class= for the chat panel.
...
This is in preparation to support multiple tabs, which will provide a
separate chat tab per running game.
Signed-off-by: Matt Mullins <mmullins@mmlx.us>
2013-02-23 14:18:07 -08:00
df6be2ea00
null check to fix junit test
2013-02-03 11:02:51 -08:00
e436a63cf1
Change chat flood protection from 5 messages per 15 seconds to 3 messages per 10 seconds.
2013-02-03 10:58:26 -08:00
869750b6c3
Refactor Game.removePlayer() to fix a deadlock.
2013-02-03 10:56:57 -08:00
9b46a854a7
update card sql with Very Serious card set
2013-01-09 00:02:25 -08:00
3e7e948052
updated news
2013-01-08 23:35:41 -08:00
6f9c507f9d
increase game limit from 60 to 75
2013-01-08 23:34:33 -08:00
d4adaa7692
fix a comment
2013-01-08 23:34:21 -08:00
c8a5898e6d
Add code style settings to project.
2012-12-29 13:48:57 -08:00
20cf5ed3cc
Atomically check for existing user with requested nickname and add new user if there is not such an existing user. Fixes #26 .
2012-12-29 12:57:31 -08:00
5a52a48976
fix code formatting, formatting for the 's' for 'Awesome Points', and formatting for 'Your Hand' text
2012-12-23 09:48:00 -08:00
9f14e33880
Moving padding inside container divs
2012-12-23 09:30:53 -08:00
45375abaf7
Added point title class to shrink "awesome pts"
2012-12-23 09:30:52 -08:00
2fc43c3e27
Bolding scores and player on scorecard
2012-12-23 09:30:52 -08:00
a2ac914817
Update WebContent/cah.css
...
Removing margin from h3 in game lobby description
2012-12-23 09:30:51 -08:00
9d55c49ccb
Update WebContent/game.jsp
...
Reformatting Game Lobby entry to prioritize Host name and Player Count
Hiding Game ID
2012-12-23 09:30:51 -08:00
0c2dfb659a
Update WebContent/cah.css
...
Changing selected card style
2012-12-23 09:30:51 -08:00
ce20c55807
Update WebContent/cah.css
...
-Adding gradients to bottom of cards and game lobbies
-Styling Join button
2012-12-23 09:30:50 -08:00
a8fd92cf66
Update WebContent/cah.css
...
General:
-Removing borders and using grey background to add contrast
Game Lobby:
-Bolding Game Status & Join Button
-Padding Game Description
Game:
-Adding rounded corners and thinner borders to cards
-Subtler blue selected card state
2012-12-23 09:30:50 -08:00
5dba74fac6
Add 2012 Holiday Pack and r/MLPLounge card sets.
2012-12-07 18:48:42 -08:00
45312306c9
update vsTerminus's IP address for admin, and fix cardsets.jsp for new jquery version
2012-12-07 18:46:46 -08:00
ce8e203a08
avoid an NPE in Game.getInfo if the host is null. This almost certainly means the game is no longer valid anyway. Fixes #13 .
2012-11-10 22:40:57 -08:00
891d2a36a1
need to discard black cards so reshuffling actually works
2012-11-10 20:00:52 -08:00
482361fa46
Try to fix another deadlock
2012-11-09 23:26:30 -08:00
c357c3bfb0
Merge branch 'master' of github.com:ajanata/PretendYoureXyzzy
...
Conflicts:
src/net/socialgamer/cah/data/Game.java
2012-11-09 23:26:17 -08:00
dee40315b8
check for null in judgeCard, just in case
2012-11-09 23:25:18 -08:00
1849588bf7
check for null in judgeCard, just in case
2012-11-09 23:17:45 -08:00
18e51e9d04
close hibernate session when removing a game. shouldn't have to explicitly do it but why not
2012-11-09 23:12:21 -08:00
972229aa17
Reshuffle the correct deck when out of black cards. This has caused a StackOverflowException.
2012-11-09 21:11:39 -08:00
9c65662997
Don't wait for queued messages if the timeout is negative. This requires a very close timing of when it thinks it should do another loop and when it actually does the loop. Fixes #14 .
2012-11-09 19:55:15 -08:00
aa7b199bdb
lock around Game.cardSets, as this was causing concurrent modification exceptions. It would be ideal to allow concurrent reads and just require an exclusive write, but that is an excerise for later. Fixes #21 .
2012-11-09 19:40:22 -08:00
c66ffa6e1f
Now fix the chat box font.
2012-10-27 08:51:12 -07:00
11a343eb75
I hate CSS. "Fix" the game hand display. Not sure why it got broken, had to be related to using tabs.
2012-10-27 08:50:07 -07:00
f294f3b64a
Reorganize a bit of code in Game.start() to try to avoid a deadlock (see #23 ). I think this should fix it but I haven't tested it yet.
2012-10-17 23:36:37 -07:00
22156e90ac
add tabs, move user preferences to a tab, and fix the chat ui to fit the tab. it gets very bad at small window sizes though
2012-10-15 20:23:37 -07:00
54974836c8
I don't like editing library files I'm pulling from elsewhere, but those JS errors in Eclipse were getting annoying.
2012-10-13 13:48:57 -07:00
63b8f3eaaf
Player and score limit options dynamically generated. Allow up to 69 point score goal.
2012-10-11 21:40:41 -07:00
de331e738a
- User preferences. Can turn off (dis)connect messages except for kicks/bans ( fixes #9 ), and can ignore chat from specific users (except admins). Also remembers the user's name. All of these are stored in js cookies.
...
- Update jQuery and jQuery Cookie plugin, and add jQuery UI.
2012-10-11 21:18:40 -07:00
15d94735e7
Use lower-case version of nickname as key into users map, to allow for case-insensitivity of nicknames. Fixes #19 .
2012-10-11 20:09:56 -07:00
c6c6feb49f
Display non-passworded games before passworded games. Fixes #20 .
2012-10-11 20:05:06 -07:00
842598fd46
Fix name of JavascriptConfigServlet
2012-10-11 19:51:46 -07:00
3b454c4552
Generate cah.config.js via a Servlet. Idea from d4472c1238/src/net/socialgamer/cah/servlets/JavascriptConfig.java
2012-10-11 19:49:16 -07:00
68998c3244
Remove defunct TestServlet from web.xml.
2012-10-11 19:31:31 -07:00
b0b1f5fbf2
Fix @Nullable annotations.
2012-10-11 19:31:17 -07:00
ec1e85ec5d
Check X-Forwarded-For on the admin pages. Fixes #22 .
2012-10-01 20:12:14 -07:00
bd9741e5bd
re-do the db dump without reading from stdin
2012-09-25 18:37:00 -07:00
7e0f36ee87
X-Forwarded-For actually needs to return the first IP address in that header. Shouldn't affect my deployment, though, but worth fixing.
2012-09-22 18:45:42 -07:00
3533471d27
X-Forwarded-For support
2012-09-22 18:43:30 -07:00
b57ee2de7e
add google analytics. why did I wait so long?
2012-09-22 07:51:23 -07:00
Matt Mullins
Andy Janata
timsookram