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

1319 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Morschhäuser
90b64a257f Installer shows GPL, appends git hash, uses solid lzma now. 2013-05-08 20:46:57 +02:00
Mark Morschhäuser
204f457e2b Updated COPYING (GPLv2) with GPLv2 from GNU.org (trivial) 2013-05-08 20:45:38 +02:00
Mark Morschhäuser
284d2a8615 Merge branch 'documentation' 2013-05-08 15:09:37 +02:00
Daenyth
e449520a3e Merge pull request #12 from VanNostrand/documentation 
Documentation
 2013-05-08 06:02:41 -07:00
Mark Morschhäuser
6bf0045967 Installer: added usermanual, use default paths, add timestamp to exe. 2013-05-08 13:42:50 +02:00
Mark Morschhäuser
91366a6f43 Fixed the Windows howto, it uses the official nsis script now. 2013-05-08 13:41:43 +02:00
Mark Morschhäuser
a176cf0940 Moved the CentOS6 Howto into the usermanual. 2013-05-08 11:26:51 +02:00
Mark Morschhäuser
1a63fa233e Added a Windows compilation howto. 2013-05-08 10:53:56 +02:00
Mark Morschhäuser
6e85f15688 Added some linebreaks. 2013-05-08 09:35:42 +02:00
Mark Morschhäuser
9284a9e40f Merge branch 'documentation' 2013-05-07 22:58:10 +02:00
Daenyth
1c10c27217 Merge pull request #10 from VanNostrand/documentation 
Added Dragon's Maze to sets.xml
 2013-05-07 09:11:05 -07:00
Mark Morschhäuser
dd4ffc0f8a Added Dragon's Maze to sets.xml 2013-05-07 12:07:23 +02:00
Mark Morschhäuser
8359b5a451 Merge branch 'oracle-fixes' 2013-04-21 19:20:22 +02:00
Daenyth
7ce8a93767 Merge pull request #8 from VanNostrand/oracle-fixes 
Oracle fixes
 2013-04-21 10:17:44 -07:00
Daenyth
78e8ea230f Merge pull request #9 from VanNostrand/documentation 
Documentation-Branch v2
 2013-04-21 10:17:28 -07:00
Mark Morschhäuser
f53fff9a7b create_sets_xml.sh now creates the correct header for sets.xml. 2013-04-21 18:31:23 +02:00
Mark Morschhäuser
9dd5697213 Restored picture/set url entries from 2011-01-26. 2013-04-21 18:22:11 +02:00
Mark Morschhäuser
8bd247e681 Fixed spoiler list parsing, oracle works again. 2013-04-21 17:31:07 +02:00
Mark Morschhäuser
b179f446f5 Get sets.xml directly from github. 2013-04-21 17:30:08 +02:00
Mark Morschhäuser
bd861bbff1 Removed two unused variables. 2013-04-21 15:53:27 +02:00
skoh-fley
03852f0409 To-be permanents on the stack now enter the battlefield when double-clicked 2013-04-17 08:23:31 -07:00
skoh-fley
2727781c0e Added a UI option to always play nonlands onto the stack 
Previously this behavior only occured for instants and sorceries

Woops, missed a file

Missed some parentheses
 2013-04-17 08:23:12 -07:00
Daenyth
1accaffb70 Merge pull request #6 from skoh-fley/cursorhandclenchbug 
Fixed a cursor bug
 2013-04-16 19:59:53 -07:00
skoh-fley
69e6c9ac69 Fixed a cursor bugo 
Click-holding on a card then immediately releasing now properly changes the
cursor from a closed hand back to an open hand
 2013-04-16 18:12:48 -07:00
Mark Morschhäuser
b45a4f1282 Completed dokuwiki import. 2013-04-14 12:27:21 +02:00
Mark Morschhäuser
8ee75331b5 Added chapter Playing Online 2013-04-14 12:11:08 +02:00
Daenyth
cd190aeb7e Merge pull request #5 from skoh-fley/master 
Various Markdown fixes in README.md
 2013-04-08 17:36:00 -07:00
skoh-fley
27b155f79d Changed some paragraph splits to proper line breaks 2013-04-08 16:49:07 -07:00
skoh-fley
334beabc6d Changed inline code formatting to block code formatting 2013-04-08 16:47:53 -07:00
skoh-fley
9872f8fa5e Smooshed subtly separate bullets lists into single lists 2013-04-08 16:46:54 -07:00
Mark Morschhäuser
654b25bfec Completed "Getting Started" of the Usermanual. 2013-04-03 12:29:19 +02:00
Mark Morschhäuser
1fbb5df7dd Added script that generates sets.xml output 2013-04-03 11:48:47 +02:00
Mark Morschhäuser
b40a5896d4 Updated sets.xml - maybe it is too complete now. 2013-04-03 11:46:54 +02:00
Mark Morschhäuser
4f042681bb fixed the github url 2013-04-03 11:40:28 +02:00
Mark Morschhäuser
e769f5df94 New LaTeX usermanual: added first pt. from cockatrice.de dokuwiki 2013-04-02 22:30:28 +02:00
Daenyth
39624ec077 Merge pull request #3 from VanNostrand/documentation 
Documentation-Branch
 2013-04-02 10:14:56 -07:00
Mark Morschhäuser
e3b1e801be Added current sets.xml 2013-04-02 18:29:56 +02:00
Mark Morschhäuser
b5d5e94649 Added documentation/howto for card database. 2013-04-02 18:29:43 +02:00
Mark Morschhäuser
cf98f0cf17 Added shortcuts documentation. 2013-04-02 18:29:12 +02:00
Mark Morschhäuser
94b0593623 Added FAQ from cockatrice wiki. 2013-04-02 18:27:22 +02:00
Mark Morschhäuser
be7c287322 Added internet howto for own server on CentOS. 2013-04-02 18:27:10 +02:00
Daenyth
a975f0ddba Merge pull request #2 from VanNostrand/RespUsernameInvalid-fix 
Fixed duplicate case compile error
 2013-04-02 06:19:09 -07:00
Mark Morschhäuser
1bf4f74a50 Fixed duplicate case compile error 2013-04-02 12:04:37 +02:00
Daenyth
347d30a84b Merge branch 'master' of git://github.com/mbruker/Cockatrice 2013-02-27 12:36:14 -05:00
Max-Wilhelm Bruker
ce642e3000 don't use Server_Room::getInfo when updating 2013-02-15 19:31:37 +01:00
Max-Wilhelm Bruker
7a30b827c8 changed Server_Room::gamesMutex to QReadWriteLock 2013-02-11 15:43:31 +01:00
Max-Wilhelm Bruker
00029eeeb4 Server_Room optimisation 2013-02-11 15:29:19 +01:00
Max-Wilhelm Bruker
de3055be6a Merge branch 'master' of git://github.com/mbruker/Cockatrice 2013-02-11 14:40:46 +01:00
Max-Wilhelm Bruker
49d2fdc93d changed users table in servatrice.sql 2013-02-11 14:40:32 +01:00
Max-Wilhelm Bruker
dca87cb41b Merge pull request #115 from aeosynth/master 
Create README.md
 2013-02-10 11:54:49 -08:00