Commit Graph

59612 Commits

Author SHA1 Message Date
Anthony Calosa
6d23bb4184 Merge pull request #1349 from kevlahnota/master
crash fix using textratypist on Android
2022-08-18 15:44:17 +08:00
Anthony Calosa
89319f95ab crash fix using textratypist on Android 2022-08-18 15:39:51 +08:00
Anthony Calosa
a60ba55986 Merge pull request #1348 from kevlahnota/master
revert flip
2022-08-18 07:19:50 +08:00
Anthony Calosa
0349f45a9b revert flip 2022-08-18 07:19:00 +08:00
Anthony Calosa
11de68f123 Merge pull request #1347 from kevlahnota/master
fix autosave flip preview
2022-08-18 04:39:46 +08:00
Anthony Calosa
c595cf7896 fix autosave flip preview
- the screenshot is already flipped to render correctly so we don't need to flip it again
2022-08-18 04:33:59 +08:00
Anthony Calosa
57362c1ef8 Merge pull request #1346 from kevlahnota/master
fix save preview for some android devices
2022-08-18 03:30:12 +08:00
Anthony Calosa
8493c151c7 fix save preview for some android devices
- take screenshot and redraw it on a new framebuffer so it renders properly on some android devices that don't support RGBA framebuffer directly.
2022-08-18 03:22:09 +08:00
Paul Hammerton
c6bec5f7a1 Merge pull request #1345 from JohnWilliams77/patch-36
Update Secret Lair Drop Series.txt
2022-08-17 11:03:07 +01:00
JohnWilliams77
4c75268fe1 Update Secret Lair Drop Series.txt 2022-08-17 10:14:43 +01:00
Paul Hammerton
dc0763a36c Merge pull request #1341 from JohnWilliams77/patch-35
Create Summer Vacation Promos 2022.txt
2022-08-17 08:27:48 +01:00
Anthony Calosa
c157ee709a Merge pull request #1344 from kevlahnota/master
add TextraTypist
2022-08-17 13:52:36 +08:00
Anthony Calosa
003ec159c8 unused import 2022-08-17 13:37:06 +08:00
Anthony Calosa
7170b2d282 add TextraTypist
for Font Effects, Styles, etc..
2022-08-17 13:32:17 +08:00
Anthony Calosa
03e2c8b572 Merge pull request #1342 from t-w-o-s-a-t/master
Update de-DE.properties
2022-08-17 08:31:59 +08:00
Anthony Calosa
f8dc0f6ff7 Update sharpshooter_elf.txt 2022-08-17 08:27:04 +08:00
t-w-o-s-a-t
00480d95fc Update de-DE.properties
found a changed var-name
2022-08-16 17:44:49 +02:00
JohnWilliams77
11fb6826ae Create Summer Vacation Promos 2022.txt 2022-08-16 12:58:18 +01:00
Anthony Calosa
04a6847576 Merge pull request #1339 from kevlahnota/master
fix captured image
2022-08-16 14:36:24 +08:00
Anthony Calosa
49e1df5682 .. 2022-08-16 14:32:46 +08:00
Anthony Calosa
9a0a5e3c85 Merge branch 'master' into newmaster 2022-08-16 14:31:49 +08:00
Anthony Calosa
aa1d639855 fix captured image
- on some android devices, it doesn't support RGBA Framebuffer, this should fix the lastScreenTexture rendering black
2022-08-16 14:20:10 +08:00
Paul Hammerton
f8b7a74518 Merge pull request #1337 from JohnWilliams77/patch-34
Update Secret Lair Drop Series.txt
2022-08-15 16:52:06 +01:00
JohnWilliams77
7524bc675f Update Secret Lair Drop Series.txt 2022-08-15 10:36:14 +01:00
Anthony Calosa
dd217cf81a Merge pull request #1336 from kevlahnota/master
prevent NPE
2022-08-15 08:28:06 +08:00
Anthony Calosa
1f9d212dfd prevent NPE 2022-08-15 08:25:15 +08:00
Paul Hammerton
af1a05df45 Merge pull request #1335 from paulsnoops/typo
Small editions clean up
2022-08-14 20:51:35 +01:00
paulsnoops
98f171a75a Small editions clean up 2022-08-14 20:48:06 +01:00
Paul Hammerton
252254b343 Merge pull request #1334 from JohnWilliams77/patch-33
Update Secret Lair Drop Series.txt
2022-08-14 20:19:43 +01:00
Anthony Calosa
08c4017dad fix Nezahal, Primal Tide return abililty 2022-08-14 18:00:35 +08:00
JohnWilliams77
6393f68556 Update Secret Lair Drop Series.txt 2022-08-14 10:40:23 +01:00
Anthony Calosa
8599c60177 Update StartScene.java 2022-08-14 10:12:09 +08:00
Anthony Calosa
be6b9ecca3 Update SaveLoadScene.java 2022-08-14 10:04:34 +08:00
Anthony Calosa
c625cf8ef4 Merge pull request #1333 from kevlahnota/master
set 250 as minimum value for temp health boost
2022-08-14 09:48:03 +08:00
Anthony Calosa
6ad81080fc set 250 as minimum value for temp health boost 2022-08-14 09:32:37 +08:00
Anthony Calosa
f1ccf6c3cd Merge pull request #1332 from tool4ever/canttargetfix
CantTarget "as you cast it" is checked on resolve
2022-08-14 09:21:54 +08:00
Paul Hammerton
211ae630d4 Merge pull request #1331 from JohnWilliams77/patch-32
Update 30th Anniversary Promos.txt
2022-08-13 21:52:13 +01:00
JohnWilliams77
3323437fe2 Update 30th Anniversary Promos.txt 2022-08-13 21:17:53 +01:00
tool4EvEr
98215c324c CantTarget "as you cast it" is checked on resolve 2022-08-13 21:57:24 +02:00
JohnWilliams77
7ec155496e Update 30th Anniversary Promos.txt 2022-08-13 13:26:38 +01:00
Anthony Calosa
fcecec09d6 Update InnScene.java
move computation on scene enter
2022-08-13 20:17:36 +08:00
Anthony Calosa
2952fc9692 Merge pull request #1212 from Card-Forge/autoHealWhenEnteringTowns
Auto heal when entering towns
2022-08-13 18:15:37 +08:00
Anthony Calosa
f3f9c222b0 Merge branch 'master' into autoHealWhenEnteringTowns 2022-08-13 17:53:30 +08:00
Anthony Calosa
b9a3189849 Update GameHUD.java 2022-08-13 17:31:40 +08:00
Anthony Calosa
5e5117315b colored lifepoints 2022-08-13 17:26:14 +08:00
Anthony Calosa
7d13763219 Update zh-CN.properties 2022-08-13 16:59:32 +08:00
Anthony Calosa
f9552fd6f7 Update pt-BR.properties 2022-08-13 16:59:00 +08:00
Anthony Calosa
a07787e6d5 Update ja-JP.properties 2022-08-13 16:58:21 +08:00
Anthony Calosa
2153c3d8aa Update it-IT.properties 2022-08-13 16:57:33 +08:00
Anthony Calosa
6543fa1ed8 Update es-ES.properties 2022-08-13 16:56:52 +08:00