adam/SCED
1
0
Fork 0
Code Actions Releases 8 Activity
689 Commits 5 Branches 26 Tags 19 MiB
be97f42268
Commit Graph

689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chr1Z93
d53302c9e0 WIP commit to split PR into parts 2022-12-08 12:01:10 +01:00
Chr1Z93
d4beeeb95d UI done for now 2022-12-07 16:40:55 +01:00
Chr1Z93
df9cff8f38 addition of more fonts 2022-12-07 13:20:29 +01:00
Chr1Z93
229277d1d7 custom font added 2022-12-07 13:02:09 +01:00
Chr1Z
477074cc20
Merge pull request #83 from argonui/servitor-bugfix 
DeckImporter: Summoned Servitor (Dominance) - BUGFIX
 2022-12-06 22:42:33 +01:00
Chr1Z
bf5639008d
Merge pull request #85 from argonui/jessica-fix 
Add damage for Jessica's uses
 2022-12-06 22:42:18 +01:00
Buhallin
ca585857dc
Add damage for Jessica's uses 2022-12-06 13:30:31 -08:00
Chr1Z93
d4a41b7b02 option for playermat snap tags added 2022-12-06 21:26:08 +01:00
Buhallin
5231609f44 Add some cleanup for playmat snap type setting, as well as a get() method to return the current state 2022-12-06 21:00:56 +01:00
Buhallin
bd89174377 Expanded documentation and remove old log messages 2022-12-06 21:00:45 +01:00
Buhallin
43315aefcc Add method to enable or disable card type snap point tagging on a playmat 
This uses the new object API concept to provide a layer of indirection between
an object and others which might call() to methods on it.  Example usage:

local playmatApi = require("playermat/PlaymatApi")
playmatApi.setLimitSnapsByType(tag, "All")
 2022-12-06 21:00:23 +01:00
Chr1Z93
ce8e6815a5 xml cleanup 2022-12-06 20:57:33 +01:00
Chr1Z93
12a71894d8 moved xml to dedicated folder, save function added 2022-12-06 20:10:09 +01:00
Chr1Z93
5b0cdf942d resolve merge conflict (again!!) 2022-12-06 11:34:49 +01:00
Chr1Z93
c84e8a2101 resolve merge conflict (again) 2022-12-06 11:34:00 +01:00
Chr1Z93
cd83347c72 resolve merge conflict 2022-12-06 11:32:57 +01:00
Chr1Z93
33a33ebbe1 Revert "use require, optimize" 
This reverts commit 97b3dd4ce5.
 2022-12-06 11:16:00 +01:00
Chr1Z93
b03aee593d bugfix for 'dominance' 2022-12-06 11:09:47 +01:00