Commit d9f6ec0
Merge branch 'master' into auto-apply-ability-order
Resolve conflicts:
- YieldUpdate.java: keep both SetYieldPref (V2) and ClearAbilityOrders permits
- PlayerControllerHuman.applyYieldUpdate: switch to yieldController.apply()
delegation; keep ClearAbilityOrders branch early-returning since
orderedSALookup lives on PCH, not YieldController
- GameMenu / VGameMenu: combine V2's Yield Settings + Auto-Pass items
with our Clear-Ability-Orders item (Auto-mode only)
- ForgePreferences: keep our UI_REORDER_SIMULTANEOUS_ABILITY_MODE
alongside V2's YIELD_* prefs + UI_AUTO_DECISION_MODE rename
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>340 files changed
Lines changed: 8913 additions & 3202 deletions
File tree
- docs
- forge-ai/src/main/java/forge/ai
- ability
- forge-core/src/main/java/forge
- card
- item
- util
- forge-game/src/main/java/forge
- game
- ability/effects
- card
- combat
- player
- spellability
- trigger
- zone
- trackable
- forge-gui-android
- src/forge/app
- forge-gui-desktop/src
- main/java/forge
- control
- deckchooser
- gui
- framework
- itemmanager
- views
- screens
- deckeditor
- controllers
- views
- home
- settings
- match
- controllers
- views
- workshop/views
- view
- arcane
- test/java/forge
- ai/ability
- deck
- gamesimulationtests/util
- net
- forge-gui-ios/src/forge/ios
- forge-gui-mobile-dev/src/forge/app
- forge-gui-mobile/src/forge
- adventure
- data
- scene
- util
- deck
- screens
- constructed
- match
- views
- settings
- toolbox
- util
- forge-gui
- res
- adventure
- Realm of Legends
- maps/map
- barbariancamp
- cave
- world
- common
- maps/map/main_story
- world
- ai
- cardsfolder
- a
- b
- c
- d
- e
- f
- g
- h
- i
- j
- k
- l
- m
- n
- o
- p
- q
- r
- s
- t
- upcoming
- u
- v
- w
- y
- defaults
- editions
- languages
- lists
- skins/default
- tokenscripts
- src/main/java/forge
- deck
- gamemodes
- limited
- match
- input
- net
- client
- event
- server
- quest
- gui
- control
- interfaces
- interfaces
- itemmanager
- localinstance
- properties
- skin
- model
- player
- util
- tools
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
65 | 71 | | |
66 | 72 | | |
67 | 73 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | 12 | | |
14 | 13 | | |
15 | 14 | | |
| |||
20 | 19 | | |
21 | 20 | | |
22 | 21 | | |
23 | | - | |
24 | 22 | | |
25 | 23 | | |
26 | 24 | | |
| |||
38 | 36 | | |
39 | 37 | | |
40 | 38 | | |
41 | | - | |
42 | 39 | | |
43 | 40 | | |
44 | 41 | | |
45 | 42 | | |
46 | 43 | | |
47 | | - | |
48 | 44 | | |
49 | 45 | | |
50 | 46 | | |
| |||
64 | 60 | | |
65 | 61 | | |
66 | 62 | | |
67 | | - | |
68 | 63 | | |
69 | 64 | | |
70 | 65 | | |
71 | 66 | | |
72 | 67 | | |
73 | | - | |
74 | 68 | | |
75 | 69 | | |
76 | 70 | | |
77 | | - | |
78 | 71 | | |
79 | 72 | | |
80 | 73 | | |
81 | | - | |
82 | 74 | | |
83 | 75 | | |
84 | 76 | | |
85 | 77 | | |
86 | 78 | | |
87 | | - | |
88 | | - | |
| 79 | + | |
0 commit comments