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,509 Commits 32 Branches 187 Tags
057f5face3ee3f858e546b0e45aabce8f62cec7c
Commit Graph

36509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Kamensky
4d41ed60c9 Merge branch 'challengerdecks2' into 'master' 
Added first batch of preconstructed challenger decks

See merge request core-developers/forge!253
 2018-02-24 06:48:26 +00:00
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
maustin
7db9a6730a Merge remote-tracking branch 'origin/challengerdecks2' into challengerdecks2 
# Conflicts:
#	forge-gui/res/quest/precons/Counter Surge.dck
#	forge-gui/res/quest/precons/Vehicle Rush.dck
 2018-02-23 19:38:10 +00:00
austinio7116
5a784e6c9b Added first batch of preconstructed challenger decks 2018-02-23 19:37:31 +00:00
austinio7116
91c16a319c Added first batch of preconstructed challenger decks 2018-02-23 19:33:20 +00:00
maustin
47ebfec59e Merge remote-tracking branch 'origin/commanderDeckGenerator' into commanderDeckGenerator 
# Conflicts:
#	forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java
 2018-02-23 18:54:26 +00:00
austinio7116
f582469ba2 Assigning lstDecks.getGameType().getDeckFormat() to a variable so we don't have to write it out each conditional 2018-02-23 18:43:15 +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
austinio7116
d4c3dc4eab Update to card view of decks so long-press opens deck viewer to be consistent with list view 2018-02-22 20:13:02 +00:00
austinio7116
cfeb07c65f Increased basic land count in random commander decks. 
Fixed lobby update on variant change
 2018-02-22 20:13:02 +00:00
austinio7116
ced56ec4cd Completed random commander deck generation refactoring to work on Desktop, to support partner commanders and corrected a number of bugs found during testing. Full support on android and desktop for saving of selected deck states for the new features added. 2018-02-22 20:13:02 +00:00
austinio7116
3cf215dbd0 Error handling and thread timeout added to simulated matches to allow large AI tournaments without infinite length games due to loops. AI tournaments should now always finish - if the matches take too long they are scored as a draw. 2018-02-22 20:13:02 +00:00
austinio7116
f237a8d29a Addition of new new random commander deck generation - both fully random decks based on a selected commander and matrix-based synergistic deck generation using a model learned from thousands of commander decks. This also includes support for commander net-decks on desktop. 2018-02-22 20:13:02 +00:00
austinio7116
4d5a1a152f Added model file for new commander deck generation and updated modern and standard models too 2018-02-22 20:13:02 +00:00
austinio7116
6735bf3e76 Update to card view of decks so long-press opens deck viewer to be consistent with list view 2018-02-22 08:51:11 +00: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
austinio7116
6fe34ec618 Increased basic land count in random commander decks. 
Fixed lobby update on variant change
 2018-02-21 18:56:22 +00:00
maustin
05a30d0129 Merge remote-tracking branch 'origin/commanderDeckGenerator' into commanderDeckGenerator 
# Conflicts:
#	forge-gui-desktop/src/main/java/forge/screens/home/CLobby.java
#	forge-gui-mobile/src/forge/deck/FDeckChooser.java
#	forge-gui/res/deckgendecks/Commander.dat
#	forge-gui/res/deckgendecks/Modern.dat
#	forge-gui/res/deckgendecks/Standard.dat
#	forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
#	forge-gui/src/main/java/forge/deck/DeckType.java
#	forge-gui/src/main/java/forge/deck/DeckgenUtil.java
#	forge-gui/src/main/java/forge/limited/CardThemedCommanderDeckBuilder.java
 2018-02-21 09:30:49 +00:00
austinio7116
6cf2c3459c Completed random commander deck generation refactoring to work on Desktop, to support partner commanders and corrected a number of bugs found during testing. Full support on android and desktop for saving of selected deck states for the new features added. 2018-02-21 09:28:17 +00:00
austinio7116
e87513bb45 Error handling and thread timeout added to simulated matches to allow large AI tournaments without infinite length games due to loops. AI tournaments should now always finish - if the matches take too long they are scored as a draw. 2018-02-21 09:12:48 +00:00
austinio7116
0f5c1b8e8e Addition of new new random commander deck generation - both fully random decks based on a selected commander and matrix-based synergistic deck generation using a model learned from thousands of commander decks. This also includes support for commander net-decks on desktop. 2018-02-21 09:12:48 +00:00
austinio7116
c109ac76a7 Added model file for new commander deck generation and updated modern and standard models too 2018-02-21 09:12:48 +00: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
tehdiplomat
6ca1269261 Add ability to load tokens via scripts before 2018-02-19 13:15:12 -05:00
Chris H
d374da0481 Refactor TokenEffect to be easier to add in TokenScripts 2018-02-19 13:15:12 -05: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