marco
44fefc20c2
Fix portable on OSX
2015-09-03 19:47:07 +02:00
marco
baa61d0571
Merge branch 'master' into Refactor-settings
...
Conflicts:
oracle/CMakeLists.txt
2015-09-01 21:28:53 +02:00
Fabio Bas
6d7baec37b
Merge with master
2015-08-31 22:55:46 +02:00
Fabio Bas
5cfb034452
merged with master
2015-08-31 22:48:14 +02:00
Zach
e6a8fa59e3
Merge pull request #1428 from tooomm/patch-1
...
text adjustments in oracle
2015-08-27 12:39:00 -04:00
Fabio Bas
fcff6301ed
Fetched new translations. Arrr!
2015-08-27 18:32:14 +02:00
tooomm
5d8d2f277c
oxford compliance
...
@ZeldaZach grammar nazi :) 👍
2015-08-27 15:55:22 +02:00
tooomm
17665aad60
fixed alignment
...
nice alignment over strict tabbing
2015-08-27 14:55:19 +02:00
tooomm
f18f136d2b
text adjustments
...
- removed some info text since oracle imports all cards now and no longer offers sets selection
- added info about token
- `<br/>` --> `\n`
- capitalized `URL` --> http://www.oxforddictionaries.com/definition/english/URL
2015-08-27 14:43:34 +02:00
marco
0b94b47f72
Servatrice portable + cmake options
...
Use -DPORTABLE=1 to build a portable version
2015-08-25 21:25:13 +02:00
marco
4125d690fa
Fix merge & relative path for portable build
2015-08-25 20:22:31 +02:00
marco
be7efa98cf
Fix relative path for image download & settings
2015-08-23 15:54:52 +02:00
marco
1e2d5b0693
Fix translate setting + Mod oracle to portable build
2015-08-23 14:14:11 +02:00
marco
c8d59eec5e
Refactred settings to use settingscache & ini files
2015-08-22 01:05:15 +02:00
marco
b0bf94e378
Shorcut read from settings
2015-08-09 12:16:52 +02:00
Fabio Bas
7e7c0ef4d2
Updated translations
2015-08-01 10:55:06 +02:00
Zach
7ebf817b17
Merge pull request #1197 from Cockatrice/cpp11
2015-07-13 13:23:18 -04:00
Fabio Bas
a65b2e6c94
Changed url to cockatrice's tokens repo + minor fix
2015-07-08 19:31:04 +02:00
Fabio Bas
eda55679da
Implemented suggested improvements
2015-07-08 10:19:05 +02:00
Fabio Bas
24aabc4cfe
Oracle: download tokens; fix #915
2015-07-07 20:06:14 +02:00
Gavin Bises
8ed9d35724
Update project to C++11 compilation.
2015-07-03 10:02:31 -04:00
Fabio Bas
5e1566046e
removed debug
2015-07-02 15:31:14 +02:00
Fabio Bas
5f28dff30e
Fix #1188
2015-07-02 09:22:05 +02:00
Zach
6fd1e839df
Merge pull request #1168 from ctrlaltca/oracle_hidpi
...
Enable HiDpi on oracle too
2015-06-28 09:41:38 -04:00
Fabio Bas
56db6cd060
Updated translations
2015-06-28 15:17:46 +02:00
ctrlaltca
4f972848a5
Merge pull request #1162 from ctrlaltca/oracle_fixes
...
Oracle fixes
2015-06-28 15:00:37 +02:00
Fabio Bas
a8de6d5c67
Enable HiDpi on oracle too
2015-06-25 16:02:26 +02:00
Fabio Bas
fa6e9c7344
updated translations
2015-06-24 13:26:02 +02:00
Fabio Bas
aed20324da
reverted #163
2015-06-23 21:45:08 +02:00
Fabio Bas
f95fe57c1b
Import split cards of any size; fix #181
2015-06-23 21:42:25 +02:00
Fabio Bas
6afc6cc4fd
Cleaned and commented code
2015-06-23 19:36:40 +02:00
Fabio Bas
a1d28736d7
Oracle remove old code handling split cards; fix #382
2015-06-23 19:23:07 +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
Fabio Bas
518bda8c09
Rotate 180 degrees the art of flipped cards
2015-06-13 16:10:06 +02:00
Fabio Bas
da84bb33e1
Import related cards in the card database
2015-06-11 10:48:50 +02:00
Zach
5975184d67
Merge pull request #1091 from ZeldaZach/oracle_hideaway
2015-05-21 14:06:20 -04:00
Fabio Bas
df83a82fa3
Removed gaelic translation from oracle, too
...
The cockatrice translation has been removed yesterday.
2015-05-21 19:14:31 +02:00
Zach H
56c1a7f8b4
hideaway update
2015-05-21 09:45:16 -04:00
Fabio Bas
4da1404a06
Translation updates
2015-05-20 19:43:52 +02:00
tooomm
a6970d9624
svg+png updates
...
-updated and cleaned up cockatrice+servatrice svg's
-added old original svg's for future adjustments
-updated cockatrice+servatrice png's
ico+icns updates
-see #925 for more details
-updated svg's as source for new icon files
bmp updates
-updated svg's as source for new installer logos
cleaned up oracle.svg
cleaned up oracle.svg /2
svg updates /2
removed sensible data
`inkscape:export-filename` removed
removed sensible data
inkscape:export-filename
removed sensible data
inkscape:export-filename
removed sensible data
inkscape:export-filename
fix
fix2
2015-04-28 16:06:36 +02:00
Fabio Bas
9e281f70ae
Fetched new translations from Transifex
2015-04-24 17:19:46 +02:00
Fabio Bas
af3a3239fb
Updated translations
2015-04-21 14:49:50 +02:00
Fabio Bas
881cea27f4
Rework the way sets selection/importing works; fix #539 (rebased)
2015-04-18 18:47:09 +02:00
Fabio Bas
42c0b09fbd
Remove dependency on QtXml (unused)
2015-04-16 12:26:02 +02:00
tooomm
b8219ca82b
oracle icon updates
...
- ico for win
- icns for mac
both now with several resolutions inside and high res support
mac version even included old+different logo
2015-04-08 01:23:20 +02:00
Fabio Bas
62d0a61717
Set cmc to 0 if not set; fix #669
2015-03-30 11:56:08 +02:00
Fabio Bas
28ec1a7186
Fix #633
...
Requires #889
2015-03-29 18:55:15 +02:00
Fabio Bas
48d588f6cd
Fix #670
...
Additionally, remove an unneeded split() + join() call on every card
text
2015-03-29 17:48:59 +02:00
Fabio Bas
c3e5679604
Fetch updated translations from transifex
2015-03-26 15:13:57 +01:00
Fabio Bas
2da43b8155
fetched updated translations from transifex
2015-03-14 18:49:00 +01:00
