OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-01-21 19:08:30 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity
3,386 Commits 44 Branches 0 Tags
c3def649bcf4a9e3051ccd8dfa5273d7c53bdc8a
Commit Graph

3386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gonk
c3def649bc synchronized listeners to prevent crashs 2020-02-29 20:22:49 +01:00
Gonk
03584ecf93 Merge branch 'fixtoastcrash' into nut_test_brimhaven 2020-02-29 20:10:16 +01:00
Gonk
207397c325 Canceling an existing and shown toast on P and up should prevent app crashes 2020-02-29 19:36:48 +01:00
Gonk
0f5cdea3c6 Merge branch 'fixcurrentmapracecondition' into nut_test_brimhaven 2020-02-25 23:02:42 +01:00
Gonk
6935c26650 The different parts of the currently active map are now switched in one step. This should avoid a lot of dumps from race conditions. 
Highly experimental!
 2020-02-25 23:01:19 +01:00
Gonk
f66451f3e6 Merge branch 'spawnidcheck' into nut_test_brimhaven 2020-02-22 20:50:04 +01:00
Gonk
6c61910bb1 Merge branch 'fixmonsterdifficulty' into nut_test_brimhaven 
# Conflicts:
#	AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatControllerTest.java.txt
 2020-02-22 20:47:24 +01:00
Gonk
ca833b3803 Renamed the unittest file so it can be checked in without requiering the unittest libs when building 2020-02-22 20:45:07 +01:00
Gonk
9b57ae21d3 Added validatedata for dupliacte spawn areas 2020-02-22 20:21:03 +01:00
Gonk
b03905c1f9 Merge branch 'nut_v079' into nut_test_brimhaven 2020-02-22 18:57:34 +01:00
Gonk
9a27bc935f Merge branch 'v079' of https://github.com/NutAndor/andors-trail into nut_v079 2020-02-22 18:51:13 +01:00
Gonk
9a8ad47fd2 Adding display scaling factor 0.75 2020-02-22 18:50:38 +01:00
Gonk
0d8fb12334 Adding display scaling factor 0.75 2020-02-22 18:48:29 +01:00
Nut
d3df37a769 translation states 2020-02-22 15:56:34 +01:00
Nut
a28a677036 changed source repo 2020-02-22 11:13:58 +01:00
Gonk
48c64f32db Merge branch 'nut_v079' into nut_test_brimhaven 2020-02-22 08:34:59 +01:00
Gonk
d6823bdf07 Adding display scaling factor 0.5 as workaround for bug https://github.com/NutAndor/v079/issues/3 2020-02-22 08:32:15 +01:00
Gonk
74fa25c2b6 Changed the woodcutter's axe stats in AT to prevent the itemlist_weapons.json from beeing overwritten by ATCS 2020-02-20 21:38:18 +01:00
Gonk
ff468dadc0 Adding display scaling factor 0.5 as workaround for bug https://github.com/NutAndor/v079/issues/3 2020-02-20 21:08:22 +01:00
Nut
9a7f18525b teleport AR 2020-02-18 23:30:22 +01:00
Gonk
b90cb991ce Merge branch 'languageselection' into nut_test_brimhaven 2020-02-16 21:47:30 +01:00
Gonk
3a7d170ee0 Merge branch 'languageselection' into nut_v079 2020-02-16 21:43:41 +01:00
Gonk
db4c4a0ce9 Replaced Locale.forLanguageTag which is only availale starting at API level 21 2020-02-16 21:33:06 +01:00
Nut
d93a0eab6a setNonWeaponDamageModifier , 2020-02-16 13:29:37 +01:00
Gonk
46b3135e81 Merge branch 'test_brimhaven' of https://github.com/NutAndor/andors-trail into nut_test_brimhaven 2020-02-11 00:25:02 +01:00
Gonk
bbb1bd6e11 Removed testclass until I found out how to add the lib reference to git 2020-02-11 00:24:15 +01:00
Nut
9717a062c3 Set debugMessages on 2020-02-10 23:04:46 +01:00
Gonk
fb64073961 Added more damage modifiers 2020-02-10 22:51:20 +01:00
Gonk
8341210381 Added damage modifiers for all existing weapons 2020-02-10 22:31:16 +01:00
Gonk
900fc6caa0 Merge branch 'test_brimhaven' of https://github.com/NutAndor/andors-trail into nut_test_brimhaven 2020-02-10 22:24:40 +01:00
Gonk
e5389a2b26 Merge branch 'fixmonsterdifficulty' into nut_test_brimhaven 2020-02-10 22:18:43 +01:00
Nut
baab4773d5 enable debug buttons 2020-02-10 00:28:37 +01:00
Nut
9042fa9daa new version 0.7.9dev(51): 
Probably the next release with bugfixes and translations
 2020-02-08 20:14:18 +01:00
Nut
27367518ea new version 51 2020-02-08 10:31:52 +01:00
Nut
ef969ef1ae Merge pull request #33 from AndorsTrailRelease/master 
internal version to 50
 2020-02-08 10:26:29 +01:00
Nut
a4b86b4abe internal version to 50 2020-02-06 23:37:02 +01:00
Nut
e48a6da936 new version 0.7.9dev(50) 2020-02-05 00:09:39 +01:00
Gonk
d9b8683e59 Added a unit test which helped to find a parantheses bug 2020-02-02 20:00:07 +01:00
Gonk
08e6f1be27 some typos and a missing floor 2020-02-02 18:09:22 +01:00
Gonk
92073d8a52 First draft of the adjusted monster difficulty calculation 
See https://andorstrail.com/viewtopic.php?f=3&t=6661
 2020-02-01 00:29:10 +01:00
Gonk
dc5db4e1e6 Added the giant_basilisk icon 2020-01-25 20:58:55 +01:00
Gonk
98646055d2 Merge branch 'rebalancing' into nut_test_brimhaven 
rebalancing code (content will be placed in an ATCS project)
 2020-01-21 21:50:58 +01:00
Gonk
0b2c21a4cc Merge branch 'explainpermission' into nut_test_brimhaven 2020-01-20 23:00:31 +01:00
Gonk
d6d8128fcf Merge branch 'conversationcloseonclickoutsideprevention' into nut_test_brimhaven 2020-01-20 22:58:48 +01:00
Gonk
c51ab49864 Merge branch 'questsortorder' into nut_test_brimhaven 2020-01-20 22:57:43 +01:00
Gonk
31d272dd0e Merge branch 'wearremove_requirement' into nut_test_brimhaven 2020-01-20 22:55:54 +01:00
Gonk
111a30a7b5 Merge remote-tracking branch 'origin/patch-1' into nut_test_brimhaven 2020-01-20 22:48:01 +01:00
Gonk
191a24c933 Merge branch 'development' into nut_test_brimhaven 2020-01-20 22:45:39 +01:00
Gonk
bf3abaa7b0 Typo 2020-01-20 22:29:30 +01:00
Nut
daaa6bd515 Merge pull request #32 from NutAndor/master 
v078
 2020-01-19 16:13:20 +01:00