OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-19 18:15:27 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
1,053 Commits 44 Branches 0 Tags
03d67209cd2d43a5a2683ff6fc84fd415fdebb85
Commit Graph

1053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zukero
153ea0a660 Fixed narrator messages being greyed out as rewards. 2018-02-12 22:06:16 +01:00
Zukero
27a2a87949 Merge separate changes. 2018-02-12 21:52:15 +01:00
Zukero
b77c1b3f94 Fixed bug preventing modified maps from being updated on the worldmap 
upon visiting them.
 2018-02-12 13:46:22 +01:00
Zukero
5b8e3a7ae4 Merge pull request #45 from Rijackson/master 
Fix for cliff heights in Crossglen
 2018-02-10 16:58:01 +01:00
Rijackson
8a0af4038a Fixed fix for cliff heights in Crossglen. 2018-02-10 10:08:16 -05:00
Rijackson
98bf2d0381 Fix for cliff heights in Crossglen 2018-02-10 10:03:38 -05:00
Zukero
e300c1383e Merge branch 'master' of https://github.com/Zukero/andors-trail.git 2018-02-10 14:32:53 +01:00
Zukero
193048cb8f Added "alignmentSet" reward type for dialogues. 2018-02-10 14:32:36 +01:00
Zukero
23faa6d19c Fix mis-clicks around the "flee" buttons (and all of the Combat UI) 
triggering an attack.
You are now allowed to use fat fingers.
 2018-01-15 11:55:40 +01:00
Zukero
332eee0736 Merge remote-tracking branch 'origin/master' into title_screen 2018-01-15 11:35:11 +01:00
Zukero
421a03980a Bug fix for factionScore requirements 2018-01-15 11:34:25 +01:00
Zukero
0a04b516dd Fixed another (hopefully the last one) issue introduced during the Great 
Reordering of content (loss of requirements negation in Dialogues'
replies).
 2017-12-12 23:35:27 +01:00
Zukero
b87617e7eb Renamed themes. 2017-12-09 15:36:01 +01:00
Zukero
1be47b2e0e Fixed the green theme colors. Added dark gray theme. Renamed the themes 
after metals.
 2017-11-22 23:29:33 +01:00
Zukero
5b6301998e Forgot to update a color ref for green. 2017-11-22 18:24:55 +01:00
Zukero
14f83283fb No more "gold", green instead. All made from blue using scripts. 2017-11-22 18:22:47 +01:00
Zukero
bca34db508 Cleanup of all UI bitmaps, to have a cleaner, more consistent color 
palette, easing the scriptability of derivatives creation.
 2017-11-22 16:17:34 +01:00
Zukero
7e2494196c Fixed ListSeparator bugs introduced with recent change. 
New and enhanced debug buttons!
 2017-11-21 15:07:35 +01:00
Zukero
a54798443a Fixed compatibility with Donut (1.6). Better list separator. Shops tabs 
were mysteriously forgotten, until now, so I added icons too.
 2017-11-20 23:52:38 +01:00
Zukero
413bf66c68 Removed Red, replaced by Gold. Not really pretty either... but it now 
works... except on Android 1.6...
 2017-11-20 18:50:10 +01:00
Zukero
827260c90f First phase in attempt to provide several UI themes. 2017-11-19 22:37:03 +01:00
Zukero
b24e348c51 Another one. 2017-11-18 00:10:48 +01:00
Zukero
cbdb53c813 "Really" fixed minor coloring issue. 2017-11-18 00:09:26 +01:00
Zukero
92793c73cf Fixed minor coloring issue. 2017-11-18 00:07:44 +01:00
Zukero
d81ed7a6b5 Fixed styles. Now correctly themeable. 2017-11-18 00:06:24 +01:00
Zukero
df81e96a08 WARNING: Does not run! 
Huge clean-up. Separation between themes and style. Preparatory work for
theme inheritance and alternative themes made by derivation.
Problem: due to a pre-lollipop bug, I still have to remove some color
indirections through attributes, as they are not preperly resolved.
 2017-11-17 19:20:35 +01:00
Zukero
8c28166c11 Fixed issue in Vilegard where you could talk about the Xulviir and the 
Feygard swords to all merchants instead of only the smith while Vilegard
people distrusts you.
 2017-11-17 12:01:38 +01:00
Zukero
f1867667aa More layout fixes 2017-11-17 11:55:49 +01:00
Zukero
af052408b1 More layout fixes on the rangebar. 2017-11-14 22:45:11 +01:00
Zukero
a4d1e8b463 Clean up stylesheets. 2017-11-14 22:35:34 +01:00
Zukero
e93810876c "More" action button presence in ItemInfoActivity corrected. 2017-11-14 22:17:51 +01:00
Zukero
aea3571ca5 Fixed title screen animation for Lollipop+ 
Larger buttons overall and better spacing between replies.
 2017-11-14 19:03:58 +01:00
Zukero
81c0c1a7ff Animated logo on title screen 2017-11-13 16:43:08 +01:00