projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-15 05:13:14 -04:00
Code Issues Projects Releases Wiki Activity
3,569 Commits 11 Branches 4 Tags
8c0f7fcb52bb5ee5514a2ff388105efd77308f0f
Commit Graph
1645 Commits
Author SHA1 Message Date
CharonInferar 8c0f7fcb52 Fixed Incap weaken immortality bug 2014-08-24 03:13:08 +02:00
Waverunner 1c49296287 Added quest events, Added goTo task types, Changed activation of next steps to go through completeActiveTask 2014-08-23 16:44:23 -04:00
Waverunner 409c6b4ab0 Added waypoints to retrieve item tasks 2014-08-22 16:08:53 -04:00
Treeku eaf6e7511c Minor addition to last commit. 2014-08-21 21:15:40 +01:00
Treeku 3d1f244f4d See extended... 
- Fixed minor issue where bufferId was being set to the buffeeId.
 2014-08-21 18:27:06 +01: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
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 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
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
Obique 36190aefe4 Merge branch 'experimental' 
Conflicts:
	src/resources/objects/waypoint/WaypointObject.java
 2014-08-16 00:59:18 -05:00
Viaron dbec5fd321 Merge pull request #1161 from zingzing175/master 
Added getStationName admin command.
 2014-08-15 23:36:03 -04:00
Zing cbe7372c95 Added getStationName admin command. 2014-08-15 20:03:46 -07:00
Waverunner 5cf7367e61 Fixed buildouts besides buildings and their children not being added to quadtree 
Fixed some bugs with retrieving quest items
Changed quest service's next task method to temporarily not auto-advance
to next quest if it's defined - will be re-enabled when most of task
types are done
Changed buildout objects to load server templates (unsure why they were
not loaded before)
Fixed SpawnPoint odb save error
 2014-08-15 18:04:47 -04:00
Waverunner ffbe209207 Added handling of retrieve item quests, Added handling of giving quest rewards 
Note: All changes may not be listed! Please view changes to get a better
idea, lots of changes compared to what I had before!
Changed ShowLootBox to use object id's instead of SWGObject
Added "A Speeder For Me" quest
Fixed quests so they advance to the next step properly and complete
properly
 2014-08-15 11:34:58 -04:00
Ziggeh 7650b6dcb4 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-14 07:18:54 +02:00
Ziggeh b88a399e54 Added isFatal boolean to ErrorMessage 
Last unknown in ErrorMessage was a boolean for fatality.
 2014-08-14 07:18:41 +02:00
Waverunner da568bac1d Changed quest data to retrieve info from Datatables, Added basis for automation of QuestTask's 
Fixed /waypoint method for getting planet crc's
Fixed quest crc's for quest scripts in children folders
Fixed some admin commands not being executed (no longer case sensitive)
Changed accessLevel to be gotten from database until ready to switch to
client
 2014-08-13 16:21:51 -04:00
Waverunner c8c99fc7dd Changed login handler to set client's accessLevel 2014-08-13 09:18:24 -04:00
Ziggeh 31d94b4ceb Removed debug print when using admin commands 2014-08-13 09:42:11 +02:00
tacef e3335cbd40 Added Entertainermissions 2014-08-13 09:03:11 +02:00
Waverunner b581118ad3 Added implementation of parsing data from quest files 
Added methods for checking if a quest is completed and if they have a
quest.
Updated SWGList to account for the special format of Quest list deltas.
Added method that shows a quest in a window
 2014-08-12 19:03:19 -04:00
Waverunner 3fb52e2422 Merge pull request #1151 from tacef/EntertainerMissions 
Entertainer missions
 2014-08-12 10:54:37 -04:00
Ziggeh 0fa8faa675 Fixed an issue where non-admins could use admin commands 2014-08-12 14:34:46 +02:00
Ziggeh cacd6292cf Added specialLine scripts 
This will greatly reduce the amount of duplicate combat command scripts.
 2014-08-12 10:05:10 +02:00
Ziggeh 5f4f3d1132 Added specialLine field to CombatCommand 2014-08-12 10:04:36 +02:00
Obique 14ab6f13b0 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-12 00:02:20 -05:00