OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-22 11:25:35 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
6,627 Commits 44 Branches 0 Tags
b4c490f648dcca2f2f4ec29bd97dd945ede1461e
Commit Graph

6627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zukero
afadac0f2f NPCs don't need to be aggressive to "pathfind" the player anymore. 2017-10-02 18:24:05 +02:00
Zukero
38985b0ef3 Merge branch 'master' into stoutford_tests 2017-10-02 16:33:11 +02:00
Zukero
60edd73fc2 Removed unnecessary warnings about replace area requirement-related 
properties.
Added code to clear the "isApplied" flag on a replace area when another
replace area is applied later and intersects with the first one.
 2017-10-02 16:32:31 +02:00
Zukero
4b4a10ec62 Merge pull request #38 from sdevaney/master 
Readme and contributors list
 2017-09-29 09:17:44 +02:00
Anders Jonsson
0d384fd495 Translated using Weblate (Swedish) 
Currently translated at 53.0% (243 of 458 strings)
 2017-09-29 00:49:09 +02:00
Anders Jonsson
1290d178c2 Translated using Weblate (Swedish) 
Currently translated at 6.3% (405 of 6378 strings)
 2017-09-29 00:48:58 +02:00
Scott Devaney
597f90da21 fix last of relative links 2017-09-28 17:02:17 -04:00
Scott Devaney
b7fe6864d3 fix relative links 2017-09-28 16:59:07 -04:00
Scott Devaney
3841e00c3a Updated readme v0.2 
Broke out gfx and additional contribs to their own file.
Added additional Authors
 2017-09-28 16:53:30 -04:00
Scott Devaney
6052788322 Contributors lists 
added contributors lists and broke out graphics to another file since it is so long
 2017-09-28 16:41:25 -04:00
Scott Devaney
d4e82b4e68 First readme for AT 
Readme v0.1
 2017-09-28 14:14:40 -04:00
Eilon
4fcf77f855 Translated using Weblate (Hebrew) 
Currently translated at 17.2% (79 of 458 strings)
 2017-09-20 21:46:59 +02:00
Allan Nordhøy
4256059cab Translated using Weblate (Norwegian Bokmål) 
Currently translated at 34.9% (160 of 458 strings)
 2017-09-13 03:53:24 +02:00
lanet
c9e4352962 Translated using Weblate (Turkish) 
Currently translated at 18.3% (1170 of 6378 strings)
 2017-09-08 12:48:49 +02:00
lanet
22933d24a6 Translated using Weblate (Turkish) 
Currently translated at 18.3% (1168 of 6378 strings)
 2017-08-31 12:58:34 +02:00
Zukero
e0c7dd35b8 Items' onHitReceived effects now applied. 2017-08-29 18:47:35 +02:00
Zukero
ea03360145 Bug fixes and first tests with debug content for the revenge strike and 
enhanced combat log features.
 2017-08-28 18:32:43 +02:00
Zukero
a17eaadf4e Added UI to show the stats for the "revenge strike" feature. 2017-08-28 17:52:34 +02:00
Zukero
da76ea4542 Revenge effects & Enhanced combat log. 
Apply effect when you or a NPC received a hit (effect defined on
defender).
Apply effect when a NPC dies (effect defined on NPC).
Messages in the combat log for taunt skill and actor conditions effects.
 2017-08-28 16:55:53 +02:00
Zukero
819edf7048 Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
 2017-08-28 13:18:42 +02:00
Zukero
93bdb8e18f New icon for immunity overlay. 2017-08-28 13:15:39 +02:00
Zukero
ab61c774bf Added immunity as a dialogue reward type. 
Debug content can trigger all event types.
 2017-08-27 12:58:14 +02:00
Zukero
9b42b246bb Reapply item-borne condition prevented by a now worn out temporary 
immunity.
 2017-08-27 10:21:04 +02:00
Zukero
aeaa5ffd42 Fixed issues in immunity management: 
- Can detect the case where you unequip an item that grants an immunity
while having another, temporary, immunity to the same actor condtion
- Reapplies an AC coming from an equipped item when you unequip another
item that granted immunity.
- Added immunities to the saves.
 2017-08-27 09:45:51 +02:00
Zukero
84059a575f Actor condition immunity! It works! 
For a few rounds with a positive duration, or forever with 999 duration,
or as part of the equip_effect on an item. Examples in the debug items.
 2017-08-27 00:47:29 +02:00
Zukero
6b5513acb2 Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/res/drawable/items_rijackson_1.png
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
 2017-08-25 23:52:10 +02:00
Zukero
cd508e70f1 Included new tilesets in the resource loader. 
Also added comment flags to prepare for generation of these lines by
ATCS.
 2017-08-25 23:45:26 +02:00
Zukero
edecf946b2 Merge pull request #35 from Rijackson/master 
Added japozero spritesheets to master branch. Also a new item sprite …
 2017-08-25 23:32:55 +02:00
lanet
9a4a1610c4 Translated using Weblate (Turkish) 
Currently translated at 18.2% (1167 of 6378 strings)
 2017-08-23 18:48:29 +02:00
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