Commit Graph
2558 Commits
Author SHA1 Message Date
Undercova PSWG a42dad3be9 Updated cloning_respawn.sdb 2016-10-04 03:17:53 +00:00
Undercova PSWG ac1733d8f4 Added minetypes.sdb 2016-10-04 02:56:36 +00:00
Undercova PSWG 457e71b919 Updated item.sdb 2016-10-02 22:43:24 +00: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 19237b3308 Replaced a try-catch in CommandService 2016-09-29 10:47:48 +02:00
Obique PSWG 1ffcb1ff53 Merged in Undercova/holocore (pull request #310)
Added spawn eggs for exploration and clicky collections (clicky only partially implemented for now)
2016-09-28 22:19:59 -05:00
Undercova PSWG b42b282b99 Added spawn eggs for exploration and clicky collections (clicky only partially implemented for now) 2016-09-29 03:14:55 +00:00
Obique PSWG 300867e541 Reverted getCounter update for now 2016-09-27 12:11:44 -05: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
Obique PSWG cf15287c41 Merged in slehan/holocore/nge-165-roadmap (pull request #303)
NGE-165 is ready for testing, added Roadmap Rewards
2016-09-26 09:42:19 -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
Obique PSWG 202ce07598 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-09-25 17:28:23 -05:00
Obique PSWG 273bf54aa4 Changed getCounter() to getUpdateCounter() in DataTransformWithParent 2016-09-25 10:20:51 -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 2aa4895958 Merged in M4SS/holocore/terminals_click_fix (pull request #306)
NGE-269 - Single click on terminal now opens/uses it
2016-09-23 08:02:14 -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 eca7b5dbe2 Fixed an issue where targeting a terminal would activate it 2016-09-23 13:09:41 +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 641e236e2c Edited incorrect comment in CommandService 2016-09-23 12:18:09 +02:00
Mads Boddum 2775d7b5a7 Added a bit of logging to CommandService 2016-09-23 12:17:02 +02:00
Mads Boddum 7a8ce4d5fd Combat queues are now cleared upon the player moving and not performing 2016-09-23 12:15:10 +02:00
Mads Boddum ba54cf0cf7 Renamed a thread 2016-09-23 11:02:37 +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 62f9597c04 Removed unused import in SpawnerService 2016-09-21 19:16:36 +02:00
Mads Boddum 27237f3daf Respawn timer now starts when corpse despawns and not at death 2016-09-21 19:15:59 +02:00
Mads Boddum 6546351f88 Removed a few unused imports 2016-09-21 18:38:57 +02:00
Mads Boddum bb1a3b84c3 Cleaned up CorpseService a bit 2016-09-21 17:43:01 +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 5d65b781e8 Increased the amount of time a NPC corpse remains in the world 2016-09-21 13:34:38 +02:00
Mads Boddum 7f126d33f3 Added some TODOs in CorpseService for cloning 2016-09-21 13:22:32 +02:00
Mads Boddum b8735ca50d Renamed removeCorpse() in CorpseService to deleteCorpse() 2016-09-21 12:57:05 +02:00
Mads Boddum 4b6db884d2 Added a bit of code to CorpseService for initial support for cloning 2016-09-21 12:52:39 +02:00
Mads Boddum 044f095a7d corpseService field in CombatManager is now final 2016-09-21 12:51:19 +02:00
Mads Boddum 3538f642cd Removed unnecessary logic in CorpseService.terminate() 2016-09-21 11:26:45 +02:00
Mads Boddum 3948c3f794 The corpses of killed NPCs now disappear after a while 2016-09-21 11:25:40 +02: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
Mads Boddum f0452fad1d Added more logging to CombatService 2016-09-20 13:34:20 +02:00
Mads Boddum 6e01b09b5f Added CreatureKilledIntent 2016-09-20 13:28:23 +02:00
Mads Boddum 6f7694e4ec Created the CreatureKilledIntent that's broadcasted whenever a creature is killed 2016-09-20 13:26:08 +02:00
Mads Boddum 2184336846 Fixed an issue where you could turn around while incapacitated or dead 2016-09-20 13:04:06 +02:00