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

3300 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabio Bas
2d2958e931 cmake: Enable c++11 for all targets 2016-03-21 13:09:56 +01:00
Fabio Bas
a55b3784eb cmake: Enable c++11 for all targets 2016-03-21 11:42:38 +01:00
Fabio Bas
18993b397b First test for card database: loading and clear 2016-03-21 11:08:14 +01:00
Fabio Bas
df393638ed Small Fix 2016-03-18 21:18:48 +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
woogerboy21
0b8f52e084 Merge pull request #1836 from Cockatrice/mysql57update 
Added MySQL 5.7 lib path to servatrice CMAKE
 2016-02-28 17:48:09 -05:00
woogerboy21
3ba3f1e2a7 Added MySQL 5.7 lib path to servatrice CMAKE 
Added default search path for most recent version of MySQL
 2016-02-27 15:13:59 -05:00
ctrlaltca
49c22f3810 Merge pull request #1834 from ctrlaltca/fix_server 
Warning/ban notifications: null check userInfo pointer before dereferencing it
 2016-02-25 00:47:13 +01:00
Fabio Bas
b462f95343 Warning/ban notifications: null check userInfo pointer before dereferencing it 2016-02-24 23:47:35 +01:00
ctrlaltca
f31a89ebbb Merge pull request #1828 from ctrlaltca/fix_mysqlconnector 
Fix libmysqlclient detection on 64-bit linux
 2016-02-24 21:38:37 +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
Gavin Bisesi
bc79d9e2f8 Merge pull request #1796 from zebington/feat/custom-set-import 
Add "Import custom set" function
 2016-02-24 09:12:31 -05:00
Fabio Bas
ac06544849 Added 64bit libraries each path for libmysqlclient 2016-02-23 08:56:47 +01:00
ctrlaltca
66634c9b3d Merge pull request #1808 from ctrlaltca/innodb 
Move schema to Innodb and add FKs
 2016-02-22 16:39:03 +01:00
woogerboy21
108ec145b7 Merge pull request #1604 from woogerboy21/mod_notify_onbanwarn 
Re-Implemented the moderator notification upon user warning/ban
 2016-02-22 09:02:39 -05:00
woogerboy21
4e78d6ec95 Merge remote-tracking branch 'refs/remotes/origin/master' into mod_notify_onbanwarn 2016-02-21 16:36:20 -05:00
Gavin Bisesi
bf42319296 Merge pull request #1820 from tooomm/patch-2 
add template for issues
 2016-02-20 07:45:08 -05:00
Gavin Bisesi
4f1d3c3269 Merge pull request #1821 from tooomm/patch-3 
todo file - removed usermanual part
 2016-02-20 07:44:26 -05:00
tooomm
e3064727c3 add template for issues 
https://github.com/blog/2111-issue-and-pull-request-templates

move to .github folder + prompt for date
 2016-02-18 19:23:35 +01:00
tooomm
2418b8017d moved usermanual part to wiki 2016-02-18 18:32:17 +01:00
ctrlaltca
2d43ab9f50 Merge pull request #1819 from ctrlaltca/fix_xp 
Cmake: build Windows Xp compatible packages
 2016-02-17 21:25:46 +01:00
Fabio Bas
aac2d09f48 Move schema to Innodb and add FKs 
Fix #1805
 2016-02-17 21:24:28 +01:00
Fabio Bas
195ab9a150 Try to build windowsxp compatible packages 2016-02-17 15:08:56 +01:00
Zach
5b22187a3d Merge pull request #1794 from zebington/master 
Fixes for create game dialogue.
 2016-02-16 17:07:28 -05:00
Zach
36f1536b09 Merge pull request #1807 from ctrlaltca/game_sizes 
Correctly save and retrieve docks size in game tabs
 2016-02-14 20:46:29 -05:00
Fabio Bas
a8c723326d Game tab: use short title for undocked wdgets 
fix #1777
 2016-02-12 14:49:37 +01:00
Fabio Bas
ae8296a50e Game tab: reset docks sizes on "reset layout" 2016-02-11 18:29:50 +01:00
woogerboy21
93d4f78715 Merge pull request #1803 from Cockatrice/replay-maint-update 
Update replay maintenance script
 2016-02-10 15:16:41 -05:00
woogerboy21
8f819dfa66 Update replay maintenance script 
Update the replay maintenance script to allow for rolling replay maintenance along with cleanup of the two associated db tables (replay access and games).  This updated script will now allow players to see the past X days (8 by default) of replays rather than loosing all replays from the point in the the script gets run.
 2016-02-10 10:53:18 -05:00
Ira Aspen
aa658f95f6 Gave error dlg a description of the error for the user. 2016-02-09 03:10:57 +00:00
Ira Aspen
d078cf52c9 Removed unnecessary confirmClose() call. 2016-02-09 02:57:23 +00:00
Ira Aspen
96fbad1f0c Moved get next set index code to own function 2016-02-09 02:55:52 +00:00
Ira Aspen
829f84fe50 Moved from using hex QT version checks to QT_VERSION_CHECK(). 2016-02-09 01:56:24 +00:00
Ira Aspen
0ef2b48902 Refactored DlgAddSet class/functions to DlgAddSetResult 2016-02-09 01:52:09 +00:00
Ira Aspen
5a975831d4 Renamed "dlg_add_set.*" to "dlg_add_set_result.*" and updated references. 2016-02-09 01:40:21 +00:00
Fabio Bas
058b913455 Game: save and restore dock sizes 2016-02-07 21:58:51 +01:00
Zach
cddb45085c Merge pull request #1799 from tooomm/patch-2 
shortcut tab adjustments (settings)
 2016-02-07 01:40:08 -05:00
Ira Aspen
9d3c4f20a1 Changed strings referencing a set to say sets/cards. 2016-02-07 01:41:35 +00:00
tooomm
802ccd7f14 shortcut tabs adjustments 
- typo fix
- improved description of some shortcuts
 2016-02-06 19:29:57 +01:00
Ira Aspen
b5363f47ab Updated message. 2016-02-06 12:42:45 +00:00
Ira Aspen
927226633d Moved menu item decleration to work on all OSs. 2016-02-06 02:37:34 +00:00
Ira Aspen
de388a74bd Moved exec statement. 2016-02-06 02:32:04 +00:00
Ira Aspen
54a759497f Added confirmation dialogue when set added. 2016-02-06 02:29:09 +00:00
Ira Aspen
c914395236 Finished add set functionality. 2016-02-06 01:33:43 +00:00
Ira Aspen
2960cba12b Added a file picker to the add set menu item. 2016-02-05 21:09:24 +00:00
Ira Aspen
646c4b4197 Added functionless menu button for adding a set. 2016-02-05 20:32:40 +00:00
Ira Aspen
9846fb1d8e Made reseting the create game dialogue box only select 'Only regeistered users' if player is a registered user. 2016-02-05 19:32:27 +00:00
Ira Aspen
154da4452d Made create game box prevent only buddies can join being selected for unregistered users. 2016-02-05 19:29:19 +00:00
ctrlaltca
323fc06885 Merge pull request #1787 from ctrlaltca/speak_this 
Some updated translations from transfix
 2016-02-02 22:05:30 +01:00