external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,069 Commits 31 Branches 187 Tags
bb591db7e35bba680960e1812ccff31b41fbca8c
Commit Graph

58069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris H
e0e889e4d4 Merge pull request #99 from Card-Forge/fix-readme-wiki 
Update README.md
 2022-04-19 23:44:54 -04:00
Magpie
caf2d5279c Merge remote-tracking branch 'upstream/master' 2022-04-19 23:46:54 +02:00
Magpie
322bbc1972 Big map update 10 
* Dispose of color frames texture.
 2022-04-19 23:46:11 +02:00
Paul Hammerton
d25b6413a3 Merge pull request #102 from churrufli/master 
Net Deck Archive Updates
 2022-04-19 22:41:19 +01:00
Churrufli
5d435209a1 Net Deck Archive Updates 2022-04-19 23:27:15 +02:00
pfirpfel
51014b5eb4 Also trigger on pull_request 2022-04-19 23:15:14 +02:00
Paul Hammerton
27a3049835 Merge pull request #101 from paulsnoops/snc_ncc_tokens 
SNC and NCC edition tokens
 2022-04-19 22:06:39 +01:00
paul_snoops
c8e18f5a23 SNC and NCC edition tokens 2022-04-19 22:05:41 +01:00
pfirpfel
1a96e227e2 Add testing workflow 2022-04-19 23:04:19 +02:00
tool4EvEr
8095469596 Fix self-blinks still returning when exiled by another effect 2022-04-19 22:29:13 +02:00
Chris H
589b2e0b97 Update README.md 2022-04-19 16:18:40 -04:00
tool4ever
1577f9ebfd Merge pull request #95 from Northmoc/snc_ctj 
SNC: Case the Joint and support
 2022-04-19 20:53:19 +02:00
Leandro Doctors
e570222e31 format: convert tabs to spaces 2022-04-19 15:35:31 -03:00
Leandro Doctors
1a57bee27f forge-gui-desktop: tests: refactor (format) 
Affected namespace:
forge.ai.simulation
 2022-04-19 15:35:31 -03:00
Leandro Doctors
efa45f8889 forge-gui-desktop: tests: refactor (rename) 
Affected namespace:
forge.ai.simulation
 2022-04-19 15:35:31 -03:00
Leandro Doctors
c7d0dde3e7 forge-gui-desktop: tests: migrate from JUnit3 to TestNG 
Affected namespace:
forge.ai.simulation
 2022-04-19 15:35:30 -03:00
Leandro Doctors
19962f4b9e forge-game: tests: refactor 2022-04-19 15:35:30 -03:00
Leandro Doctors
ac4917a093 forge-game: tests: migrate from JUnit3 to TestNG 2022-04-19 15:35:30 -03:00
Northmoc
2ab91730e6 if DamageAllEffect is a SubAbility, let it state its name in StackDesc 2022-04-19 13:50:41 -04:00
Northmoc
2d296b5180 hostile_takeover.txt fix typo 2022-04-19 13:49:44 -04:00
Northmoc
5cc348bcab hostile_takeover.txt (thanks SladeWilson) 2022-04-19 13:07:47 -04:00
Northmoc
c27a4aeb3d handle "card" vs. "cards" better 2022-04-19 13:00:33 -04:00
pfirpfel
daa6feef30 Fix checkstyle error 2022-04-19 18:54:18 +02:00
Northmoc
49e1dbb916 one more tweak for revealYouChoose stackDesc 2022-04-19 12:29:05 -04:00
Northmoc
af6b25e83f inquisition_of_kozilek.txt add DiscardValidDesc 2022-04-19 12:25:31 -04:00
Northmoc
55e27aa965 DiscardEffect getStackDescription() cleanup 2022-04-19 12:24:57 -04:00
Northmoc
96af69eaa4 Merge pull request #89 from paulsnoops/snc_19_april 
SNC - 19 April
 2022-04-19 11:37:38 -04:00
Northmoc
b82e113345 PeekAndRevealEffect fix param for pop-up title + some long line formatting 2022-04-19 11:25:48 -04:00
Northmoc
67327c533d PeekAndRevealEffect update comments 2022-04-19 11:25:01 -04:00
Northmoc
b27a9e834c PeekAndRevealEffect add getStackDescription() 2022-04-19 11:23:15 -04:00
Northmoc
1ae91351b8 medomais_prophecy.txt 2022-04-19 11:21:54 -04:00
Northmoc
3a5e9e9aa9 case_the_joint.txt 2022-04-19 11:15:22 -04:00
paul_snoops
4f4764ea28 fixes 2022-04-19 16:10:25 +01:00
paul_snoops
7979aa6d90 more cards 2022-04-19 16:10:25 +01:00
paul_snoops
906ee13a91 SNC - 19 April 2022-04-19 16:10:25 +01:00
Anthony Calosa
bd0238a93d disable BaseMultiResolutionImage 2022-04-19 23:01:52 +08:00
Anthony Calosa
7da398f5b4 unused import 2022-04-19 22:36:59 +08:00
Northmoc
0fe71378c2 Merge pull request #91 from t-w-o-s-a-t/master 
Update de-DE.properties
 2022-04-19 10:02:39 -04:00
Northmoc
3d1d6dc36a Merge branch 'master' into master 2022-04-19 10:02:21 -04:00
Anthony Calosa
3ceae176f7 Merge pull request #94 from kevlahnota/master 
Update RewardData
 2022-04-19 21:58:16 +08:00
Anthony Calosa
e8be64c9a0 Merge branch 'master' into newmaster 2022-04-19 21:56:49 +08:00
Anthony Calosa
527997f5b2 Update RewardData 
- exclude Online and Funny Card for Adventure Rewards
 2022-04-19 21:54:14 +08:00
tool4ever
9a88de1d6f Fix IsTriggerRemembered for Tokens (#93) 
Co-authored-by: TRT <>
 2022-04-19 15:06:08 +02:00
Paul Hammerton
3058b172b6 Merge pull request #88 from Northmoc/snc_18 
sizzling_soloist.txt
 2022-04-19 12:22:53 +01:00
Northmoc
3ad039f52e sizzling_soloist.txt fixup 2022-04-19 07:02:07 -04:00
Northmoc
18e6fcdf6d SNC: Make Connive effect (#11) 2022-04-19 12:28:35 +02:00
t-w-o-s-a-t
8daee86275 Update de-DE.properties 
typo
 2022-04-19 12:04:40 +02:00
t-w-o-s-a-t
e85d1c9a38 Update de-DE.properties 
Tapio Dmitriyevichs and my changes of  #Adventure entries
 2022-04-19 11:56:33 +02:00
Paul Hammerton
a12b6cf12f Merge pull request #90 from paulsnoops/ala_gdy_editions 
Update ALA and GDY editions
 2022-04-19 09:23:23 +01:00
paul_snoops
c2d5cdb7e3 Update ALA and GDY editions 2022-04-19 09:21:11 +01:00