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

2541 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabio Bas
c356a6fc48 Run oracle from cockatrice 2015-05-01 16:38:31 +02:00
Zach
ca2ff99391 Merge pull request #1037 from tooomm/patch-1 
fixed typos + small adjustments in contributing.md
 2015-04-29 09:36:47 -04:00
tooomm
1af358c4df fixed typos 2015-04-29 15:30:30 +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
11c6e8ce34 Merge pull request #1034 from ZeldaZach/gamescene_fix 
Fixed incorrect zone positioning
 2015-04-27 16:51:48 -04: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
ctrlaltca
11da8d09bf Merge pull request #1030 from tooomm/patch-1 
removed tr() tag from hidden strings
 2015-04-27 08:48:58 +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
Zach
1f2641d562 Merge pull request #1023 from poixen/server_p_t_fix 
Fixed issue with non creature perms set to 0/0
 2015-04-26 17:28:29 -04:00
Zach
ecaaa9eeb8 Merge pull request #1022 from poixen/orange_pt 
Changed pt to orange
 2015-04-26 17:25:16 -04: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
9c1e509a37 Fixed issue with non creature perms set to 0/0 
The issue was that I had set the ctor to set the p/t to 0/0 rather than
-1/-1. This meant that when you join a game in progress (spec or
reconnect) the server would send the card value to the client as 0/0,
instead of -1/-1. The client has been coded so that if the toughness is
<0 then dont show it. 0/0 is instead shown.

We still need to look into cards with no p/t being set to a 0/1 as
@tooomm mentioned in anther issue. As it stands, this is more important
than that.
 2015-04-26 00:57:31 +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
ctrlaltca
54f0706b4a Merge pull request #1019 from ctrlaltca/translations 
Fetched new translations from Transifex
 2015-04-24 17:23:35 +02:00
Fabio Bas
9e281f70ae Fetched new translations from Transifex 2015-04-24 17:19:46 +02:00
Zach
a16f8e02e3 Merge pull request #1016 from poixen/add_remove_buttons 
Updated + / - buttons
 2015-04-23 17:48:13 -04: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
66f854fe1d Changed to check every 10 mins 2015-04-23 00:26:21 +02:00
Zach
269a62c801 Merge pull request #1005 from poixen/colored_PT 
Colored PT
 2015-04-22 17:39:02 -04:00
Zach
1e474bef94 Merge pull request #1009 from poixen/p_t_fix 
Fix for #1007
 2015-04-22 17:33:41 -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
1356bbcd94 Fix for #1007 2015-04-22 16:53:07 +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
ctrlaltca
82d8c72427 Merge pull request #1002 from ctrlaltca/refix_999 
Added translation fix missing from #1001
 2015-04-22 12:03:34 +02:00
Fabio Bas
7e56c5a9c6 Added translation fix missing from #1001 2015-04-22 11:10:14 +02:00
ctrlaltca
36a0d25ceb Merge pull request #1001 from ctrlaltca/fix_999 
Permit translation in "game created" column; Fix #999
 2015-04-22 09:51:09 +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
woogerboy21
3141fb84e9 Merge pull request #994 from Cockatrice/woogerboy21-removewindebugoutput 
Remove --debug-ouput on start menu shortcut
 2015-04-21 12:34:46 -04:00
ctrlaltca
98632741d4 Merge pull request #997 from ctrlaltca/translations 
Updated translations
 2015-04-21 14:50:13 +02:00
Fabio Bas
af3a3239fb Updated translations 2015-04-21 14:49:50 +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
ctrlaltca
cbd2595d7b Merge pull request #996 from ctrlaltca/travis_debug 
Switch travis builds to debug mode, since they catch more errors
 2015-04-21 09:30:54 +02:00
Fabio Bas
3c0ffef06d Switch travis builds to debug mode, since they catch more errors 
In debug mode, warnings are considered as errors.
 2015-04-21 08:58:37 +02:00
ctrlaltca
64315f7750 Merge pull request #995 from ctrlaltca/servatrice_fixes 
Remove warning in server_logger; fix #993
 2015-04-21 08:56:05 +02:00
Fabio Bas
55c174a823 Remove warning in server_logger; fix #993 2015-04-21 08:38:31 +02:00
woogerboy21
1b09b76eee Remove --debug-ouput on start menu shortcut 
Remove argument that if added by default with out having the proper configuration defined during compiling would cause cockatrice to not open properly.
 2015-04-20 23:28:10 -04: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
Zach
118bc06ae8 Merge pull request #987 from poixen/storm 
Added colored storm counter
 2015-04-19 14:21:05 -04:00
Zach
374313a295 Merge pull request #988 from ctrlaltca/servatrice_crash 
Simple stack trace for signal handler (unix only)
 2015-04-19 14:07:52 -04:00