Commit Graph
107 Commits
Author SHA1 Message Date
Waverunner 6472fe98a1 Added container permissions 2015-05-27 14:18:58 -04:00
Obique PSWG 786eb4d685 Removed slot descriptors to fix persistent NullPointerException 2015-05-27 08:12:47 -05:00
Obique PSWG 786d45f9af Merge branch 'development' of bitbucket.org:projectswg/holocore into development 2015-05-27 07:31:56 -05:00
Waverunner 868114283b Merge branch 'development' of https://bitbucket.org/projectswg/holocore into development 2015-05-27 00:16:56 -04:00
Waverunner a620a19333 Added ContainerResult enum to return for moveToContainer method, Updated object destroy methods for slots refactor in ObjectManager 2015-05-27 00:16:49 -04:00
Obique PSWG 8bc3f7856c Removed warnings 2015-05-26 22:42:25 -05:00
Obique PSWG 81d387d864 Merge branch 'development' of bitbucket.org:projectswg/holocore into development 2015-05-26 22:23:22 -05:00
Obique PSWG 5964080399 Added enum for CreatureState 2015-05-26 22:22:41 -05:00
Waverunner 4392a9f28e Merge branch 'development' of https://bitbucket.org/projectswg/holocore into development 2015-05-26 14:52:07 -04:00
Waverunner e706c3b1f9 Updated awareness for objects in slots and containers, added removeObject, updated transferItemMisc command for slots refactor 2015-05-26 14:51:48 -04:00
Waverunner 329288dee3 Merge branch 'development' of https://bitbucket.org/projectswg/holocore into development 2015-05-25 17:59:20 -04:00
Waverunner 4af510f636 Refactored slots to not require a slot name and added in foundation for containers 2015-05-25 17:59:07 -04:00
Obique PSWG ae70752b4f Changed PlayerFlags to be an enum 2015-05-25 16:12:32 -05:00
Obique PSWG 2cca8c843b Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2015-05-22 22:22:29 -05:00
Obique PSWG 2835bc887f Fixed delta number for CreatureObject.setHeight() 2015-05-22 20:18:52 -05:00
Waverunner 5740b983fc Fixed null hologram error 2015-05-22 09:38:22 -04:00
Undercova 4ab43cf7f2 Merged in M4SS/holocorenew/CORE-103-inventory-features (pull request #32)
Fixed CORE-106 and implemented CORE-103
2015-05-22 06:20:50 +02:00
Obique 6e9abc8f4a Merge branch 'development' of bitbucket.org:projectswg/holocore into development 2015-05-21 23:12:48 -05:00
Mads Boddum be2d3ac91b Merged development into CORE-103-inventory-features 2015-05-22 06:03:45 +02:00
Ziggeh fe479bd5da conflict fix, take 2 2015-05-22 06:02:58 +02:00
Ziggeh 708a015227 Attempt at merge conflict fix 2015-05-22 05:59:03 +02:00
Waverunner d541624dc7 Added the capability to destroy objects 2015-05-21 23:10:02 -04:00
Ziggeh c1d99d36f8 Added functionality for equipping items 2015-05-21 20:35:51 +02:00
Ziggeh 66dcc7159e Fixed lots of issues caused by child objects not sending packets to those aware of their parent object 2015-05-21 20:21:18 +02:00
Ziggeh 3f86bd87c8 Implemented appearance item functionality 2015-05-20 10:01:20 +02:00
Ziggeh b0d3a31e63 Implemented hologram colours 2015-05-20 09:54:51 +02:00
Ziggeh 6f24a93a0c Fixed incorrect PLAY03 baseline variables and deltas that caused issues with /showhelmet and /showbackpack 2015-05-20 09:43:15 +02:00
Obique a6596c1d3f Removed secondary observers list in SWGObject, and possibly fixed chat related bugs 2015-05-17 23:40:18 -05:00
Josh Larson 65cc4f733d Merged in M4SS/holocore/CORE-78-pants-shown (pull request #24)
Fixed CORE-78 'Pants shown'
2015-05-11 23:31:30 -05:00
Ziggy 8cbc346811 Added an equipItem() method in CreatureObject 2015-05-11 10:29:31 +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 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
Ziggy cf88aad5f8 Fixed an issue where total time played would reset every log-in 2015-05-09 01:42:46 +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
Ziggy be78ce73a9 Fixed an issue where setting a player flag would cause a client crash 2015-05-07 20:41:06 +02:00
Z61 6e7e3ab579 Added CreatureMood enum 2015-05-06 16:46:55 -04:00
Obique 9ffbde1765 Added license to all files within the project 2015-05-04 10:19:06 -05:00
Obique 47231d7f4d Merged Engine into the Core! Woooo open source 2015-05-02 11:56:03 -05:00
Obique d11c2620a9 Sped up the TerrainBuildoutLoader 2015-03-07 16:59:57 -06:00
Obique 9ea9dcda22 Added buildouts - still not completely functional but close 2015-02-28 12:22:25 -06:00
Obique e754f286a8 Moved many things into the engine and removed the casting from getCreatureObject 2015-02-22 11:41:54 -06:00
Obique ae37a24380 Fixed sitting except for chairs 2015-02-21 15:06:08 -06:00
Obique 61604f715c Went into an insane bugfixing mode in the core 2015-02-17 01:13:52 -06:00
Obique 2a086ddb38 Merge branch 'master' of ssh://37.59.100.124:7999/nge/core3 2015-02-16 20:38:22 -06:00
Obique 9332629fe8 Updated CreatureObject to use new Posture enum 2015-02-16 20:35:21 -06:00
Waverunner 5694d73030 Fixed update types for baseline 4 in CREO 2015-02-16 12:17:05 -05:00
Waverunner 5f983bd9ce Merge branch 'master' of http://37.59.100.124:7990/scm/nge/core3 2015-02-16 10:52:10 -05:00