OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-17 17:17:08 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
1,086 Commits 44 Branches 0 Tags
7bb4aac88a56bae6ee081dc00a796592c790732c
Commit Graph

1086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
47f9ef52eb Merge pull request #50 from NutAndor/guynmart_merge 
Guynmart merge
 2018-06-05 17:21:04 +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
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
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
Rijackson
622a3e5d48 Very minor dialog fixes 2018-04-29 18:00:14 -04:00
Rijackson
e29bc07150 The graveyard and waterwaycave material from Gulisano and me. 2018-04-23 18:18:57 -04:00
Zukero
e8e850e65e Merge pull request #47 from Rijackson/master 
Fix bwentry worldmap and English on one sign
 2018-04-09 18:03:30 +02:00
Rijackson
4d771057e6 Fix bwentry worldmap and English on one sign 2018-03-30 16:36:11 -04:00
Zukero
93d759e060 Merge branch 'title_screen' 2018-03-27 13:16:01 +02:00
Zukero
3b28c2f378 Desaturated the clouds' colors. Even less saturation for faraway ones. 
Clouds speed should be even more consistent across different devices.
Also made the title screen's UI backgrounds "clickable" so a misclick
doesn't hide the UI too easily.
 2018-03-26 16:26:52 +02:00
Zukero
055a2eaf32 Finally fixed clouds' lowest position. 
Slower logo animation.
Larger logo.
 2018-03-26 14:02:28 +02:00
Zukero
db788703e0 Faction-related agressivenes of each monster is now dynamic, not a 
one-way flag.
 2018-03-26 11:00:25 +02:00
Zukero
8b2dbb4ead Cleanup and consistency. 2018-03-23 17:04:53 +01:00
Zukero
a905d8b08a Better handling of clouds position 2018-03-23 16:56:47 +01:00
Zukero
e594713a9b Attempts to fix clouds position's screen ratio independence & threading 
issues on loading dialog.
 2018-03-23 16:48:28 +01:00
Zukero
a98df96474 New animation for title logo. Better clouds scaling (now same 
pixel-width as mountains etc.). Better loading animation. Clouds
animation now also showing behind loading dialog. Still need to enhance
support for low-end devices.
 2018-03-22 17:34:04 +01:00
Zukero
470bc423ef Added custom loading animation. Saved some PNGs in indexed color mode, 
saving space.
 2018-03-14 18:45:15 +01:00
Zukero
03d67209cd Attempts to reduce memory usage of title screen and to improve 
consistency over varied screen sizes and DPI (from spica to Full HD PC
through high-end 5" phone). Far from complete...
 2018-03-13 18:55:12 +01:00
Zukero
1bb52b1f0e More changes to the clouds. 2018-03-12 18:57:37 +01:00
Zukero
e6dda3651d Enhanced title screen's clouds animation. 2018-03-12 15:46:08 +01:00
Zukero
bf154e058b Progress towards target title screen. 2018-03-09 18:03:19 +01:00
Zukero
d6d473a3d7 Started integrating new title screen drawables. Crashes on my phone 
though :/
 2018-03-08 18:28:54 +01:00
Zukero
67f2c41ac9 Preparatory works for new title screen 2018-03-07 17:51:58 +01:00
Zukero
d285871321 Merge branch 'master' into title_screen 
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
 2018-02-28 17:09:23 +01:00
Zukero
97bffa86c7 Fixed rendering when animations are disabled. Backported automatic 
sizing of TileCollection from stoutford_tests.
 2018-02-28 12:09:03 +01:00
Zukero
68b60a0286 Merge branch 'master' into title_screen 
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
 2018-02-27 18:43:53 +01:00
Zukero
ec733e5b97 Moving sprites do not each trigger a redraw in concurrent threads. 
There is now a unique timer that triggers unified timely redraws when
there are sprites moving around. The downside is the moving NPC always
trigger full-screen redraws. On the upside, it should prevent stuttering
when there is a large number of NPCs moving at the same time, as they
were each asynchronously triggering redraws.
 2018-02-27 18:37:55 +01:00
Zukero
7d2134205c SpawnArea's spawn group can refer to a specific monster type, even if 
the spawn group doesn't exist and that this monster type belongs to a
specific spawngroup (like in ATCS).
 2018-02-27 14:29:39 +01:00
Zukero
f4c762026d Merge branch 'master' of https://github.com/Zukero/andors-trail.git 2018-02-22 23:29:37 +01:00
Zukero
3708c4886e Added new graphics layer "top" above the "above" layer. 2018-02-22 16:43:38 +01:00
Zukero
da59c7143d Spawn areas now allow a boolean property "ignoreAreas", false by 
default, that allows monsters from this area to be spawned and moved
over other game objects, like key areas, mapchange areas and rest areas.
 2018-02-22 16:19:26 +01:00
Zukero
2ade99eed0 Backported new debug buttons from title_screen branch into master. 2018-02-22 16:00:33 +01:00
Zukero
752a3b64f0 Fixed worldmap recenter that failed on some devices. Now handled in Java 
instead of Javascript.
 2018-02-22 15:49:36 +01:00
Zukero
4fb476a94e Merge pull request #33 from carceris-magister/mikhail 
Mikhail
 2018-02-22 13:52:22 +01:00