Commit Graph
6324 Commits
Author SHA1 Message Date
Waverunner ab4f9243fc Fixed container and slot volume size logic checks and moved AFK to a script 2015-06-05 16:42:58 -04:00
Waverunner 856e87fb26 Revert "Commented out clear aware in delete object causing awareness issues on relogging"
This reverts commit 9d2adce3fc.
2015-06-05 15:22:14 -04:00
Waverunner 9d2adce3fc Commented out clear aware in delete object causing awareness issues on relogging 2015-06-05 15:09:16 -04:00
Waverunner 695c419603 Disabled waypoint color setting by id in RequestWaypointCmdCallback until fix is ready 2015-06-05 14:38:06 -04:00
Waverunner 9db7b2afd6 Merge branch 'quality_assurance' into development 2015-06-05 14:23:56 -04:00
Obique PSWG eed7ffb429 Merged in wallaceg09/holocore/bugfix/AwarenessHotfix (pull request #38)
Fixes awareness on logout bug
2015-06-05 12:20:57 -05:00
wallaceg09 425ac416b7 Fixes awareness bug 2015-06-05 12:15:21 -05:00
Glen Wallace cdf3263b8e Merged projectswg/holocore into development 2015-06-05 12:14:10 -05:00
Obique PSWG b76fe7075b Merged in wallaceg09/holocore/bugfix/AwarenessHotfix (pull request #37)
Fixes awareness on logout bug
2015-06-05 11:25:43 -05:00
wallaceg09 a1a2ee3ddf Fixes awareness bug 2015-06-05 11:20:35 -05:00
Undercova PSWG 8f9658ad37 Merged in M4SS/holocorenew/CORE-145-recent-commit-history-is-now-sh (pull request #36)
Implemented CORE-145 'Recent commit history is now shown as MOTD'
2015-06-05 17:55:13 +02:00
Waverunner c58df94b3c Refactored ClientFactory to be used statically 2015-06-05 10:37:04 -04:00
Waverunner 3645454031 Merge branch 'development' into quality_assurance 2015-06-05 10:17:34 -04:00
Waverunner 0d61bcfb65 Creating waypoints through planetary map will now try to set the color if appropriate and will no longer produce an error when requesting on city icons 2015-06-05 10:16:58 -04:00
Ziggeh b2b23de071 Commit history is now cached upon initialisation of ZoneService 2015-06-05 10:46:26 +02:00
Ziggeh 814e10dd83 Revert "The shortened commit name now comes from abbreviate() instead of substring"
This reverts commit 586787b17c.
2015-06-05 10:28:53 +02:00
Ziggeh 586787b17c The shortened commit name now comes from abbreviate() instead of substring 2015-06-05 05:09:45 +02:00
Ziggeh ebee9929ac Commit history is now sent in a single system message instead of four 2015-06-05 04:48:14 +02:00
Waverunner 2a4832d825 Merge branch 'development' of https://bitbucket.org/projectswg/holocore into development 2015-06-04 22:32:41 -04:00
Waverunner 1e2951d857 Added WorldSnapshotData class 2015-06-04 22:32:28 -04:00
Ziggeh b9aad61bc3 Commit history is now shown to players upon zone-in 2015-06-05 04:21:46 +02:00
Ziggeh e11441ac6e Added JGit library and dependencies to the classpath 2015-06-05 04:13:47 +02:00
Undercova PSWG 9990b2d2e4 Merged in Z61/holocore/development (pull request #35)
FIxed CORE-84
2015-06-05 03:56:55 +02:00
Z61 d40ae0d88c Removed not used import 2015-06-04 21:24:32 -04:00
Z61 eaf5a1ea4e Fixes CORE-84 for datapad button and command. 2015-06-04 21:21:23 -04:00
Mads Boddum 47c65a90f0 Merged projectswg/holocore/development into master 2015-06-05 02:50:33 +02:00
Z61 bc9c8799e8 Merged projectswg/holocore into development 2015-06-04 20:49:46 -04:00
Obique PSWG 2e353b4da9 Removed character from object awareness when disappearing and adding when zoning in 2015-06-04 19:34:46 -05:00
Obique PSWG 22b286c54b Removed players from ConnectionService as soon as they are disconnected 2015-06-04 19:21:38 -05:00
Mads Boddum 719f59df27 Merged projectswg/holocore/development into master 2015-06-05 02:12:23 +02:00
Waverunner c92acdd119 Merged in Z61/holocore/development (pull request #34)
Fixed CORE-84
2015-06-04 18:11:06 -04:00
Waverunner 76cb745cb9 Fixed baselines for Intangible objects not being sent properly and made a minor improvement to encode method in SWGList and SWGMap 2015-06-04 18:06:15 -04:00
Mads Boddum 4b449c6911 Merged projectswg/holocore/development into master 2015-06-04 10:23:23 +02:00
Z61 2292ddcd83 Removed extra comments and print statement. 2015-06-04 00:11:54 -04:00
Z61 531a18b476 Adds waypoint limit when creating. 2015-06-04 00:07:46 -04:00
Z61 e76bfe0638 Merged projectswg/holocore into development 2015-06-03 20:33:44 -04:00
Obique PSWG abd632c793 Fixed buildout crash with ResourceContainerObject baselines being wrong 2015-06-03 19:28:07 -05:00
Obique PSWG 2e5f7ae8f8 Fixed warning messages 2015-06-03 19:25:40 -05:00
Obique PSWG 1a4d72b406 Properly removed old players when new ones connect in ConnectionService 2015-06-03 19:13:16 -05:00
Z61 e0dd621df2 Merged projectswg/holocore into development 2015-06-03 17:58:09 -04:00
Waverunner c727af3065 Small revision to previous commit 2015-06-02 16:44:47 -04:00
Waverunner 1c3761a8e5 Merge branch 'development' of https://bitbucket.org/projectswg/holocore into development 2015-06-02 16:27:24 -04:00
Waverunner 3f0028ec03 Updated ClientFactory for /serverdata/ folder 2015-06-02 16:25:25 -04:00
Waverunner 622291d6dc Added MapService along with temporary locations for tatooine cities 2015-06-02 16:21:21 -04:00
Obique PSWG ee58752ea4 Added debug parameter to server command, for basic testing 2015-06-02 00:37:21 -05:00
Obique PSWG 5fe13240d7 Changed CharacterCreationRestriction to allow unlimited character creation 2015-06-02 00:22:22 -05:00
Obique PSWG b29d87d0fa Merge branch 'development' into quality_assurance 2015-06-01 00:26:14 -05:00
Obique PSWG 3ecbec17ad Merge branch 'development' of bitbucket.org:projectswg/holocore into development 2015-06-01 00:25:30 -05:00
Obique PSWG 0a3abd82f5 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2015-06-01 00:25:20 -05:00
Obique PSWG 96200e0075 Enabled buildouts in nge.cfg 2015-06-01 00:25:02 -05:00