Commit Graph

63746 Commits

Author SHA1 Message Date
Chris H
e4a73af041 Create stale.yml 2023-04-17 16:14:47 -04:00
Paul Hammerton
32c0064ab7 Merge pull request #2942 from JohnWilliams77/patch-84
Update Secret Lair Drop Series.txt
2023-04-17 17:45:56 +01:00
JohnWilliams77
235363394d Update Secret Lair Drop Series.txt 2023-04-17 14:15:35 +01:00
Anthony Calosa
0e066ccb98 Merge pull request #2941 from kevlahnota/newmaster2
enable option to zoom view rotated battle cards
2023-04-17 21:08:20 +08:00
Anthony Calosa
b0cde1cd2e enable option to zoom view rotated battle cards 2023-04-17 21:01:43 +08:00
Anthony Calosa
9857084217 fix CardZoom not working 2023-04-17 20:31:42 +08:00
Anthony Calosa
797dc055c7 Update FSkinImage.java
use default sourcefile for MANAICONS
2023-04-17 20:16:45 +08:00
Anthony Calosa
32c7829ac8 Merge pull request #2939 from Card-Forge/battle-editor
Battle deck editor types
2023-04-17 19:28:39 +08:00
Anthony Calosa
4ba888bdcf Update FSkinProp.java
update battle icon coordinate
2023-04-17 18:14:06 +08:00
Anthony Calosa
e8bd1ae159 Update FSkin.java
get default skinfile for manaIcons, should fix old skins without battle icon
2023-04-17 18:11:07 +08:00
Anthony Calosa
25cb794b7e update default icons
add battle icon
2023-04-17 18:08:50 +08:00
friarsol
2f6b6cbd47 Mobile battle deck editor additions 2023-04-16 23:06:36 -04:00
friarsol
245e828dd9 Add Battles for DeckEditor types 2023-04-16 22:19:20 -04:00
Anthony Calosa
cbb8a6f236 Merge pull request #2938 from kevlahnota/newmaster2
add Flip icon
2023-04-17 08:19:02 +08:00
Anthony Calosa
e983cbac61 add Flip icon 2023-04-17 08:13:54 +08:00
tool4ever
1a32b30c9d Update the_brothers_war.txt 2023-04-16 22:32:51 +02:00
Anthony Calosa
ab32527fc7 Merge pull request #2936 from jjayers99/master
Adventure Updates
2023-04-17 01:31:17 +08:00
Anthony Calosa
3948a6df8a Update AdventureQuestStage.java
format
2023-04-17 00:55:09 +08:00
TabletopGeneral
21d4478f28 Merge branch 'Card-Forge:master' into master 2023-04-16 07:29:43 -04:00
jjayers99
04ef8de211 Adventure Updates
Fix for requiring specific targets for battle objectives.
Small corrections to Island / Mountain capital maps
2023-04-16 07:29:10 -04:00
tool4ever
47950c0984 Update roar_of_resistance.txt 2023-04-16 09:26:32 +02:00
Anthony Calosa
fcce9f8bc6 Merge pull request #2934 from kevlahnota/newmaster2
update dialog and some icons
2023-04-15 21:22:51 +08:00
Anthony Calosa
7a60241f73 update dialog and some icons 2023-04-15 21:18:42 +08:00
Anthony Calosa
41bf7461db Merge pull request #2931 from jjayers99/master
Adventure quest updates
2023-04-15 10:31:05 +08:00
Anthony Calosa
d0a00461ae Update AdventureQuestController.java 2023-04-15 10:30:16 +08:00
jjayers99
fb8a7b904a Adventure quest updates
Arena quest stage objectives now available, one quest added.
Removed extra trigger for accepting quest in "A Vision of Destruction" offer dialog.
Minor dialog enhancements.
2023-04-14 22:14:12 -04:00
Anthony Calosa
93204bdd13 Merge pull request #2927 from jjayers99/master
Adventure updates
2023-04-15 06:57:42 +08:00
Anthony Calosa
08106f3add Merge pull request #2930 from tool4ever/sliverfix
Fix Frenetic Sliver + Tribute placer
2023-04-15 06:56:58 +08:00
tool4EvEr
7a50e013e5 Placer is opponent 2023-04-14 22:18:52 +02:00
tool4EvEr
64dd09c0d0 Fix Frenetic Sliver trigger 2023-04-14 21:27:20 +02:00
Paul Hammerton
6c6d36d2a7 Merge pull request #2928 from Northmoc/clbranks
add CLB to rankings.txt
2023-04-14 17:05:04 +01:00
Northmoc
32ba7fb513 Merge branch 'master' into clbranks 2023-04-14 08:48:24 -04:00
Northmoc
064f99b034 add CLB to rankings.txt 2023-04-14 08:42:42 -04:00
Simisays
450cefcdf1 MOM 9 cards (#2902)
* update

* update

* update

* update

* Delete inga_and_esika.txt

* Update invasion_of_arcavios_invocation_of_the_founders.txt

* update

* Update final_flourish.txt
2023-04-14 08:33:55 -04:00
jjayers99
92ec69e095 Adventure updates
Clear quests on New Game+
Small cleanup tweaks to town layouts
Added (big) signs to capitals for arena and spellsmith.
Quests can now be tagged with sources, allowing generation in specific towns / biomes.
NPC arena matches are now weighted on relative HP rather than 50/50 odds.
Removed invisible collision wall in Maze_1.tmx, gave threat range to nearby enemy instead.
2023-04-14 07:55:38 -04:00
Anthony Calosa
c71c5874b3 Merge pull request #2910 from bbp9857/master
Added copy and delete deck
2023-04-14 08:31:39 +08:00
Benjamin Perry
0505b6c709 Merge conflicts 2023-04-13 20:10:21 -04:00
Benjamin Perry
2f17c2f8f9 Merge conflicts 2023-04-13 20:08:05 -04:00
Anthony Calosa
c9bf01475f Merge pull request #2925 from kevlahnota/newmaster2
fix buttons
2023-04-14 08:01:26 +08:00
Benjamin Perry
cf86796b0e Add portrait-mode layout for delete/copy buttons 2023-04-13 19:59:07 -04:00
Anthony Calosa
93b8fc79b7 fix buttons 2023-04-14 07:52:55 +08:00
Anthony Calosa
10ac2bf139 Merge pull request #2924 from tool4ever/autopay
Fix Autopay test selecting same mana multiple times
2023-04-14 07:13:27 +08:00
tool4EvEr
6a27f7ea70 Fix Autopay test selecting same mana multiple times 2023-04-13 23:55:43 +02:00
Anthony Calosa
ae4f4e3555 Merge pull request #2923 from kevlahnota/newmaster2
update menu button positions
2023-04-14 05:37:40 +08:00
Anthony Calosa
26cc7d0fe5 update menu button positions 2023-04-14 05:26:25 +08:00
Anthony Calosa
a6705dcecf Merge pull request #2922 from paulsnoops/mom_edition_tokens
Remove redundant tokens from MOM edition
2023-04-14 05:07:37 +08:00
paulsnoops
c2e7060584 Remove redundant tokens from MOM edition 2023-04-13 21:50:38 +01:00
Anthony Calosa
27117f3102 Merge pull request #2921 from tool4ever/cleanup13
Clean up descriptions
2023-04-14 04:42:12 +08:00
tool4EvEr
6103c7b657 Clean up descriptions 2023-04-13 22:30:12 +02:00
Anthony Calosa
0fee7bfe53 Merge pull request #2861 from EldritchBimbo/Gwyn-Dev
Dross Pit Content Update
2023-04-14 04:18:05 +08:00