Commit Graph
3800 Commits
Author SHA1 Message Date
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
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 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
Treeku 7714c69c19 Fixed some syntax errors 2014-09-09 03:27:02 +01:00
Zing b4ffd72015 Merge pull request #18 from ProjectSWGCore/master
pull
2014-09-08 19:03:44 -07:00
Treeku 34994eeab5 Changed respec, frogs to remove equipment better 2014-09-08 22:43:39 +01:00
Treeku 95d0ce89e9 Fixed some syntax errors 2014-09-08 22:16:29 +01:00
Treeku 8d8a4d78f4 Updated transferitemweapon 2014-09-08 21:53:01 +01:00
Treeku b98cdcbc47 Updated transferitemmisc 2014-09-08 21:50:45 +01:00
Treeku abc6b8de01 Updated transferitemarmor 2014-09-08 21:48:30 +01:00
Treeku 511e04045c Equipment performs operations in the correct order 2014-09-08 21:28:23 +01:00
Treeku f8f2d156c1 Added minor method to get equipment for object 2014-09-08 20:20:57 +01:00
Zing 0d37a83b4b Merge pull request #17 from ProjectSWGCore/master
See extended...
2014-09-07 14:02:00 -07:00
Treeku 390e5838b5 See extended...
- equipAppearance no longer equips if an item already occupies that slot.  The old item must be removed first.
2014-09-07 22:01:02 +01:00
Zing 1a5743c2ae Merge pull request #16 from ProjectSWGCore/master
Fixed a potential issue with equipping.
2014-09-07 13:47:53 -07:00
Treeku c45a04c286 Fixed a potential issue with equipping. 2014-09-07 21:45:24 +01:00
Zing e0ebd7c509 Merge pull request #15 from ProjectSWGCore/master
pull
2014-09-07 13:26:53 -07:00
Treeku b318d17956 Fixed issue with equipping appearance items. 2014-09-07 21:24:27 +01:00
Waverunner 06eb8fbec7 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-09-07 15:38:32 -04:00
Waverunner 8f316aec68 Updated engine 2014-09-07 15:34:21 -04:00
Zing 8995a5412e Merge branch 'master' of https://github.com/zingzing175/NGECore2 2014-09-07 12:05:06 -07:00
Zing f277308a42 Merge pull request #14 from ProjectSWGCore/master
See extended...
2014-09-07 12:04:30 -07:00
Treeku 4ec682ae01 See extended...
- Fixed issue where old item wasn't correctly unequipped when equipping another item of the same type.
2014-09-07 20:01:55 +01:00
Zing d7abfd6605 Revert "Added activateClone command"
This reverts commit 5c961abac8.
2014-09-07 09:35:38 -07:00
Zing 5c961abac8 Added activateClone command 2014-09-06 14:26:59 -07:00