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
6,324 Commits 16 Branches 86 Tags
dependabot/github_actions/actions/setup-java-3
Commit Graph
6324 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Boddum 1c76add7ff HAM methods in CreatureObject now implement range checks and return the difference 2016-09-16 15:42:18 +02:00
Undercova PSWG a1607e22fc Added spaceholder values for empty cells in collection_clicky.sdb. The values will be put in once the extra planets work 2016-09-16 10:54:51 +00:00
Obique PSWG bf83686a8d Merged in Undercova/holocore (pull request #296) 
Changed "none" in weapon.sdb to "-"
 2016-09-16 04:43:48 -05:00
Undercova PSWG 1a3cd80aa5 Changed "none" in weapon.sdb to "-" 2016-09-16 09:42:39 +00: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
Obique PSWG 7cc88cfb0e Merged in M4SS/holocore/prof_master_badge (pull request #295) 
NGE-283 - Profession Mastery Badges
 2016-09-16 04:40:18 -05:00
Mads Boddum 59babc92de Added profession mastery badges 2016-09-16 10:24:13 +02:00
Mads Boddum dc04402dbd Removed a couple of debug prints from ChatRoomService 2016-09-16 08:39:06 +02:00
Mads Boddum 70ba778fad Implemented group chat 2016-09-16 08:36:42 +02:00
Obique PSWG 1387c9ba9a Merged in M4SS/holocore/pvp (pull request #293) 
NGE-446 and NGE-448
 2016-09-15 21:28:42 -05:00
Mads Boddum ce549ed073 Optimised statement in CreatureObject.isEnemy() 2016-09-16 04:26:25 +02:00
Mads Boddum cc9a8730c5 The default weapon is now treated as a slotted object 2016-09-16 04:12:37 +02:00
Mads Boddum 0c3ad8f4e0 Added PvP support 2016-09-16 04:11:41 +02:00
Obique PSWG 20fb460b00 Merged in M4SS/holocore/pvp_faction_fix (pull request #292) 
NGE-130 - PvP Factions
 2016-09-15 08:22:14 -05:00
Mads Boddum 7935f6619a Fixed incorrect PvP status messages being sent by FactionService 2016-09-15 10:52:23 +02:00
Undercova PSWG 4c039b433f Merged in slehan/holocore (pull request #291) 
Fixed a bug preventing Collection items from being spawned
 2016-09-14 19:10:49 +02:00
Skyler Lehan 6bcf975071 Fixed a bug preventing Collection items from being spawned 2016-09-14 13:09:32 -04:00
Obique PSWG aa367e431a Merged in M4SS/holocore/uniform_box_fix (pull request #290) 
NGE-433 - Uniform box items now have the correct attributes applied
 2016-09-14 06:57:19 -05:00
Obique PSWG 7251b52ebd Merged in M4SS/holocore/watch_performer (pull request #289) 
NGE-373 range fix
 2016-09-14 06:55:27 -05:00
Mads Boddum 7bcd9c61cf Uniform box items now have the correct attributes applied 2016-09-14 06:15:10 +02:00
Mads Boddum 313c21a32d Fixed typo in a log message 2016-09-14 05:20:49 +02:00
Mads Boddum 34b023c68f Fixed an issue where running out of range of a performer would make you unable to watch them again 2016-09-14 05:19:55 +02:00
Obique PSWG fe43e11f2c Merged in M4SS/holocore/watch_performer (pull request #288) 
NGE-373 - Watch Entertainer
 2016-09-13 21:51:53 -05:00
Mads Boddum 5f69ab14d8 Turned spaces into tabs in cmdWatch and cmdStopWatching 2016-09-14 04:50:18 +02:00
Mads Boddum dd4daf24ba Fixed an issue with changing dance 2016-09-14 04:30:36 +02:00
Mads Boddum 7a9cb23b18 Merge holocore/quality_assurance into watch_performer 
Conflicts:
	src/services/commands/EntertainmentService.java
 2016-09-14 04:27:47 +02:00
Mads Boddum 3ac35de8b3 Added range checks for watching a performer 2016-09-14 04:20:34 +02:00
Obique PSWG 7604b5aeb9 Merged in M4SS/holocore/static_items (pull request #277) 
Static Items
 2016-09-13 20:39:02 -05:00
Obique PSWG c2b26c77bb Rolled back change in StaticItemService 2016-09-13 20:38:41 -05:00
Josh Larson 46ba57a292 Rolled back change in nge.cfg 2016-09-13 20:34:34 -05:00
Obique PSWG 270443be06 Merged in Undercova/holocore (pull request #287) 
Moved "required CL" attribute from global object attribute to specific ones
 2016-09-13 20:12:18 -05:00
Undercova PSWG b168cd8101 Fixed typo in weapon.sdb 2016-09-13 00:39:18 +00:00
Undercova PSWG 23cdf8ec13 Moved "required CL" attribute from global object attribute to specific ones 2016-09-12 23:17:50 +00:00
Obique PSWG 4ef6f8a546 Merged in Undercova/holocore (pull request #286) 
Added utinni sound to collections
 2016-09-12 17:20:46 -05:00
Undercova PSWG 2c3b2d95ee Added utinni sound to collections 2016-09-12 21:44:17 +00:00
Mads Boddum d37b699718 Merge holocore/quality_assurance into static_items 
Conflicts:
	src/services/objects/StaticItemService.java
 2016-09-12 22:25:54 +02:00
Obique PSWG 59de792409 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2016-09-12 14:56:54 -05:00
Obique PSWG 98c3ebbba5 Enhanced ScheduledUtilities class to add a run with delay function 2016-09-12 14:56:36 -05:00
Obique PSWG 3babbef4cb Merged in slehan/holocore/collections (pull request #284) 
Collections ready for code review
 2016-09-12 13:07:16 -05:00
Skyler Lehan b42cb0aa4d Fixed more formatting issues 2016-09-12 14:01:32 -04: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 9e49d218ae NGE-168 + NGE-418 - cleaned up code, ready for PR 2016-09-12 09:56:14 -04:00
Skyler Lehan ccc877a85b NGE-418 + NGE-168 - When using a consumable connection, the item is now removed from the players inventory 2016-09-11 23:59:33 -04:00
Skyler Lehan 8358db6a61 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into collections 2016-09-11 23:02:52 -04:00
Skyler Lehan 52953d3511 Fixed a compilation issue due to an uncaught exception 2016-09-11 23:02:32 -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
Obique PSWG 1c993b7788 Merged in Undercova/holocore (pull request #283) 
Updated weapon.sdb regarding heavy weapons and electricity elemental damage
 2016-09-11 21:38:39 -05:00
Undercova PSWG d84ece88f5 Updated weapon.sdb regarding heavy weapons and electricity elemental damage 2016-09-12 01:40:04 +00:00
Obique PSWG 77324428e5 Fixed log statement with integers 2016-09-11 08:16:05 -05:00