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
6,398 Commits 44 Branches 0 Tags
03b0ec16deaee23faec2bdf58f291328fa8d655f
Commit Graph

6398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zukero
75238bbcdf Merge branch 'master' into stoutford_tests 2017-08-21 14:41:10 +02:00
Zukero
d15e15a897 Fixed bug in feature ending a round at the end of a combat that caused 
an infinite recursion (Stack overflow) when the combat ended due to
player death while afflicted by an actor condition.
 2017-08-21 14:40:46 +02:00
Rijackson
6a4c949ad5 Added japozero spritesheets to master branch. Also a new item sprite (recolored flowers for the damerialias), and some new map sprites (a new window, some new fences/pillars, and some crossings for the rail tracks). The map sprites are only in experimental maps, but I thought I should make them available to anyone doing map making. 2017-08-20 19:10:20 -04:00
Zukero
f23b5ee738 Merge branch 'master' into stoutford_tests 2017-08-20 11:14:36 +02:00
Zukero
acf15e5b6d Added the new "factionScore" requirement type. 2017-08-20 11:13:57 +02:00
lanet
a3398a1754 Translated using Weblate (Turkish) 
Currently translated at 18.2% (1167 of 6378 strings)
 2017-08-19 15:48:21 +02:00
Carceris Magister
8f8bcf8a6c Use proper JSON boolean for negate statements 2017-08-18 22:47:49 -04:00
Carceris Magister
a5e10aaf0b Merge branch 'mikhail' of github.com:carceris-magister/andors-trail into mikhail 2017-08-18 22:42:48 -04:00
Carceris Magister
ff61d64c83 Merge branch 'master' of github.com:Zukero/andors-trail into mikhail 2017-08-18 19:41:47 -04:00
Zukero
7c231336a6 Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapTranslator.java
 2017-08-18 16:22:05 +02:00
Zukero
7086684eb0 Replace areas can now use complete requirements, like Key areas, not 
only "questProgress" ones. Untested. Beware.
 2017-08-18 16:08:35 +02:00
Zukero
98ac4ba6ef Merge branch 'master' into stoutford_tests 2017-08-18 11:54:41 +02:00
Zukero
8acaef419d Fixed lost "negate" line in conversationlist_stoutford.json 
It was breaking the rumblings quest.
 2017-08-18 11:54:25 +02:00
Zukero
2e631c74da Merge pull request #34 from carceris-magister/mikhail-poison 
Fixed dangling reference in Mikhail's conversation list.
 2017-08-17 17:49:48 +02:00
Carceris Magister
101d722ae6 Fixed dangling reference in Mikhail's conversation list. 2017-08-17 09:16:36 -04:00
monolifed
54115a7d07 Translated using Weblate (Turkish) 
Currently translated at 17.1% (1093 of 6378 strings)
 2017-08-17 08:53:04 +02:00
Carceris Magister
195b8eb5f9 Improved Mikhail's initial dialog with more context and to avoid repeating opening monologue (info still available when character asks.) 2017-08-16 21:13:08 -04:00
Zukero
f9ea913bba Cleaner formula for previous dual-wield fix. 2017-08-16 21:09:09 -04:00
lanet
b5be8aee96 Translated using Weblate (Turkish) 
Currently translated at 17.1% (1092 of 6378 strings)
 2017-08-15 12:48:12 +02:00
lanet
a8d601600e Translated using Weblate (Turkish) 
Currently translated at 16.1% (1033 of 6378 strings)
 2017-08-12 18:48:39 +02:00
Zukero
ed4fd97e1c Cleaner formula for previous dual-wield fix. 2017-08-11 13:10:01 +02:00
Zukero
23170721cb Cleaner formula for previous dual-wield fix. 2017-08-11 13:09:28 +02:00
Zukero
24b6b5b062 Merge branch 'master' into stoutford_tests 2017-08-11 13:05:43 +02:00
Zukero
7c6aea4d7c Fixed Dual-Wield level 1, so that the resulting attack cost is the 
slowest weapon + half the fastest weapon, instead of the main hand +
half the off-hand.
Implies changes to the skill description in the string ID
skill_longdescription_fightstyle_dualwield.
 2017-08-11 13:05:22 +02:00
Zukero
0c05167db6 Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
 2017-08-11 10:45:05 +02:00
Zukero
1751b9d765 Fixed and robustified the pathway_fallhaven quest. 2017-08-11 10:41:44 +02:00
lanet
014fcc02fe Translated using Weblate (Turkish) 
Currently translated at 14.9% (955 of 6378 strings)
 2017-08-10 15:47:17 +02:00
Zukero
f8fd6888d7 No more hard-coded fixed size TileCollection. No more crashes because 
you used a new tile.
 2017-08-09 18:07:01 +02:00
Stanisław Krukowski
2527b95924 Translated using Weblate (Polish) 
Currently translated at 99.9% (6377 of 6378 strings)
 2017-08-09 09:46:04 +02:00
lanet
0cba627a37 Translated using Weblate (Turkish) 
Currently translated at 14.8% (944 of 6378 strings)
 2017-08-08 09:46:55 +02:00
lanet
1561d3e8db Translated using Weblate (Turkish) 
Currently translated at 14.6% (932 of 6378 strings)
 2017-08-07 00:46:53 +02:00
İsim Yok
d162e3dedd Translated using Weblate (Turkish) 
Currently translated at 10.0% (644 of 6378 strings)
 2017-08-02 00:47:12 +02:00
İsim Yok
37ba066a3b Translated using Weblate (Turkish) 
Currently translated at 6.4% (412 of 6378 strings)
 2017-07-30 00:47:13 +02:00
Zukero
45d3ab9fb5 Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/res/values/loadresources.xml
 2017-07-25 21:33:55 +02:00
Zukero
ee838d67c8 Merge pull request #30 from dacmot/end_round_at_end_of_combat 
End round at end of combat
 2017-07-25 21:07:01 +02:00
dacmot
a3a043b993 Add myself to authors 2017-07-25 14:55:25 -04:00
thomas
ce462c57a8 Translated using Weblate (French) 
Currently translated at 74.6% (4763 of 6378 strings)
 2017-07-24 12:45:16 +02:00
thomas
ced979131a Translated using Weblate (French) 
Currently translated at 74.6% (4763 of 6378 strings)
 2017-07-19 21:44:59 +02:00
Petter Reinholdtsen
479aac3fd7 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 9.3% (43 of 458 strings)
 2017-07-10 09:46:05 +02:00
Petter Reinholdtsen
40529f645d Added translation using Weblate (Norwegian Bokmål) 2017-07-08 06:49:59 +02:00
Roman Leo
3bd12be85d Translated using Weblate (Polish) 
Currently translated at 99.9% (6377 of 6378 strings)
 2017-07-05 18:46:41 +02:00
Roman Leo
010c17b6d5 Translated using Weblate (German) 
Currently translated at 100.0% (6378 of 6378 strings)
 2017-06-29 15:54:00 +02:00
Roman Leo
1b90e1c892 Translated using Weblate (German) 
Currently translated at 100.0% (458 of 458 strings)
 2017-06-29 15:54:00 +02:00
Roman Leo
0bc8ceb06c Translated using Weblate (German) 
Currently translated at 100.0% (458 of 458 strings)
 2017-06-26 12:45:34 +02:00
Sebastian Hainke
d23bf6fdba Translated using Weblate (German) 
Currently translated at 100.0% (6378 of 6378 strings)
 2017-06-26 12:25:20 +02:00
Roman Leo
bf935ac921 Translated using Weblate (German) 
Currently translated at 100.0% (6378 of 6378 strings)
 2017-06-26 12:21:07 +02:00
Roman Leo
2634beb2f4 Translated using Weblate (German) 
Currently translated at 100.0% (6378 of 6378 strings)
 2017-06-26 12:04:14 +02:00
anonymous
b38aeeb04f Translated using Weblate (German) 
Currently translated at 99.9% (6377 of 6378 strings)
 2017-06-26 12:01:17 +02:00
Roman Leo
1e5bec8636 Translated using Weblate (German) 
Currently translated at 99.9% (6376 of 6378 strings)
 2017-06-26 12:00:00 +02:00
Stefanie Beck
06ab5d5dd9 Translated using Weblate (German) 
Currently translated at 99.9% (6375 of 6378 strings)
 2017-06-26 11:56:10 +02:00