Commit Graph
2582 Commits
Author SHA1 Message Date
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
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
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
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
Zach 75ea89361f Merge pull request #1052 from poixen/mention_pop_fix
Can now disable desktop mentions
2015-05-04 09:36:20 -04:00
Matt Lowe b81ed893e1 Can now disable desktop mentions
Was not checking if the setting was enabled
2015-05-04 12:40:51 +02:00
woogerboy21 01a85ce60b Merge pull request #1048 from ctrlaltca/crashed_into_you
Catch std exceptions thrown by protobuf and try to pretty print them
2015-05-03 08:00:31 -04:00
Zach d2b6daae0a Merge pull request #1046 from ctrlaltca/version_date
Append last commit date to version string; fix #1036
2015-05-02 21:01:26 -04:00
Matt Lowe 052ce72993 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.
2015-05-02 21:18:02 +02:00
Fabio Bas c605948975 Catch std exceptions thrown by protobuf and try to pretty print them 2015-05-02 21:17:55 +02:00
Fabio Bas 6e9a211aed Append last commit date to version string
Shown in “about” dialog and used in windows packages name.
2015-05-02 19:14:14 +02:00
ctrlaltca 53f63e2801 Merge pull request #1024 from tooomm/icon_works
Icon works
2015-05-02 18:32:28 +02:00
ctrlaltca 8cbf89410b Merge pull request #1041 from poixen/protobuf_error
Removed lprotobuf error on building
2015-05-02 18:31:24 +02:00
Matt Lowe 7ccc23f902 Moved zone loactions
I have moved the default opening positions of some of the reveal zones.

Example:

The sideboard will be in the same position as the scry and the random
card from hand will be the same as the hand view.
2015-05-02 17:52:34 +02:00
Matt Lowe 33fa3ae032 Fixed revealing top card bug
Previously if you were to reveal the top card, then look at the top x (x
> 1) cards, then move them to another zone, the top card would stop
being revealed.

The issue was that when moving the cards the first card was being
revealed, then being moved.

I have also fixed an issue too:
+ reveal top card
+ scry 4
+ grab all cards and move to the first column of available space at the
left most of the screen (column 0). Everything is fine.
+ now try with another column (> 0), you will see that the card order
has flipped.

This no longer happens.

This needs some testing before being merged. I will run the build for a
while, right now it feels good though.
2015-05-02 17:25:41 +02:00
Zach 9ff22eaf17 Merge pull request #1040 from poixen/fixed_search
Reverted back to full punctuation
2015-05-01 18:02:31 -04:00
Matt Lowe 878b760321 Removed lprotobuf error on building
Will need @ctrlaltca to confirm this wont mess anything up. I have
removed a option to se set from the cmake file. This option is not
needed.

Windows users, you will need to run cmake to create the sln again.
2015-05-01 22:32:31 +02:00
Matt Lowe 95104df589 Reverted back to full punctuation
Reverted back. Right now it feels strange to only have simple search.
Really you would want both simple search AND accurate search on, though
this requires twice the checks for each result.
2015-05-01 22:26:44 +02:00
Zach ca2ff99391 Merge pull request #1037 from tooomm/patch-1
fixed typos + small adjustments in contributing.md
2015-04-29 09:36:47 -04:00
tooomm 1af358c4df fixed typos 2015-04-29 15:30:30 +02:00
Zach 5410afbbb1 Merge pull request #1035 from ctrlaltca/fix_762
Add "play top card face down" menu entry to library; fix #762
2015-04-28 11:33:41 -04: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 e649535211 Add "play top card face down" menu entry to library; fix #762 2015-04-27 23:02:45 +02:00
Zach 11c6e8ce34 Merge pull request #1034 from ZeldaZach/gamescene_fix
Fixed incorrect zone positioning
2015-04-27 16:51:48 -04:00
Zach H 425790e398 Fixed incorrect zone positioning 2015-04-27 16:26:57 -04:00
Zach 1ca561dec5 Merge pull request #1033 from poixen/token_pt_fix
Only use local db if no pt is provided
2015-04-27 15:58:41 -04:00
Zach c5ac3701ba Merge pull request #1031 from ZeldaZach/update_about_menu 2015-04-27 12:21:15 -04:00