external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,124 Commits 33 Branches 187 Tags
03c1a0e6f08b8d74f68860b9c91b51fbb5808acd
Commit Graph

2391 Commits

Author SHA1 Message Date
Chris H
a9d3150b34 Small fixes 2024-06-28 20:40:49 -04:00
Chris H
33f34231f4 Add remaining Conspiracy cards 
- Archdemon of Paliano
- Canal Dredger
- Deal Broker
- Lore Seeker
 2024-06-28 20:40:49 -04:00
Chris H
4207736809 Fix 1v1 draft matches 2024-06-24 23:13:59 -04:00
Jetz
33c0e5dfd6 Merge branch 'master' into Attractions 2024-06-23 11:23:47 -04:00
Chris H
d4469ca736 Add Spire Phantasm, Agent of Acquisitions, Cogwork Librarian, Leovold's Operative (#5437) 
* Next few Draft cards

* Code review fixes

* Add Spire Phantasm

* Add Agent of Acquisitions, Cogwork Librarian, Leovold's Operative

* Some small fixes

* Getting closer

* Now the UI is updating

* Switch DraftPack to a delegate class

* Fix agent of acquisitions when AI drafts it
 2024-06-22 13:42:29 +03:00
Jetz
3e6871ce86 Merge branch 'master' into Attractions 
# Conflicts:
#	forge-core/src/main/java/forge/deck/DeckFormat.java
 2024-06-19 22:58:49 -04:00
kevlahnota
14be75e711 add annihilator & exalted icon and update toxic icon (#5426) 
* add annihilator icon and update toxic icon

* add exalted icon
 2024-06-14 15:58:36 +03:00
Chris H
50746d9a72 Draft matters with a vengeance (#5400) 
* Next few Draft cards

* Whispergear Sneak

* Whispergear Sneak

* Code review fixes

* Fix index mapping

* Don't try to log if Draft doesnt have one
 2024-06-12 09:18:12 +03:00
Jetz
49e7576742 Merge remote-tracking branch 'origin/master' into Attractions 
# Conflicts:
#	forge-core/src/main/java/forge/card/CardFace.java
#	forge-core/src/main/java/forge/card/CardRules.java
 2024-06-07 22:13:24 -04:00
Chris H
66bd484f27 Add Animus of Predation 2024-06-04 12:46:26 -04:00
Chris H
26ec757736 Show draft matters data in Card Detail Panel 2024-06-04 12:46:26 -04:00
Chris H
799fd4cc51 More draft matters 2024-06-04 12:46:26 -04:00
Chris H
4310fecc8b Unused imports 2024-06-04 12:46:26 -04:00
Chris H
7d4cb9b5a3 Trying to get Draft log in 2024-06-04 12:46:26 -04:00
kevlahnota
6012cde11b add Ward and Wither keyword icon (#5364) 
-closes #5361
 2024-06-03 17:31:33 +03:00
Jetz
1b07896afe Merge branch 'master' into Attractions 
# Conflicts:
#	forge-core/src/main/java/forge/card/CardRules.java
 2024-06-02 02:16:31 -04:00
Jetz
174db0cac6 I think I see why nobody wanted to do this 2024-06-02 02:08:36 -04:00
Chris H
6087167673 Draft Matters - How many cards you've drafted this round (#5203) 2024-05-21 11:36:59 +02:00
Hans Mackowiak
d384da986b add ManaCostShard Map and cleanup Desktop and Mobile (#5215) 
* add ManaCostShard Map and cleanup Desktop

* refactor mobile and remove SourceFile enum

* refactor mobile using ManaCostShard

* Fix Phyrexian Symbols and better String=>SkinProp mapping
 2024-05-18 12:13:19 +02:00
Hans Mackowiak
3309a48710 AI: Basic Logic for Destroy RE 2024-05-16 20:19:07 +02:00
Chris H
6152f75d9e Restore manual updater 2024-05-10 19:15:33 -04:00
Hans Mackowiak
31ab875d6e ManaCostShard: add Hybrid Colorless (#5199) 
* ManaCostShard: add Hybrid Colorless

* Add Hybrid Colorless Sprite

* fix CostReduction for ColorlessHybrid

---------

Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
 2024-05-06 08:21:01 +03:00
Agetian
a9c97aac2c AI Sideboarding Mode toggle as a Preferences option (#5136) 
* - Initial commit for the AI sideboarding mode toggle.

* - Tweak the parameter value to correspond to the enum.

* - Consistency.
 2024-04-25 14:19:47 +03:00
Chris H
d2e3b4826d Initial commit for Assist 2024-04-13 08:31:45 -04:00
Chris H
6d5579c4b8 Fix some more places where gaame elements were reusing old game versions 2024-04-08 10:11:52 -04:00
Chris H
91259f4d8b Code review comments 2024-04-08 10:11:52 -04:00
Chris H
175c25145d Experimental Snapshots for undoing spell/abilities 2024-04-08 10:11:52 -04:00
Hans Mackowiak
ca362664b7 MagicStack: fix fizzle removing too much Targets (#4873) 
* MagicStack: fix fizzle removing too much Targets

* Fix Dead Ringers

* Clean up useless check
 2024-03-27 15:03:11 +00:00
Hans Mackowiak
abfb74eee3 Card: differ between Game and Layer Timestamp (#4840) 
* Card: differ between Game and Layer Timestamp

---------

Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
 2024-03-21 09:19:21 +01:00
tool4ever
40f281bcf5 Support for Vault 11: Voter's Dilemma (#4828) 
* Fix Triassic Egg

* Support for Vault 11: Voter's Dilemma

* Fix Summoning Trap

* Support Vault nicknames

* Fix NPE
 2024-03-18 08:17:32 +01:00
Chris H
21be2c4bb3 Disable opengl acceleration 2024-03-10 21:41:09 -04:00
thedevnull
bada43b901 - fixed performance with OpenGl acceleration (#4742) 
Co-authored-by: Daniel Lage <daniels.nix@gmail.com>
 2024-02-26 09:50:12 +01:00
Paul Hammerton
a8758f230c fix_test 2024-01-26 09:53:16 +00:00
friarsol
0fd99618c1 Simplify how users can open the log file when we need it 2024-01-22 08:47:19 -05:00
Northmoc
aa847acf04 MKM - Case stuff (#4566) 2024-01-21 09:42:28 +00:00
tool4ever
e733b8fe0c Reimplement UI_CLONE_MODE_SOURCE (#3984) 
* Reimplement UI_CLONE_MODE_SOURCE
 2024-01-19 21:59:39 +00:00
Hans Mackowiak
c8def9b1ca GameSimulationTest: update some hasKeyword tests 2024-01-07 07:29:19 +01:00
friarsol
238977dac4 Disable lazy loading 2024-01-03 10:17:16 -05:00
Northmoc
7f5e75bdb0 PIP: Radiation mechanic implementation (#4204) 
* PIP: Radiation mechanic implementation

* remove OVERRIDE

* remove unused property
 2023-12-26 06:55:14 +03:00
Paul Hammerton
ebbb3ffb0d test_fix 2023-11-28 09:29:05 +00:00
Northmoc
1a7a135c2b LCI – Discover mechanic implementation (#3992) 
* LCI – Discover mechanic implementation

* curator_of_suns_creation.txt

* wiring improvements

* more cards

* last cards/tweaks
 2023-11-15 19:20:47 +03:00
tool4EvEr
6410d24e04 Apply patch 2023-11-05 11:51:45 +01:00
Northmoc
e06d4bcb87 jadelight_spelunker.txt and ExploreEffect improvements 2023-11-04 15:04:15 -04:00
Northmoc
77725b6e6d merge lblOk and lblOK (#4040) 2023-10-30 21:50:28 +03:00
tool4ever
aa1c3dd45e Restore misunderstood functionality to desktop card viewer (#3985) 2023-10-26 14:17:04 +00:00
kevlahnota
a5e3a43b84 Merge pull request #3982 from kevlahnota/newmaster2 
remove UI_CLONE_MODE_SOURCE preference
 2023-10-26 17:22:40 +08:00
kevlahnota
36fe377977 Merge pull request #3977 from tool4ever/fullControl 
Full Control
 2023-10-26 17:22:03 +08:00
kevlahnota
bbb91354cd Merge pull request #3971 from tool4ever/secdoc 
Second Doctor
 2023-10-26 17:21:20 +08:00
Anthony Calosa
fcccd1fc3d cleanup 2023-10-26 17:08:12 +08:00
kevlahnota
624d0f26d8 Merge pull request #3944 from Northmoc/bamboozle 
bamboozling_beeble.txt and centaur_of_attention.txt and Support
 2023-10-26 16:55:47 +08:00