Commit Graph
3822 Commits
Author SHA1 Message Date
Matt Parnell b44c1ab13b fix my comparison 2014-10-05 00:37:03 -05:00
Matt Parnell 3c1480b891 try this then 2014-10-05 00:34:56 -05:00
Matt Parnell e3d63a872e attempt a sanity check 2014-10-05 00:29:52 -05:00
Zing 8520db18e2 Merge pull request #1231 from zingzing175/master
Small test for crash
2014-10-02 18:34:33 -07:00
Zing c2e26f40fd Small test for crash 2014-10-02 18:32:22 -07:00
Zing 3cb8207d33 Merge pull request #1228 from zingzing175/master
pull
2014-09-28 20:35:07 -07:00
Zing 1c8fc117a4 Removed modifier from movement till it works correctly 2014-09-28 20:34:30 -07:00
Zing 43a930f03a Merge pull request #23 from ProjectSWGCore/master
pull
2014-09-28 20:03:38 -07:00
CharonInferar 0ce1a0a4f6 Merge pull request #1226 from CharonInferar/FixFixFix
Fixed buildouts loading order and assembly
2014-09-29 02:44:49 +02:00
Zing 773192f852 Merge pull request #1225 from zingzing175/master
Cleanup of Officer commands/buffs pt1.
2014-09-28 17:43:19 -07:00
CharonInferar 50adba0575 Merge remote-tracking branch 'origin/master' into FixFixFix 2014-09-29 02:42:43 +02:00
CharonInferar 2627425bf8 Fixed buildouts loading order and assembly
All Cells are first instantiated and then added to their parent
buildings
2014-09-29 02:41:07 +02:00
Zing 50eb8308cc Cleanup of Officer commands/buffs pt 1
Added expertise_dodge skillmod
Added combat_critical_hit_reduction skillmod
Moved commands to combat commands (seen by client)
Added Officer Insipred action 5PC configuration to CommandService.
2014-09-28 17:41:02 -07:00
Zing a58bd0a92c Updated Insipred Action 2014-09-28 16:28:38 -07:00
Zing 12e5b5c355 Added Officer Inspired Action 5PC random buff. 2014-09-28 01:20:01 -07:00
Zing d4864a7df9 Merge pull request #1224 from zingzing175/master
Fixed medic buffs.
2014-09-27 22:04:12 -07:00
Zing 610be8c96a Deleted old scripts
medic buff fix pt 2
2014-09-27 21:59:09 -07:00
Zing b51b49700e Fixed medic buffs. Buffs no longer remove and blackbar players. buffs add correctly to players and or group. Moved to combat command folder.
(Client recognizes them as combat commands)
2014-09-27 21:53:50 -07:00
Zing 4c77daa6ec Merge pull request #22 from ProjectSWGCore/master
pull
2014-09-27 12:39:29 -07:00
CharonInferar ca9a9f4346 Merge pull request #1223 from CharonInferar/FixFixFix
Fixes appearance inventory overload
2014-09-27 20:50:01 +02:00
CharonInferar f47c642619 Debug msg removed 2014-09-27 20:48:43 +02:00
CharonInferar 59fcbe7d1f Fixes appearance inventory overload
Appearance items can now be correctly equipped after server
restart/relog.
2014-09-27 20:47:40 +02:00
CharonInferar 462e1bdd37 Merge pull request #1222 from CharonInferar/DatabaseLockFix
Fixes database lock exceptions
2014-09-27 18:20:45 +02:00
CharonInferar 51bcb80d6c Fixes database lock exceptions
Thus fixing characters not loading their data correctly from the
database after server-restart.
2014-09-27 18:17:24 +02:00
CharonInferar 66156e1d3f Merge remote-tracking branch 'upstream/master' 2014-09-27 18:09:31 +02:00
tacef 7ecb8919bb Merge pull request #1220 from cdmpse/master
Updates to Quests
2014-09-26 23:23:39 +02:00
CharonInferar 3f30fc8349 Merge remote-tracking branch 'upstream/master' 2014-09-26 13:07:30 +02:00
CharonInferar c861b5f84c Conflict resolve 2014-09-26 13:07:05 +02:00
cdmpse 293f533e0d Fixed Syntax Errors 2014-09-21 17:11:47 -05:00
cdmpse 70f2ee1fc0 Fixed Syntax Errors 2014-09-19 20:20:11 -05:00
cdmpse f54e2a35c2 Updates to Quest Resource and Script 2014-09-19 20:08:52 -05:00
cdmpse 8682534728 Updates to Quest Services 2014-09-19 20:08:01 -05:00
cdmpse b5254a20c2 Updates to "Tasty Dried Critters" Quest 2014-09-19 20:07:04 -05:00
cdmpse e1b62d63df Added Underworld Smuggler Tatooine Quests 2014-09-19 20:06:16 -05:00
Waverunner 94956c6abe Revert "Updated engine"
This reverts commit e0a60e6885.
2014-09-11 18:28:10 -04:00
Zing 12e13c147f Merge pull request #21 from ProjectSWGCore/master
pull
2014-09-11 15:15:38 -07:00
Waverunner 8dcb432084 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-09-11 18:08:28 -04:00
Waverunner e0a60e6885 Updated engine 2014-09-11 17:39:03 -04:00
Treeku 14565e134c Fixed some disconnect and save errors 2014-09-11 21:44:04 +01:00
Lewis 5b812c2de0 Merge pull request #1212 from cdmpse/master
Updates to "Tasty Dried Critters" Quest and QuestService Update
2014-09-09 22:27:44 -04:00
Waverunner a56a191ddf Updated engine 2014-09-09 21:07:13 -04:00
cdmpse b778c81ebf Updates to "Tasty Dried Critters" Quest 2014-09-09 13:21:04 -05:00
cdmpse 27f1aaa8f5 Additions to QuestService and QuestTask 2014-09-09 13:16:04 -05:00
Zing c3cb847b0e Merge pull request #20 from ProjectSWGCore/master
pull
2014-09-09 07:39:37 -07:00
Zing b82d0bd421 Merge pull request #1216 from zingzing175/master
Fixed syntax error in PlayerService
2014-09-09 07:38:23 -07:00
Treeku ba003ef2f0 Fixed another syntax error 2014-09-09 09:39:49 +01:00
Zing 6807979781 Fixed syntax error in PlayerService 2014-09-08 23:07:05 -07:00
Zing d88762da96 Merge pull request #1215 from zingzing175/master
Fixed small typo. Removed unused import
2014-09-08 19:40:55 -07:00
Zing 53b591beb0 Fixed small typo. Removed unused import 2014-09-08 19:39:18 -07:00
Zing fc0c4f847f Merge pull request #19 from ProjectSWGCore/master
Fixed some syntax errors
2014-09-08 19:28:06 -07:00