Commit Graph

2987 Commits

Author SHA1 Message Date
Chr1Z
f0e7d31817
Merge pull request #988 from YumiWhellie/main
adjusted Mandy and Ursula's data
2024-11-15 15:00:59 +01:00
Zerino
0afb0a9fb0 adjusted Mandy and Ursula's data 2024-11-15 10:53:50 -03:00
Chr1Z93
38c1e17be8 Merge branch 'main' into taboo-2.3 2024-11-14 15:01:04 +01:00
Chr1Z93
b420f8821d Merge branch 'main' into importer-exporter 2024-11-14 15:00:53 +01:00
Chr1Z93
a77d4477eb Merge remote-tracking branch 'origin/main' into random-boxes 2024-11-14 15:00:37 +01:00
Chr1Z
5118930d0f
Merge pull request #987 from YumiWhellie/main
Updated slot modification through permanent dropping
2024-11-14 14:58:25 +01:00
Zerino
1640b72bac added Directive and Miskatonic Archaeology Funding to modifySlot() 2024-11-14 10:48:49 -03:00
Zerino
16d26dcbbb added Blursed slot icon for Occult Reliquary 2024-11-14 10:46:53 -03:00
Zerino
51050b9bac Merge branch 'main' of https://github.com/argonui/SCED 2024-11-14 10:32:23 -03:00
Zerino
64a7509500 added Blursed icon slot for Occult Reliquary dropping 2024-11-14 10:30:41 -03:00
dscarpac
e17f6245da
Merge pull request #971 from argonui/play-area-images
Updated Playarea Image Gallery
2024-11-14 07:21:55 -06:00
dscarpac
e15f23c9ef
Merge pull request #972 from argonui/updated-build-task
Updated tasks
2024-11-14 07:21:23 -06:00
dscarpac
4f891520ee
Merge pull request #982 from argonui/parallel-mateo
Parallel Mateo: fixed missing cycle and added to official cycle list
2024-11-14 07:20:58 -06:00
Chr1Z
9806cd5bcb
Merge pull request #985 from YumiWhellie/main
updated upkeep hotkey, removed upkeep (multihanded) hotkey
2024-11-14 08:05:54 +01:00
Zerino
77f320e188 fixed a local, made code even smaller 2024-11-13 21:42:27 -03:00
Chr1Z93
ac6f0da74c turned checkboxes into crosses 2024-11-14 01:18:30 +01:00
Zerino
52e5ec01f4 updated upkeep hotkey, removed upkeep (multihanded) hotkey 2024-11-13 21:08:52 -03:00
Chr1Z
0c1f5e8bdb
Merge pull request #984 from YumiWhellie/main
updated customizables' textfield size
2024-11-13 23:19:41 +01:00
Zerino
67abfbcc16 updated customizable textfield size 2024-11-13 18:47:52 -03:00
Zerino
42b7ecad48 Merge branch 'main' of https://github.com/argonui/SCED 2024-11-13 18:02:19 -03:00
Zerino
5dad64ae98 updated modifySlot 2024-11-13 18:02:04 -03:00
Chr1Z
500efef81c
Merge pull request #983 from YumiWhellie/main
edit slots by dropping Charisma/Relic Hunter
2024-11-13 20:23:07 +01:00
YumiWhellie
59f64415d4
updated vector comparison
Co-authored-by: Chr1Z <97286811+Chr1Z93@users.noreply.github.com>
2024-11-13 16:07:31 -03:00
Chr1Z93
0773605be0 Merge branch 'main' into taboo-2.3 2024-11-13 18:46:01 +01:00
Zerino
a9c31630f0 edit slots by dropping Charisma/Relic Hunter 2024-11-13 12:25:39 -03:00
Chr1Z93
25f0c45272 fixed missing cycles and added to official cycle list 2024-11-12 23:29:20 +01:00
Chr1Z93
2d1de89ab0 merge additional player cards 2024-11-12 23:25:51 +01:00
Chr1Z93
1cbb7e2aa7 store clean up helper settings 2024-11-12 23:16:45 +01:00
Chr1Z93
58dd1e79af fixed handling for non-downloaded campaign boxes 2024-11-12 23:03:44 +01:00
dscarpac
c3c105f670
Merge pull request #975 from argonui/custom-data-helper
Updated Custom Data Helper
2024-11-11 19:37:11 -06:00
dscarpac
3e12ea3fcc
Merge pull request #978 from argonui/para-agnes
Fixed `extraToken` for parallel Agnes
2024-11-11 19:36:56 -06:00
Chr1Z93
aae9913e05 Fixed extraToken for parallel Agnes 2024-11-11 21:30:04 +01:00
dscarpac
b4ad803cbf
Merge pull request #977 from argonui/mod-manager
Removed TTSMM
2024-11-11 12:37:23 -06:00
Chr1Z93
50b817ce4c Removed TTSMM 2024-11-11 19:33:01 +01:00
dscarpac
cd84bd89bc
Merge pull request #976 from argonui/upgradesheet-saving
Upgradesheets: updated save function
2024-11-10 17:59:23 -06:00
Chr1Z93
6acb053842 Updated save function 2024-11-11 00:51:45 +01:00
Chr1Z
3cd93501ee
Merge pull request #974 from YumiWhellie/main
Created XML for customizable' upgrade sheets
2024-11-11 00:43:04 +01:00
Zerino
4733a9ef4a optimized code 2024-11-10 20:36:27 -03:00
Chr1Z93
b70ca1275a more mats 2024-11-11 00:28:08 +01:00
Chr1Z93
8a7a003174 missing mat handling 2024-11-10 23:59:46 +01:00
Zerino
8f7cac79aa Merge branch 'main' of https://github.com/argonui/SCED 2024-11-10 19:05:52 -03:00
Zerino
1c8820c779 updated customizable library to use xml 2024-11-10 19:05:29 -03:00
dscarpac
ae05ef7f5b
Merge pull request #973 from argonui/hand-helper
Hand Helper: Fixed formatting
2024-11-10 10:55:07 -06:00
Chr1Z93
5cea6acfc9 Fixed formatting 2024-11-10 16:30:18 +01:00
Chr1Z93
108ed9cf05 end of file new line 2024-11-10 15:24:08 +01:00
Chr1Z93
9aac5cecaa added decompose task 2024-11-10 15:22:39 +01:00
Chr1Z93
93d052d340 updated build task 2024-11-10 15:19:07 +01:00
Chr1Z93
31a90fdb68 removed LITAS duplicate 2024-11-09 22:17:05 +01:00
Chr1Z93
8a320ff842 added myriad's side scenarios and desk 2024-11-09 22:13:33 +01:00
Chr1Z
d533aa1c9b
Merge pull request #970 from YumiWhellie/main
fix for cleanup helper changing doomSubtractMode
2024-11-08 22:33:27 +01:00