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
893 Commits 44 Branches 0 Tags
6c9fcd5b4656a0ca7032925bb69eb67b867de36f
Commit Graph

893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zukero
c4896aaab3 Tiled group name also in ReplaceableMapSection 2013-10-20 22:18:42 +02:00
Zukero
bddb3e2a8c MapObject & MonsterSpawnArea now keep track of their Tiled group's name. 2013-10-20 22:14:35 +02:00
Oskar Wiksten
7f2388904b Minor gfx update to tiling pine trees 2013-10-20 10:30:01 +02:00
Oskar Wiksten
73e8851f27 Bugfix: Redraw whole screen if double-buffer is not pre-filled 
* Fixes issue where the screen was only partially drawn after having entered heroinfoactivity before starting combat.
* lockCanvas() changes the supplied Rect object occasionally, to indicate that the double buffer has not been filled. In those cases, you need to redraw the whole rect.
 2013-10-20 10:00:20 +02:00
Oskar Wiksten
a0f943994f Bugfix: Continue combat after having seen the combat log 
* Previously, combat was stopped when entering the combat log. This commit makes the combat continue after having been stopped.
 2013-10-20 09:03:53 +02:00
Oskar Wiksten
518934751b Merge branch 'new_tilesets_20131005' 2013-10-05 17:56:12 +02:00
Ian Haase
36da967dbe updated tilesets + template.tmx and authors.xml 2013-10-05 17:55:57 +02:00
Oskar Wiksten
9812dc6344 Merge pull request #5 from Zukero/master 
Egocentric commit. Added my name in the authors...
 2013-10-03 13:32:43 -07:00
Zukero
5daf70e739 Egocentric commit. Added my name in the authors... 2013-10-03 22:27:11 +02:00
Oskar Wiksten
0a8859b304 Add explicit quest stages to existing key areas 2013-10-03 08:27:11 +02:00
Oskar Wiksten
3cee7e95d2 Merge branch 'key_area_use_requirements' 2013-10-03 08:26:26 +02:00
Zukero
140dd16408 Key Area now use Requirement, instead of QuestProgress 
* Requirement class moved from model.conversation to model.script
* Added requirement questLatestProgress : quest stage must be reached, but no stage with superior ID must be reached.
* New key requirements conditions type (item/gold/bonemeals) consumption (more or less than value, never strict checking, either <= or >=).
 2013-10-02 18:21:14 +02:00
Oskar Wiksten
9af294932f Remove unused code 2013-09-25 22:30:10 +02:00
Oskar Wiksten
5136a7cab0 Merge branch 'headless-scripts' 2013-09-25 17:55:25 +02:00
Oskar Wiksten
b41fffee44 Content editor: Add support for giveItem,createTimer and timerElapsed in convs 2013-09-25 17:54:08 +02:00
Oskar Wiksten
0212dd6bbc Add world timers and world time (counted in number of rounds) 
* Increase world time each round.
* Add script reward "createTimer"
* Add script requirement "timerElapsed"
 2013-09-25 17:54:08 +02:00
Oskar Wiksten
d6583a4e33 Add reward type "giveItem", for quest rewards that do not need full droplists. 2013-09-25 17:54:08 +02:00
Oskar Wiksten
02bfeb5625 Enable map scripts to run on every round or tick 2013-09-25 17:54:08 +02:00
Oskar Wiksten
dc278fb5da First attempt at scripted map areas 2013-09-25 17:54:08 +02:00
Ian Haase
8d91c7375d recolored dirt transitions 2013-09-25 17:47:10 +02:00
Oskar Wiksten
d13cd4c02a Add preference "use localization", to allow disabling partial translations 2013-09-08 16:56:03 +02:00
Oskar Wiksten
787fcc0a65 Rearrange worldmap.xml (sort by name) 2013-09-02 20:45:53 +02:00
Oskar Wiksten
d29218c7c3 Prepare data placeholder "worldData". 2013-08-31 19:28:09 +02:00
Oskar Wiksten
9c78b6a2ec Refactor player combat round methods 2013-08-31 19:21:37 +02:00
Oskar Wiksten
96d451ffbe Worldmap tile alignment (awesome work by Tomcat!) 2013-08-30 21:04:08 +02:00
Oskar Wiksten
2dfed6847c Content editor: Display phrase rewards and replies as divs instead of table 2013-08-27 22:54:23 +02:00
Oskar Wiksten
0992053a72 Bugfix: Realign tiles in Fallhaven (thanks Mayweed & Tomcat) 2013-08-24 17:05:38 +02:00
Oskar Wiksten
a1da45ce3f Refactor: Changed namespaces, reorganized imports. 2013-08-24 13:51:59 +02:00
Oskar Wiksten
89a64bbdea Content editor: Add support for switching active NPC in dialogue 2013-08-20 20:42:12 +02:00
Oskar Wiksten
06feff98c1 Update Elwyl/Elwel conversation to switch active NPC 2013-08-20 20:42:12 +02:00
Oskar Wiksten
8611148530 Conversations with more than one NPC 
* Add "switchToNPC" property on phrases, that should contain the monsterTypeID of the NPC that should tak over the dialogue.
 2013-08-20 20:42:12 +02:00
Oskar Wiksten
126eb49e10 Use long param names when starting local Content Editor 2013-08-20 20:41:34 +02:00
Oskar Wiksten
f620ca924e Bugfix: Exclude hidden quests from completed quests statistics (thanks jlhromeo!) 2013-08-20 19:45:39 +02:00
Oskar Wiksten
fb1782bb7e Conversation spelling corrections (thanks LoveToFlyGuy!) 2013-08-19 20:06:13 +02:00
Oskar Wiksten
a87605661b Merge branch 'master' of https://code.google.com/p/andors-trail 2013-08-19 20:01:52 +02:00
Oskar Wiksten
0bcd41b2ef Waterfall tiles (thanks red hatter!) 2013-08-19 20:01:04 +02:00
Ian Haase
73894752f2 added a new tutorial called "Advanced Mapmaking". 2013-08-17 13:13:01 +02:00
Ian Haase
32a3d9c964 Updated map editor tutorial 2013-08-16 12:28:23 +02:00
Ian Haase
5bff7c79d2 Revert "Update on the Map Editor wiki: http://andorstrail.com/wiki/doku.php?id=andors_trail_wiki:developer_section:map_editor" 
This reverts commit dd6431cb1b.
 2013-08-16 12:05:15 +02:00
Ian Haase
dd6431cb1b Update on the Map Editor wiki: http://andorstrail.com/wiki/doku.php?id=andors_trail_wiki:developer_section:map_editor 2013-08-16 12:02:16 +02:00
Oskar Wiksten
b810a6e91e Add monster movement type 'wholeMap'. 
* Monsters with this movement type can even move outside their own spawn areas.
 2013-08-08 17:14:48 +02:00
Oskar Wiksten
16e8a5fdbe Bugfix: only use pathfinder for monsters that are aggressive 2013-08-08 11:31:06 +02:00
Oskar Wiksten
a83271c3a9 Bugfix: Show correct ingreds for Lodar def pot in the quest log (Thanks jamnjim358) 2013-08-05 10:54:27 +02:00
Oskar Wiksten
b6c2beb348 Bugfix: Clear temporay combat state when loading game 
Fixes issue with not being able to attack in combat after having exited combat during monster's attack animation.
 2013-08-05 10:27:17 +02:00
Oskar Wiksten
3b938c3a0a Refactor: Use more enums instead of const ints 2013-08-05 10:17:14 +02:00
Oskar Wiksten
98f6cd0f97 Bugfix: Redraw everything once initially 
* Fixes issue with black screen during combat on Android >= 4.2
 2013-08-05 09:32:03 +02:00
Ian Haase
fcabb356ce Updated scarydungeon1. 2013-08-04 10:48:48 +02:00
Oskar Wiksten
7486e130f8 Renamed mapmaking tutorial map 2013-08-03 11:58:05 +02:00
Oskar Wiksten
8bb663a739 Update version to v0.7.1dev 2013-08-03 11:56:49 +02:00
ian.haase2
784df46fb5 Updated scarydungeon1 map. 2013-07-29 17:43:01 +00:00