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
Undercova
3911da102a
Merged in M4SS/holocore (pull request #4 )
...
Minor changes to misc classes
2015-05-07 11:08:17 +02:00
Ziggeh
99784f499f
Fixed an issue where Posture.getFromId() would return an incorrect Posture and in some cases throw an exception
2015-05-07 10:34:26 +02:00
Ziggy
8be5a88fe1
Fixed an issue where a CreatureObject in certain situations wouldn't have Posture.DEAD
2015-05-07 10:31:30 +02:00
Mads Boddum
ade8dfc394
Merged projectswg/holocore into development
2015-05-07 10:11:06 +02:00
Ziggeh
5eace03800
Changed Scripts.execute() to no longer throw an exception when attempting to call a script that doesn't exist
2015-05-07 08:43:33 +02:00
Undercova
2b764ce53a
Merged in Z61/holocore (pull request #5 )
...
Fixed CORE-83
2015-05-07 00:27:32 +02:00
Z61
6e7e3ab579
Added CreatureMood enum
2015-05-06 16:46:55 -04:00
Z61
37c928d262
Added CreatureMood (list of all moods available to players.) And added usage to zone-in mood reset.
2015-05-06 16:43:16 -04:00
Z61
902dc33a74
Fixed CORE-83 'Mood doesnt reset with logout'.
2015-05-06 15:57:57 -04:00
Z61
c2e11ebeab
Merged projectswg/holocore into development
2015-05-06 15:32:22 -04:00
Ziggeh
cf560ac2cf
Changed wildcard imports and moved class fields into the test method in TestSortedLinkedList
2015-05-06 21:13:40 +02:00
Ziggeh
69dc2ebf31
Readded Field Encapsulation for resources.Attributes
...
Changed each unsupported operation method in resources.SortedLinkedList to create new exception objects
Renamed SortedLinkedListTest to TestSortedLinkedList
2015-05-06 19:47:29 +02:00
Ziggy