Fork/mmocore
1
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity
1,283 Commits 5 Branches 0 Tags 281 MiB
037fb131ec
Commit Graph

247 Commits

Author SHA1 Message Date
Ka0rX
037fb131ec Merge branch 'master' into Skills-update 
# Conflicts:
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
 2023-03-19 13:57:20 +01:00
Ka0rX
8fc13a70b9 Adapted YamlDataStorage to the new formatting for boundSkills. 2023-03-19 13:51:29 +01:00
Ka0rX
8fc5b5a51c Map representation for BoundSkill in SavedClassInformation.java 2023-03-19 13:43:35 +01:00
Ka0rX
7538b66673 Modification to have the skillSlots seen has as a Map<Integer,ClassSkill> rather than a List<ClassSkill> 2023-03-19 13:42:21 +01:00
Ka0rX
2ec66e92ef Skill Slots Update 2023-03-19 10:53:40 +01:00
Jules
68fe326035 Using new debug methods 2023-03-18 23:23:40 +01:00
Jules
a3166b1049 Fixed combat placeholders 2023-03-18 21:56:14 +01:00
Jules
e1011d449f Fixed %mmocore_in_combat% 2023-03-18 21:20:43 +01:00
Ka0rX
1718e04ba5 Removed reference to passive/active skills. 2023-03-16 14:36:07 +01:00
Ka0rX
f5b312691f Modif for SkillSlots (skillSlot map in PlayerClass) 2023-03-16 14:35:18 +01:00
Ka0rX
3b40b2ef30 Removed SkillSlotLimit in PlayerData. 2023-03-16 14:31:51 +01:00
Ka0rX
456ecb9da1 SkillSlot modifications 2023-03-16 14:31:16 +01:00
Jules
a84d240a4e Placeholder for invulnerability 2023-03-11 18:52:58 +01:00
Jules
e5743a7011 Max combat level difference 2023-03-11 18:39:59 +01:00
Jules
b8624733da Messages for combat level restriction 2023-03-11 18:32:46 +01:00
Jules
5c9b73e3ec Fixed merge 2023-03-11 18:02:30 +01:00
Jules
fe2340f8cb Min combat level 2023-03-11 17:59:01 +01:00
Jules
482eeb9e8b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java
 2023-03-11 17:45:16 +01:00
Ka0rX
81f245a4ce Removed passive skill from the skill list GUI 2023-03-09 23:10:49 +01:00
Ka0rX
b7d3aa07eb Removed all references to passiveBoundSkill in playerData 2023-03-09 19:03:20 +01:00
Ka0rX
8e6ac3755d Removed references to PassiveBoundSlots in SavedClassInformation.java 2023-03-09 19:01:38 +01:00
Ka0rX
8e37898d33 Changed PlayerClass to make it compatible with SkillSlots 2023-03-09 19:00:38 +01:00
Ka0rX
e9a7097a8d Removed the boundPassiveSkill method in DataContainer 2023-03-09 18:59:29 +01:00
Ka0rX
ef173a2336 Added categories to registeredSkills 2023-03-09 18:58:17 +01:00
Ka0rX
4dce534d74 Creation of skillSlot class 2023-03-09 18:57:07 +01:00
Jules
42f583ac8d Merge remote-tracking branch 'origin/master' 2023-03-09 17:54:01 +01:00
Jules
3239b9ca17 Test push 2023-03-09 17:53:54 +01:00
Ka0rX
25e3b478d5 test 2023-03-09 17:50:41 +01:00
Ka0rX
8b6e31651f Fixed bug for ressources + class based ressource system 2023-03-09 17:49:55 +01:00
Ka0rX
e338c0fd25 Fixed bug for ressources + class based ressource system 2023-03-09 17:22:58 +01:00
Ka0rX
825473c8c6 Debug ressources loading. 2023-03-03 21:59:47 +01:00
Jules
bbd3708393 Removed default exp holos for the exp trigger. 2023-03-03 16:12:37 +01:00
Jules
393fddf497 Cleanup 2023-03-03 16:00:45 +01:00
Jules
5e73e41fa8 Cleanup 2023-03-03 15:22:54 +01:00
Jules
46ea648414 Moved close script to party module listener 2023-03-03 14:55:29 +01:00
Jules
8c0d8da483 Moved "class-confirmation-gui-name" option from class-select to class-confirm GUI 2023-03-03 14:22:43 +01:00
Jules
8ac6af34af Cleanup 2023-03-03 14:20:56 +01:00
Ka0rX
2b5932756f Debug Model Data Skill Tree GUI. 2023-03-03 10:27:45 +01:00
Ka0rX
a9ebca0f4d Enabled to have customizable ClassConfirmation GUI names. 2023-03-02 22:03:03 +01:00
Ka0rX
6ac3267059 Fixed bug that occured w/ perm stats when changing to a new class. 2023-03-02 21:31:42 +01:00
Ka0rX
b3c3218d87 Fixed bug that occured w perm stats when doing /mmocore reload 2023-03-02 21:09:31 +01:00
Ka0rX
d847049e90 Merge remote-tracking branch 'origin/master' 2023-03-02 21:08:37 +01:00
Jules
9ae2b3e661 Fixed UClans comp 2023-02-28 18:05:45 +01:00
Jules
ff75a08e42 Fixed DungeonsXL comp 2023-02-28 18:05:24 +01:00
Jules
79e26086ae Combat registers when logging in/changing world 2023-02-28 10:50:15 +01:00
Jules
f750326fe3 Added messages for guild/party module hook 2023-02-23 00:07:14 +01:00
Jules
deffae106a Updated KingdomsX dep 2023-02-23 00:07:02 +01:00
Jules
b966508c2d Messages sent only when dmg > 0 2023-02-22 23:59:00 +01:00
Jules
afa4a0467e Final commit for combat mode 2023-02-22 23:56:51 +01:00
Jules
14c015645d Reduced confusion for guild module 2023-02-22 23:40:37 +01:00