e8970ccddb
increase game limit again
2013-03-30 08:09:40 -07:00
622f50aa89
update changelog
2013-03-26 20:43:39 -07:00
18606af0cd
increase game limit
2013-03-26 20:43:33 -07:00
660fd2d5f1
prevent wrapping in the middle of cardset names
2013-03-26 20:31:46 -07:00
c662bf954d
admins can send chat to all connected users
2013-03-26 20:17:49 -07:00
a768677eaf
allow html in card text
2013-03-26 18:07:09 -07:00
61b567e2ec
add watermark to add card page
2013-03-26 18:06:43 -07:00
9273a8ad4a
logging
2013-03-26 17:19:07 -07:00
a43e087fa2
card set descriptions
2013-03-26 17:19:01 -07:00
cc954aa0e4
JRE classpaths on my system changed, this should be compatible anyway
2013-03-26 17:18:06 -07:00
526911bc0e
Don't update the game list when it isn't visible (i.e. you're already in a game). The client will refresh it when the player leaves their game anyway. This will hopefully cut down on a lot of bandwidth usage -- that's a lot of data sent around whenever anybody joins or leaves any game, and nobody sees it.
2013-03-02 23:50:24 -08:00
e70874cbcf
update changelog
2013-02-24 23:57:22 -08:00
ccca422b8c
show game-related log messages in the game's log instead of the global log
2013-02-24 18:57:04 -08:00
300e7e09b7
Fix up per-game chats so global chat still works. Fix graphical glitch with game chat tab. Make enter work in game chat box. Clear game chat log when joinging game.
2013-02-24 18:47:05 -08:00
b1c8e52dd4
Remove the chat tab when leaving a game
2013-02-24 17:48:49 -08:00
77f54fb1b4
Send game ID to client for in-game chat
2013-02-24 17:48:49 -08:00
9cbd699109
Display Per-game chat messages in the correct tab
...
Errors are displayed in all chat tabs, including the global chat and
all in-game chats.
2013-02-24 17:48:49 -08:00
043f02509e
Test per-game chat. Breaks global chat.
2013-02-24 17:48:48 -08:00
b74aed03c1
make per-game chats resize with the window like global chat.
2013-02-23 14:32:00 -08:00
d110b59b9c
Create a new tab for game-specific chat.
...
Signed-off-by: Matt Mullins <mmullins@mmlx.us>
2013-02-23 14:18:22 -08:00
3183af0a45
Add generalized arguments to chatsubmit_click
...
These parameters are used as a closure, so that the generated handler knows
which game it is attached to.
Signed-off-by: Matt Mullins <mmullins@mmlx.us>
2013-02-23 14:18:18 -08:00
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
Andy Janata
Matt Mullins
timsookram