Commit Graph

2573 Commits

Author SHA1 Message Date
dscarpac
05fcead3d1
Merge branch 'argonui:main' into kohaku 2024-06-29 07:38:13 -05:00
dscarpac
cc86d223d0
Merge pull request #729 from argonui/clean-up-helper
Updated Clean Up Helper
2024-06-28 16:30:49 -05:00
dscarpac
e8e68de98a
Merge branch 'argonui:main' into kohaku 2024-06-28 16:29:50 -05:00
dscarpac
5928c1888e spawns tokens in empty slots 2024-06-28 16:23:53 -05:00
dscarpac
c001dbd755 Merge branch 'kohaku' of https://github.com/dscarpac/SCED into kohaku 2024-06-28 11:41:28 -05:00
dscarpac
c27fcb5b25 first pass 2024-06-28 11:41:19 -05:00
Chr1Z93
ee0600f8e4 Added object unselection to context menus 2024-06-28 14:02:41 +02:00
Chr1Z93
aa70467489 Merge branch 'main' into clean-up-helper 2024-06-28 10:07:24 +02:00
dscarpac
df71f95383
Merge pull request #725 from argonui/scroll-of-secrets
Updated Scroll of Secrets menu
2024-06-27 22:34:01 -05:00
Chr1Z
a578688f5a
Merge pull request #728 from argonui/minicard-scale
Set correct scale for spawning mini cards
2024-06-28 01:13:11 +02:00
Chr1Z93
b4f63bf1f4 bugfix 2024-06-28 01:11:53 +02:00
Chr1Z93
55aaf7df51 Merge branch 'main' into clean-up-helper 2024-06-28 00:44:38 +02:00
Chr1Z93
bb45eda845 Updated clean up helper 2024-06-27 16:47:40 +02:00
dscarpac
07263d9d9d
Merge pull request #726 from argonui/weakness-by-trait
Added right-click function to specify a trait for RBW button
2024-06-27 09:06:31 -05:00
Chr1Z93
9954e1df80 updated search algorithm 2024-06-27 16:04:22 +02:00
Chr1Z93
fe5996d9a5 force correct scale for minicards 2024-06-27 15:55:53 +02:00
Chr1Z93
27c96df747 added multi trait search 2024-06-27 15:09:04 +02:00
dscarpac
9eae42212a
Merge branch 'argonui:main' into kohaku 2024-06-27 07:56:15 -05:00
dscarpac
d3ff9b61f2
Merge pull request #727 from argonui/resource-replenishing
Implemented proper replenishing for resource spawning hotkey
2024-06-27 07:46:18 -05:00
Chr1Z93
a945f9b4a6 added suffix 2024-06-27 14:33:45 +02:00
Chr1Z93
a5a1d90dae uses 0 for fake credentials 2024-06-27 13:50:55 +02:00
Chr1Z93
34ab661f7f Implemented proper replenishing for resource spawning hotkey 2024-06-27 12:51:53 +02:00
Chr1Z93
fd9e7e6c86 added right-click function to specify a trait 2024-06-27 12:12:55 +02:00
Chr1Z93
69a6647a5a updated comment 2024-06-27 02:29:12 +02:00
Chr1Z93
9e5d417acd merge 2024-06-27 02:21:20 +02:00
Chr1Z93
2d202bd513 Merge branch 'main' into scroll-of-secrets 2024-06-27 02:21:09 +02:00
Chr1Z93
b7cde57aba updated drop down menu 2024-06-27 02:18:21 +02:00
dscarpac
a90a69efb9
Merge branch 'argonui:main' into kohaku 2024-06-26 18:36:36 -05:00
dscarpac
8ac0c7a48a
Merge pull request #718 from argonui/playermats
Playermat update
2024-06-26 18:29:36 -05:00
Chr1Z93
7871924bcc Merge branch 'main' into playermats 2024-06-27 00:51:45 +02:00
dscarpac
af5ce39132
Merge pull request #715 from argonui/featured-and-notes
Updated featured content and added draft of release notes
2024-06-26 17:48:32 -05:00
Chr1Z93
f56c133516 updated notes 2024-06-27 00:46:05 +02:00
Chr1Z93
699dd82c7b temprarily lock objects 2024-06-27 00:42:00 +02:00
dscarpac
ed4ac42ee7
Merge pull request #724 from argonui/helpers
Bugfixes for CardsWithHelpers
2024-06-26 17:35:25 -05:00
Chr1Z93
a66ad8c630 bugfixes 2024-06-26 23:21:27 +02:00
Chr1Z93
bd65901e3a Merge branch 'main' into playermats 2024-06-26 22:51:15 +02:00
Chr1Z93
ffe25cb101 updated notecard + some snap points 2024-06-26 22:47:14 +02:00
Chr1Z93
939fd80a81 notecard updating 2024-06-26 22:45:53 +02:00
Chr1Z93
51255547dc Merge branch 'main' into featured-and-notes 2024-06-26 22:39:16 +02:00
BootleggerFinn
1b02c61fed
Merge pull request #722 from argonui/helpers
New option: Enable all card helpers
2024-06-26 09:23:49 -05:00
Chr1Z93
f81b3e22b6 updated date 2024-06-26 15:37:48 +02:00
Chr1Z93
4b0f5988d0 Merge branch 'main' into featured-and-notes 2024-06-26 15:36:28 +02:00
Chr1Z93
b9c6fd35b6 removed UI asset caching 2024-06-26 15:15:45 +02:00
Chr1Z
0a92bce6ea
Merge pull request #721 from dscarpac/patrice
Adds automatic discarding of hand for Patrice
2024-06-26 14:13:10 +02:00
Chr1Z93
6988ce170b bugfixing and formatting 2024-06-26 13:59:20 +02:00
Chr1Z93
b668146ba4 Merge branch 'helpers' into playermats 2024-06-26 12:54:03 +02:00
Chr1Z93
37d73b82c5 Merge branch 'main' into helpers 2024-06-26 12:45:11 +02:00
Chr1Z93
110f6f45a0 formatting 2024-06-26 02:08:29 +02:00
Chr1Z93
34a3cbd1d0 merge corrections 2024-06-26 01:55:34 +02:00
Chr1Z93
850b57bde2 Merge branch 'main' into playermats 2024-06-26 01:46:51 +02:00