OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-23 20:05:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
1,815 Commits 44 Branches 0 Tags
3ef4e501f951a5af45bf3482a7e4360c96cc5fe7
Commit Graph

1815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zukero
3ef4e501f9 Fixed minor issue with secret room pop-up in waterwayacavex 2018-10-31 12:50:40 +01:00
Zukero
6466f7f936 Reverted and made again the translations update. 
Previous update contained mistakes. The sad part is that I have no
choice but to overwrite all translations made since on weblate. Sorry
everyone.
 2018-10-31 12:24:22 +01:00
Zukero
245cf4ccf2 Merge pull request #90 from NutAndor/bugfix_2018_10 
changes to Erwyn/Yolgen/Gyra  from nutAndor:bugfix_2018_10
 2018-10-30 08:03:41 +01:00
Nut
c9ea6c286d add nut changes with Erwyn+Gyra 2018-10-29 23:28:04 +01:00
Nut
17e33fecc3 Merge branch 'master' into bugfix_2018_10 
# Conflicts:
#	AndorsTrail/res/raw/conversationlist_stoutford_combined.json
 2018-10-29 00:12:14 +01:00
NutAndor
00ac1b2b36 Merge pull request #8 from Zukero/master 
merge fromzukero master
 2018-10-28 19:22:05 +01:00
Zukero
9e0960ebf2 Merge pull request #87 from Rijackson/master 
Some fixes for bugs that came up on the forums.
 2018-10-28 14:56:51 +01:00
Zukero
f027d9a9cd Merge pull request #88 from urbalazs/authors 
Added myself to contributor list
 2018-10-28 10:52:16 +01:00
Balázs Úr
03b2de6c61 Added myself to contributor list 2018-10-28 10:00:35 +01:00
Nut
c611ef8c01 small fix with Odirath 2018-10-28 09:29:42 +01:00
Nut
0db5bf24ac Gyra's quest ending 
- you can end the quest now at Berbane or at Odirath. Quest stages will be in correct order
 2018-10-28 09:00:18 +01:00
Rijackson
7576648105 Removed changes to conversationlist_stoutford_combined 2018-10-27 18:18:10 -04:00
Rijackson
62a7ed79d5 Revert "Some fixes for bugs that came up on the forums." 
This reverts commit b4e57e5481.
 2018-10-27 18:16:05 -04:00
Rijackson
b4e57e5481 Some fixes for bugs that came up on the forums. 2018-10-27 17:41:52 -04:00
Zukero
1c7f081f18 Merge pull request #86 from urbalazs/monster-names-lowercase 
Fixed wording of monster names in sentences
 2018-10-27 18:01:45 +02:00
Nut
f97a8bc5ce fixes around Yolgen/Erwyn, Gyra needs some action still 2018-10-25 07:03:36 +02:00
NutAndor
e9e75acf52 Merge pull request #7 from NutAndor/master 
merge zukero's changes
 2018-10-24 23:36:07 +02:00
NutAndor
4b1bcabafa Merge pull request #6 from Zukero/master 
merge zukero's changes
 2018-10-24 23:34:03 +02:00
Zukero
d301076f2b Small fix to Halvor's dialogues, to improve consistency. 2018-10-24 11:16:00 +02:00
Zukero
0c1afc0370 Changed item rarity sort order to legendary, extraordinary, rare, quest, 
ordinary.
 2018-10-24 10:51:45 +02:00
Zukero
0af042f94d Fixed stupid issue with the new low-quality filters... 2018-10-24 10:37:56 +02:00
Zukero
2997109258 Merge pull request #84 from urbalazs/nonverbal 
Fixed non verbal communications
 2018-10-24 10:16:59 +02:00
NutAndor
4c4369da50 Merge pull request #5 from Zukero/master 
merge from zukeros master
 2018-10-21 17:37:34 +02:00
Balázs Úr
46177d0962 Fixed wording of monster names in sentences 2018-10-17 21:41:41 +02:00
Zukero
5846e37769 Merge pull request #85 from urbalazs/monster-names 
Fixed wording of monster names
 2018-10-14 21:58:02 +02:00
Balázs Úr
28ad027fa1 Fixed wording of monster names 2018-10-14 21:45:55 +02:00
Balázs Úr
a6775a1e95 Fixed non verbal communications 2018-10-10 00:02:05 +02:00
Zukero
47e47f9804 Merge pull request #83 from urbalazs/blackwater 
Fixed spelling of Blackwater mountain settlement
 2018-10-09 18:48:42 +02:00
Balázs Úr
ed699333a4 Fixed spelling of Blackwater mountain 2018-10-09 18:21:57 +02:00
Zukero
90abe8d769 Update translations following merged pull-requests by Balazs Ur 2018-10-09 11:00:01 +02:00
Zukero
66344e4ced Merge branch 'master' of https://hosted.weblate.org/git/andors-trail/game-content 2018-10-09 10:31:42 +02:00
Jiri Zizkin Zizka
d2f238c825 Translated using Weblate (Czech) 
Currently translated at 13.1% (1184 of 8979 strings)
 2018-10-07 17:24:47 +02:00
Balázs Úr
c5059dce19 Translated using Weblate (Hungarian) 
Currently translated at 40.6% (3646 of 8979 strings)
 2018-10-07 00:29:37 +02:00
Lucas Rossi
5375f5115a Translated using Weblate (Italian) 
Currently translated at 99.2% (8913 of 8979 strings)
 2018-10-06 21:29:37 +02:00
huzhanrong
be2c5e70b2 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 3.6% (324 of 8979 strings)
 2018-10-06 05:23:43 +02:00
Mo Ro
bf5af914f3 Translated using Weblate (German) 
Currently translated at 71.3% (6403 of 8979 strings)
 2018-10-06 02:29:07 +02:00
Zukero
18d7a5c212 Merge pull request #78 from urbalazs/ellipsis 
Fixed ellipsis
 2018-10-05 19:01:46 +02:00
Mo Ro
9126677e69 Translated using Weblate (German) 
Currently translated at 95.5% (497 of 520 strings)
 2018-10-05 11:28:20 +02:00
Balázs Úr
e2ab2d484b Improved usage of ellipsis 2018-10-04 17:11:32 +02:00
Balázs Úr
896b0a1647 Translated using Weblate (Hungarian) 
Currently translated at 39.0% (3509 of 8979 strings)
 2018-10-04 00:29:15 +02:00
Balázs Úr
e537ed3d7e Fixed ellipsis 2018-10-03 22:02:31 +02:00
Zukero
39013ceef4 Merge pull request #75 from urbalazs/okay 
Fixed spelling for OK
 2018-10-03 17:48:30 +02:00
Zukero
981d90eb66 Merge pull request #77 from urbalazs/hmm 
Fixed spelling of Hmm
 2018-10-03 17:40:03 +02:00
Balázs Úr
efc24cfb05 Fixed spelling of Hmm 2018-10-03 16:32:08 +02:00
Balázs Úr
e0c967b367 Fixed spelling for OK 2018-10-02 21:49:29 +02:00
Zukero
6164028b2e Merge pull request #74 from urbalazs/apostrophe 
Removed Unicode characters
 2018-10-02 19:23:37 +02:00
Balázs Úr
44bbd1d24f Removed Unicode characters 2018-10-02 18:36:10 +02:00
Zukero
517c187ca4 Merge pull request #73 from urbalazs/punctuation 
Fixed punctuation, trimmed strings, fixed typos
 2018-10-02 15:57:31 +02:00
Balázs Úr
d205fbc73b Translated using Weblate (Hungarian) 
Currently translated at 38.4% (3449 of 8979 strings)
 2018-10-02 02:28:09 +02:00
Balázs Úr
0e3a17ef21 Fixed punctuation, trimed strings, fixed typos 2018-10-02 00:14:49 +02:00