projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-18 08:02:56 -04:00
Code Issues Projects Releases Wiki Activity
100 Commits 16 Branches 86 Tags
2b37cbb7bb3e6f1392d3bbdec6def8e92dfac79b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Waverunner 2b37cbb7bb Merge branch 'master' into awareness 
Conflicts:
	src/services/objects/ObjectManager.java
 2014-12-15 08:57:01 -05:00
Waverunner fe9bd9f89d Merge branch 'awareness' of https://bitbucket.org/projectswg/core3 into awareness 2014-12-15 08:39:36 -05:00
Waverunner f98b183958 Hair will now show on players, Added equipment and appearance list methods to CreatureObject 2014-12-14 12:00:29 -05:00
Waverunner ccc0052cd4 Merged slots into master 2014-12-14 11:08:39 -05:00
Waverunner 96a44952cd Volume limit now set based on template files, Refactored zoning to account for ghost slot, Added inventory and datapad on creation 2014-12-14 10:52:47 -05:00
Waverunner 92fcafe2eb New objects are now created with their appropriate slots 2014-12-13 19:53:21 -05:00
Obique f06161a7ea Fixed awareness to see nearby players 2014-12-13 10:53:46 -06:00
Waverunner 7568ca1d60 Merge branch 'master' of https://bitbucket.org/projectswg/core3 into awareness 2014-12-12 22:38:19 -05:00
Obique a611beb5f6 Merge branch 'master' of https://bitbucket.org/projectswg/core3 into awareness 2014-12-12 21:32:00 -06:00
Waverunner 9f51b6d3be Revert "Added debug code to figure out stf error" 
This reverts commit 9e2b38710f5e948f7a88c430779c10dac001b940.
 2014-12-12 20:27:23 -05:00
Waverunner 879f20f0ea Added debug code to figure out stf error 2014-12-12 19:44:31 -05:00
Waverunner 9392f8bfa1 Added admin tags 2014-12-12 18:27:25 -05:00
Waverunner 403448ec44 Added option to enable auto-logins 
Disabled by default, you must set client config file to have sessionId set with the username and password seperated with a dash

Ex: sessionId=Wave-pass
 2014-12-12 17:30:34 -05:00
Obique 384423f068 Merge branch 'master' of https://bitbucket.org/projectswg/core3 into awareness 2014-12-12 13:55:56 -06:00
Obique be5b6683dd Merge branch 'awareness' of https://bitbucket.org/projectswg/core3 into awareness 
Conflicts:
	src/services/objects/ObjectManager.java
 2014-12-12 13:11:10 -06:00
Obique 0b36e44d8e Added additional output on init, and Added null check to createObject 2014-12-12 13:09:37 -06:00
Waverunner 78c811542d Updated calls to Race, Hair is no longer created with an empty hair template 2014-12-12 12:12:36 -05:00
Obique d9af86df02 Fixed null pointer exception in awareness and Added setLocation to properly move the object 2014-12-12 02:13:35 -06:00
Obique e34dd6daaf Merge branch 'master' of https://bitbucket.org/projectswg/core3 into awareness 
Conflicts:
	src/services/objects/ObjectManager.java
 2014-12-12 00:54:46 -06:00
Waverunner 94b916b499 Deleted AString class, Updated skills to use new SWGList constructor for strings 2014-12-12 00:56:26 -05:00
Waverunner 9c08b1ab54 Changed born dates in player baseline to show actual creation date 2014-12-11 23:27:55 -05:00
Waverunner 7dc87b5720 Added automatic STF parsing for a new object's STF file and detail STF file 2014-12-11 22:16:06 -05:00
Waverunner 6e2376fe74 Added serial to AString and updated stf methods in CreatureObject and WeaponObject 2014-12-11 18:56:15 -05:00
Waverunner 198310de42 CreatureObject now uses SWGList for appropriate lists in its baselines 2014-12-11 18:15:23 -05:00
Waverunner cb54238931 Merged player-baselines into master 2014-12-11 16:52:22 -05:00
Waverunner 2aecdfb567 Commented out the system prints for incoming and outgoing packets 2014-12-11 16:44:03 -05:00
Waverunner 451e081e53 Fixed crashing when pressing escape button or going to view skills 2014-12-11 16:42:26 -05:00
Waverunner e145b1f45a Enabled sending of all the PLAY baselines and removed hardcoding for PLAY6 2014-12-11 15:47:25 -05:00
Waverunner 0ed44dc926 Cleaned up debugging code, disabled creation of default weapon until equipment list is added, CREO6 baseline is no longer sent hardcoded 2014-12-11 15:02:55 -05:00
Waverunner cff70541a7 Baseline changes to CREO, WEAP, TANO 2014-12-11 14:39:15 -05:00
Obique 35915eaae6 Initial step to awareness. Started processing ObjectControllers 2014-12-11 12:15:18 -06:00
Waverunner c85ac1cdb1 Made WeaponObject encodable for CREO6, updated CREO6 for default weapon, new characters are created with default weapon 2014-12-11 00:17:49 -05:00
Waverunner 068921afc6 Added WeaponObject baselines, Updated TangibleObject baselines, Updated CreatureObject Baselines 2014-12-09 10:33:57 -05:00
Waverunner 321ff14fc3 Merge branch 'master' into baseline-operands 2014-12-08 15:45:41 -05:00
Waverunner 413f2c9d07 Added operand count incrementor for CREO, ITNO, PLAY, and TANO baselines 2014-12-08 15:38:49 -05:00
Obique 2170d39807 Fixed compile time error 2014-12-08 14:38:15 -06:00
Obique 14b4bad6ed Got started on SWGObject awareness 2014-12-08 13:03:01 -06:00
Waverunner 384129e059 Added odb folder to gitignore 2014-12-08 10:09:12 -05:00
Waverunner c8195a2025 Changed galaxyId in CoreManager to 1 and added placeholder.txt to odb folder 2014-12-08 10:08:32 -05:00
Obique c76e85889d Removed my characters from the db backup 2014-12-08 00:22:34 -06:00
Obique 1595e396be Merge branch 'master' of https://bitbucket.org/projectswg/core3 
Conflicts:
	nge.backup
 2014-12-08 00:20:38 -06:00
Obique 63e7d45cf3 Updated backup 2014-12-07 15:35:31 -06:00
Obique e036870a7b Removed zone/ping ports from the config 2014-12-07 15:34:13 -06:00
Obique 96c3d1b627 Added persistent data to ObjectManager and PlayerManager 2014-12-07 15:33:28 -06:00
Obique f7a5b4f8e6 Added galaxy to GalacticIntent 2014-12-07 15:32:00 -06:00
Obique 06a4db325b Added galaxy concept to the managers/services 2014-12-07 15:31:40 -06:00
Obique f6510df464 Made several more objects serializable 2014-12-07 15:22:45 -06:00
Waverunner 0979eb7dc2 Added WaypointObject 2014-12-07 15:10:39 -05:00
Waverunner 0ba97ebd50 Added IntangibleObject baselines 2014-12-07 15:09:35 -05:00
Waverunner 58200dad89 Updated baselines for CreatureObject 2014-12-07 12:43:56 -05:00