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 |
|
Anthony Calosa
|
9da9d1f714
|
Update AdventureQuestController.java
update check
|
2023-04-14 04:10:08 +08:00 |
|
Anthony Calosa
|
9298feb297
|
Merge pull request #2920 from kevlahnota/newmaster2
fix loading error classcastexception
|
2023-04-14 04:05:41 +08:00 |
|
Anthony Calosa
|
4bbf516e89
|
fix loading error classcastexception
- fix classcastexception-cannot-assign-instance-of since the old value is of UUID and changed to String, old file will not load...
|
2023-04-14 04:04:09 +08:00 |
|
Simisays
|
3e736104a1
|
Adventure: Grolnok Rework + a bunch of tweaks to my older PR's (#2915)
|
2023-04-14 03:47:23 +08:00 |
|
Paul Hammerton
|
315478aac0
|
Merge pull request #2919 from paulsnoops/update_mat
Edition updates: MAT
|
2023-04-13 20:44:29 +01:00 |
|
paulsnoops
|
edbc2d2e10
|
Edition updates: MAT
|
2023-04-13 20:41:03 +01:00 |
|
Anthony Calosa
|
a14c65e31b
|
Merge pull request #2918 from paulsnoops/edition_updates
Edition updates: MOC, MUL
|
2023-04-14 03:36:36 +08:00 |
|
Anthony Calosa
|
4e9e535826
|
Merge pull request #2916 from Northmoc/battle2
MOM: more Battle-related CardProperty fun!
|
2023-04-14 03:35:18 +08:00 |
|
paulsnoops
|
95852d0d2f
|
Edition updates: MOC, MUL
|
2023-04-13 20:31:00 +01:00 |
|
Anthony Calosa
|
11989ebb2b
|
Merge pull request #2917 from kevlahnota/newmaster2
update GameHUD, InventoryScene
|
2023-04-14 03:15:15 +08:00 |
|
Anthony Calosa
|
932269f0c3
|
Merge pull request #2909 from jjayers99/master
Adventure updates
|
2023-04-14 03:06:39 +08:00 |
|
Anthony Calosa
|
8ccdabcdf6
|
update GameHUD, InventoryScene
- can equip activatable items for quick access on GameHUD
|
2023-04-14 02:49:09 +08:00 |
|
Benjamin Perry
|
7e386c034a
|
Merge remote-tracking branch 'upstream/master'
|
2023-04-13 14:29:58 -04:00 |
|
Northmoc
|
984049276e
|
cut_short.txt and support (#2877)
* cut_short.txt and support
|
2023-04-13 20:01:43 +02:00 |
|
Northmoc
|
6cd56c0cfc
|
Merge pull request #2889 from paulsnoops/mom_draft
Booster Draft: MOM with ONE & SIR updates
|
2023-04-13 12:32:08 -04:00 |
|
Northmoc
|
219b06a46a
|
hidetsugu_devouring_chaos.txt better
|
2023-04-13 12:30:15 -04:00 |
|
Northmoc
|
0a82769405
|
add some battle cards
|
2023-04-13 10:32:57 -04:00 |
|
Northmoc
|
782224bf78
|
MOM: more Battle-related CardProperty fun!
|
2023-04-13 10:22:14 -04:00 |
|
Northmoc
|
102ace575c
|
Merge pull request #2913 from tool4ever/castbattle
Battle: lazy build SpellPermanent on TDFC
|
2023-04-13 10:18:34 -04:00 |
|
Northmoc
|
e89d4f0d67
|
Merge pull request #2908 from Northmoc/i+e
MOM: inga_and_esika.txt + support
|
2023-04-13 10:10:50 -04:00 |
|
jjayers99
|
8514442220
|
Additional quest fixes, framework for new objective type
|
2023-04-13 09:00:53 -04:00 |
|
Benjamin Perry
|
a743e412ce
|
updating local deck, and selecting / scrolling to new copy
|
2023-04-13 08:23:32 -04:00 |
|
jjayers99
|
32417c7958
|
Update DialogActor.java
|
2023-04-13 07:11:52 -04:00 |
|
Benjamin Perry
|
a1366deff7
|
not mucking with selected index
|
2023-04-13 06:55:03 -04:00 |
|
TRT
|
faa8e6d6c9
|
lazy build SpellPermanent on TDFC
|
2023-04-13 11:55:19 +02:00 |
|
tool4ever
|
d90bfb0504
|
Update invasion_of_kylem__valors_reach_tag_team.txt
|
2023-04-13 08:52:50 +02:00 |
|
Anthony Calosa
|
4e129c6c9f
|
Merge pull request #2912 from tool4ever/fixes13
Some fixes
|
2023-04-13 14:46:52 +08:00 |
|
Anthony Calosa
|
e9376901e2
|
Merge pull request #2896 from Northmoc/battle1
MOM: Battle stuff
|
2023-04-13 14:16:46 +08:00 |
|
tool4EvEr
|
2b9a5a290e
|
Some fixes
|
2023-04-13 08:10:18 +02:00 |
|
Anthony Calosa
|
0711a2accb
|
Merge pull request #2911 from kevlahnota/newmaster2
remove redundant frames on navigation arrow
|
2023-04-13 11:59:52 +08:00 |
|
Anthony Calosa
|
1eca58c313
|
remove redundant frames on navigation arrow
|
2023-04-13 11:50:34 +08:00 |
|
Benjamin Perry
|
993bc03635
|
Regional language
|
2023-04-12 23:36:33 -04:00 |
|
Benjamin Perry
|
083a4cc815
|
Added copy and delete deck
|
2023-04-12 23:33:33 -04:00 |
|
Benjamin Perry
|
f5f3496e30
|
Added copy and delete deck
|
2023-04-12 23:28:44 -04:00 |
|
jjayers99
|
3a8aae7af0
|
Adventure updates
|
2023-04-12 23:25:39 -04:00 |
|
Anthony Calosa
|
a896a1563a
|
Merge pull request #2906 from bbp9857/master
Garruk's Mighty Axe's script now only applies to Green cards
|
2023-04-13 09:50:58 +08:00 |
|