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

107 commits

Author SHA1 Message Date
Fabio Bas
8db10be892 Log UI 2016-06-27 22:18:39 +02:00
Fabio Bas
1bc56e1c86 Fix some translation issues 
Fix #2010
 2016-06-15 22:17:31 +02:00
Fabio Bas
bb5292aa8d Drop Qt4, libgcrypt, qtmobility dependencies 2016-05-11 12:45:58 +02:00
Fabio Bas
a55b3784eb cmake: Enable c++11 for all targets 2016-03-21 11:42:38 +01:00
Fabio Bas
1e3fb6c6e1 Rework "paths" settings loading and card database loading 
* main.cpp: removed path checking and db loading
 * card database: merge card loading methods into a single one
 * settings cache: take care of returning safe paths for decks,
replays, etc..
 * main window: if db loading fails (eg. first run), propose to run
oracle

NSIS: propose to run cockatrice instead of oracle

Rework card database loading

 * Move carddatabase-related method out of deckeditor tab
 * Load cards in another thread and render them progressively
 * Optimize database reload after enabled sets change

Fix deck editor column width

 * removed the noCard hack.
 * getCard() no more creates cards instead of just returning existing
ones
 * Fix the “edit tokens” dialog.
 * PictureLoader: avoid trying to download twice the same card
 * PictureLoader: correct return of card background
 * AbstractCardItem: avoid recalculating card color at every paint

Use a different file to save custom tokens

Misc required improvements

 * Use nullptr;
 * Refactor CardInfoWidget to use CardInfoPicture and CardInfoText
instead of duplicating code;
 * Added CardInfo::getColorChar()
 * Fixed some potential crashes
 * removed dead code related to CardInfoWidget
 * Don't require a restart after adding a new custom sets file
 * Bump CMake requirements to 3.1
 2016-03-15 22:27:55 +01:00
ctrlaltca
b2c1ae264b Merge pull request #1832 from tooomm/restructure 
move sounds+themes folder inside cockatrice
 2016-02-24 21:38:09 +01:00
tooomm
754e666eaa updated to new folder locations 
- `sounds` and `themes` moved into `cockatrice/`

moved subdirectory reference
`/cmakelists` to `/cockatrice/cmakelists`
 2016-02-24 15:41:04 +01:00
Ira Aspen
5a975831d4 Renamed "dlg_add_set.*" to "dlg_add_set_result.*" and updated references. 2016-02-09 01:40:21 +00:00
Ira Aspen
54a759497f Added confirmation dialogue when set added. 2016-02-06 02:29:09 +00:00
Michael Milton
66fda086c3 Client update implementation 2016-01-20 22:26:17 +01:00
Fabio Bas
4d7795ca3a Split pictuloader out of carddatabase 2015-12-26 16:40:17 +01:00
Fabio Bas
bab4a51ebb CPack: Debian package 2015-10-13 22:16:00 +02:00
Fabio Bas
7fe60279de Fix PR #1600 2015-10-09 14:59:42 +02:00
Gavin Bisesi
3ebe42c400 Add dummy googletest 
Uses the built in cmake -Dtest=ON

It should download googletest on the fly if needed.

Adds a new make target, `make test`

Ref #167
 2015-10-09 14:58:46 +02:00
Fabio Bas
74c58cc2b0 fix qt libraries bundling on osx 
fix #1547
 2015-10-01 23:35:54 +02:00
Zach
d5adec53a2 Revert "Reimplemented PictureLoader as a singleton" 2015-09-23 03:17:33 -04:00
Zach
064c89ba5c Merge pull request #1556 from ctrlaltca/carddatabase_changes 
Reimplemented PictureLoader as a singleton
 2015-09-23 01:21:37 -04:00
woogerboy21
62ffcde6bd Added logs tab to allow moderators the ability to review log history/details 2015-09-23 00:50:01 -04:00
Fabio Bas
f6c7f3355f Reimplemented PictureLoader as a singleton 
* Removed remaining picture handling from card database and cardinfo
 * removed the “noCard object” hack
 2015-09-22 23:09:53 +02:00
Fabio Bas
5aaae5279c revert to using QAudioOutput 2015-09-13 19:37:49 +02:00
Zach
226a8cc017 Merge pull request #1498 from ctrlaltca/sound_whatever 
Reworked SoundEngine overhaul
 2015-09-12 00:35:20 -04:00
Fabio Bas
0b072e2d60 Remove dependency to qt multimedia/mobility under qt4 and unused phonon plugins 2015-09-11 00:42:37 +02:00
woogerboy21
90cb890cc2 Added the ability or moderation staff to request user ban history 2015-09-10 16:02:45 -04:00
marco
baa61d0571 Merge branch 'master' into Refactor-settings 
Conflicts:
	oracle/CMakeLists.txt
 2015-09-01 21:28:53 +02:00
Fabio Bas
5cfb034452 merged with master 2015-08-31 22:48:14 +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
c8d59eec5e Refactred settings to use settingscache & ini files 2015-08-22 01:05:15 +02:00
Jeff
05f2bc8392 Fix Conflicts 2015-08-20 22:27:46 -04:00
Jeff
e9bad2cacb Merge branch 'master' into fix_1387 
Conflicts:
	cockatrice/CMakeLists.txt
	cockatrice/src/tab_game.h
	cockatrice/src/tab_room.cpp
 2015-08-20 22:23:47 -04:00
marco
c6aba5a6d0 Renamed file + reduced window size + resfresh on change 2015-08-20 20:23:08 +02:00
Jeff
a64ea17357 Add LineEditCompleter to Tab_Game 2015-08-19 18:46:08 -04:00
marco
beaa4e9383 Configurable shortcuts 2015-08-16 13:46:57 +02:00
marco
b0bf94e378 Shorcut read from settings 2015-08-09 12:16:52 +02:00
Zach
7ebf817b17 Merge pull request #1197 from Cockatrice/cpp11 2015-07-13 13:23:18 -04:00
Fabio Bas
7f5f290c93 Profile management 2015-07-05 22:44:35 +02:00
Gavin Bises
8ed9d35724 Update project to C++11 compilation. 2015-07-03 10:02:31 -04: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
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
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
Fabio Bas
42c0b09fbd Remove dependency on QtXml (unused) 2015-04-16 12:26:02 +02:00
Fabio Bas
798dc09fe6 Translation updates to support Transifex 
* ignore .tx folder
 * cmake: when UPDATE_TRANSLATIONS=ON, extract new strings only to the
english translation file.
 * added info in CONTRIBUTING.md
 * updated english translations
 2015-02-13 15:56:17 +01:00
Gavin Bisesi
b38cd7833f Merge pull request #500 from ctrlaltca/translation_fixes 
Translation fixes
 2015-01-01 08:07:06 -05:00
Fabio Bas
54ce135e0c Optimize qt plugins installation 
* Always install “release” plugins
 * install only plugins actually used
 2014-12-28 22:21:45 +01:00
Fabio Bas
72ba5a1683 Parse header files for translatable strings 
We previously parsed only .cpp files, but some strings are inlined in
header files.
 2014-12-26 14:45:31 +01:00
Fabio Bas
c0ee060af4 Fixed vendor name 2014-11-09 23:14:36 +01:00
Fabio Bas
a716d73a42 OSX: Add proper infos to info.plist 
fixes #411
 2014-11-09 21:03:10 +01:00
Fabio Bas
9ef4d79c33 Install the audio/* plugins under windows and osx 2014-10-14 21:13:04 +02:00
Fabio Bas
dfb8be79cf Fix installation of libeay32.dll, ssleay32.dll while compiling the PACKAGE target 2014-10-10 17:22:29 +02:00
Fabio Bas
6f25e09132 Deploy openssl libraries under win32 
They are needed to fetch prices from deckbrew and possibly, in the
future, for ssl server connections
 2014-10-10 14:12:30 +02:00
Fabio Bas
a0b35ee60b Cockatrice - CMake: Include all existing translation files using a glob 2014-09-06 10:38:59 +02:00