OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
3,285 Commits 44 Branches 0 Tags
681d78aa9cd9e852d51fcea74b92ec221e8cec81
Commit Graph

3285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gonk
681d78aa9c Merge branch 'nut_arulir_mountain' into AndorsTrailRelease_master 
- All changes to PO and POT files from nut_arulir_mountain ignored, used the ones from AndorsTrailRelease_master because they contain the latest changes
- Small changes to authors.xml from nut_arulir_mountain ignored, used the ones from AndorsTrailRelease_master and checked that everything is there
- Current version display contains "dev". This has to be changed for the release

# Conflicts:
#	AndorsTrail/AndroidManifest.xml
#	AndorsTrail/assets/translation/ar.po
#	AndorsTrail/assets/translation/bg.po
#	AndorsTrail/assets/translation/ca.po
#	AndorsTrail/assets/translation/cs.po
#	AndorsTrail/assets/translation/de.po
#	AndorsTrail/assets/translation/el.po
#	AndorsTrail/assets/translation/english.pot
#	AndorsTrail/assets/translation/es.po
#	AndorsTrail/assets/translation/es_AR.po
#	AndorsTrail/assets/translation/fi.po
#	AndorsTrail/assets/translation/fil.po
#	AndorsTrail/assets/translation/fr.po
#	AndorsTrail/assets/translation/fr_AG.po
#	AndorsTrail/assets/translation/gl.po
#	AndorsTrail/assets/translation/hu.po
#	AndorsTrail/assets/translation/id.po
#	AndorsTrail/assets/translation/it.po
#	AndorsTrail/assets/translation/ja.po
#	AndorsTrail/assets/translation/ko.po
#	AndorsTrail/assets/translation/ms.po
#	AndorsTrail/assets/translation/nb.po
#	AndorsTrail/assets/translation/nl.po
#	AndorsTrail/assets/translation/pa.po
#	AndorsTrail/assets/translation/pl.po
#	AndorsTrail/assets/translation/pt.po
#	AndorsTrail/assets/translation/pt_BR.po
#	AndorsTrail/assets/translation/ru.po
#	AndorsTrail/assets/translation/sl.po
#	AndorsTrail/assets/translation/sv.po
#	AndorsTrail/assets/translation/th.po
#	AndorsTrail/assets/translation/tr.po
#	AndorsTrail/assets/translation/uk.po
#	AndorsTrail/assets/translation/zh_CN.po
#	AndorsTrail/assets/translation/zh_TW.po
#	AndorsTrail/res/values/authors.xml
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
 2020-01-06 20:34:17 +01:00
Gonk
35d831485a corrected the link in about to the game wiki and spelling of "lose" 2020-01-04 21:08:46 +01:00
Gonk
9e7e3b3fbd changed "armour" to "armor" (american english) 2020-01-04 20:54:42 +01:00
Nut
0d3ac02dc1 pahsito and russian translate percentage 2019-12-24 00:06:44 +01:00
Gonk
5ae78dd2fb make sure after loading a limitedsaves game that it is saved to the quickslot before deleting the savegame file 2019-12-23 23:58:42 +01:00
Nut
2d9cf8e364 Translation state per language 2019-12-22 09:15:26 +01:00
Nut
5b5e6cffe2 added pahsito again 2019-12-22 08:54:27 +01:00
Nut
aad26bd23e Translations update - 'Thieves' 2019-12-21 10:01:56 +01:00
Gonk
cfa2640e6a Merge branch 'permadeath' into nut_arulir_mountain 
# Conflicts:
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
 2019-12-20 15:20:02 +01:00
Gonk
c9c4c6377e incremented versionnumber for permadeath savegames because 48 was already used for the released 077 2019-12-20 15:14:36 +01:00
Gonk
a3e496eebb Merge remote-tracking branch 'weblate/master' into AndorsTrailRelease_master 2019-12-19 23:19:37 +01:00
Gonk
e2340536a0 Reseted language changes so we can make a clean weblate sync 2019-12-19 22:59:01 +01:00
Gonk
7d133b2d1c Merge remote-tracking branch 'typos/typos' into nut_arulir_mountain 2019-12-15 21:54:31 +01:00
Nut
06a806837c from Richard 14.12. 2019-12-15 06:10:48 +01:00
Nut
a3cfe18b53 Merge pull request #2 from AndorsTrailRelease/v077 
V077
 2019-12-15 05:47:55 +01:00
Nut
b51622e213 Merge pull request #1 from NutAndor/v077 
V077
 2019-12-14 23:48:33 +01:00
Nut
e4c6cbcb77 init branch v077 2019-12-14 23:31:52 +01:00
Kai-fong Chang
7ec59efc1d Translated using Weblate (Chinese (Traditional)) 
Currently translated at 3.6% (321 of 9023 strings)
 2019-12-12 08:05:57 +01:00
Luboš Nečas
95c027b098 Translated using Weblate (Czech) 
Currently translated at 15.5% (1401 of 9023 strings)
 2019-12-09 04:49:32 +01:00
Ueliton Alves Dos Santos
14dc6613e8 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.5% (8257 of 9023 strings)
 2019-12-09 04:49:29 +01:00
Gökhan Demirden
d3d93bbeae Translated using Weblate (Turkish) 
Currently translated at 17.4% (1573 of 9023 strings)
 2019-12-09 04:49:09 +01:00
Ueliton Alves Dos Santos
9477e44b2b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.5% (8257 of 9023 strings)
 2019-12-05 22:09:19 +01:00
Anatoly Chub
a96630436f Translated using Weblate (Ukrainian) 
Currently translated at 14.5% (1305 of 9023 strings)
 2019-12-05 05:47:15 +01:00
Ueliton Alves Dos Santos
b89fcb71ea Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.5% (8255 of 9023 strings)
 2019-12-05 05:47:13 +01:00
Ueliton Alves Dos Santos
45b7887366 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.5% (8255 of 9023 strings)
 2019-12-04 20:12:05 +01:00
Nut
57b17af382 add monsters_fatboy73 to base for arulir tests (correct typo) 2019-12-02 00:31:27 +01:00
Nut
dfc63029e7 add monsters_fatboy73 to base for arulir tests 2019-12-02 00:15:58 +01:00
Gonk
968b63394f Merge branch 'permadeath' into nut_arulir_mountain 2019-12-01 19:34:55 +01:00
Gonk
6e0a94898c Changed the labeling and display of the play modes 2019-12-01 19:33:25 +01:00
Ueliton Alves Dos Santos
481aafe6a0 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.5% (8255 of 9023 strings)
 2019-12-01 00:14:54 +01:00
Gonk
2d2bc41708 Merge branch 'arulir_mountain' of https://github.com/NutAndor/andors-trail into nut_arulir_mountain 2019-11-30 00:25:37 +01:00
Gonk
b91e924a75 Added my self to the authors 2019-11-30 00:25:02 +01:00
Ewe Pacheco
ab861e683a Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.5% (8253 of 9023 strings)
 2019-11-30 00:05:21 +01:00
Ueliton Alves Dos Santos
84f009042a Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 91.5% (8253 of 9023 strings)
 2019-11-30 00:05:18 +01:00
Ewe Pacheco
ef03e337cf Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (523 of 523 strings)
 2019-11-30 00:05:00 +01:00
Vanka
1af85dd9c1 Translated using Weblate (German) 
Currently translated at 100.0% (9023 of 9023 strings)
 2019-11-28 19:05:31 +01:00
Ueliton Alves Dos Santos
ac23103605 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 87.9% (7928 of 9023 strings)
 2019-11-28 19:05:25 +01:00
Vanka
0bafe112ef Translated using Weblate (Slovenian) 
Currently translated at 0.4% (2 of 523 strings)
 2019-11-28 19:04:57 +01:00
Davide Neri
71c86661d0 Translated using Weblate (Italian) 
Currently translated at 100.0% (9023 of 9023 strings)
 2019-11-25 05:18:16 +01:00
Chriz76
16eece8ee4 Merge pull request #28 from Chriz76/actionpointsfix 
action points are reset after a fight so the action points displayed …
 2019-11-24 20:17:13 +01:00
Nut
de1e5fe34e base for v078dev 
with added new Arulir graphics
 2019-11-24 05:05:12 +01:00
Gonk
b3cecaf845 action points are reset after a fight so the action points displayed are always max when not in a fight 2019-11-20 23:04:48 +01:00
Oğuz Ersen
b0c821662c Translated using Weblate (Turkish) 
Currently translated at 17.4% (1569 of 9023 strings)
 2019-11-15 21:04:33 +01:00
Oğuz Ersen
1049f93dd5 Translated using Weblate (Turkish) 
Currently translated at 80.9% (423 of 523 strings)
 2019-11-15 21:04:28 +01:00
Gonk
bf9e2ce947 Merge branch 'rangefix' into nut_arulir_mountain 2019-11-14 22:34:37 +01:00
Gonk
9c4374502e some fixes regarding ranges 
corrected display of negative values
min value has to be smaller than max value
added a debug check
 2019-11-14 22:33:07 +01:00
Anatoly Chub
2e38431291 Translated using Weblate (Ukrainian) 
Currently translated at 14.3% (1288 of 9023 strings)
 2019-11-14 13:29:10 +01:00
Murat Tuna
b10dd7bfad Translated using Weblate (Turkish) 
Currently translated at 17.3% (1565 of 9023 strings)
 2019-11-13 20:04:23 +01:00
Anatoly Chub
221db78032 Translated using Weblate (Ukrainian) 
Currently translated at 14.1% (1275 of 9023 strings)
 2019-11-10 10:04:18 +01:00
Gonk
764f39967d Merge branch 'localefix' into nut_arulir_mountain 2019-11-10 09:07:49 +01:00