projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-17 07:02:53 -04:00
Code Issues Projects Releases Wiki Activity
3,557 Commits 11 Branches 4 Tags
9718715a17466fc40ef3bd4b322be209d889f59f
Commit Graph
1934 Commits
Author SHA1 Message Date
Matt Parnell 9718715a17 comment on issue with reserved name filter - it just doesn't work. 2014-08-18 22:47:47 -05:00
Matt Parnell 4ba5303b24 autoformat the Forager.java file as it was a little difficult to read 2014-08-18 22:32:26 -05:00
Matt Parnell b6fb961c70 tag TODO on a Forager item - where buffs affect the forage 2014-08-18 22:28:33 -05:00
Matt Parnell 952d57afeb convert multiple if/else if statements into switch for buff category on BuffBuilder.java 2014-08-18 22:27:12 -05:00
Matt Parnell a54707307f this is the actual merge of the two if statements - autoformat happened on the first 2014-08-18 22:21:55 -05:00
Matt Parnell 38474bee35 merge nested if statements with no elses in Buff.java 2014-08-18 22:19:32 -05:00
Matt Parnell 23a0dd4e60 autoformat unittest.java 2014-08-18 22:11:39 -05:00
Matt Parnell c5331c063d clean up formatting on message.java 2014-08-18 22:11:13 -05:00
Matt Parnell 49a0279a54 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/main/NGECore.java
 2014-08-18 22:02:19 -05:00
Viaron 0498aceb0e Merge pull request #1179 from zingzing175/master 
Fixed Some Admin commands not working on file systems other than windows. Added blocks to admin commands with godLevel of 0.
 2014-08-17 21:34:42 -04:00
CharonInferar 557764bc50 Merge pull request #1180 from CharonInferar/Fixes2 
Fixed AI-consideration in command service
 2014-08-17 14:39:32 +02:00
CharonInferar cb6bbe37ea Removed debug messages 2014-08-17 14:35:17 +02:00
Waverunner ae9126ad75 Merge pull request #1178 from ProjectSWGCore/TacefEntertainer 
Entertainermissions
 2014-08-17 07:59:23 -04:00
CharonInferar 400a72eb7c Merge remote-tracking branch 'origin/master' into Fixes2 2014-08-17 13:30:28 +02:00
CharonInferar a52d01652c Fixed broken command service 2014-08-17 13:28:23 +02:00
Zing 6de085b3da Fixed Admin commands part2 2014-08-17 01:18:34 -07:00
tacef f34a950b29 Merge pull request #1177 from tacef/EntertainerMissions 
Fixed some minor things in EntertainerMissionsObjective
 2014-08-17 09:09:36 +02:00
tacef 745ee6d2eb Fixed some minor things in EntertainerMissionsObjective 2014-08-17 09:08:44 +02:00
tacef f2f4a7e1a6 Merge pull request #1176 from tacef/EntertainerMissions 
Changed EntertainerMissionObjective
 2014-08-17 08:37:06 +02:00
tacef 41406703b1 Changed EntertainerMissionObjective 2014-08-17 08:36:01 +02:00
Matt Parnell 1a8ad79083 forgot to turn this into a string 2014-08-17 01:01:34 -05:00
Matt Parnell a57120f7ce replace the call to cleanupCreatureODB in the start function, though it is now in the cleanup function as well..also added comment that will help in speeding it up sometime (TODO) 2014-08-17 00:43:54 -05:00
Matt Parnell 42bfacb76d move creature cleanup to the cleanUp() function 2014-08-16 23:36:19 -05:00
Matt Parnell 0543b60bb1 change the order and formatting of NGECore.java to make it more readable and logically sensible 2014-08-16 23:35:23 -05:00
Matt Parnell 82dacdba89 forgot to remove a variable 2014-08-16 22:41:16 -05:00
Matt Parnell 4a0614217a remove an unnecessary loop in the cleanupCreatureODB function 2014-08-16 22:40:48 -05:00
Waverunner dcb9ee561c Removed canceling of postZoneIn threads for null obis temporarily 
Possible that creature object / session / client is null at some parts
 2014-08-16 23:27:35 -04:00
Waverunner 810a80cc24 Forgot to add this - part of previous commit 2014-08-16 23:15:07 -04:00
Waverunner 40ea74e03d Changed postZoneIn scheduleList to a Map and added null checks 2014-08-16 23:11:21 -04:00
Waverunner b7280cd138 Removed console print spam 2014-08-16 22:51:45 -04:00
Waverunner 02e9ddd3a5 Fixed attribute names 2014-08-16 22:37:32 -04:00
Waverunner f5bfb50e51 Merge pull request #1172 from ProjectSWGCore/CreatureObjectRefactor 
Creature object refactor
 2014-08-16 22:21:15 -04:00
Treeku 231a476441 Fixed some merge issues with creature refactor. 2014-08-16 23:02:01 +01:00
Treeku e5d4a633bf Merge remote-tracking branch 'origin/master' into CreatureObjectRefactor 
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
	src/services/PlayerService.java
	src/services/ai/AIActor.java
	src/services/ai/states/AttackState.java
 2014-08-16 22:19:19 +01:00
Obique 00413a1157 Merge pull request #1170 from Obique/master 
Fixed crashing bug related to teleporting
 2014-08-16 15:22:25 -05:00
CharonInferar d13afe6489 Merge pull request #1169 from CharonInferar/Fixes 
Fixed KBT #65, 182 and AI-related commandService bug
 2014-08-16 21:48:07 +02:00
CharonInferar 09cce93f8a Reset goon spawn 2014-08-16 21:46:35 +02:00
Waverunner abdb1c9373 Merge pull request #1168 from zingzing175/master 
Added (re added) access level print
 2014-08-16 15:45:57 -04:00
Zing 9add8a6862 Added (re added) access level print 
enabled for a test to make sure server is reading DB and accesslevels
folder correctly
 2014-08-16 12:44:26 -07:00
CharonInferar e61ced824b Merge remote-tracking branch 'origin/master' into Fixes 2014-08-16 21:41:55 +02:00
CharonInferar 1c676d8ddd Fixed KBT #65, 182 and AI-related commandService bug 2014-08-16 21:39:26 +02:00
Treeku 0175a6716e Refactored CreatureObject 2014-08-16 20:35:06 +01:00
Waverunner 9f1e473984 Added sound when completing a quest 
Fixed error when completing a quest
Removed some debug code
 2014-08-16 15:30:30 -04:00
Obique 912be980fa Changed CharacterService to reset CmdSceneReady to verify it is always false before zoning in 2014-08-16 14:20:35 -05:00
Obique 88056a0714 Added additional logging to determine what could go wrong with re-loading characters 2014-08-16 14:19:55 -05:00
Waverunner 01fa5ccbf7 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-16 11:42:31 -04:00
Waverunner d33d5adbf2 Changed QuestJournal to use SWGMap, Added counter to retrieve_item task types 2014-08-16 11:42:11 -04:00
tacef f7aa9d5166 Merge pull request #1167 from tacef/EntertainerMissions 
Entertainer missions
 2014-08-16 16:12:09 +02:00
tacef 1fe8e1409b Changed Entertainermissions 
They now check for distance to waypoint, if player is performing, in our
case dancing, and have a hardcoded 10 minutes timer.

Entertainermissions now have payout after 10 minutes.
TODO: test if crash, make the endlocation a Cantina or theater
 2014-08-16 16:08:08 +02:00
Zing cbcb28e00a Added blocked admin commands 2014-08-16 03:43:36 -07:00