Commit graph

1445 commits

Author SHA1 Message Date
tooomm
3767d49407 resolved typo 2015-05-25 03:27:27 +02:00
Fabio Bas
471f6371b5 More work
* Refactored code out of common/ into servatrice/
 * added smtp client library
 * disable registration when connected
 * validate email address
 * send activation token via email
2015-05-24 23:02:51 +02:00
Fabio Bas
d6cee242e3 Another gcc warning-as error removal 2015-05-24 00:53:08 +02:00
Fabio Bas
ff1aed717e Added token generation, user activation command and response. 2015-05-24 00:37:45 +02:00
tooomm
8f64fd4a0b text works
fixed welcome msg
added some articles
added database phrase to card updater
cosmetic changes to the description in edit sets
2015-05-23 23:13:45 +02:00
Fabio Bas
5ace0dd892 Almost completed registration
* added missing bits of serverside code;
 * added fronted in client;
 * removed demo python scripts;
2015-05-23 20:13:03 +02:00
ctrlaltca
411fc38337 Merge pull request #1106 from ctrlaltca/fix_1105
Fix crash on server shutdown; fix #1105
2015-05-23 18:26:13 +02:00
Matt Lowe
ad6dc16f84 Fixed replay crash
Game types are only available in online games.
This is the fastest fix.
Replays now work again.
2015-05-23 16:43:35 +02:00
Fabio Bas
323537d08d Fix crash on server shutdown; fix #1105 2015-05-23 11:33:36 +02:00
poixen
43c9f4e123 Merge pull request #1100 from poixen/new_sounds
Updated sounds
2015-05-22 21:03:14 +02:00
woogerboy21
3532c31d91 Merge pull request #1098 from poixen/gui_time_limit
Increased server shutdown limit
2015-05-22 14:52:32 -04:00
Matt Lowe
4c1e24c214 fixed conflicts 2015-05-22 11:51:10 +02:00
poixen
d1b243481b Merge pull request #1086 from poixen/sounds
updated sounds
2015-05-22 11:19:50 +02:00
Matt Lowe
7ac0f6f420 Added game type to tab title
+ The game type(s) is now displayed in the tab
+ Reformatted tab title
2015-05-22 10:39:49 +02:00
Matt Lowe
085eb0f2fa Increased server shutdown limit
Added a max of 999 mins for the server shutdown to the gui.
2015-05-22 10:00:25 +02:00
Fabio Bas
227c18fc5a Fix card update under windows
It failed if the path contained spaces.
2015-05-21 21:39:51 +02:00
Fabio Bas
6af91b3d1c Ignore filename case when loading custom sets 2015-05-21 19:58:35 +02:00
Fabio Bas
ff20e04842 fixed untranslatable string, regenerated translations 2015-05-21 19:40:17 +02:00
tooomm
7db7b7fb06 expanded wording of name conflicts for tokens /2
- removed space
- fixed wording
2015-05-21 15:17:52 +02:00
Fabio Bas
b566bf4a19 Load additional xml sets from $userprofile/customsets/ 2015-05-20 18:27:50 +02:00
Matt Lowe
3ac2a69b8b updated 2015-05-20 00:31:56 +02:00
Matt Lowe
5758ac685c Added untap sound
After more tinkering, it feels nice to have untap sound
2015-05-19 23:50:15 +02:00
Zach
292d730ca7 Merge pull request #1067 from tooomm/patch-1
expanded error msg for name conflicts (tokens)
2015-05-19 16:56:39 -04:00
poixen
5a516de26a Merge pull request #1078 from poixen/url
No need for [url][/url]
2015-05-19 22:43:37 +02:00
poixen
8209c59941 Merge pull request #1076 from poixen/sb_locked
Disable SB button when ready
2015-05-19 11:15:04 +02:00
Matt Lowe
af29d4529c Can now use more url types
Can now use
http://
https://
www.
2015-05-19 11:11:20 +02:00
ctrlaltca
15dd3471bc Merge pull request #1075 from ctrlaltca/fix_1070
Ensure sounds are working at startup; Fix 1070
2015-05-16 18:21:08 +02:00
ctrlaltca
25f444a5af Merge pull request #1051 from poixen/reveal_top_x
Reveal top x cards
2015-05-16 18:20:56 +02:00
ctrlaltca
262ebe3bf7 Merge pull request #1039 from ctrlaltca/update_oracle
Run oracle from inside cockatrice and improve sets handling;
2015-05-16 18:20:36 +02:00
Matt Lowe
9ce3aecd38 No need for [url][/url]
No longer need to use the [url] tags to add **HTTPS** links. I want to
only link to "secure" site by default, hence only https.

Users can still use [url] tags if they want to.

The ENTIRE chat  code needs to be rewitten, as it is just packing more
code upon code. It can be done in another PR though. This just gets the
base working feature in place.
2015-05-16 09:49:28 +02:00
Matt Lowe
f2c3045a71 Disable SB button when ready
Updated to trigger on receive rather than send
2015-05-16 08:49:38 +02:00
Fabio Bas
2299fa1ac4 Add backward compatibility for new client on old servers 2015-05-15 18:18:25 +02:00
Fabio Bas
8fba04397b All platform: at startup, ensure that a proper directory for sounds is set 2015-05-14 15:47:57 +02:00
Fabio Bas
924337ee93 revert 0b4701c42f 2015-05-14 15:36:44 +02:00
ctrlaltca
9c20811a7a Merge pull request #1071 from poixen/sounds
Cleanup
2015-05-14 15:14:36 +02:00
Fabio Bas
44800df89c Reworked the layout of "edit sets" window 2015-05-14 13:12:24 +02:00
Fabio Bas
58a5834f34 Implemented proposed changes to initial popup message 2015-05-14 12:38:30 +02:00
Matt Lowe
f1703ed0ad Cleanup
+ Removed todo
+ linked test sound to the player joined sound
2015-05-12 19:25:49 +02:00
tooomm
c541944089 expanded wording of name conflicts for tokens
added "Make sure to enable the 'token set' in 'Edit sets...' dialog to display them correctly."
2015-05-09 14:12:41 +02:00
Zach
07fcde038c Merge pull request #1065 from poixen/die_roll_parent
Connected die roll dlg to parent
2015-05-08 16:14:47 -04:00
Matt Lowe
80e53b334e Connected die roll dlg to parent
Die roll now has a logo as it is correctly connected to the parent.
2015-05-08 20:36:31 +02:00
poixen
a8c4e4439c Merge pull request #1055 from poixen/sounds
Refreshing Cockatrice Sound
2015-05-07 08:57:30 +02:00
poixen
df834183bd Merge pull request #1053 from poixen/reveal_makeover
Updated reveal zone
2015-05-07 08:54:35 +02:00
poixen
433412dee1 Merge pull request #1061 from poixen/filter_svgs
Updated filter svgs
2015-05-07 08:54:28 +02:00
Matt Lowe
5dfef6215c Added punctuation mark 2015-05-06 14:19:01 +02:00
Matt Lowe
6da6e5b562 Updated card loadout background 2015-05-06 14:09:27 +02:00
Matt Lowe
f2a53abcd8 Updated filter svgs
Now uses the same as in the deck editor
2015-05-06 13:25:06 +02:00
Matt Lowe
c64eeb4ebe Added sound settings page
+ added sound setting page
+ added sound setting icon
+ moved sound settings from interface settings

Added master volume

+ added master volume slider.
+ volume can be changed by sliding bar or by using the spin box
+ Preview of  volume will be played when dragging and releasing bar.

Added checks for qt4

Qt4 does not have support for setting the volume without some lengthy
work around, I have disabled volume control for qt4 users and have
mentioned that "Master volume requires qt5".

Updated sfx

+ removed all old sfx
+ added new end step and tap sound
+ tap/endstep sound has a timer on it to prevent spamming
+ test sound engine will now use endstep sound

Made end step sfx softer

end step felt too harsh

Added player joined sound

+ added a sound for when a new player joins a room

Updated

Was missing a sound when a player joins

Made end step softer

Made end step even softer

updated sound again
2015-05-06 12:47:48 +02:00
Matt Lowe
87d938e56b Updated hand and table color
Updated default colors, darker, more modern, slick. Great feedback from
community.
2015-05-05 23:58:36 +02:00
Matt Lowe
1e0c4cbf87 Updated reveal zone check boxes
I saw in some images from other platforms it can take up alot of space.
Made the boxed horizontal, rather than vertical.

WIP Remade reveal zone

+ darkened card area to eaisily see boundries
+ reverted back to using a window
+ window can be resized
+ removed fake title bar and "X"
+ moved all cards revealed slightly to the right, makes it easier to
drag-select from the left

Cleanup

Changed style to use cockatrice icon

Changed cast

from static_cast to qstyleoption_cast
2015-05-05 10:14:27 +02:00
poixen
cf24f4aa04 Merge pull request #1045 from poixen/move_reveal_location
Moved zone loactions
2015-05-04 17:09:23 +02:00
Zach
399122f49d Merge pull request #1047 from poixen/move_filter_boxes
Updated reveal zone check boxes
2015-05-04 10:47:44 -04:00
Matt Lowe
45d214aa19 Added deck size limit
Updated to use the current deck size limit
2015-05-04 16:21:59 +02:00
Matt Lowe
b81ed893e1 Can now disable desktop mentions
Was not checking if the setting was enabled
2015-05-04 12:40:51 +02:00
Matt Lowe
59c0834427 Reveal top x cards
Updated reveal top card to reveal top x cards
Sometimes you want to reveal more than only the top 1 card.
2015-05-04 10:49:49 +02:00
Matt Lowe
052ce72993 Updated reveal zone check boxes
I saw in some images from other platforms it can take up alot of space.
Made the boxed horizontal, rather than vertical.
2015-05-02 21:18:02 +02:00
Matt Lowe
7ccc23f902 Moved zone loactions
I have moved the default opening positions of some of the reveal zones.

Example:

The sideboard will be in the same position as the scry and the random
card from hand will be the same as the hand view.
2015-05-02 17:52:34 +02:00
Matt Lowe
95104df589 Reverted back to full punctuation
Reverted back. Right now it feels strange to only have simple search.
Really you would want both simple search AND accurate search on, though
this requires twice the checks for each result.
2015-05-01 22:26:44 +02:00
Fabio Bas
66adeb6d75 Improve sets handling
Move the “check unknown sets” method inside the cards database, so that
it can be executed when the card database gets reloaded after a card
database update.
Additionally, show the user a welcome message the first time they run a
new cockatrice version, so that they know why they get shown the “edit
sets” window and how to hide/disable sets.
2015-05-01 18:55:14 +02:00
Fabio Bas
c356a6fc48 Run oracle from cockatrice 2015-05-01 16:38:31 +02:00
Zach
5410afbbb1 Merge pull request #1035 from ctrlaltca/fix_762
Add "play top card face down" menu entry to library; fix #762
2015-04-28 11:33:41 -04:00
Fabio Bas
e649535211 Add "play top card face down" menu entry to library; fix #762 2015-04-27 23:02:45 +02:00
Zach H
425790e398 Fixed incorrect zone positioning 2015-04-27 16:26:57 -04:00
Zach
1ca561dec5 Merge pull request #1033 from poixen/token_pt_fix
Only use local db if no pt is provided
2015-04-27 15:58:41 -04:00
Zach
c5ac3701ba Merge pull request #1031 from ZeldaZach/update_about_menu 2015-04-27 12:21:15 -04:00
Zach H
a15a0c0385 gavin & translate update
Add dev section

add report section
2015-04-27 11:34:53 -04:00
Matt Lowe
6fd5c4dd27 Only use local db if no pt is provided
Addresses issue #1032

If a token is created with no p/t then the local db value will be passed
instead. If a value is provided then that will be used instead.
2015-04-27 10:17:46 +02:00
tooomm
f83ddf48fd cleaned up translations
removed tr() tag from hidden strings
2015-04-27 00:25:43 +02:00
Zach
f6d0b5216b Merge pull request #1027 from ctrlaltca/osx_retina_ok
Enable hidpi (retina) support under osx
2015-04-26 18:13:56 -04:00
poixen
ab28b45d68 Merge pull request #1029 from poixen/server_shutdown_fix
Fixed server shutdown crash
2015-04-27 00:12:28 +02:00
Matt Lowe
a729bb076b Fixed server shutdown crash
`serverShutdownMessageBox` was not assigned to 0 in the ctor.
2015-04-26 23:39:20 +02:00
Fabio Bas
e88bad786f Enable hidpi (retina) support under osx
* add to the application bundle a custom info.plist
 * fix a graphic glitch on the life counter
2015-04-26 22:50:59 +02:00
Matt Lowe
ff1aec406b Changed pt to orange
After feedback, and also noticing myself, the blue requires a little
more focus than should be nessesarry. I have updated to be orange, which
feels more comfortable. I have polled the community and they also agree
orange > blue.
2015-04-25 23:06:41 +02:00
Matt Lowe
74f140ade8 removed qfont import 2015-04-23 23:06:21 +02:00
Matt Lowe
637bd767bb Updated to use svgs 2015-04-23 22:43:24 +02:00
Matt Lowe
1ab2ba3f6f Updated + / - buttons
+ moved to the left to make it easier to move from buttons to macros
+ changed buttons to + / -
+ made buttons a bit bigger
2015-04-23 18:42:49 +02:00
woogerboy21
924dd174e3 Merge pull request #1010 from poixen/server_shutdown_warnings
Updated server shutdown timer logic
2015-04-23 10:59:32 -04:00
Matt Lowe
e646122f55 Updated server shutdown timer logic
Will follow the following rules

+ send a message initially
+ send a message every 20 mins
+ send a message every min when time <= 5

Updated client popup

Updated client to close any previous popups and bring up a new one.

NEEDS TO BE TESTED

added missing include

Added delete on close
2015-04-22 19:14:14 +02:00
Matt Lowe
004a952cb4 Colored PT
I compare the card pt, to the card with the same name in the db. if the
card is found, we compare the pt, of the db item and the item in play.
If there is not a match then we change the color of the PT. This is
pretty much the same as mtgo does it.

I looked into having only the P, or the T colored, though this is not
posible, when you set a pen color you can not change it partway through
painting a string. That would require 3 strings painted, one for p, /
and t. Which is more effort than its worth. This does the job pretty
well.

I have also moved the pt slightly to the left so it lines up better. I
have some images to compate.
2015-04-22 15:02:47 +02:00
Fabio Bas
7e56c5a9c6 Added translation fix missing from #1001 2015-04-22 11:10:14 +02:00
Fabio Bas
629f48e2ff Permit translation in "game created" column; Fix #999
Also, extracted the 2 new strings
2015-04-22 09:12:38 +02:00
ctrlaltca
4a36be84a8 Merge pull request #985 from ctrlaltca/sets_rebased
Rework the way sets selection/importing works; fix #539 (rebased)
2015-04-21 14:46:51 +02:00
poixen
2902d8575e Merge pull request #983 from poixen/mention_fix
Mentions will now work with all legal chars
2015-04-20 14:20:23 +02:00
ctrlaltca
5f13f89d74 Merge pull request #986 from poixen/clear_chat_fix
Added clear chat fix
2015-04-19 18:20:40 +02:00
Matt Lowe
86fa02c6c5 Added clear chat fix
When clearing the chat, we now clear the last sender.

This fixes the issue where you clear the chat and a user continues to
talk, you get no indication of who is talking. Now it will show the
users name.
2015-04-18 22:23:51 +02:00
Fabio Bas
881cea27f4 Rework the way sets selection/importing works; fix #539 (rebased) 2015-04-18 18:47:09 +02:00
ctrlaltca
e69ca60164 Merge pull request #978 from tooomm/useronserver_rename
clearly differentiate user lists
2015-04-18 18:17:55 +02:00
Matt Lowe
2d34bfeb1b Mentions will now work with all legal chars
As the server has been updated to enforce username rules, we can now
check for the next position of whitespace. This allows ALL users to have
a working mention system. Currently "-" is available for users, this
will fix that.
2015-04-18 14:42:39 +02:00
woogerboy21
69a9484e45 Merge pull request #981 from ctrlaltca/servatrice_compilation_fix
Quick compilation fix for debug mode
2015-04-17 13:44:26 -04:00
woogerboy21
1562d1efd1 Merge pull request #980 from poixen/server_period
Updated server to support "."
2015-04-17 13:44:15 -04:00
Fabio Bas
3d0b132dae yet another unused parameter 2015-04-17 18:57:37 +02:00
Fabio Bas
3969572d36 Fixed double variable declaration 2015-04-17 18:51:48 +02:00
Fabio Bas
2a9945ac6a Reorder member initialization 2015-04-17 17:44:07 +02:00
ctrlaltca
6807fed02f Merge pull request #976 from ctrlaltca/fix_643
Fix #643 (problem in deck editor's OR filter when no term is enabled)
2015-04-17 09:47:32 +02:00
ctrlaltca
b99a0a682e Merge pull request #973 from poixen/filter_dlg
Filter password games consistancy
2015-04-17 09:47:18 +02:00
Matt Lowe
d5a1264bcb Updated server to support "."
Now uses regex.
Added "."
Updated login message
2015-04-16 23:50:05 +02:00
Fabio Bas
c27735b09e Simplified code 2015-04-16 22:20:40 +02:00
tooomm
5be3ec8068 clearly differentiate users lists
users in room vs. users on server
2015-04-16 15:17:08 +02:00
Fabio Bas
9296e6007f Fix #643 2015-04-16 12:44:10 +02:00
ctrlaltca
2f35e86be9 Merge pull request #954 from ctrlaltca/deckeditor_cmc
Minor deck editor fixes
2015-04-16 08:12:53 +02:00