external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,033 Commits 32 Branches 187 Tags
fc8624c93b44c92a5e9657b7c489e13d852443e8
Commit Graph

36033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sol
fc8624c93b Merge branch 'multiplayer' into 'master' 
ensure that View(s) are used for ManaAbility choice(s)

See merge request core-developers/forge!251
 2018-02-24 00:14:05 +00:00
Sol
800a77b2e0 Merge branch 'multiplayerchatfixes' into 'master' 
Extended multiplayer chat text box to 255 character max from 60 and fixed multiplayer chat focus stealing issue

See merge request core-developers/forge!254
 2018-02-23 23:58:33 +00:00
austinio7116
361443d845 Extended multiplayer chat text box to 255 character max from 60 
Prevented the game from stealing focus from the multi player chat box to ensure you do not auto end turn or pass priority due to typing in chat when you regain priority
 2018-02-23 21:20:25 +00:00
Jamin W. Collins
06bc5e074a ensure that View(s) are used for ManaAbility choice(s) 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-22 20:06:23 -07:00
Michael Kamensky
85adc466b3 Merge branch 'master' into 'master' 
- Code base cleanup.

See merge request core-developers/forge!237
 2018-02-22 04:16:51 +00:00
Sol
afc02a856d Merge branch 'multiplayer' into 'master' 
further multiplayer fixes

See merge request core-developers/forge!250
 2018-02-22 01:29:23 +00:00
Jamin W. Collins
21d6b02410 submit previous deck if sideboarding timeout occurs 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-21 17:27:03 -07:00
Jamin W. Collins
5b0b719ce9 use SpellAbilityView for generic effect choice(s) 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-21 17:13:33 -07:00
Jamin W. Collins
9ce0315c3e give remote players 5 minutes per question 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-21 17:10:51 -07:00
Sol
d7bca1c232 Merge branch 'multiplayer' into 'master' 
multiplayer fixes for graveyard and stack targeting

See merge request core-developers/forge!248
 2018-02-21 04:11:16 +00:00
Jamin W. Collins
0a034f9acb ensure Stack targeting uses views 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-20 20:47:21 -07:00
Jamin W. Collins
98774c408c ensure that TargetSelection presents CardView(s) 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-20 20:20:41 -07:00
Jamin W. Collins
802036f693 print a message when unable to send event 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-20 15:27:18 -07:00
Agetian
5bb9ac6fcd - More cleanup. 2018-02-20 08:02:31 +03:00
Agetian
fcc02ed600 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2018-02-20 07:55:13 +03:00
Sol
1e45d14ec3 Merge branch 'AftermathFix' into 'master' 
CardFactory: fixed keywords for SplitCards

See merge request core-developers/forge!239
 2018-02-20 02:42:39 +00:00
Sol
97027e657e Merge branch 'multiplayer' into 'master' 
further multiplayer fixes

See merge request core-developers/forge!238
 2018-02-20 02:41:48 +00:00
Jamin W. Collins
487fec0258 multiplayer fix for 2nd and 3rd games of match 
The server was not updating the lobby player's game reference.  So, the
remote client's response was being processed for the wrong game
instance.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-19 16:03:48 -07:00
Hanmac
b25bc72f3e CardFactory: fixed keywords for SplitCards 2018-02-19 21:37:16 +01:00
Jamin W. Collins
d086e4d692 cleanup remote client game state creation 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-19 13:23:07 -07:00
Jamin W. Collins
8d2d66abb9 move external address out to a class attribute 
Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-19 13:23:07 -07:00
Agetian
83242e1fa9 - More cleanup. 2018-02-19 20:56:05 +03:00
Agetian
35fa4e7d8f - More cleanup. 2018-02-19 20:50:45 +03:00
Agetian
5022e96a48 - More cleanup. 2018-02-19 20:50:09 +03:00
Agetian
1779c8f84e - More cleanup and Price of Progress logic fix. 2018-02-19 20:15:12 +03:00
Michael Kamensky
74d9791f03 Merge branch 'ScorchedEarth' into 'master' 
Scorched earth

See merge request core-developers/forge!234
 2018-02-19 16:52:41 +00:00
Michael Kamensky
a6cb96c758 Merge branch 'BattleCry' into 'master' 
Gerrard's Battle Cry : play before combat

See merge request core-developers/forge!235
 2018-02-19 16:51:59 +00:00
Agetian
b05463ad6c - Code base cleanup. 2018-02-19 19:48:06 +03:00
Seravy
f229fbc4b1 Update DestroyAi.java 2018-02-19 12:54:16 +00:00
Seravy
1d470f87d4 Gerrard's Battle Cry : play before combat 2018-02-19 12:55:59 +01:00
Michael Kamensky
8c680da98c Merge branch 'PriceOfProgress' into 'master' 
Price of progress

See merge request core-developers/forge!210
 2018-02-19 04:37:54 +00:00
Michael Kamensky
21e682f54d Merge branch 'deck-editor' into 'master' 
improve how foiling is done

See merge request core-developers/forge!233
 2018-02-19 04:27:28 +00:00
Seravy
70593c2b6a Try to play Scorching Earth before playing a land for higher X. 2018-02-18 23:35:44 +01:00
Seravy
6b64667767 Do not spend more on X than the number of lands we can discard! 2018-02-18 21:37:20 +01:00
Hanmac
96d1777132 ChangeZoneEffect: it should Fizzle when removing to Command zone too 2018-02-18 20:58:12 +01:00
Jamin W. Collins
f6bd725633 improve how foiling is done 
Previous implementation relied on the removed card becoming focused in
the full card inventory.  This implementation works directly with the
deck avoiding the full inventory.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
 2018-02-18 12:51:55 -07:00
Michael Kamensky
dd7e2d933f Merge branch 'DumpTurn' into 'master' 
Dump/Setup game state will now save current game turn.

See merge request core-developers/forge!209
 2018-02-18 19:39:22 +00:00
Seravy
97177e379e Default turn = 1 if none set 2018-02-18 20:22:17 +01:00
Seravy
8df00a18e8 This should be 0 2018-02-18 19:55:59 +01:00
Michael Kamensky
6668fa5505 Merge branch 'revert-a9e15c2d' into 'master' 
Revert "Merge branch 'Guavafix' into 'master'"

See merge request core-developers/forge!232
 2018-02-18 18:54:35 +00:00
Seravy
c348ffa34e Now using SVar 2018-02-18 19:54:29 +01:00
Michael Kamensky
275e1be6be Revert "Merge branch 'Guavafix' into 'master'" 
This reverts merge request !217
 2018-02-18 18:54:20 +00:00
Hanmac
0c005bb3ff Commander: CommanderTax now is on the Player who casted the Commander 2018-02-18 18:47:59 +01:00
Hanmac
57b9a1b4c7 SpellAbility: copy manaPart 2018-02-18 18:07:41 +01:00
Hanmac
b29b1b3630 CardState: fixed copyState and LKI 2018-02-18 18:06:38 +01:00
Hanmac
3a071ea071 DestroyAi: extended havepact logic 2018-02-18 11:26:34 +01:00
Hanmac
25efe15329 fix final in ACEditor 2018-02-18 11:17:48 +01:00
Michael Kamensky
d544d69524 Merge branch 'AIInDangerRange' into 'master' 
AI In danger threshold now configurable and can be random instead of being locked to always 4.

See merge request core-developers/forge!220
 2018-02-18 09:15:34 +00:00
Michael Kamensky
bcc0fc9e00 Merge branch 'AINoncombatantCreatures' into 'master' 
Ai noncombatant creatures

See merge request core-developers/forge!221
 2018-02-18 09:10:39 +00:00
Seravy
7f2d2d6588 AI In danger threshold now configurable and can be random instead of being locked to always 4. 
(As a player, I find the fact the AI always changes their behavior towards more defensive at exactly 5 life extremely abusable - I can always be 100% sure they won't block certain creatures or activate certain spells/abilties otherwise, and in many cases, if the AI already got down to 5 life, even if they do activate their big trump card, it's too late : the last 5 damage is way easy to deal.)

Used this for playing the past few days and it seemed to work without problems.
 2018-02-18 10:08:29 +01:00