Commit Graph
3251 Commits
Author SHA1 Message Date
CharonInferar 560df308de Revert "Fix of Rifle bug part1"
This reverts commit e79d1ad9d0.
2014-08-09 01:35:47 +02:00
CharonInferar e79d1ad9d0 Fix of Rifle bug part1 2014-08-09 01:33:01 +02:00
Waverunner 92a207056f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/resources/objects/creature/CreatureObject.java
2014-08-08 10:05:09 -04:00
Waverunner 3003a3b62e Fixed wrong SWG collection type for Skills and added missing params causing a crash 2014-08-08 10:02:48 -04:00
Waverunner 327a794044 Merge pull request #1110 from zingzing175/master
Fxied GCW Rank commands not being rewarded, Fixed GCW rank armor stats. Reverted commit d9ca531 (causes crash on zone in) Added /server admin command needs.
2014-08-08 10:01:32 -04:00
Zing dff394c077 Configured /server admin command for server related needs.
Added initiateStop to NGECore.
2014-08-07 23:49:20 -07:00
Zing 04f41a0f41 Revert "Removed printAnalysis for CREO3 baseline, Added SWGList for Skills"
This reverts commit d9ca531c5d.
2014-08-07 21:47:43 -07:00
Zing 5cbdfa7551 Merge pull request #2 from ProjectSWGCore/master
pull
2014-08-07 21:37:46 -07:00
Zing bae95657d8 Fixed GCW rank commands not being rewarded,
Fixed GCW rank armor stats.
2014-08-07 21:15:05 -07:00
Viaron 8ae66375da Added Transfer of Several Admin Commands by Zing 2014-08-07 23:27:21 -04:00
Ziggeh 67e823078e Merge pull request #1105 from ProjectSWGCore/revert-1104-master
Revert "Removed Level Restriction From GCW Scout Trooper Boots and Glove...
2014-08-08 04:32:53 +02:00
Ziggeh 3ee4733c41 Revert "Removed Level Restriction From GCW Scout Trooper Boots and Gloves And Added Armor Restriction Like They Were On Live" 2014-08-08 04:32:44 +02:00
Ziggeh ced0b604e1 Merge pull request #1104 from Iosnowore-Kun/master
Removed Level Restriction From GCW Scout Trooper Boots and Gloves And Added Armor Restriction Like They Were On Live
2014-08-08 04:29:02 +02:00
Iosnowore Kun d6d78dcbb7 Fixed Officer Pistol Roadmap Reward 2014-08-07 22:14:26 -04:00
Iosnowore Kun 5f72a08f92 Removed Level Restriction From GCW Scout Trooper Boots and Gloves And Added Armor Restriction Like They Were On Live 2014-08-07 22:06:57 -04:00
Iosnowore Kun 5d4dbe1e76 Merge branch 'ProjectSWGCore-master' 2014-08-07 21:26:41 -04:00
Waverunner d9ca531c5d Removed printAnalysis for CREO3 baseline, Added SWGList for Skills 2014-08-07 17:56:30 -04:00
Waverunner 79de1c89ce Fixed group decline message being sent to invited instead of leader 2014-08-07 17:21:52 -04:00
tacef cdd85219e8 Merge pull request #1101 from tacef/master
Changed Removed Frogbuilding placed Frog only
2014-08-07 20:17:26 +02:00
tacef 83d97679a7 Changed Removed Frogbuilding placed Frog only 2014-08-07 20:16:41 +02:00
tacef 25d301d406 Merge pull request #1100 from tacef/master
Fixed Readded Frogbuilding in Mos Espa
2014-08-07 19:35:53 +02:00
tacef aabe5c5b9a Fixed Readded Frogbuilding in Mos Espa 2014-08-07 19:34:45 +02:00
Waverunner 544b8194fe Merge pull request #1087 from voronius/master
Fix for 139 - bug of inspiration buff stacking
2014-08-07 10:29:57 -04:00
tacef e2321b83f4 Merge pull request #1088 from tacef/master
Added Dantooine Lairs
2014-08-06 19:55:38 +02:00
tacef 92cf013629 Added Dantooine Lairs
Added Baby Bol NPC's
Changed Several Lairs to be more acurate to Live
2014-08-06 19:52:58 +02:00
voronius 76b552bc29 Fix for 139 part 2
Inspiration buffs should no longer stack -
https://www.youtube.com/upload. Removed a new file I shouldn't have
commited.
2014-08-06 20:20:29 +03:00
voronius 3b1568339d Fix for issue 136
Fix for issue 136. Inspiration buffs should no longer stack.
2014-08-06 20:05:04 +03:00
tacef ec694a911c Merge pull request #1082 from tacef/master
Added Corellian Lairs
2014-08-06 13:56:04 +02:00
tacef 3027a60809 Added Corellian Lairs
Fixed Typo in existing lairs
Fixed Typo in grassland slice hound npc script
2014-08-06 13:55:18 +02:00
Waverunner 8b4aa5086f Added constructor for EnterTicketPurchaseModeMessage, Removed duplicate travel packet 2014-08-05 16:26:35 -04:00
tacef ccc2da9d2d Merge pull request #1080 from tacef/master
Fixed Typo in Mustafarian Bunker
2014-08-05 21:04:24 +02:00
tacef 5942c71a51 Fixed Typo in Mustafarian Bunker 2014-08-05 21:03:42 +02:00
tacef 582912cdd2 Merge pull request #1079 from tacef/master
Added a few things
2014-08-05 21:00:06 +02:00
tacef fe6fc77179 Added Elevatorterminals to Mustafarian bunker
For testing Purposes only
2014-08-05 20:58:16 +02:00
Waverunner 493c8faf83 Updated documentation location 2014-08-05 14:13:19 -04:00
Waverunner 1959110961 Merge pull request #1078 from voronius/master
Fix for inspiration buff
2014-08-05 13:59:54 -04:00
tacef 2e99c287e9 Fixed Setgodmode str error(temp)
Added TicketPurchaseModeMessageItv for Itv's
Changed Travel_terminal_itv to use the new Purchasemode
2014-08-05 07:58:58 +02:00
Zing d8aa822260 Merge pull request #1 from ProjectSWGCore/master
pull
2014-08-04 20:45:03 -07:00
voronius 4d99a84935 Fix for inspiration buff
Buff is now properly applied, stat mods are properly computed and
changes to stats are clearly visible . Sample test at
https://www.youtube.com/watch?v=KOV2C4z5VAw
2014-08-05 04:14:13 +03:00
Waverunner 413a89e924 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-04 16:40:15 -04:00
Waverunner e16e0373d6 Added system err print for combat commands being considered regular scripted commands
Removed loading of buildout objects temporarily to help make it easier
to resolve major loading crashes

Commands that are considered combat commands by the client but are using
regular command format will work, it'll just give an error. They should
be moved to the proper combat command format.
2014-08-04 16:39:43 -04:00
tacef 3ecc0c8e04 Merge pull request #28 from ProjectSWGCore/master
Fork update
2014-08-04 21:39:05 +02:00
Waverunner cb91738fd1 Merge pull request #1077 from voronius/master
2 Small fixes, one for a query and the other for the inspiration buffs
2014-08-04 15:35:42 -04:00
tacef 7a5a9d7327 Merge pull request #27 from ProjectSWGCore/master
Fork Update
2014-08-04 12:56:04 +02:00
Treeku f1b8c50918 Fixed a minor bug with previous engine update 2014-08-04 00:32:53 +01:00
tacef 31b0b90fdc Merge pull request #1069 from Undercova/master
Creature / NPC update
2014-08-02 21:50:53 +02:00
Bronco69 2e8b7020da Removed setOptionsBitmask from all faction npcs 2014-08-02 21:47:05 +02:00
tacef 136f087804 Merge pull request #26 from ProjectSWGCore/master
Fixed a minor bug with previous engine update
2014-08-02 10:06:42 +02:00
voronius ca004a162c fix for not being able to reuse or delete char
Fix for not being able to reuse or delete char after creation. All chars
were only available once as the query to the result set used wrong field
name to get the char id.
2014-08-02 11:01:16 +03:00
voronius 48a1014fb0 Fix for inspiration and group buffs
Fix for inspiration and group buffs, they used distance check with
different coordinate systems. Now watching and inspiration buff is
possible.
2014-08-02 10:45:03 +03:00