gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-31 08:00:25 -07:00
Code Issues Packages Projects Releases Wiki Activity
2,609 Commits 53 Branches 176 Tags
c07e5e5970a8ec55df2f673c8d35e2b2541b91e0
Commit Graph
2609 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ctrlaltca c07e5e5970 Merge pull request #1094 from ctrlaltca/translations 
Removed gaelic translation from oracle, too
 2015-05-21 19:15:59 +02: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 d71c0b277f Merge pull request #1090 from tooomm/patch-1 
expanded wording of name conflicts for tokens /2
 2015-05-21 09:47:00 -04:00
tooomm 7db7b7fb06 expanded wording of name conflicts for tokens /2 
- removed space
- fixed wording
 2015-05-21 15:17:52 +02:00
ctrlaltca 15dcfd1566 Merge pull request #1089 from ctrlaltca/translations 
Translation updates
 2015-05-20 19:44:51 +02:00
Fabio Bas 4da1404a06 Translation updates 2015-05-20 19:43:52 +02:00
Zach 292d730ca7 Merge pull request #1067 from tooomm/patch-1 
expanded error msg for name conflicts (tokens)
 2015-05-19 16:56:39 -04:00
poixen 5a516de26a Merge pull request #1078 from poixen/url 
No need for [url][/url]
 2015-05-19 22:43:37 +02:00
poixen 8209c59941 Merge pull request #1076 from poixen/sb_locked 
Disable SB button when ready
 2015-05-19 11:15:04 +02:00
Matt Lowe af29d4529c Can now use more url types 
Can now use
http://
https://
www.
 2015-05-19 11:11:20 +02:00
Zach 5d08236cbe Merge pull request #1079 from ctrlaltca/fix_918 
Removed resolved issues from TODO.md; fix #918
 2015-05-16 13:08:51 -04:00
Fabio Bas fab4781395 Removed resolved issues from TODO.md 
Remove old unused sets.xml related files
Remove faqs and shortcuts doc since they’re outdated and been rewritten
in the wiki
 2015-05-16 18:50:51 +02:00
ctrlaltca 15dd3471bc Merge pull request #1075 from ctrlaltca/fix_1070 
Ensure sounds are working at startup; Fix 1070
 2015-05-16 18:21:08 +02:00
ctrlaltca 25f444a5af Merge pull request #1051 from poixen/reveal_top_x 
Reveal top x cards
 2015-05-16 18:20:56 +02:00
ctrlaltca 262ebe3bf7 Merge pull request #1039 from ctrlaltca/update_oracle 
Run oracle from inside cockatrice and improve sets handling;
 2015-05-16 18:20:36 +02:00
Matt Lowe 9ce3aecd38 No need for [url][/url] 
No longer need to use the [url] tags to add **HTTPS** links. I want to
only link to "secure" site by default, hence only https.

Users can still use [url] tags if they want to.

The ENTIRE chat  code needs to be rewitten, as it is just packing more
code upon code. It can be done in another PR though. This just gets the
base working feature in place.
 2015-05-16 09:49:28 +02:00
Matt Lowe f2c3045a71 Disable SB button when ready 
Updated to trigger on receive rather than send
 2015-05-16 08:49:38 +02:00
poixen 02453d3576 Merge pull request #3 from ctrlaltca/pr_1051 
Add backward compatibility for new client on old servers
 2015-05-15 20:36:35 +02:00
Fabio Bas 2299fa1ac4 Add backward compatibility for new client on old servers 2015-05-15 18:18:25 +02:00
Fabio Bas 8fba04397b All platform: at startup, ensure that a proper directory for sounds is set 2015-05-14 15:47:57 +02:00
Fabio Bas 924337ee93 revert 0b4701c42f 2015-05-14 15:36:44 +02:00
Fabio Bas 76422854a4 NSIS: default to INSTDIR\sounds directory 2015-05-14 15:36:29 +02:00
ctrlaltca 9c20811a7a Merge pull request #1071 from poixen/sounds 
Cleanup
 2015-05-14 15:14:36 +02:00
Fabio Bas 44800df89c Reworked the layout of "edit sets" window 2015-05-14 13:12:24 +02:00
Fabio Bas 58a5834f34 Implemented proposed changes to initial popup message 2015-05-14 12:38:30 +02:00
Matt Lowe f1703ed0ad Cleanup 
+ Removed todo
+ linked test sound to the player joined sound
 2015-05-12 19:25:49 +02:00
ctrlaltca 18da49d454 Merge pull request #1068 from ctrlaltca/fix_1063 
Fix macro for MSVC; fix #1063
 2015-05-11 09:12:25 +02:00
Fabio Bas 590894d283 Fix macro for MSVC; fix #1063 2015-05-11 09:00:25 +02:00
tooomm c541944089 expanded wording of name conflicts for tokens 
added "Make sure to enable the 'token set' in 'Edit sets...' dialog to display them correctly."
 2015-05-09 14:12:41 +02:00
ctrlaltca 50ab6295c5 Merge pull request #1062 from ctrlaltca/nsis 
NSIS installer improvements; refs #876
 2015-05-09 11:00:34 +02:00
Zach 07fcde038c Merge pull request #1065 from poixen/die_roll_parent 
Connected die roll dlg to parent
 2015-05-08 16:14:47 -04:00
Matt Lowe 80e53b334e Connected die roll dlg to parent 
Die roll now has a logo as it is correctly connected to the parent.
 2015-05-08 20:36:31 +02:00
ctrlaltca 474d952242 Merge pull request #1064 from ctrlaltca/fix_1063 
Remove spaces and parenthesis from package names; hopefully fix #1063
 2015-05-08 15:35:43 +02:00
Fabio Bas 8e89b0d7ec Remove spaces and parenthesis from package names; hopefully fix #1063 2015-05-08 15:14:01 +02:00
Fabio Bas da5677080b NSIS installer improvements; refs #876 
* uninstaller: delete zlib1.dll (first issue in #876)
 * require the user to uninstall the old version before installing the
new one
 * use project-version as branding name (fourth issue in #876)
 2015-05-07 22:29:39 +02:00
poixen a8c4e4439c Merge pull request #1055 from poixen/sounds 
Refreshing Cockatrice Sound
 2015-05-07 08:57:30 +02:00
poixen df834183bd Merge pull request #1053 from poixen/reveal_makeover 
Updated reveal zone
 2015-05-07 08:54:35 +02:00
poixen 433412dee1 Merge pull request #1061 from poixen/filter_svgs 
Updated filter svgs
 2015-05-07 08:54:28 +02:00
Matt Lowe 5f27050962 flipped svg 2015-05-06 21:29:53 +02:00
poixen 9a81b15168 Merge pull request #1059 from poixen/dark_play 
Updated hand and table color
 2015-05-06 15:48:16 +02:00
Matt Lowe c34718fe99 updated clear svg 2015-05-06 15:38:30 +02:00
Matt Lowe 5dfef6215c Added punctuation mark 2015-05-06 14:19:01 +02:00
poixen 325e240d67 Merge pull request #1044 from poixen/reveal_bug 
Fixed revealing top card bug
 2015-05-06 14:15:39 +02:00
Matt Lowe 6da6e5b562 Updated card loadout background 2015-05-06 14:09:27 +02:00
Matt Lowe f2a53abcd8 Updated filter svgs 
Now uses the same as in the deck editor
 2015-05-06 13:25:06 +02:00
Matt Lowe c64eeb4ebe Added sound settings page 
+ added sound setting page
+ added sound setting icon
+ moved sound settings from interface settings

Added master volume

+ added master volume slider.
+ volume can be changed by sliding bar or by using the spin box
+ Preview of  volume will be played when dragging and releasing bar.

Added checks for qt4

Qt4 does not have support for setting the volume without some lengthy
work around, I have disabled volume control for qt4 users and have
mentioned that "Master volume requires qt5".

Updated sfx

+ removed all old sfx
+ added new end step and tap sound
+ tap/endstep sound has a timer on it to prevent spamming
+ test sound engine will now use endstep sound

Made end step sfx softer

end step felt too harsh

Added player joined sound

+ added a sound for when a new player joins a room

Updated

Was missing a sound when a player joins

Made end step softer

Made end step even softer

updated sound again
 2015-05-06 12:47:48 +02:00
Matt Lowe 87d938e56b Updated hand and table color 
Updated default colors, darker, more modern, slick. Great feedback from
community.
 2015-05-05 23:58:36 +02:00
Matt Lowe 1e0c4cbf87 Updated reveal zone check boxes 
I saw in some images from other platforms it can take up alot of space.
Made the boxed horizontal, rather than vertical.

WIP Remade reveal zone

+ darkened card area to eaisily see boundries
+ reverted back to using a window
+ window can be resized
+ removed fake title bar and "X"
+ moved all cards revealed slightly to the right, makes it easier to
drag-select from the left

Cleanup

Changed style to use cockatrice icon

Changed cast

from static_cast to qstyleoption_cast
 2015-05-05 10:14:27 +02:00
poixen cf24f4aa04 Merge pull request #1045 from poixen/move_reveal_location 
Moved zone loactions
 2015-05-04 17:09:23 +02:00
Zach 399122f49d Merge pull request #1047 from poixen/move_filter_boxes 
Updated reveal zone check boxes
 2015-05-04 10:47:44 -04:00