aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3019 commits 1 branch 0 tags 51 MiB
Commit graph

1885 commits

Author SHA1 Message Date
Zach
7ebf817b17 Merge pull request #1197 from Cockatrice/cpp11 2015-07-13 13:23:18 -04:00
Zach H
29aecc4eb8 Green kick msg 2015-07-13 03:05:03 -04:00
Fabio Bas
87c70466a4 Rework message parser 2015-07-12 23:56:32 +02:00
Zach H
97f298452e first fixes 2015-07-12 11:00:11 -04:00
Zach H
dc05a14f4c Highlight Custom Words 2015-07-11 22:46:00 -04:00
Zach
9edacd7b3e Merge pull request #1236 from Fizztastic/fix_574 
Double Click to open replays
 2015-07-09 23:36:33 -04:00
Jeff
8bc885c3f1 Double Click to open replays 2015-07-09 00:42:02 -04:00
Zach
f733daf18a Merge pull request #1179 from mildmongrel/feature-player-rotation 
Added ability to rotate player positions in the local game view.
 2015-07-08 18:23:10 -04:00
Zach
091ca9fc12 Merge pull request #1230 from ZeldaZach/fix_97 
add shortcut for filter delete
 2015-07-08 18:11:08 -04:00
Zach
2837a4c010 Merge pull request #1232 from ZeldaZach/fix_242 
show colors of cards
 2015-07-08 18:10:23 -04:00
Zach
2bd0133055 Merge pull request #1233 from Fizztastic/fix_340 
Play cards only with double left click
 2015-07-08 18:09:31 -04:00
Jeff
6470e1fd10 Remove unneeded if 2015-07-08 16:25:25 -04:00
mildmongrel
124788d217 Added ability to rotate player positions in the local game view. 2015-07-08 09:16:37 -07:00
Jeff
438aacb9c4 Play cards only with double left click 
Fix #340
 2015-07-08 00:55:35 -04:00
Zach H
afa8b53870 show colors of cards 2015-07-07 23:50:37 -04:00
Zach H
ce42d56a2d add shortcut for filter delete 2015-07-07 22:42:05 -04:00
Zach
f199e20740 Merge pull request #1216 from ZeldaZach/fix_morphs 
Fix Morphs from Sharing Information
 2015-07-07 22:00:32 -04:00
Zach
955cc3920f Merge pull request #1189 from mildmongrel/fix_col_layout 
Fixed horizontal positioning in multicolumn layout.
 2015-07-07 21:40:17 -04:00
Zach
f0efab5142 Merge pull request #1226 from ctrlaltca/fix_241 
Add an option to annotate tokens from card text (default off)
 2015-07-07 21:12:59 -04:00
Zach
9b87f9e7e7 Merge pull request #1225 from ctrlaltca/fix_247 
Order cards by name in deck-load screen
 2015-07-07 20:42:44 -04:00
Zach
db604bce03 Merge pull request #1219 from poixen/pic_fix 2015-07-07 13:41:06 -04:00
Fabio Bas
68e176cc00 Add an option to annotate tokens from card text (default off); fix #241 2015-07-07 19:19:58 +02:00
Fabio Bas
1c2ddccb46 Order cards by name in deck-load screen; fix #247 2015-07-07 17:56:11 +02:00
Zach
685aa99ad6 Merge pull request #1224 from ctrlaltca/profile_edit 
Integrate #1210 changing "Gender" to "Pronouns"
 2015-07-07 10:47:37 -04:00
Fabio Bas
6013974b5e Gender => Pronouns 2015-07-07 14:10:15 +02:00
Zach
1c69288f0e Merge pull request #1222 from Fizztastic/fix_740 
Added 2 shortcuts to game deck screen
 2015-07-07 02:43:04 -04:00
Zach
6bf421cc31 Merge pull request #1210 from ctrlaltca/profile_edit 
Profile management
 2015-07-07 02:01:27 -04:00
Fizztastic
4d6a405d01 Added 2 shortcuts to game deck screen 
- Ctrl+O (Load Deck)
- Ctrl+Alt+O (Load Remote Deck)
 2015-07-07 01:14:06 -04:00
Zach
2b484aa9ee Merge pull request #1221 from Fizztastic/fix_818 
Load .cod files from clipboard in deck editor
 2015-07-07 00:36:49 -04:00
Zach
29b83c3700 Merge pull request #1215 from ZeldaZach/fix_1208 
Mod Global Messaging
 2015-07-06 23:48:46 -04:00
Fizztastic
0b8fab4721 Load .cod files from clipboard 2015-07-06 23:46:11 -04:00
Fizztastic
680332a708 keep consistent ordering 2015-07-06 19:18:27 -04:00
Fizztastic
19bd6cc381 Adds Move To... Hand context menu for cards 2015-07-06 19:10:13 -04:00
Matt Lowe
c260a8a1d4 Fixed image centering 2015-07-06 20:34:38 +02:00
Zach H
ae4436ade7 mod global msg overrides settings 2015-07-06 12:45:08 -04:00
Zach H
cf09aeccfd local user sees orange too 2015-07-05 23:21:46 -04:00
Zach H
1bda6e53b2 allow mod global msg 2015-07-05 22:06:35 -04:00
Zach H
e20c06b639 troubleshooting&faq 2015-07-05 20:11:42 -04:00
Fabio Bas
15998fb3e6 Misc fixes 2015-07-05 22:44:35 +02:00
Fabio Bas
7f5f290c93 Profile management 2015-07-05 22:44:35 +02:00
mildmongrel
75d0d5f66b Fixed horizontal positioning in multicolumn layout. 2015-07-05 10:12:01 -07:00
Zach
31890450dc Merge pull request #1205 from ZeldaZach/fix_1173 
Server Name Rules Information
 2015-07-04 19:37:50 -04:00
Zach H
1f9b3ed28f minor fix 2015-07-04 18:52:50 -04:00
Zach H
24e54fd291 fix crash on mention 2015-07-04 18:26:54 -04:00
Zach H
1d210e57bd show all rules 2015-07-03 23:54:14 -04:00
Zach
360498c83f Merge pull request #1194 from ZeldaZach/fix_1192 
Fix local mention crash
 2015-07-03 18:41:48 -04:00
Gavin Bises
8ed9d35724 Update project to C++11 compilation. 2015-07-03 10:02:31 -04:00
Zach H
cc3e4edfd9 rename function 2015-07-03 00:37:30 -04:00
Zach H
e2be1cd897 fix local mention crash 2015-07-03 00:30:59 -04:00
Fabio Bas
6cf3db7e6b Servatrice: refactor signal handling and permit config reloading 2015-06-30 22:21:26 +02:00
Fabio Bas
6b54d8cbfd Fixed issues 2015-06-30 21:40:39 +02:00
Fabio Bas
02dcaff356 Publish username rules in login failure, too 2015-06-30 18:44:40 +02:00
Fabio Bas
4c27304047 publish username rules in registration failure 2015-06-29 23:35:27 +02:00
Fabio Bas
56db6cd060 Updated translations 2015-06-28 15:17:46 +02:00
Zach
36d0a13fc9 Merge pull request #1153 from ctrlaltca/issue_1144 
Fix windows size growing out of screen; fix #1144
 2015-06-27 21:20:57 -04:00
Zach
d2b71a15fa Merge pull request #1166 from ctrlaltca/fix_232 
Support <tablerow> for tokens; fix #232
 2015-06-27 20:49:14 -04:00
Fabio Bas
f84d6fec1b Never send wrong row numbers 2015-06-25 15:39:03 +02:00
Fabio Bas
fa6e9c7344 updated translations 2015-06-24 13:26:02 +02:00
Fabio Bas
d0c0531bfc extracted new translatable strings 2015-06-24 13:01:23 +02:00
ctrlaltca
78a53f0691 Merge pull request #1151 from ZeldaZach/fix_1050 
Fix False Notifications
 2015-06-24 12:55:13 +02:00
Fabio Bas
ed24b38add support <tablerow> for tokens; fix #232 2015-06-24 10:31:00 +02:00
Fabio Bas
872177a5ed Card images blacklist; changed fallback urls 2015-06-23 15:44:43 +02:00
Zach H
27fa6eb642 Fix False Notifications 2015-06-22 22:43:59 -04:00
Fabio Bas
ec45a099e1 Made items not collapsible; changed players widget's min height from 60 to 40 px 2015-06-22 18:24:05 +02:00
ctrlaltca
0c24f48aa2 Merge pull request #1145 from ZeldaZach/fix_182 
Fix Moved From Error
 2015-06-22 17:29:15 +02:00
ctrlaltca
2415ba2605 Merge pull request #1134 from ctrlaltca/related_cards 
Related cards
 2015-06-22 17:22:47 +02:00
poixen
d7c81a07c6 Merge pull request #1155 from poixen/solid_counters 
Solid counters
 2015-06-21 08:39:38 +02:00
Matt Lowe
4cc959396f Reduced min table width 
The initial table width is too high. The table starts to scale down far
too soon, meaning you have to play in a letterbox ratio.
 2015-06-19 23:40:55 +02:00
Matt Lowe
5c526f6c07 Solid counters 
Removed gradient to give counters a more solid look
 2015-06-19 23:26:36 +02:00
Fabio Bas
c400d6d4ec use the new card frame in game; mitigates #1144 2015-06-19 14:57:20 +02:00
Fabio Bas
1ae79fbcaa Removed double margin around chatbox in game 2015-06-19 14:42:13 +02:00
Fabio Bas
1251338619 enforce max size for user avatar on userinfobox; refs #1144 2015-06-19 14:33:23 +02:00
Fabio Bas
d6ce1852a1 Fix deckeditor jitter problem; fix #1143 2015-06-18 23:13:12 +02:00
Zach H
045da30546 fix wording 2015-06-18 00:16:09 -04:00
Zach
853342463a Merge pull request #1138 from ZeldaZach/chatview_www 
Fix WWW link error
 2015-06-16 20:57:46 -04:00
ctrlaltca
8cf0c3beed Merge pull request #1141 from ZeldaZach/hq_options2 
Allow Custom Download URL
 2015-06-16 09:02:20 +02:00
Zach H
89f1298a48 change wording 2015-06-15 16:47:02 -04:00
Fabio Bas
38486b2248 updated 2015-06-15 15:01:17 +02:00
Fabio Bas
f17dec29f6 Reorganized images in subfolders 
As per @daenyth’s comment:
https://github.com/Cockatrice/Cockatrice/pull/792#issuecomment-76593730
 2015-06-15 14:37:19 +02:00
Fabio Bas
6b8ebe54e9 Theme manager 
This is the first implementation of a theme manager. It’s a rebased and
revisited version of #792.
 2015-06-15 14:35:58 +02:00
ctrlaltca
48c3e64ef5 Merge pull request #1137 from ctrlaltca/deck_editor 
Reworked deck editor
 2015-06-15 12:51:51 +02:00
Fabio Bas
fac44966fd Reworked to use a qtabwidget: better cross-os look 2015-06-15 12:27:54 +02:00
Zach H
45c2e6f646 Allow Custom HQ URL 2015-06-15 01:03:41 -04:00
Zach H
be4a581f7c remove autoclear 2015-06-14 20:53:20 -04:00
Zach H
5d5eb05857 fix www error 2015-06-14 20:35:17 -04:00
Fabio Bas
3af5804073 Reworked deck editor 2015-06-13 20:37:51 +02:00
Fabio Bas
518bda8c09 Rotate 180 degrees the art of flipped cards 2015-06-13 16:10:06 +02:00
Fabio Bas
8826908923 Automatically attach related cards to the original card 2015-06-13 15:40:59 +02:00
Fabio Bas
9ca1329cac Fix for gcc compilation (-Werror=reorder) 2015-06-11 13:01:05 +02:00
Fabio Bas
946598375f Expose related cards in card menu 2015-06-11 12:45:25 +02:00
Fabio Bas
da84bb33e1 Import related cards in the card database 2015-06-11 10:48:50 +02:00
Fabio Bas
7ff318bd04 Fix "welcome" popup appearing more than once 2015-05-31 16:32:46 +02:00
Zach
dd16ea78ac Merge pull request #1115 from poixen/text_highlight 
Highlight text after adding card
 2015-05-30 18:51:25 -04:00
woogerboy21
28ccec711e Merge pull request #1101 from ctrlaltca/registration 
[WIP] In-client Registration support
 2015-05-30 13:49:04 -04:00
Matt Lowe
7d2ad9ee3b Highlight text after adding card 
After adding a card to the main or side, the search text will become
selected to easily start the next search
 2015-05-30 16:50:52 +02:00
ctrlaltca
fab0a0ee4e Merge pull request #1110 from tooomm/text-works2 
text works
 2015-05-30 14:23:48 +02:00
ctrlaltca
595d70cf23 Merge pull request #1088 from ctrlaltca/customsets 
Load additional xml sets from $userprofile/customsets/
 2015-05-30 14:23:01 +02:00
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
4da1404a06 Translation updates 2015-05-20 19:43: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
5f27050962 flipped svg 2015-05-06 21:29:53 +02:00
Matt Lowe
c34718fe99 updated clear svg 2015-05-06 15:38:30 +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