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
3,327 Commits 16 Branches 86 Tags
69d25d9990cd4e9d34667dfd31f6d9734a4be7b0
Commit Graph
3327 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Obique PSWG 69d25d9990 Added sending of chat rooms for every enter room to avoid client errors 2017-04-11 08:18:29 -05:00
Obique PSWG 63cdb9d7dc Removed unused import in MapManager 2017-04-11 08:18:17 -05:00
Obique PSWG e7dfb42a3d Removed serialization from ChatRoom 2017-04-11 08:18:07 -05:00
Obique PSWG db652d6ce8 Additional syntax based refactoring to CommandService 2017-04-11 08:16:02 -05:00
Obique PSWG 499eaf16f0 Merge branch 'quality_assurance' of bitbucket.org:projectswg/holocore into quality_assurance 
Conflicts:
	src/resources/objects/player/PlayerObject.java
	src/services/collections/CollectionBadgeManager.java
	src/services/collections/CollectionService.java
	src/services/commands/BuffService.java
	src/services/commands/CommandService.java
 2017-04-06 21:31:23 -05:00
Eric Frechette 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
Gene Pressinger 2ebd878aa1 Merged in Iosnowore/holocore (pull request #436) 
Fixed JIRA bug NGE-563
 2017-04-07 00:36:49 +00: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 479099b8df Merge branch 'quality_assurance' of https://bitbucket.org/Iosnowore/holocore into quality_assurance 2017-04-06 17:23:15 -07:00
Iosnowore 52dda3b2c6 Reverted Eclipse auto indent 2017-04-06 17:22:41 -07:00
Gene Pressinger 971dc7eef0 Merged projectswg/holocore into quality_assurance 2017-04-06 20:16:07 -04:00
Iosnowore dc91fdcac9 Fixed JIRA bug NGE-563 
https://projectswg.atlassian.net/browse/NGE-563
 2017-04-06 17:15:08 -07:00
Gene Pressinger f51ed2119a Merged in Iosnowore/holocore (pull request #419) 
Added duel and endduel commands
 2017-04-07 00:13:59 +00: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
Obique PSWG 1a82508cb4 Removed some debug logging 2017-04-06 12:31:36 -05:00
Obique PSWG 6f552b9151 Improved the memory efficiency of the object creation classes 2017-04-06 12:29:33 -05:00
Obique PSWG a2fdd957a3 Did a basic memory-based refactor to SpawnerService 2017-04-06 12:29:16 -05: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
Obique PSWG ea0231710e Initial refactor of CommandService 2017-04-05 18:17:16 -05:00
Obique PSWG 7b865028c6 Fixed issue where main thread would be "interrupted" every time the loop ran 2017-04-05 18:16:52 -05:00
Iosnowore 0561178bb2 Forgot to change these 2017-04-05 13:38:53 -07:00
Obique PSWG bcf6b306d3 Massive refactor to start using lib/PSWGCommon.jar 2017-04-05 13:51:19 -05: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
Obique PSWG 8bc071897c Second iteration of the chat refactor 2017-04-04 21:54:10 -05: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 b7109309fc Removed AUTOINCREMENT attribute of players.id 2017-04-04 18:06:42 -05: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 PSWG ebc1360d44 Merged in Undercova/holocore (pull request #435) 
Content update
 2017-04-04 16:21:47 +00:00
Undercova 969d3eac04 Added remaining files to last commit 2017-04-04 07:30:41 +02:00
Undercova 6cfe61a3c7 Renamed creature database and all related files/entries to npc 
Removed old loot files
Renamed several database sdbs
 2017-04-04 07:29:53 +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 6909cf0d59 Removed extra indent 2017-04-02 14:12:10 -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