projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-12 22:45:18 -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
Ziggy 6995dd223d Fixed an issue where the starter clothing wasn't being properly equipped 2015-05-11 10:29:56 +02:00
Ziggy 8cbc346811 Added an equipItem() method in CreatureObject 2015-05-11 10:29:31 +02:00
Mads Boddum 8129c4bdb2 Merged projectswg/holocore into development 2015-05-10 18:07:01 +02:00
Undercova 7b696666f9 Merged in M4SS/holocore/CORE-76-time-played-function (pull request #19) 
Added CORE-76 '"Time played" function'
 2015-05-10 16:06:10 +02:00
Undercova 27da28e7da Merged in M4SS/holocore/CORE-86-sitonobject-not-working (pull request #21) 
Fixed CORE-86 'SitOnObject not working'
 2015-05-10 16:06:02 +02:00
Undercova 5708628ad3 Merged in M4SS/holocore/CORE-72-afk-ld-tag (pull request #8) 
Fixed CORE-72 'LD tag'
 2015-05-10 16:05:55 +02:00
Undercova 3dd8d86b77 Merged in M4SS/holocore/CORE-101-setting-player-flags-in-play03- (pull request #20) 
Fixed CORE-101 'Setting player flags in PLAY03 can cause client crashes'
 2015-05-10 16:05:43 +02:00
Ziggy b74154c52b Removed unnecessary comment 2015-05-10 03:02:54 +02:00
Undercova 9bb1a23f49 Merged in M4SS/holocore/CORE-76-time-played-function (pull request #18) 
Added CORE-76 '"Time played" function'
 2015-05-09 02:54:41 +02:00
Ziggy d08207936b Merge conflict, take 2 2015-05-09 02:37:37 +02:00
Ziggy ac42cfb27a Merge conflict fix attempt 2015-05-09 02:34:35 +02:00
Ziggy c4a344ba1c Merge conflict fix, take 2 2015-05-09 02:31:06 +02:00
Ziggy a34b8f5398 Revert "Merge conflict fix?" 
This reverts commit 0b4052c7824b6a60364892246187c13f4297ec29.
 2015-05-09 02:16:45 +02:00
Ziggy d95b06ddea Merge conflict fix? 2015-05-09 02:16:18 +02:00
Mads Boddum 86f050de5e Merged projectswg/holocore into development 2015-05-09 02:12:30 +02:00
Ziggy 141e3f763f Revert resources.server_info.DataManager 2015-05-09 01:46:25 +02:00
Ziggy cf88aad5f8 Fixed an issue where total time played would reset every log-in 2015-05-09 01:42:46 +02:00
Undercova 0a741c6a9a changed reserved_words.txt 2015-05-08 19:04:15 +00:00
Undercova 82bd54f40b Merged in Z61/holocore (pull request #11) 
Fixed CORE-95
 2015-05-08 20:37:07 +02:00
Undercova 626d7e2835 Merged in M4SS/holocore/CORE-102-boss-creatures-being-displayed- (pull request #17) 
Fixed CORE-102 'Boss creatures being displayed as Elite creatures'
 2015-05-08 20:07:39 +02:00
Undercova b9644b11c9 Merged in M4SS/holocore/CORE-87-mails-become-unread-again-after- (pull request #16) 
Fixed CORE-87 'Mails become unread again after relog'
 2015-05-08 18:53:28 +02:00
Ziggy 0ae8ceba23 Reverted Posture.java 2015-05-08 18:45:39 +02:00
Undercova e1b591bde6 Merged in M4SS/holocore/CORE-86-sitonobject-not-working (pull request #15) 
Fixed CORE-86 'SitOnObject not working'
 2015-05-08 18:12:09 +02:00
Undercova 5e59eaf4fd Merged in M4SS/holocore/CORE-102-boss-creatures-being-displayed- (pull request #14) 
Fixed CORE-102 'Boss creatures being displayed as Elite creatures'
 2015-05-08 18:02:20 +02:00
Undercova 10c106ad88 Merged in M4SS/holocore/CORE-87-mails-become-unread-again-after- (pull request #13) 
Fixed CORE-87 'Mails become unread again after relog'
 2015-05-08 18:02:05 +02:00
Ziggy 639d000275 Fixed an issue that prevented players from sitting in chairs 2015-05-08 17:38:09 +02:00
Ziggy 4ad69ccf37 Fixed an issue where boss creatures would be displayed as Elite creatures 2015-05-08 13:22:13 +02:00
Ziggy dbf52dd72b Revert "Fixed CORE-102 'Boss creatures being displayed as Elite creatures'" 
This reverts commit 162c03535e014c17e8b941b8bad282de811f2e3c.
 2015-05-08 13:03:35 +02:00
Ziggy 0680feaba4 Fixed CORE-102 'Boss creatures being displayed as Elite creatures' 2015-05-08 13:01:06 +02:00
Mads Boddum 0b3db0f415 Merged projectswg/holocore into development 2015-05-08 12:43:26 +02:00
Ziggy 173bae2a90 Reverted Posture 2015-05-08 12:43:14 +02:00
Ziggy 3bd55d62bf Fixed CORE-87 'Mails become unread again after relog' 2015-05-08 12:16:39 +02:00
Undercova 37b57922ff Merged in Z61/holocore/development (pull request #12) 
Fixes ui_name_declined_fictionally_inappropriate
 2015-05-08 10:39:45 +02:00
Z61 b3b45e3e1a Fixed part of CORE-95 (ui_name_declined_fictionally_reserved). Also added fiction reserved check. Will need names added to that. 2015-05-07 19:56:07 -04:00
Z61 8ad8c608ef Merged projectswg/holocore into development 2015-05-07 19:53:44 -04:00
Undercova 27491bd405 Merged in M4SS/holocore/CORE-101-setting-player-flags-in-play03- (pull request #10) 
Fixed CORE-101 'Setting player flags in PLAY03 can cause client crashes'
 2015-05-07 20:50:12 +02:00
Ziggy be78ce73a9 Fixed an issue where setting a player flag would cause a client crash 2015-05-07 20:41:06 +02:00
Ziggy 0b8521375c Changed the LD flag to only be cleared on zone-in 2015-05-07 20:23:20 +02:00
Undercova 9d60ce54dd Merged in M4SS/holocore/CORE-72-afk-ld-tag (pull request #9) 
Fixed CORE-72 'LD tag'
 2015-05-07 18:33:44 +02:00
Ziggy ffbecaeba2 Changed the LD flag to be cleared in ConnectionService.disappear() instead of the Runnable that calls said method 2015-05-07 17:52:44 +02:00
Ziggy 5c71df31f3 Added a method call that will clear the LD flag upon zone-in 2015-05-07 17:47:04 +02:00
Ziggy 4be4470c1e Fixed some inconsistencies with the LD flag 2015-05-07 17:46:17 +02:00
Ziggy b7e31ae748 Changed LD flag from being toggled to being set forcefully when a player is logged out 2015-05-07 17:22:24 +02:00
Ziggy 0f0a0c001d Reverted resources.Posture.java 2015-05-07 17:11:37 +02:00
Ziggy 78ae71d4a4 Removed an unnecessary nested call when setting the LD flag 2015-05-07 16:55:38 +02:00
Ziggy 85c1e10ef3 Added the LD tag for players that have been logged off 2015-05-07 16:45:02 +02:00
Obique 830b433e37 Changed Posture's hash map to Hashtable and Fixed a bug where DEAD isn't accessible in the enum's map 2015-05-07 07:53:11 -05:00
Mads Boddum c9a4a61636 Merged projectswg/holocore into development 2015-05-07 11:19:59 +02:00
Undercova 6f738670bd Merged in M4SS/holocore/CORE-99-method-for-getting-a-posture-fro (pull request #6) 
Fixed CORE-99 'Method for getting a Posture from an ID will never return Posture.DEAD'
 2015-05-07 11:16:04 +02:00
Ziggy 2310710abf Added an offset variable to the Posture enumeration in an effort to make the code more understandable 2015-05-07 11:10:10 +02:00