Chr1Z93
2e99d57e46
Merge branch 'main' into optionpanel-2
2022-12-12 13:25:43 +01:00
Chr1Z93
5ab71c56c0
Merge branch 'optionpanel' into optionpanel-2
2022-12-12 13:25:34 +01:00
Chr1Z93
4086365b38
data for 10 tokens (akachi + brand lvl 4)
2022-12-12 12:23:36 +01:00
Chr1Z93
74bc2807f6
disabled option-panel button for now
2022-12-12 12:20:54 +01:00
Chr1Z93
24e8f3d8a6
resolving review comments
2022-12-12 12:18:45 +01:00
Buhallin
9d8beeaedc
Merge pull request #89 from argonui/tour
...
SCED Intro Tour, Part 1
2022-12-12 01:42:18 -08:00
Chr1Z
bb0418bb9c
Merge pull request #79 from argonui/displacement-tool
...
Displacement tool: visual update
2022-12-12 10:41:44 +01:00
Chr1Z
a379494045
removed unwanted spaces
2022-12-12 10:41:18 +01:00
Chr1Z
2fc634a5e8
reverted removed linebreaks
2022-12-12 10:40:38 +01:00
Chr1Z93
4445682d0f
Merge branch 'displacement-tool' of https://github.com/argonui/SCED into displacement-tool
2022-12-12 10:39:37 +01:00
Chr1Z93
2b130a3f11
reverting unwanted change
2022-12-12 10:39:30 +01:00
Chr1Z
fc4ba8f6be
Merge branch 'main' into displacement-tool
2022-12-12 10:37:59 +01:00
Chr1Z93
e6d9248997
resolving comments
2022-12-12 10:21:24 +01:00
Chr1Z
6d11bf56fb
Merge pull request #81 from argonui/doom-and-clue-counters
...
Doom Counter Option UI // Clue Counter clean up
2022-12-12 10:17:10 +01:00
Chr1Z93
5325f511db
Merge branch 'main' into optionpanel-2
2022-12-12 10:02:05 +01:00
Chr1Z
2f83df87d8
removed empty line
2022-12-12 09:55:20 +01:00
Chr1Z
ef7502fbe8
resolving merge conflict
2022-12-12 09:54:02 +01:00
Chr1Z
c4552b4021
Merge branch 'main' into optionpanel
2022-12-12 09:51:15 +01:00
Chr1Z
5d011e804d
Merge pull request #78 from argonui/cleanuphelper-update
...
Clean Up Helper: Remove vector lines
2022-12-12 09:42:01 +01:00
Chr1Z93
a312ede891
repairing save function, XML animation added
2022-12-12 09:38:29 +01:00
Chr1Z93
8d66dd839f
resolving comments, removing "last updated"
2022-12-12 09:14:57 +01:00
Chr1Z93
552b9699d4
reverting falsely committed file
2022-12-12 09:08:22 +01:00
Chr1Z
7fedaaf52e
Merge pull request #74 from argonui/chaosbagmanager-update
...
Chaos Bag Manager: remove usage of "_G"
2022-12-11 23:12:08 +01:00
Buhallin
054e2cb721
Merge pull request #90 from argonui/chaos-lock
...
Block chaos bag changes while the bag is being searched
2022-12-11 13:56:54 -08:00
Buhallin
1bf7e6de57
Merge pull request #92 from argonui/playermat-tags
...
Dynamic playmat snap point tagging
2022-12-11 13:56:37 -08:00
Buhallin
a3a3fd4515
Merge pull request #52 from argonui/player-snap-tags
...
Add card type tags to playermats
2022-12-11 13:54:37 -08:00
Buhallin
fcb5db3e28
Merge branch 'main' into player-snap-tags
2022-12-11 13:44:24 -08:00
Buhallin
4e500a8cc5
Remove GUID comparison in favor of direct object comparison
2022-12-11 13:37:40 -08:00
Buhallin
b0ba445767
Merge pull request #91 from argonui/require-refactor
...
Refactor some required files to function as modules
2022-12-11 13:34:35 -08:00
Buhallin
63b781075c
Merge branch 'main' into require-refactor
2022-12-11 00:10:45 -08:00
Buhallin
cb9c4d2d44
Block chaos bag changes while the bag is being searched
...
A TTS bug can cause tokens to be lost or possibly duplicated if they are added to a container while that container is being searched. This uses event listeners to block bag changes while it is being searched.
Steps to reproduce:
1. Search the bag
2. Add a token to the bag (bless/curse is easiest)
3. Remove a token from the bag using the search window
4. Close the search
The token supposedly added in #2 will be gone.
2022-12-11 00:06:21 -08:00
Buhallin
7025c0038e
Merge branch 'main' into tour
2022-12-10 23:30:03 -08:00
Buhallin
485c961660
Update a few comments
2022-12-10 23:29:09 -08:00
Buhallin
5d1c7b9c17
Add multiplayer handling to TourManager
...
Each player will now be tracked independently, and can watch their own tour.
2022-12-10 18:08:24 -08:00
Buhallin
a1684b30f0
SCED Intro Tour, Part 1
...
Creates the basic framework for the SCED introduction/training tour. As this will be a large feature, this is intended to checkpoint
progress and work.
What's here:
- Basic tour script definition
- Script UI creation, camera handling, and flow
What's not here:
- Multiplayer support. Everything is currently locked to white.
- Final UI. Most UI is placeholder and will be updated later.
- Extra script capability such as higlighting objects, explicit positioning, etc.
2022-12-10 17:06:27 -08:00
Buhallin
142beb350d
Merge pull request #88 from argonui/2.4.0-release
...
Update Fan-MadeScenariosCampaignsMiscellany.66e97c.json
2022-12-10 16:10:12 -08:00
bootleggerFinn
d142b0cff0
Update Fan-MadeScenariosCampaignsMiscellany.66e97c.json
...
Moving Fan Made Scenarios Box to be aligned
2022-12-10 17:32:54 -06:00
Buhallin
05924a56e2
Merge pull request #87 from argonui/2.4.0-release
...
Initial 2.4.0
2022-12-10 15:04:27 -08:00
bootleggerFinn
a082a281a0
Patch Notes
...
Added Patch Notes, moved search-a-card out of barrel, moved a few snap points
2022-12-10 16:19:55 -06:00
bootleggerFinn
22716fff55
Re-added SRC folder
2022-12-08 17:01:01 -06:00
bootleggerFinn
b5fbe4d0db
Initial 2.4.0
...
Rearranged table for new campaign
Previously featured community content converted to downloader versions
Updated/Added Following content: The Scarlet Keys, Celtic Rising, Jumanji, Machining a Mystery, Dr. Jekyll and Mr. Hyde, CYOA Campaign Guides, Dead Space Investigators, Aespa Investigators, Magical Girl Project, Streets of New Capenna, The Bad Batch, Arkham Fantasy Pixel Art Mini-Cards
Updated snap points
Updated spawn position of standalone scenarios/challenge scenarios memory bags
2022-12-08 16:54:44 -06:00
BootleggerFinn
a43b295833
Merge pull request #58 from argonui/datahelper-tsk
...
TSK: clue data
2022-12-08 12:54:11 -08:00
BootleggerFinn
fa28ccec17
Merge pull request #80 from argonui/custom-playmats
...
Bugfix: Custom Data Helper // New image display for custom playmat images
2022-12-08 12:50:21 -08:00
Chr1Z
1160ea5101
Merge pull request #86 from argonui/BootleggerFinn-patch-1
...
Update CODEOWNERS with CZ
2022-12-08 21:49:46 +01:00
BootleggerFinn
628ff98de7
Update CODEOWNERS
2022-12-08 14:49:01 -06:00
Chr1Z93
cb0a3d4256
removing orphaned file
2022-12-08 14:39:49 +01:00
Chr1Z93
285a638577
reset playarea image
2022-12-08 14:38:18 +01:00
Chr1Z93
251bf93dd4
implementing clue counting method swap
2022-12-08 14:27:55 +01:00
Chr1Z93
f69f426248
Merge branch 'doom-and-clue-counters' of https://github.com/argonui/SCED into optionpanel-2
2022-12-08 12:55:26 +01:00
Chr1Z93
19e538fbd9
WIP clue counting method swapping
2022-12-08 12:46:22 +01:00
