projectswg-bitbucket/holocore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/holocore.git synced 2026-10-20 12:02:57 -04:00
Code Issues Projects Releases Wiki Activity
2,691 Commits 2 Branches 3 Tags
d58733995c187b47efabdd4ce9577dab8d4e2daa
Commit Graph
902 Commits
Author SHA1 Message Date
Mads Boddum d58733995c Added support for combat command ranges 2016-10-23 07:35:01 +02:00
Mads Boddum 54db22252e Added support for single target damage abilities 2016-10-23 04:16:40 +02:00
Mads Boddum 4107d64cbc Fixed an issue where stackable buffs could be stacked above their max 2016-10-23 03:12:59 +02:00
Mads Boddum 1538b904fb Added buff stacking support 2016-10-22 18:30:22 +02:00
Mads Boddum 0a3ebe53a5 Fixed callback buffs for buffs 2016-10-19 10:50:48 +02:00
Mads Boddum 7b64bbb7a2 Moved a couple of method bodies from CreatureObject into CREO06 2016-10-18 15:55:07 +02:00
Mads Boddum 7d4d14a3fa Merge holocore/quality_assurance into buffs 2016-10-18 12:56:32 +02:00
Mads Boddum 291961eac0 Merge holocore/quality_assurance into cloning 
Conflicts:
	src/services/faction/FactionService.java
 2016-10-13 03:40:32 +02:00
Obique PSWG 77ed25fe51 Merged in M4SS/holocore/weapon_damage (pull request #323) 
NGE-466 - Account for weapon damage in combat calculations
 2016-10-12 15:02:49 +00:00
Mads Boddum 02973c7c82 Fixed WeaponObject versioning 2016-10-12 16:02:53 +02:00
Mads Boddum 22993660ae Weapon damage is now accounted for 2016-10-12 15:43:21 +02:00
Mads Boddum 709db360e1 Weapon damage now affects combat calculations 2016-10-12 14:24:28 +02:00
Obique PSWG 39fb11f219 Merged in M4SS/holocore/lingering_threads (pull request #297) 
NGE-456 - Lingering threads
 2016-10-11 15:44:58 -05:00
Mads Boddum f706aadc13 Merge holocore/quality_assurance into buffs 
Conflicts:
	src/services/galaxy/GameManager.java
 2016-10-10 15:50:38 +02:00
Mads Boddum 02bc31145f Cloning facility names are now displayed in the cloning SUI window 2016-10-09 20:39:21 +02:00
Obique PSWG fb9c3bc896 Merged in M4SS/holocore/cooldowns (pull request #312) 
NGE-458 - Cooldown Checks
 2016-10-03 06:52:45 -05:00
Obique PSWG 8ce8f39513 Merged in M4SS/holocore/command_queue (pull request #304) 
NGE-432 - Command Queue
 2016-09-29 08:30:00 -05:00
Mads Boddum 475f9b3736 Initial work on cooldowns 2016-09-28 13:33:36 +02:00
Mads Boddum a45400ade7 Merge origin/command_queue into cooldowns 2016-09-28 10:50:23 +02:00
Obique PSWG 7152f9e8e8 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-09-27 12:10:47 -05:00
Obique PSWG c3c51bec90 Made Log support non-service logging input tags 2016-09-27 12:10:22 -05:00
Skyler Lehan 85109b2901 Fixed issues in pull request for NGE-165 2016-09-26 08:25:43 -04:00
Skyler Lehan 0425dc1910 Fixed merge conflict 2016-09-25 21:57:57 -04:00
Obique PSWG c19ac0525d Merged in M4SS/holocore/radials_fix (pull request #307) 
NGE-426 - Radial menu for bank terminal is incorrect
 2016-09-25 19:33:53 -05:00
Skyler Lehan aa6705533d NGE-165: prevented blank items from being "added" to the inventory 2016-09-24 18:00:09 -04:00
Skyler Lehan fcb7e51bb3 Fixed issues in NGE-165, switched ArrayLists to a String array for the reward items 2016-09-24 17:46:03 -04:00
Obique PSWG 02c45ce1db Merged in M4SS/holocore/vulernable_world_objects (pull request #305) 
NGE-417 - World objects do have a red bar
 2016-09-23 08:02:27 -05:00
Obique PSWG 25e1e8890d Merged in M4SS/holocore/creature_respawn (pull request #302) 
NGE-457 - Creature Respawn
 2016-09-23 07:49:00 -05:00
Mads Boddum ec3106a6cf Fixed an issue with radials where overridden text for children wasn't applied 2016-09-23 14:34:17 +02:00
Mads Boddum b1e459fd32 Fixed radial options getting mixed up 2016-09-23 14:22:13 +02:00
Mads Boddum eb8268b497 Fixed an issue where lots of world objects had visible health bars 2016-09-23 12:54:27 +02:00
Mads Boddum 2e85078889 Added initial combat queues 2016-09-23 09:54:48 +02:00
Skyler Lehan 6c0b2b1b33 NGE-165 is ready for testing, added Roadmap Rewards 2016-09-21 13:16:45 -04:00
Mads Boddum 6546351f88 Removed a few unused imports 2016-09-21 18:38:57 +02:00
Obique PSWG c7a2086b17 Merged in M4SS/holocore/creature_kill (pull request #301) 
NGE-445 - Creature Death
 2016-09-21 09:39:29 -05:00
Mads Boddum 6a0b189ceb Killed NPCs now respawn 2016-09-21 10:52:15 +02:00
Mads Boddum 6c2db165c6 Initial work on combat queues 2016-09-21 10:21:07 +02:00
Obique PSWG 9160997e0b Merged in M4SS/holocore/HAM_regeneration (pull request #298) 
NGE-447 - HAM regeneration
 2016-09-20 13:31:49 -05:00
Obique PSWG c7bcd039a0 Merged in M4SS/holocore/transferitem_cmd (pull request #300) 
Fixed an issue where the appearance inventory could be modified during combat
 2016-09-20 05:41:49 -05:00
Mads Boddum c3ad9dbeed Added support for killing creatures and incapacitating players 2016-09-20 09:04:34 +02:00
Mads Boddum 0a9be989d1 Fixed an issue where the appearance inventory could be modified during combat 2016-09-20 08:00:17 +02:00
Obique PSWG dfa66a4561 Merged in M4SS/holocore/transferitem_cmd (pull request #299) 
NGE-455 - TransferItem Commands
 2016-09-19 08:36:39 -05:00
Mads Boddum cfa461950a Fixed an issue where you were able to equip items during combat 2016-09-19 06:59:40 +02:00
Mads Boddum d473a5c729 Fixed lingering thread in TCPServer 2016-09-18 08:11:02 +02:00
Mads Boddum 78d151a83c Renamed a variable in SWGObject.getMaxContainerSize() 2016-09-18 08:09:36 +02:00
Mads Boddum fa9e114969 Current HAM for creatures is no longer persisted. Disappeared creatures always come back with max HAM 2016-09-18 07:19:16 +02:00
Mads Boddum ab7d962ad7 Refactored object transfer commands and added in a bunch of checks 2016-09-17 09:12:14 +02:00
Mads Boddum 1c76add7ff HAM methods in CreatureObject now implement range checks and return the difference 2016-09-16 15:42:18 +02:00
Obique PSWG 1c506610cb Merged in M4SS/holocore/group_chat (pull request #294) 
NGE-128 - Group chat
 2016-09-16 04:42:00 -05:00
Mads Boddum 70ba778fad Implemented group chat 2016-09-16 08:36:42 +02:00