projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-14 00:02:07 -04:00
Code Issues Projects Releases Wiki Activity
3,490 Commits 11 Branches 4 Tags
CreatureObjectRefactor
Commit Graph
3490 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Zing 156455bff9 Merge pull request #1164 from zingzing175/master 
Added blocked admin commands
 2014-08-16 03:46:56 -07:00
Zing cbcb28e00a Added blocked admin commands 2014-08-16 03:43:36 -07:00
Zing e5129e409e Merge branch 'master' of https://github.com/zingzing175/NGECore2 2014-08-15 23:03:25 -07:00
Zing 75765fa46b Merge pull request #11 from ProjectSWGCore/master 
pull
 2014-08-15 23:02:50 -07:00
Obique 36190aefe4 Merge branch 'experimental' 
Conflicts:
	src/resources/objects/waypoint/WaypointObject.java
 2014-08-16 00:59:18 -05:00
Zing 8173ecd585 Merge branch 'experimental' 2014-08-15 21:28:26 -07:00
Zing 3db958786c Merge pull request #10 from ProjectSWGCore/master 
pull
 2014-08-15 21:17:05 -07: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 a62a56c868 Changed setgodmode.py back to earlier version (accidental commit from 1st questservice commit) 2014-08-15 18:16:45 -04: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 d25286a3c7 Renamed kills in PlayerObject to killMeterPoints 2014-08-14 09:05:54 +02: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 a714ff14e3 Merge pull request #1158 from zingzing175/master 
Added /createCreature command.
 2014-08-13 23:29:24 -04:00
Zing 29c3777595 Added /createCreature command 2014-08-13 20:01:51 -07:00
Zing 8540512874 Merge pull request #9 from ProjectSWGCore/master 
pull
 2014-08-13 19:02:26 -07:00
Waverunner 49ca6ba648 Merge pull request #1157 from wallaceg09/Waypoints 
Waypoints
 2014-08-13 16:25:08 -04: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
wallaceg09 626c8a22cf FIXED Waypoints defaulting to (0,0,0) 
ADDED Comment noting a likely bug in the Engine code
 2014-08-13 14:10:10 -05:00
wallaceg09 a303a7fbe2 Revert "FIXED Waypoints defaulting to (0, 0, 0) ADDED Comment noting a likely bug in the Engine code" 
This reverts commit f75071e3b7.
 2014-08-13 13:54:10 -05:00
Glen f75071e3b7 FIXED Waypoints defaulting to (0, 0, 0) 
ADDED Comment noting a likely bug in the Engine code
 2014-08-13 13:45:39 -05:00
Waverunner c8c99fc7dd Changed login handler to set client's accessLevel 2014-08-13 09:18:24 -04:00
Ziggeh d01c0e8b70 Merge pull request #1155 from zingzing175/master 
Fixed Character builder terminal.
 2014-08-13 11:03:39 +02:00
Ziggeh 31d94b4ceb Removed debug print when using admin commands 2014-08-13 09:42:11 +02:00
Viaron 87beb92523 Changed /activateQuest System Message (cuz OCD) 2014-08-13 03:35:48 -04:00
Viaron dc63985862 Fixed activateQuest spelling error. 2014-08-13 03:28:26 -04:00
Viaron 9a03f31a11 Fixed activateQuest spelling error. 2014-08-13 03:27:18 -04:00
Viaron 09891ab85f Fixed activateQuest spelling error. 2014-08-13 03:26:24 -04:00
Zing 4fde3413c8 Fixed Character builder terminal. 2014-08-12 22:53:00 -07:00
Waverunner 1488d7a370 Merge pull request #1154 from zingzing175/master 
Fixed relogging after character has fully despawned. Changed /server admin command.
 2014-08-13 01:06:55 -04:00
Zing 16729913b1 Fixed relogging after character has fully despawned. Changed /server admin command 2014-08-12 21:35:51 -07:00
Zing c46df580d0 Merge pull request #8 from ProjectSWGCore/master 
pull
 2014-08-12 19:20:10 -07: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 8dfe4a55c9 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-12 14:10:29 -04:00
Waverunner 33ca09c595 Added updated engine 2014-08-12 14:10:14 -04:00
Zing 397d9672c0 Revert "Updated /server admin command." 
This reverts commit 5533fa52fa.
 2014-08-12 11:09:46 -07:00
tacef 14285fd169 Merge pull request #1152 from tacef/master 
Updated Standard Issued Clothing box
 2014-08-12 17:27:37 +02:00
tacef 537e634ee4 Added Customservertemplates for Wookie clothings 
Updated Standard Issued Equipment box to not throw an exception and use
all wookiee scripts
 2014-08-12 17:19:29 +02:00
tacef ba9d9b90d7 Added Customservertemplates for Ithorian clothings 
Changed Standard Issued Equipment Box to use Ithorian
Customservertemplates
Fixed Exception cause by the Standard issued Equipment box
 2014-08-12 15:29:15 +02:00
Ziggeh 0fa8faa675 Fixed an issue where non-admins could use admin commands 2014-08-12 14:34:46 +02:00
tacef 14d216c2d1 Merge pull request #1149 from tacef/master 
Changed Standard Issued Equipment Box
 2014-08-12 11:37:25 +02:00
tacef cfed90da60 Changed Standard Issued Equipment Box 
It will now check for Ithorians and Wookiees.
TODO: Customscripts
 2014-08-12 11:36:19 +02:00