projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-17 07:02:54 -04:00
Code Issues Projects Releases Wiki Activity
2,728 Commits 16 Branches 86 Tags
eb1373d2b5a63e18fd12d677c73a8bc65d3a8e3b
Commit Graph
432 Commits
Author SHA1 Message Date
Mads Boddum 1eee0487b3 Fixed an issue where combatants of opposing factions could attack each other 2016-10-27 05:42:44 +02:00
Mads Boddum de09948088 Fixed an issue where NPCs were unattackable 2016-10-27 05:32:23 +02:00
Mads Boddum 16f6c6fdb6 CreatureObject.isEnemy() is now more readable 2016-10-27 03:52:37 +02:00
Mads Boddum 9b9662307d Buffs are now persisted 2016-10-26 01:30:41 +02:00
Mads Boddum 4bd8aa8fdc Refactored buffs slightly 2016-10-25 10:20:29 +02:00
Mads Boddum d58733995c Added support for combat command ranges 2016-10-23 07:35:01 +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
Mads Boddum 02973c7c82 Fixed WeaponObject versioning 2016-10-12 16:02:53 +02:00
Mads Boddum 709db360e1 Weapon damage now affects combat calculations 2016-10-12 14:24:28 +02: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 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
Mads Boddum eb8268b497 Fixed an issue where lots of world objects had visible health bars 2016-09-23 12:54:27 +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
Obique PSWG 9160997e0b Merged in M4SS/holocore/HAM_regeneration (pull request #298) 
NGE-447 - HAM regeneration
 2016-09-20 13:31:49 -05:00
Mads Boddum c3ad9dbeed Added support for killing creatures and incapacitating players 2016-09-20 09:04:34 +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 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 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
Mads Boddum ce549ed073 Optimised statement in CreatureObject.isEnemy() 2016-09-16 04:26:25 +02:00
Mads Boddum 0c3ad8f4e0 Added PvP support 2016-09-16 04:11:41 +02:00
Skyler Lehan 32ee12cb28 Silly copyright fixes 2016-09-12 13:09:15 -04:00
Skyler Lehan bd227797e1 NGE-418 + NGE-168 - fixed issues from PR code review 2016-09-12 13:00:20 -04:00
Skyler Lehan 99e0a028e8 NGE-168 + NGE-418 - Added the ability to to add a consumable collection item to your collections, still needs to be removed from your inventory 2016-09-11 23:01:50 -04:00
Mads Boddum 095e8e1868 Initial work on groupchat 2016-09-11 01:11:52 +02:00
Skyler Lehan b62e66fc77 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into collections 2016-09-08 17:02:25 -04:00
Skyler Lehan bf5ed070d2 Started working on NGE-168, made it able to pick up the clicky collections in the world. 2016-09-08 15:39:14 -04:00
Mads Boddum fb54786f31 Merge holocore/quality_assurance into buffs 
Conflicts:
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/player/PlayerObject.java
	src/services/galaxy/GameManager.java
 2016-08-29 05:27:10 +02:00
Mads Boddum c7051c059a Volume is no longer persisted and added SWGObject version 1 2016-08-25 17:34:49 +02:00
Mads Boddum 7e9f60b2b0 Fixed an issue where container volumes weren't being incremented and decremented 2016-08-25 17:13:10 +02:00
Mads Boddum b9fb59b66e Fixed an issue where volumes of containers weren't being incremented and decremented 2016-08-25 16:45:01 +02:00
Undercova PSWG 2480b83521 Merged in M4SS/holocore/cells_fix (pull request #264) 
Fixed an awareness issue where rapidly entering and leaving a cell would spam system messages and eventually teleport
 2016-08-15 18:47:58 +02:00
Mads Boddum 6bea160880 Fixed an awareness issue where rapidly entering and leaving a cell would spam system messages and eventually teleport 2016-08-15 18:22:45 +02:00
Mads Boddum 4db0d345e4 Fixed an issue with saving WeaponObjects 2016-08-14 03:12:18 +02:00
Mads Boddum acec33a46e Fixed an issue with loading WeaponObjects with no elemental damage 2016-08-12 16:22:18 +02:00
Mads Boddum 2cc68d3845 Fixed a problem with loading WeaponObject version 0 and implemented version 1 2016-08-12 03:26:11 +02:00
Undercova 03cc25510a Added item spawning 2016-08-10 22:59:43 +02:00
Mads Boddum 69eede133a Fixed a big issue where the hashcode of a CreatureObject would change depending on posture 2016-08-06 16:49:06 +02:00
Obique PSWG 8428a7baa0 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-07-15 22:08:11 -05:00
Obique PSWG df764d7b9c Fixed awareness issue with teleportation 2016-07-15 22:06:30 -05:00
Obique PSWG 610bde20cf Merged in slehan/holocore/groups (pull request #238) 
Added temp fix to keep testing groups
 2016-07-15 10:38:19 -05:00
Skyler Lehan 6de3955439 Removing comment 2016-07-14 17:26:10 -04:00