OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-20 10:31:28 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
1,146 Commits 44 Branches 0 Tags
a32fdbd6f353fd110e7647a5f2a537faeb971480
Commit Graph

1146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zukero
a32fdbd6f3 Fixed small bug with tp debug UI 2018-08-04 21:00:36 +02:00
Zukero
6c5513cdac First attempt at fixing the graphical glitches. The easy way. 
I also added teleporting debug buttons for most of the POIs.
 2018-08-04 20:57:27 +02:00
Nut
1e3f3310c2 new graphic monsters_maksiu1, and an author list entry 2018-07-20 16:52:16 +02:00
Zukero
8c12109d97 Version pre0.7.2_alpha1 for limited distribution to testers. 2018-07-08 17:44:27 +02:00
Zukero
4ab509aead ATCS Project stoutford_combined finally integrated! 2018-07-08 15:54:47 +02:00
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
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
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
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
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
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
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
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
bf9081df00 Merge branch 'master' into stoutford_tests 
Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
 2018-03-27 13:24:08 +02: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