projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-18 08:02:56 -04:00
Code Issues Projects Releases Wiki Activity
6,944 Commits 16 Branches 86 Tags
dependabot/github_actions/actions/setup-java-5
Commit Graph
6944 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ziggy b35a8fd76b Created utility for adding quest strings to the CRC database and outputting to new .csv file 2021-01-13 07:17:13 +01:00
Undercova 358816524a Updated conversation of Ree-Yees with new folder/file layout 2021-01-13 06:05:26 +01:00
Undercova 5e3636fb59 Added conversation for Toggi Bok 
Added conversation for Gendra
Added conversation for Dunir Signos
 2021-01-12 00:12:56 +01:00
Undercova 09dc6a20c0 Updated conversation of Purvis with a shortcut to the grantQuest parts of conversation 
Updated conversation of Niko
 2021-01-11 06:57:45 +01:00
Undercova 90827cb442 Merge branch 'quality_assurance' of https://github.com/ProjectSWGCore/Holocore into quality_assurance 2021-01-11 01:39:23 +01:00
Undercova 2a35c25fff Updated poor little respec seller and made her taller :) 2021-01-11 01:39:08 +01:00
Josh Larson 62c4e330a7 Merge pull request #311 from madsboddum/quality_assurance 
Fix error in ConversationService when spawning a NPC using /createNPC
 2021-01-09 23:25:29 -05:00
Ziggy 1d031c3611 Fix error in ConversationService when spawning a NPC using /createNPC 2021-01-10 03:28:18 +01:00
Josh Larson 43edaf78bc Merge pull request #308 from madsboddum/307 
Newly looted items with a value are now sellable to junk dealers #307
 2021-01-08 16:55:13 -06:00
Undercova 2510d45389 Fixed main conversation table 
Added some droids to Watto's Junk Shop
 2021-01-08 23:51:24 +01:00
Ziggy dca9ce6cf7 Newly looted items with a value are now sellable to junk dealers #307 2021-01-08 22:29:29 +01:00
Undercova 363cf208f2 Updated imperial and rebel recruiter conversations 2021-01-08 21:52:34 +01:00
Undercova cb001911b2 Added numerous conversations to NPCs on Tatooine (mostly placeholders) 2021-01-08 05:09:05 +01:00
Undercova 996491a896 Updated recruiter conversations to show correct animations 2021-01-07 07:34:20 +01:00
Josh Larson ba249a2fb2 Merge pull request #304 from madsboddum/303 
Added npc_animation and player_animation events to conversations #303
 2021-01-06 22:45:46 -06:00
Ziggy 69ac60d76f Added npc_animation and player_animation events to conversations #303 2021-01-07 04:58:10 +01:00
Josh Larson 6cc20d1d35 Merge pull request #302 from madsboddum/12 
Conversations are now linked to spawners via conversation_id instead of spawn_id #12
 2021-01-06 21:01:01 -06:00
Undercova 8dd3ac1c33 Added NPC actions info to recruiter conversations 2021-01-07 03:55:54 +01:00
Ziggy 0b5aa52d36 Conversations are now linked to spawners via conversation_id instead of spawn_id #12 2021-01-07 03:50:21 +01:00
Undercova cf2acb97cf Merge branch 'quality_assurance' of https://github.com/ProjectSWGCore/Holocore into quality_assurance 2021-01-07 03:18:26 +01:00
Undercova 5ad76febdb Updated conversation for imperial and rebel recruiter 2021-01-07 03:18:08 +01:00
Josh Larson 533039aee7 Merge pull request #301 from madsboddum/12 
Conversations unloadable because of a last-minute change and better behaviour with 'Stop conversing'
 2021-01-06 20:10:34 -06:00
Ziggy c909e18374 Fix 'Stop conversing' not stopping the conversation completely #12 2021-01-07 03:03:07 +01:00
Ziggy e2ef7f5e16 Fixed player responses and requirements in conversations being unloadable #12 2021-01-07 02:50:38 +01:00
Josh Larson 3ddcf7157c Merge pull request #300 from madsboddum/12 
Added conversations framework and enough functionality to join and le…
 2021-01-06 17:44:22 -06:00
Ziggy 52b830ed20 Added conversations framework and enough functionality to join and leave the rebellion in Anchorhead on Tatooine #12 2021-01-07 00:18:59 +01:00
Undercova 5aa21c373d Updated all spawners to support conversations 2021-01-06 22:49:49 +01:00
Josh Larson a7c58e0cb4 Merge pull request #298 from madsboddum/296 
Dynamic spawn eggs spawn way less frequently above or below ground #296
2021.01.05 		2021-01-03 01:32:06 -06:00
Ziggy 1b814204d5 Dynamic spawn eggs spawn way less frequently above or below ground #296 2021-01-02 07:38:02 +01:00
Undercova 94a44b6265 Changed issued entertainer box content from dance prop to slitherhorn instruments 2020-12-23 10:23:38 +01:00
Undercova fb36b8d71e - Changed protection values of robes according to their rank 
- Updated issued entertainer and trader equipment in the uniform box
- Updated CBT and Jedi robes
 2020-12-13 05:34:48 +01:00
Josh Larson ff02ee0db2 Merge pull request #294 from madsboddum/removewebfiles 
Removed remnant files from old server management interface
 2020-12-12 23:08:45 -05:00
Josh Larson 5ff80e4651 Merge pull request #293 from madsboddum/290 
PvP zones are now only applied to the intended planet instead of every planet #290
 2020-12-12 23:08:36 -05:00
Josh Larson ac40c357de Merge pull request #295 from madsboddum/testlocation_moved 
Remove TestLocation because it was added to pswgcommon
 2020-12-12 23:07:49 -05:00
Ziggy d42397f2c4 Remove TestLocation because it was added to pswgcommon 2020-12-12 16:40:07 +01:00
Ziggy 928041c41a Removed remnant files from old server management interface 2020-12-12 15:40:33 +01:00
Ziggy 13fd3a1747 PvP zones are now only applied to the intended planet instead of every planet #290 2020-12-12 11:47:01 +01:00
Josh Larson 0e0b518f52 Merge pull request #288 from madsboddum/267 
Fix object attributes being jumbled when loading from persisted storage #267
 2020-12-06 11:36:46 -05:00
Ziggy b0a48ba677 Fix object attributes being jumbled when loading from persisted storage #267 2020-12-05 10:59:35 +01:00
Undercova d764ff63b1 Changed dynamic spawn chances and size 
Updated a special weapon in database
Updated dynamic spawns
2020.12.03 		2020-12-03 00:20:44 +01:00
Josh Larson 55bc854b42 Merge pull request #282 from madsboddum/281 
Consumed item charges are now set correctly and is supported by splitting/stacking #281
 2020-11-30 16:50:39 -05:00
Josh Larson 73b03702f9 Merge pull request #283 from madsboddum/3 
Aggressive NPCs ignore players that have been incapacitated recently #3
 2020-11-30 16:48:49 -05:00
Josh Larson 09f3715a33 Merge pull request #285 from madsboddum/removebuff 
Add support for removing a buff by right-clicking on it
 2020-11-30 16:48:17 -05:00
Ziggy 1377d821aa Add support for removing a buff by right-clicking on it 
Only buffs marked player removable can be removed
 2020-11-29 18:50:57 +01:00
Ziggy c8bc5c84d3 Aggressive NPCs ignore players that have been incapacitated recently #3 2020-11-29 13:24:57 +01:00
Ziggy 64a61d5b5e Consumed item charges are now set correctly and is supported by splitting/stacking #281 2020-11-29 12:06:54 +01:00
Josh Larson a601a0387b Merge pull request #278 from madsboddum/weapon_procname 
Fixed static item weapon proc effect not displaying a proper text
 2020-11-28 18:04:19 -05:00
Josh Larson 7f98a1e5ef Merge pull request #280 from madsboddum/unguilded 
Guild information for a player no longer loads forever
 2020-11-28 16:37:40 -05:00
Ziggy a3220721d4 Guild information for a player no longer loads forever 2020-11-28 22:30:38 +01:00
Josh Larson f1a771392f Merge pull request #279 from madsboddum/53 
Added racial languages #53
 2020-11-28 16:28:44 -05:00