projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01:15:57 -04:00
Code Issues Projects Releases Wiki Activity
3,513 Commits 11 Branches 4 Tags
400a72eb7c2ed3e0dcd4895e63be9dbe9d4d26c0
Commit Graph
3513 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 51f38abfc3 Merge pull request #1173 from Undercova/master 
Merge
 2014-08-16 22:38:46 -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
Bronco69 22d7fdadbf Removed wrong mobile template file name 2014-08-17 00:24:22 +02:00
Bronco69 fe90f8a21b Fixed KBT #165 and #185 
Fixed
 2014-08-17 00:23:06 +02: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
Obique 0a902ebe52 Updated the engine again 2014-08-16 15:00:29 -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
CharonInferar 5609e18d40 restored empty setgod 2014-08-16 21:44:32 +02: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
Obique b3a4342173 Updated engine 2014-08-16 14:40:40 -05: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
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