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

2059 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gavin Bisesi
93cf7dbaaf Merge pull request #609 from poixen/chat_mention_fixes 
Chat mention fixes
 2015-01-27 06:30:20 -05:00
Matt Lowe
3c0aca70e0 Updated method name 
+ updated method name
+ added some doc
 2015-01-27 10:55:52 +01:00
Gavin Bisesi
aa1814ef8f Merge pull request #610 from Cockatrice/oracle-save-location 
Inform user of cards.xml save location on success
 2015-01-26 20:33:42 -05:00
Gavin Bisesi
62c4c0f4eb Merge pull request #597 from ideocl4st/tweak-hand-context-menu 
Submenus for moving all cards in a zone to another
 2015-01-26 20:33:17 -05:00
Jaeic Lee
bfc1bd04b5 Added separators 
Looks better imo.
 2015-01-27 09:54:11 +09:00
Gavin Bises
cbdb1b8bcd Inform user of cards.xml save location on success 2015-01-26 19:05:32 -05:00
Matt Lowe
639cbefee0 Chat mention fixes 
+ fixed some issues with highlighting entire line
+ added case insensative mentions
 2015-01-27 00:43:11 +01:00
Gavin Bisesi
f51e558e57 Merge pull request #605 from ZeldaZach/more_flags_time 
Additional Flags
 2015-01-26 15:21:25 -05:00
Jaeic Lee
c6800c48d2 More ellipsis 
Should be the last of them
 2015-01-27 03:32:58 +09:00
Jaeic Lee
46fb5f820e Tweaked some texts 
Per Daenyth’s request
 2015-01-27 03:14:52 +09:00
Gavin Bisesi
486690408d Merge pull request #602 from tooomm/oracle-add-default-selection-info 
Added text line about default sets selection in Oracle
 2015-01-26 13:06:38 -05:00
Zach H
627624a9c9 adding more flags 2015-01-26 11:57:28 -05:00
Gavin Bises
c923086629 Ignore ds_store and intellij hidden files 2015-01-26 11:50:24 -05:00
Zach
613f7717ab Merge pull request #595 from poixen/shufflefix 
Fixed shuffle issue
 2015-01-26 10:24:55 -05:00
Gavin Bisesi
ceead6b9e3 Merge pull request #593 from poixen/other_user_mention_option 
Removed other user mention BG
 2015-01-26 07:18:24 -05:00
tooomm
4963cf4618 Added text line about default selection 2015-01-26 00:59:28 +01:00
Gavin Bisesi
c328f28cde Merge pull request #600 from tooomm/readme-tweaks 
2 changes
 2015-01-25 15:33:00 -05:00
Gavin Bisesi
ffb5ac6b9a Merge pull request #599 from poixen/removed_unused_connect 
Removed a connection
 2015-01-25 15:31:26 -05:00
tooomm
f1addc2882 2 changes 
- moved "Community Resources" up as talked about here 7e92b4e7df
- moved Gitter and Travis buttons for cleaner and nicer look
 2015-01-25 18:44:44 +01:00
Matt Lowe
c0aafec907 Removed a connection 
This isnt being used anymore
 2015-01-25 12:15:53 +01:00
Matt Lowe
02277b2442 Removed other user mention BG 
Due to feedback, I have removed the background color for other user
mentions. I think this looks cleaner, and doesnt require an additional
option.
 2015-01-25 09:44:07 +01:00
Jaeic Lee
cc14e3cfc6 Submenus for moving all cards in a zone to another 2015-01-25 11:34:51 +09:00
Gavin Bisesi
2a6291dcde Merge pull request #592 from poixen/tap_animation 
Faster tapping speed
 2015-01-24 21:21:31 -05:00
Zach
2850e9e9ad Merge pull request #594 from poixen/fix_green_text 
Fixed green text issue
 2015-01-24 18:39:21 -05:00
Matt Lowe
ec198c33ca Fixed shuffle issue 
when closing a view we save the current settings. I added a check to
only update the shuffle settings if the zone we are closing can be
shuffled.
 2015-01-25 00:34:41 +01:00
Matt Lowe
359391acba Fix for #557 2015-01-24 23:59:53 +01:00
Matt Lowe
e409d96bb9 Faster tapping speed 
+ Feels better with a little more speed
 2015-01-24 23:01:10 +01:00
Zach
712f12a7a6 Merge pull request #587 from ZeldaZach/return_align_fix 
adding return
 2015-01-23 12:08:18 -05:00
Zach H
22a1bcdf60 adding return 2015-01-23 12:07:53 -05:00
Zach
dac5726dab Merge pull request #504 from ctrlaltca/local_scry_and_move 
Specify the player when triggering a move on a revealed card
 2015-01-23 10:14:05 -05:00
poixen
b06b81895b Merge pull request #580 from poixen/room_user_level 
Updated game view
 2015-01-22 23:26:14 +01:00
Matt Lowe
8fdaadf462 refactorings #3 
removed const from enum
 2015-01-22 22:37:49 +01:00
Matt Lowe
86bbf75ddd refactorings #2 
+ removed static from enum
+ removed condition check for user level
 2015-01-22 22:23:21 +01:00
Matt Lowe
8ac58259b4 Refactorings 2015-01-22 22:05:08 +01:00
Matt Lowe
1406a27775 Updated game view 
+ removed password column
+ added a lock svg to restrictions if pw is needed
+ added "password" to restrictions if pw is needed
+ added user pawn to creator tab
+ reformatted code for easy adaptation later
 2015-01-22 21:35:52 +01:00
poixen
71a067030d Merge pull request #578 from poixen/user_chat_mentions 
User chat mentions
 2015-01-22 21:04:30 +01:00
Gavin Bisesi
11bb32606b Merge pull request #579 from tooomm/readme-fixed-url 
fixed wooger link not working
 2015-01-22 08:10:00 -05:00
tooomm
6929303705 fixed wooger link not working 
test description
 2015-01-22 13:50:49 +01:00
Matt Lowe
497fed6b15 Updated colors 2015-01-22 12:39:24 +01:00
Matt Lowe
0334fe3c8f Other mentions -- DRAFT -- 
Mentions about other players currently in the room will be highlighted.
They are also clickable for mentions and right clickable for context
options.
 2015-01-22 09:32:56 +01:00
Gavin Bisesi
8069eceea1 Merge pull request #572 from ideocl4st/korean-translation 
Updated Korean Translation
 2015-01-21 07:45:12 -05:00
Jaeic Lee
7128f481b9 Small tweak due to fixing spelling mistake 
cleaned up vanished transitions in the mean time.
 2015-01-21 16:50:59 +09:00
Jaeic Lee
5c7ce8ffb7 Merge remote-tracking branch 'upstream/master' into korean-translation 2015-01-21 16:46:32 +09:00
poixen
0daa7a8809 Merge pull request #573 from poixen/spellingerror 
Fixed spelling mistake
 2015-01-21 08:06:29 +01:00
Matt Lowe
fd2b34278f Fixed spelling mistake 2015-01-21 07:50:20 +01:00
Jaeic Lee
31ad9b779a Updated Korean Translation 2015-01-21 12:38:51 +09:00
Gavin Bisesi
d83987b2b7 Merge pull request #570 from poixen/move_ignore_users 
Moved "Ignore messages from unregistered users"
 2015-01-20 14:14:30 -05:00
Matt Lowe
b9c537bf47 Moved "Ignore messages from unregistered users" 
Relocated to the chat settings tab.
 2015-01-20 20:02:36 +01:00
Gavin Bisesi
6dfaa81a53 Merge pull request #561 from poixen/chatnamehighlight 
Username block highlighting
 2015-01-20 12:35:41 -05:00
Gavin Bisesi
fa8bcccaaa Merge pull request #549 from poixen/cardviewlist 
Sortable card views can now be split into pile types
 2015-01-20 12:15:19 -05:00