forked from ajanata/PretendYoureXyzzy
-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Merge Upstream #4
Open
emckee2006
wants to merge
115
commits into
emckee2006:master
Choose a base branch
from
ajanata:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The README file needs an update. As Eclipse will no longer compile the WAR correctly. Using Maven will compile PYX correctly.
I've spent multiple hours trying to figure out why it isn't actually working, and at this point I'm giving up on it. If you want an alternate web UI, send pull requests or run your own servers. My servers will only officially support my UI, though you are free to use other UIs if you can make them work with them (but I provide no guarantees that updates won't break things).
Fix typo of "hard" to "hand"
Make the README file have the correct information.
Fix removing cookies. Add per-server instance unique IDs for games and users, which will not collide between servers or when servers restart. Add GeoIP capability. Add beginning of framework for logging card plays.
…ass, name). Add metrics logging for server start up, user disconnect, and card judging events.
…an log, and do not bother re-loading pyx.properties immediately after creating the injector which already does so
… everything breaks if Postgres restarts.
Send global chat enabled with FirstLoad
When users connect (or reload the page), show a permalink to that session's games as well as a permalink to their entire play history, if they haven't opted out of that tracking. When a game starts, or a player/specator joins a game in progress, show a permalink to that game's rounds. The "when a game starts" bit required removing the tracking of the 'dealing' state, as there was no other easy way to determine that a game was starting. Nothing actually used that dealing state, so it was harmless to remove. Now, a transition from lobby to playing can be detected as a game start, as opposed to a transition from round over to playing.
Add a configurable nickname ban filter, similar to the chat filter except this is defined in the properties file since it doesn't need unicode. Any user that attempts to use a nick that contains anything on this list will be denied. Fix a bug with /kick and /ban that caused it to only work against users with entirely lower-case nicknames. Add a check that the user's IP address hasn't changed. This probably isn't as needed now that /kick actually works against everybody.
Allow admins to join passworded games
Add more info to stats.jsp
Allow admins to spectate any password protected game
Adding Docker docs to README
Not sure why this was enabled by default. Kind-of fixes #192.
…blank card limit to pyx.properties
changed geoip version to 2.8.1 because build dependencies were failing
Moved min/default/max to configuration file
update postgresql JDBC driver to latest version
[Minor fix] Moved min/default/max to configuration file
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.