projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-11 01:13:02 -04:00
Code Issues Projects Releases Wiki Activity
1,212 Commits 16 Branches 86 Tags
bb9ad1e3c2158ba6e94de40ea7d2d22c1dd75bde
Commit Graph
1212 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Boddum 9eb83dbffe Merged projectswg/holocore into quality_assurance 2015-09-21 17:26:07 +02:00
Obique PSWG c54aaa3ae5 Merged in Undercova/holocore (pull request #69) 
Added all spawner types
 2015-09-21 08:54:40 -05:00
Undercova 384aedb7e6 Added all spawner types 2015-09-21 15:47:50 +02:00
Obique PSWG 7ee3c1d9bf Merged in Undercova/holocore (pull request #68) 
Fixed spawner service to load all location entries properly
 2015-09-21 07:04:10 -05:00
Zach aeff2be744 pors /pvp command to JavaScript. 2015-09-21 00:24:31 -04:00
Zach a4f96018c4 Adds Ziggy's pvp faction implementation. 2015-09-21 00:23:07 -04:00
Zach c5ae312627 Adds FactionService 2015-09-21 00:22:44 -04:00
Zach 4828f2d2e6 Sets Pvp Flags on CharacterCreationService. 2015-09-21 00:22:24 -04:00
Zach ac52853dff Adds FactionService to GameManager. 2015-09-21 00:22:03 -04:00
Zach 4042d1a9e3 Updated TangibleObject according to Ziggy's repo. 2015-09-21 00:21:49 -04:00
Zach ebedf4a0a5 Updated CreatureObject to use PvpFlag. 2015-09-21 00:20:43 -04:00
Zach e9203a6085 Removed redundant declarations (Were moved) 2015-09-21 00:20:07 -04:00
Undercova edd0b9d182 Fixed spawner service to load all location entries properly 2015-09-21 05:09:17 +02:00
Obique PSWG 4509640507 Fixed Object IDs in buildouts being negative 2015-09-10 09:49:39 -05:00
Obique PSWG 439c98b29b Merged in M4SS/holocore/CORE-252_Spawners (pull request #67) 
Core 252 - spawners
 2015-09-10 08:55:43 -05:00
Mads Boddum ad7b5c0b9a Fixed an issue where a ResultSet in SpawnerService was never closed 2015-09-10 15:15:26 +02:00
Mads Boddum fbf0475950 Made the SQL query in SpawnerService a field in order to make the code easier to read 2015-09-10 13:32:15 +02:00
Mads Boddum 3c4ee47ee9 Fixed an issue where SpawnerService wouldn't terminate as intended if spawnerDatabase doesn't close succesfully 2015-09-10 13:29:27 +02:00
Mads Boddum 4110fd2039 Merge branch 'quality_assurance' of https://bitbucket.org/projectswg/holocore into CORE-252_Spawners 
Conflicts:
	serverdata/spawn/static.sdf
	src/services/spawn/SpawnerService.java
 2015-09-08 14:27:02 +02:00
Mads Boddum e956bd5412 Merged projectswg/holocore into quality_assurance 2015-09-08 14:22:11 +02:00
Mads Boddum 98abdda8a9 Shortened SQL query used in SpawnerService by using a wildcard 2015-09-08 14:18:12 +02:00
Mads Boddum d8224aac52 Spawners are now loaded via SDB instead of SDF 2015-09-08 14:06:05 +02:00
Mads Boddum 05997b5e74 Added a BUIO method for getting a CellObject by number 2015-09-05 14:24:17 +02:00
Mads Boddum 40fd994b88 Renamed loadEggs to loadSpawners in SpawnerService 2015-09-05 13:56:42 +02:00
Obique PSWG d07fbd557f Merged in Undercova/starting_locationssdb-created-online-wit-1439914741276 (pull request #63) 
Added new file for starting locations
 2015-09-03 08:03:10 -05:00
Obique PSWG ec4181d5e8 index.html overhal to make the login page look good - committing on behalf of tacef 2015-08-29 15:29:31 -05:00
Obique PSWG 1817f14258 Minor change to allow non-authed users to request images, css, and js for styling 2015-08-29 15:29:09 -05:00
Obique PSWG d210822c30 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2015-08-28 17:04:49 -05:00
Obique PSWG 3dfb07fcd3 Disables eggs by default 2015-08-28 17:04:38 -05:00
Undercova PSWG 6ea3b21b6c Merged Undercova/holocore into quality_assurance 2015-08-29 00:01:19 +02:00
Undercova PSWG cebb9e70a5 Changed current spawner iff to "Patrol Waypoint" for better visibility 2015-08-28 22:00:00 +00:00
Undercova PSWG 9a7e158318 Added spawners for all planets except Kashyyyk + Mustafar. Spawners inside buildings not included atm 2015-08-28 21:56:14 +00:00
Obique PSWG a43d3f9d86 Added in online player information to interface 2015-08-28 16:24:12 -05:00
Obique PSWG 418584e20a Fixed some FindBugs warnings in ObjectManager 2015-08-28 10:30:47 -05:00
Obique PSWG 8fbcfa38b5 Fixed bug where MD5'd pass doesn't work for webserver login 2015-08-28 03:36:37 -05:00
Obique PSWG 2a59b799bf Added in database authentication to access web interface 2015-08-28 03:32:59 -05:00
Obique PSWG 3e71418bf8 Added in CPU and Memory details to online graph, including for overall system 2015-08-27 17:03:49 -05:00
Obique PSWG 3b00470214 Fixed null session error when max connections is reached 2015-08-27 13:09:12 -05:00
Obique PSWG 9625d03860 Added sessions to the HttpServer 2015-08-27 12:51:22 -05:00
Obique PSWG 1eb4d0f265 Merge commit '6bc119d' into quality_assurance 2015-08-27 12:46:23 -05:00
Obique PSWG b8bdd7e1c8 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2015-08-27 12:45:45 -05:00
Obique PSWG 6bc119dbc1 Added additional constraints to nge.backup and changed user access_level to 'csr' 2015-08-27 12:43:47 -05:00
Obique PSWG d92220522a Merged in M4SS/holocore/CORE-252_Spawners (pull request #66) 
Spawners that are placed in the world should now have a building id of 0 instead of -1
 2015-08-27 12:06:38 -05:00
Mads Boddum be455bdfc9 Spawners that are placed in the world should now have a building id of 0 instead of -1 2015-08-27 19:04:34 +02:00
Undercova PSWG 0fe67ed0ed Merged in M4SS/holocore/CORE-252_Spawners (pull request #65) 
CORE-252 - Spawners
 2015-08-27 17:35:26 +02:00
Mads Boddum aabc55f15b Reduced space usage in SpawnerService 2015-08-27 01:40:38 +02:00
Mads Boddum fd50f9bb9b loadEggs in SpawnerService is now a private method 2015-08-27 01:39:10 +02:00
Mads Boddum 5d29903864 The loading of spawners now happens within initialization() of SpawnerService instead of in ObjectManager 2015-08-27 01:21:12 +02:00
Mads Boddum 65babac422 Added missing license headers to spawner-related classes and enums 2015-08-27 01:19:59 +02:00
Mads Boddum e158f30f3c Renamed the spawnEggService field in ObjectManager to spawnerService 2015-08-26 19:56:52 +02:00