Commit Graph
2335 Commits
Author SHA1 Message Date
Undercova PSWG ab50c27064 Adjusted height coordinate for Kashyyyk frogs 2017-04-26 04:00:30 +00:00
Undercova PSWG aba0eb5580 Added frogs to Etyyy, Kachirho and Kkowir forest travel locations spots 2017-04-26 03:58:54 +00:00
Undercova PSWG 056e492601 Added numerous frogs to the galaxy 2017-04-24 03:28:12 +00:00
Eric FrechetteandObique PSWG 902348675f Merged in Frechetta/holocore (pull request #434)
Fixed issues where buffs did not expire on NPCs and "Time Played" showed incorrect values.
2017-04-07 02:23:18 +00:00
Eric Frechette 87332bb7bb Changed PlayerObject.setStartPlayTime to PlayerObject.initStartPlayTime and moved all logic inside. 2017-04-06 19:19:45 -07:00
Iosnowore 8751f6f8e5 Autoindent fix 2017-04-06 17:28:07 -07:00
Iosnowore da999be330 Minor cleanup 2017-04-06 17:27:27 -07:00
Iosnowore 52dda3b2c6 Reverted Eclipse auto indent 2017-04-06 17:22:41 -07:00
Iosnowore dc91fdcac9 Fixed JIRA bug NGE-563
https://projectswg.atlassian.net/browse/NGE-563
2017-04-06 17:15:08 -07:00
Iosnowore e6bf6cbf9f Removed indentation 2017-04-06 17:13:14 -07:00
Iosnowore 19165a78c7 More changes 2017-04-06 17:12:11 -07:00
Iosnowore a427e81cd5 Changed some things that Obique commented on 2017-04-06 17:04:50 -07:00
Iosnowore 69d5bcb3cd DeveloperService update 2017-04-06 15:35:40 -07:00
Eric Frechette e0efae4dcf NPC buffs now display correct duration on client by using galactic time. Time played is fixed, calculating the time passed since the last time it's been calculated, and adds it to the old playTime. 2017-04-05 20:52:24 -07:00
Iosnowore 0561178bb2 Forgot to change these 2017-04-05 13:38:53 -07:00
Gene Pressinger 311a3c3414 Removed identical function 2017-04-05 15:53:07 +00:00
Eric Frechette 7be7e2717b Removed updateBuffEndTime functionality; put monitored.remove and monitored.add calls into separate methods. 2017-04-04 20:23:27 -07:00
Eric Frechette fce7c5a91a Merged projectswg/holocore into quality_assurance 2017-04-04 20:19:15 -07:00
Iosnowore bc1112650c Dueling implementation now only requires one list of CreatureObjects (instead of two) 2017-04-04 19:17:16 -07:00
Gene Pressinger c6fbabf0e1 Merged projectswg/holocore into quality_assurance 2017-04-04 19:23:06 -04:00
Obique PSWG adee72e309 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 2017-04-04 18:05:20 -05:00
Gene Pressinger 658dd938d5 Merged projectswg/holocore into quality_assurance 2017-04-04 17:47:20 -04:00
Iosnowore 77231fa85c Changed PR based on Oblique's comments.
Also Added .db-journal to git ignore (file created by a 3d party SQLite GUI program)
2017-04-04 14:01:55 -07:00
Undercova 969d3eac04 Added remaining files to last commit 2017-04-04 07:30:41 +02:00
Iosnowore d872ac4c87 Removed unused imports 2017-04-02 17:55:47 -07:00
Iosnowore a376093ddc Changed List to ArrayList 2017-04-02 17:51:20 -07:00
Iosnowore 00d14d2b9e Really isn't a reason to just not use an ArrayList 2017-04-02 17:49:31 -07:00
Iosnowore 2fea3a2f18 Players are no longer in combat when duel is ended 2017-04-02 17:03:28 -07:00
Iosnowore 86517381c5 Players are now attackable when dueling 2017-04-02 16:47:59 -07:00
Iosnowore 6683912383 Fixed a bug when player who sent a duel tried to end when the duel was active. 2017-04-02 16:15:29 -07:00
Iosnowore 8b37165ec9 Removed unused import 2017-04-02 14:37:41 -07:00
Iosnowore 42f24d8ee4 Moved duel checks from DuelPlayerService to their script. 2017-04-02 14:10:02 -07:00
Iosnowore 38634ab65f Removed useless function 2017-04-02 13:38:58 -07:00
Iosnowore cfc6398956 Players are now enemies if they're in a duel. 2017-04-02 13:33:54 -07:00
Eric Frechette d849d736a4 Cleanup. Fixed time issue. 2017-04-02 13:27:43 -07:00
Iosnowore 615d81f9fd Redid dueling..
- Dueling now handles multiple duels between multiple players
- Fixed some other minor bugs involving duel requesting/recieving
2017-04-02 13:20:58 -07:00
Eric Frechette 6ea678c820 Removed logging calls 2017-04-02 13:18:58 -07:00
Eric Frechette 3cda0b55e2 Put monitored.add call in a synchronized block to ensure thread safety. 2017-04-02 13:16:05 -07:00
Eric Frechette 6b26bfe638 Fixed issue where buffs do not expire on NPCs. They were not being added to the monitored list. Now any creature object that gets buffed is added to the monitored list, and is removed when it has zero non-infinite buffs. Also fixed an issue where a buff timer would keep running after a player logged out. Now, when a player logs back in, all of his buffs' endTimes are increased by the time the player was logged out. 2017-04-02 13:05:01 -07:00
Iosnowore e742886133 Removed this from last commit because of merge conflict 2017-04-02 08:14:28 -07:00
Iosnowore f437832891 Fork update 2017-04-02 08:08:54 -07:00
Obique PSWG 3fb956b33b Basic intro to a refactor in ChatRoomService 2017-03-29 01:20:54 -05:00
Obique PSWG ab5b3c334d Changed table characters to players in EngineManager 2017-03-28 14:50:35 -05:00
Obique PSWG 5d419a80a1 Fixed exception when requesting the row count of players 2017-03-27 07:32:30 -05:00
Obique PSWG 8432ecd5b1 Removed all dependencies on postgres 2017-03-26 22:58:58 -05:00
Obique PSWG 5035c655d2 Added cleanup to the sqlite databases used in LoginService and CharacterCreationService 2017-03-26 22:53:56 -05:00
Obique PSWG b713a04a76 Small whitespace change to trigger update 2017-03-26 22:43:42 -05:00
Obique PSWG b271c77e65 Random Log update to trigger build 2017-03-26 22:36:12 -05:00
Obique PSWG 796a96a798 Changed CharacterCreationService to use sqlite for characters/players 2017-03-26 22:30:31 -05:00
Obique PSWG 438b908b8a Changed LoginService to use sqlite 2017-03-26 22:26:53 -05:00