Commit Graph
6324 Commits
Author SHA1 Message Date
Mads Boddum d944379988 Merged projectswg/holocore into quality_assurance 2015-10-29 14:58:17 +01:00
Obique PSWG 3113209e75 Merged in M4SS/holocore/CORE-137-travel (pull request #79)
CORE-137 'Travel'
2015-10-29 08:50:32 -05:00
Obique PSWG 0bffdf63a8 Fixed two decode methods in SceneCreateObjectByCrc and CmdStartScene 2015-10-28 23:27:54 -05:00
Obique PSWG 8848284c34 Fixed and implemented the OfflineServersMessage 2015-10-28 22:38:15 -05:00
Obique PSWG 796eecc63c Merged in cdmpse/holocore/error_on_first_load (pull request #94)
Prevent concurrent modification error when cfg files need to be generated
2015-10-28 22:06:01 -05:00
cdmpse 53a451c468 Prevent concurrent modification error when cfg files need to be generated 2015-10-28 20:05:33 -05:00
Mads Boddum f42afce6bf Merged quality_assurance into CORE-262 2015-10-25 10:16:01 +01:00
Mads Boddum a5d6a87190 Merged projectswg/holocore into quality_assurance 2015-10-25 10:15:31 +01:00
Mads Boddum 862b8a33f9 Removed debug print in PlanetTravelPointListResponse 2015-10-25 10:00:29 +01:00
Mads Boddum 4dd101f902 Added a standard additional ticket cost. Algorithm is currently missing. 2015-10-25 09:43:22 +01:00
Mads Boddum 6ce9d56911 Fixed an issue with some terrains containing non-functional shuttles 2015-10-25 09:23:16 +01:00
Mads Boddum b11704ac73 Implemented a configurable factor which impacts travel ticket prices 2015-10-25 09:22:11 +01:00
Mads Boddum d8afee0c35 Merge branch 'quality_assurance' of https://bitbucket.org/projectswg/holocore into CORE-137-travel
Conflicts:
	src/resources/objects/SWGObject.java
	src/resources/objects/creature/CreatureObject.java
	src/utilities/IntentFactory.java
2015-10-25 08:14:34 +01:00
Mads Boddum 7107e436c6 Potential fix for non-player posture updates 2015-10-25 08:11:28 +01:00
Obique PSWG c8948265d2 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2015-10-22 15:51:17 -05:00
Obique PSWG 5152ca3b6e Added addArray function to Packet 2015-10-22 15:50:58 -05:00
Obique PSWG bf8ec4c48d Merged in tacef/holocore (pull request #92)
Moved Player Count to a seperate Method
2015-10-22 13:47:24 -05:00
Tacef Ine 069438d5e0 Updated returning String of getOnlinePlayerCount() 2015-10-22 17:56:39 +02:00
Tacef Ine 2fa6ae8be7 Removed unneeded <br /> 2015-10-22 17:48:48 +02:00
Tacef Ine 9cc59f01f5 Updated the getOnlinePlayerCount() method to be more readable. 2015-10-22 17:42:28 +02:00
cdmpse 3847c368b7 Add client radial options to server radial options 2015-10-22 09:54:54 -05:00
Tacef Ine 6795ba6a52 Fixed some typos in previous PR 2015-10-22 16:53:49 +02:00
Tacef Ine 51687ac40b Moved Player Count to a seperate Method
Changed getOnlinePlayerData to be Tables only.
2015-10-22 15:47:31 +02:00
Obique PSWG 6429c98208 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2015-10-22 08:45:53 -05:00
Obique PSWG 045b25f354 Added output for when web server is online 2015-10-22 08:44:50 -05:00
Obique PSWG 44d4b09938 Merged in tacef/holocore (pull request #91)
Redid the Server Management Interface
2015-10-22 08:39:53 -05:00
Tacef Ine 85c9736e2d Redid the Server Management Interface 2015-10-22 15:35:22 +02:00
Obique PSWG 9698703790 Fixed some weird code syntax in CellObject to fit standard 2015-10-21 08:27:40 -05:00
Obique PSWG 839ba66ac6 Grabs slightly more information from baseline packet - primarily for debugging 2015-10-20 23:58:32 -05:00
Obique PSWG 832e9442e2 Merged in cdmpse/holocore (pull request #87)
Added Animation object controller and allow SDB with trailing blanks
2015-10-18 14:23:47 -05:00
Obique PSWG b7db34765c Added ProjectSWG's galactic time function 2015-10-17 11:04:11 -05:00
Obique PSWG f1e8183a93 Fixed CmdStartScene usage in ZoneManager 2015-10-17 10:55:47 -05:00
Obique PSWG ef24afe59f Fixed packet structs for CmdStartScene and AttributeListMessage 2015-10-17 10:52:48 -05:00
cdmpse f6a0e9845f Added Animation object controller and allow SDB with trailing blanks 2015-10-17 10:17:40 -05:00
Obique PSWG 3627a907dd Removed unnecessary code for awareness from ObjectManager 2015-10-17 09:57:28 -05:00
Obique PSWG f338d99314 Fixed missing buildouts issue. Now loads all 118113 of them 2015-10-17 09:56:08 -05:00
Obique PSWG 6b7a746199 Fixed some transient variable errors as well as ODB loading etiquette 2015-10-13 22:11:58 -05:00
Obique PSWG b16136c12d Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2015-10-13 16:15:04 -05:00
Obique PSWG f0be95a939 Fixed commit errors in EnvironmentService 2015-10-13 16:14:40 -05:00
Waverunner 72dc61b730 Fixed compile errors from merge 2015-10-13 10:02:35 -04:00
Waverunner 71e7f12e5c Removed debug code in CommandService 2015-10-13 09:40:53 -04:00
Waverunner 1d4516b68c Merge branch 'groups_wip' into quality_assurance 2015-10-13 09:36:55 -04:00
Waverunner 4c1b895298 Added core grouping system for CORE-111 - Groups are now implemented 2015-10-13 09:35:18 -04:00
Obique PSWG 128a63cf3f Added specific checks username/password in LoginService ... and apparently also renaming a file. Thanks git 2015-10-12 21:45:22 -05:00
Obique PSWG 6b6acc9b24 Also added CORE-227 to OnlineInterfaceService 2015-10-12 00:02:12 -05:00
Obique PSWG 37c626e6e1 Implemented CORE-226 'Server is now more lenient towards usernames' 2015-10-12 00:01:01 -05:00
Obique PSWG ea4882f6ef Fixed error log and added radial template filtering to TerminalService 2015-10-11 23:50:14 -05:00
Obique PSWG c0d931ac40 Minor grammar change to error output 2015-10-11 23:48:28 -05:00
Obique PSWG 319d59e3cd Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2015-10-11 23:45:45 -05:00
Obique PSWG 8fae00110b Made SDB imports more resilient, to push through invalid records 2015-10-11 23:45:18 -05:00