OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-15 22:04:41 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
1,958 Commits 44 Branches 0 Tags
a1e0ae05ab47780e02fefe4150d205869cf1f22a
Commit Graph

1958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zukero
ce0e1871ab Merge branch 'master' into stoutford_tests 
# Conflicts:
#	AndorsTrail/res/raw/conversationlist_fallhaven_south.json
#	AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
#	AndorsTrail/res/raw/questlist_pathway_fallhaven.json
 2018-07-08 15:41:51 +02:00
benjamin thilliez
35abe99c02 Translated using Weblate (French) 
Currently translated at 100,0% (458 of 458 strings)
 2018-07-07 10:44:35 +02:00
roberto
43ec6da9a2 Translated using Weblate (Italian) 
Currently translated at 93.4% (5963 of 6378 strings)
 2018-07-05 23:55:40 +02:00
batista10
adc6a704fc Translated using Weblate (Portuguese) 
Currently translated at 5.1% (330 of 6378 strings)
 2018-07-04 19:41:18 +02:00
Zukero
7bb4aac88a Merge pull request #55 from Rijackson/Bug_fixes_pre_0_7_2 
Fix for the problem with pathway_fallhaven where the axe was still in…
 2018-07-01 10:58:07 +02:00
Rijackson
9452b65660 Fix for the problem with pathway_fallhaven where the axe was still in inventory after returning it. Also a fix for the Talion dialogue problem identified by zizkin (i.e. eight items should be nine items). 2018-06-29 07:49:45 -04:00
Zukero
c1ad14518d Merge pull request #54 from Rijackson/Bug_fixes_pre_0_7_2 
Bug fixes pre 0 7 2
 2018-06-29 07:35:25 +02:00
Rijackson
c75136d252 Fix the broken negation on a requirement. 2018-06-28 17:43:09 -04:00
Rijackson
896c16ab0f Minor dialogue fix 2018-06-25 21:37:03 -04:00
Rijackson
0f22db1191 Minor dialogue change for Guynmart when you choose the scroll. 2018-06-25 21:15:24 -04:00
Rijackson
451852f6a7 English fixes to pathway_fallhaven etc. 2018-06-25 21:06:02 -04:00
Zukero
7bc9b9e9e5 Merge pull request #53 from Rijackson/teksin 
Teksin
 2018-06-24 09:14:01 +02:00
Rijackson
8e972d579d Final tweaks 2018-06-23 15:01:58 -04:00
Boris Li
47d0f01a57 Translated using Weblate (Russian) 
Currently translated at 99.1% (454 of 458 strings)
 2018-06-23 11:44:42 +02:00
Zukero
b53f117232 Merge pull request #52 from NutAndor/stoutford_tests 
missing ring in lakecave map
 2018-06-22 07:46:16 +02:00
Nut
32b3c6b3e5 missing ring in lakecave map 2018-06-22 00:04:25 +02:00
Lejo
666bf3887e Translated using Weblate (German) 
Currently translated at 99.7% (457 of 458 strings)
 2018-06-21 16:38:36 +02:00
Vee F
f9e57cf0a3 Translated using Weblate (Spanish) 
Currently translated at 24.8% (1582 of 6378 strings)
 2018-06-18 09:44:01 +02:00
Hassani Lahsinui
bcfd599ca7 Translated using Weblate (Arabic) 
Currently translated at 4.5% (21 of 458 strings)
 2018-06-17 21:34:27 +02:00
Balázs Úr
0a4480820c Translated using Weblate (Hungarian) 
Currently translated at 32.7% (2095 of 6388 strings)
 2018-06-16 21:39:55 +02:00
Sótanyi Bálint
dbd917d0ff Translated using Weblate (Hungarian) 
Currently translated at 32.7% (2095 of 6388 strings)
 2018-06-16 21:39:54 +02:00
Rijackson
b5c053bca8 Some minor dialog improvements 2018-06-13 18:44:53 -04:00
Rijackson
60e9fa7073 Initial Teksin commit 2018-06-13 18:20:49 -04:00
Zukero
c045ddc56e Merge pull request #51 from NutAndor/stoutford_tests 
merge Graveyard and Guynmart into Stoutford tests
 2018-06-10 12:04:55 +02:00
Fahdxx
09544b61b4 Translated using Weblate (Arabic) 
Currently translated at 0.1% (7 of 6388 strings)
 2018-06-10 11:34:25 +02:00
Allan Nordhøy
d0c73a5fe2 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 95.6% (438 of 458 strings)
 2018-06-08 15:40:32 +02:00
NutAndor
e00ec840a1 Merge pull request #5 from Zukero/master 
merge zukeros master into nuts stoutford_tests
 2018-06-07 23:04:45 +02:00
NutAndor
a3b2cfa5b3 Merge pull request #4 from Zukero/stoutford_tests 
Stoutford tests (zukeros version)
 2018-06-07 23:00:01 +02:00
Allan Nordhøy
1770240d45 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 94.7% (434 of 458 strings)
 2018-06-07 08:40:51 +02:00
Zukero
47f9ef52eb Merge pull request #50 from NutAndor/guynmart_merge 
Guynmart merge
 2018-06-05 17:21:04 +02:00
Allan Nordhøy
8fec093497 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 89.3% (409 of 458 strings)
 2018-06-04 06:39:57 +02:00
Nut
28ddc13217 adds to guynmart_merge 
I forgot loadresources.xml :(
and added me to authors.xml
 2018-06-04 01:22:59 +02:00
Nut
9992948740 Guynmart merge 
next try
 2018-06-03 15:39:33 +02:00
NutAndor
341ed04dc8 Merge pull request #2 from Zukero/master 
upToDate
 2018-06-03 03:25:21 +02:00
Zukero
6e45d36214 Merge pull request #49 from Rijackson/master 
Added URL for Mike Gulisano
 2018-05-27 08:54:01 +02:00
Rijackson
c1a8619f40 Added URL for Mike Gulisano 2018-05-26 18:14:32 -04:00
lanet
41cccd2d1b Translated using Weblate (Turkish) 
Currently translated at 18.3% (1173 of 6378 strings)
 2018-05-25 15:43:12 +02:00
Rasmus Sæderup
efdbadcb8e Translated using Weblate (Danish) 
Currently translated at 13.9% (64 of 458 strings)
 2018-05-23 11:36:16 +02:00
Nicola Lombardi
39f6f08319 Translated using Weblate (Italian) 
Currently translated at 99.5% (456 of 458 strings)
 2018-05-19 00:38:21 +02:00
Heimen Stoffels
2ed9b72c81 Translated using Weblate (Dutch) 
Currently translated at 97.3% (446 of 458 strings)
 2018-05-18 14:36:13 +02:00
Zukero
520074bd12 Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/res/drawable/map_fence_4.png
	AndorsTrail/res/values/loadresources.xml
 2018-05-15 10:55:11 +02:00
Zukero
e041e499f3 Merge pull request #48 from Rijackson/master 
The graveyard and waterwaycave material from Gulisano and Richard.
 2018-05-15 10:24:18 +02:00
Heimen Stoffels
2b656f51ff Translated using Weblate (Dutch) 
Currently translated at 70.9% (325 of 458 strings)
 2018-05-13 12:36:18 +02:00
Heimen Stoffels
3bfb4ff735 Translated using Weblate (Dutch) 
Currently translated at 63.9% (293 of 458 strings)
 2018-05-10 14:37:04 +02:00
Heimen Stoffels
945f4ead36 Added translation using Weblate (Dutch) 2018-05-09 11:54:35 +02:00
Rijackson
b42b26bb42 Added guynmart spritesheets and modified map_fence_4 2018-05-02 17:29:12 -04:00
Rijackson
8c876225b4 Merge remote-tracking branch 'upstream/master' 2018-05-02 17:01:19 -04:00
test
a5b5b80466 Translated using Weblate (Russian) 
Currently translated at 98.0% (449 of 458 strings)
 2018-05-02 15:41:20 +02:00
Rijackson
622a3e5d48 Very minor dialog fixes 2018-04-29 18:00:14 -04:00
antuketot76
5f812bbac1 Translated using Weblate (Malay) 
Currently translated at 0.3% (20 of 6378 strings)
 2018-04-29 01:39:54 +02:00