Commit Graph
2158 Commits
Author SHA1 Message Date
Nathan 81792bd135 More Creature Name Fixes 2014-05-21 13:22:00 -04:00
Nathan befd2594e6 Fixed Talus Legacy Brood Arachne 2014-05-21 12:40:05 -04:00
Nathan e5d0a9fa9f Small Name Changes/Tweaks 2014-05-21 11:49:53 -04:00
Nathan f165511c47 Added Remaining Talus Animals 2014-05-21 10:22:13 -04:00
Nathan 9d6e255e7e Merge branch 'master' of https://github.com/Tipho/NGECore2 2014-05-20 21:11:55 -04:00
Tipho 4f09514870 Began Work on Talus Animals 2014-05-20 20:38:00 -04:00
Tipho 4a923aa2da Small Fix 2014-05-20 15:47:43 -04:00
Tipho be407331ba Merge pull request #2 from ProjectSWGCore/master
Merge
2014-05-20 15:09:58 -04:00
Tipho 9bfe54fbd0 Deleted Duplicates 2014-05-20 15:09:20 -04:00
Tipho 67bd596854 Added Remaining Endor Animals, Fixed Small Bugs 2014-05-20 13:14:02 -04:00
CharonInferar f97ecc58d2 Merge pull request #686 from CharonInferar/DantooineSpawns
Dantooine planetary mob and NPC spawns added
2014-05-20 18:49:10 +02:00
CharonInferar 9b0986521e Edits to some mobiles
Corrections
2014-05-20 18:40:57 +02:00
Tipho b629bd57ef Merge pull request #1 from ProjectSWGCore/master
Merge
2014-05-19 15:59:50 -04:00
Treeku 4d1f484fdc Merge pull request #682 from tacef/master
Fixed Filenameerror
2014-05-19 20:36:39 +01:00
Treeku 4109cf5c6d Fixed illegal argument exception in SWGSet 2014-05-19 20:34:18 +01:00
tacef 8f0a9861f6 Continued Work on Factional NPC scripts
Updated Restuss hand with Optionbitmask
2014-05-19 21:20:30 +02:00
Tipho 6d64a82d74 Small Changes and Added Most Endor Animals 2014-05-19 15:10:38 -04:00
tacef 1b03c4ea1f Merge pull request #4 from ProjectSWGCore/master
Update local fork
2014-05-19 20:01:53 +02:00
tacef 43324cf4fa Fixed Filename error with Probotdrone 2014-05-19 20:00:50 +02:00
Treeku ff220a116e Merge pull request #681 from tacef/master
Fixed Error in MobileTemplate factionStatus
2014-05-19 18:57:55 +01:00
tacef 8592841b35 Fixed Error in MobileTemplate factionStatus 2014-05-19 19:56:52 +02:00
Treeku a10fb20373 Merge pull request #680 from tacef/master
Started work on Factional NPC's
2014-05-19 18:50:37 +01:00
tacef d470489ad8 More work on Faction NPC's 2014-05-19 19:31:40 +02:00
Tipho 37637da689 Added more creatures pt. 3 2014-05-19 11:53:59 -04:00
Treeku a8aaae692b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/resources/objects/player/PlayerObject.java
2014-05-19 16:37:27 +01:00
Treeku b1650cc668 Minor changes
Not sure why the gcw time is always 888d, 33h ahead.  The epoch time is
definitely sent correct in seconds.  Adding and subtracting server
times, born date or anything else hasn't had an effect.
2014-05-19 16:32:54 +01:00
Treeku 1e864be3f1 Added gcw award for pvp 2014-05-19 16:28:14 +01:00
Tipho 9d0cf6ef68 Fixed File Names 2014-05-19 11:04:56 -04:00
CharonInferar ac1128b00d Merge remote-tracking branch 'origin/master' into DantooineSpawns 2014-05-19 15:57:26 +02:00
CharonInferar 16f82b50a6 Dantooine-wide spawns added with Planetary Spawn Tool
Considering the combat level ranges from live, the planet's surface has
been covered with spawn areas for various mobs and NPCs. A small as
possible count of collidables was used to save server resources while
still being able to realize the spawns.
2014-05-19 15:52:57 +02:00
Tipho 48ca808e4c Added more creatures pt. 2 2014-05-18 23:15:56 -04:00
Tipho e0708bd357 Added more creatures 2014-05-18 21:54:45 -04:00
Treeku 7a94d4438b Fixed type error 2014-05-18 21:40:48 +01:00
Treeku 8e5c7afaa6 Changed nextUpdateTime calculations 2014-05-18 20:59:51 +01:00
Treeku efeb66f965 Fixed potential crash 2014-05-18 20:16:39 +01:00
Treeku 43a609f9df Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-18 20:03:27 +01:00
Treeku 4c643a4cb6 Updated engine 2014-05-18 19:58:20 +01:00
tacef 48e721f831 Continued Work on Factional NPC scripts 2014-05-18 20:32:16 +02:00
Treeku eddcf01202 Implemented gcwPoints and gcwRanks 2014-05-18 19:07:13 +01:00
Treeku 54a00a45cf Refactored PLAY 2014-05-18 19:04:23 +01:00
tacef ef4e73e24e Started work on Factional NPC's
Added setFaction and setFactionStatus to Mobiletemplate
2014-05-18 18:08:49 +02:00
tacef 25ab7d3abe Merge pull request #3 from ProjectSWGCore/master
gdxg
2014-05-18 10:51:15 +02:00
Tipho 69fe632df5 Fixed some Talus, Naboo, Rori, Corellia Creature scripts 2014-05-17 20:28:24 -04:00
Light b3ae56e37d Added Group Kick command 2014-05-18 01:09:38 +02:00
Light 682e04da5d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-18 00:42:01 +02:00
Light c990690726 Implemented PvP Zones 2014-05-18 00:40:45 +02:00
Waverunner a92a3675b2 Merge pull request #678 from Ziggeh/master
Buffs - add() and remove() no longer used
2014-05-17 18:03:23 -04:00
Treeku 8bca0d625d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-17 22:15:55 +01:00
Treeku 28ccc21d10 Fixed some nulls that can occur locally 2014-05-17 22:01:33 +01:00
tacef ec91b5c33f Merge pull request #2 from ProjectSWGCore/master
merge
2014-05-17 20:11:06 +02:00