projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-30 15:13:10 -04:00
Code Issues Projects Releases Wiki Activity
463 Commits 11 Branches 4 Tags
5fd06f87c13ecb749eb4e7cccb7d769282dd83ab
Commit Graph
463 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Light2 5fd06f87c1 added missing templates 2013-12-14 21:45:24 +01:00
Light2 9a67e1c7a3 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	.gitignore
 2013-12-14 21:42:46 +01:00
Light2 5d824324c4 merge 2013-12-14 21:41:00 +01:00
Light2 896b342972 Fixed crash caused by buildings, fixed weapon object superclass, added equipment and appearance equipment deltas 2013-12-14 21:25:31 +01:00
darkk1138 6b565dcd65 fix name reservation query .. i hope. :p 2013-12-14 20:39:52 +01:00
darkk1138 ff44d1ba96 add debug output for login method return value. 2013-12-14 18:08:27 +01:00
Treeku 44422ffb42 Added buildout option (may clash, PM if need help) 
If you have snapshot objects disabled, I recommend setting the option in
options.cfg to 1 before syncing, then setting it back afterwards, to
avoid a merge clash.
 2013-12-14 10:25:56 +00:00
Treeku a67cbb0992 Export string/ as well 2013-12-14 09:21:53 +00:00
Treeku 8cd935a9b3 Profession roadmap rewards fix 2013-12-14 09:19:06 +00:00
Treeku 9336aaaf0c Fixed minor custom object script issue 2013-12-14 09:11:34 +00:00
Treeku d86614b2bd Fixed Quest error, it was .gitignored 2013-12-14 00:35:48 +00:00
Treeku 9ceaa761c9 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-13 13:44:41 +00:00
Treeku b0e0431437 Baseline work from a few months ago for reference 2013-12-13 13:43:00 +00:00
Waverunner 46ba2151b7 Added default quest object scripts, fixed waypoint system messages 2013-12-12 15:22:55 -05:00
Light2 3fc02b8f1f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-12 17:25:24 +01:00
Light2 512fbfec72 bug fixes 2013-12-12 17:24:26 +01:00
Treeku 948a4bdb0d Fixed minor merge blip 2013-12-12 14:44:34 +00:00
Treeku b6c9e74859 Merge branch 'master' of https://github.com/xbang21/NGECore2 into xbang21-master 
Conflicts:
	src/services/combat/CombatCommands.java
 2013-12-12 14:34:24 +00:00
Treeku 001bf1b390 Renamed ListObject -> Delta. Guild null fix 
Delete your ODB for this
 2013-12-12 14:17:50 +00:00
Treeku 2ff1a8e803 Minor profession resource adjustment 2013-12-12 13:17:10 +00:00
Treeku ed8e5c0ec5 Fixed GCW Zone transactions 2013-12-12 12:34:30 +00:00
Treeku ba3954d9fb Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-12 11:56:42 +00:00
Treeku e190bc78f6 Added ChangeRoleIcon (gold icons), fixed titles 2013-12-12 11:54:52 +00:00
xbang21 d54033a0c6 Finished Medic Buffs and Debuffs 
Medic buff times with expertise tested and work properly in and out of a
group
 2013-12-11 20:15:02 -05:00
Waverunner 26b7bbbff4 Merge pull request #139 from DAK-/master 
Bounty Hunter: Return Fire, Take Cover & Armor Sprint
 2013-12-11 15:49:36 -08:00
Treeku cfcd5206b7 Fixed /pvp 2013-12-11 17:23:15 +00:00
Treeku c33fcc6715 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-11 12:34:20 +00:00
Treeku 62167880ac Buff callbacks run in a separate schedule 2013-12-11 12:31:51 +00:00
DAK- 5f88bab13b Bounty Hunter: Take Cover & Armor Sprint 
Registered commands, added buff and command scripts.
Buffs apply, needs further testing.
 2013-12-11 04:48:45 -06:00
DAK- 251b159b13 Bounty Hunter: Return Fire 
Buff and command works, cools down and is modified by skill mods, (i.e.
from "Enforcer set")
 2013-12-11 03:20:55 -06:00
Waverunner 5515618b0f Merge pull request #130 from Ziggeh/master 
Fixed stackable buffs, Bounty Hunter expertise and the healing potency for LSJ
 2013-12-10 16:26:31 -08:00
Waverunner 685566857b Fixed credits in setgodmode 2013-12-10 19:24:07 -05:00
Waverunner d6eedfd2ce Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-10 18:53:47 -05:00
Waverunner 1065c70c55 friendAdd and friendRemove update PlayerObject FriendList now 2013-12-10 18:53:42 -05:00
Wefi 06d22cae9e Added "Addability" to Setgodmode and experimenting with Mediate 
Use /Setgodmod addability <String format> IE bh_sh3
 2013-12-10 17:33:56 -06:00
darkk1138 5f616ed5f0 fix wrong performance id check for dances 2013-12-10 23:14:14 +01:00
Ziggeh ce31a0d95c Bounty Hunter - Fixed Ambush CD reduction expertise 2013-12-10 20:13:32 +01:00
Ziggeh 9127cd7fc6 Bounty Hunter - Fixed Assault CD reduction expertise 2013-12-10 20:13:03 +01:00
Ziggeh 0500ffe803 Bounty Hunter - Fixed heal CD reduction expertise 2013-12-10 20:10:50 +01:00
Ziggeh bd7bb1a01b Fixed buff stacks 
Stackable buffs will no longer have their stack count reset when
exceeding the cap.
 2013-12-10 20:06:56 +01:00
Ziggeh 9bfe52763e Jedi - Fixed Soothing Aura 2013-12-10 20:05:17 +01:00
Light2 140848e3ab Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-10 17:40:21 +01:00
Light2 4ffc7138c9 Updated engine 2013-12-10 17:37:20 +01:00
Levarrishawk e7ec84d8ee Expanded reserved name filters. 
Expanded on Fictional reserved names, profanity list, staff reserved
names.   Added copy of previous sql backup file.
 2013-12-10 03:10:38 -05:00
Treeku 82a7bbaa9a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-10 05:45:49 +00:00
Treeku 95648bc262 Fixed setgodmode 2013-12-10 05:44:56 +00:00
Treeku d83e8b1e1e Merge pull request #123 from Ziggeh/master 
Added profession badges and changed healing CD reduction to be done through scripts
 2013-12-09 15:26:29 -08:00
darkk1138 03d6be9f62 Merge branch 'master' of github.com:ProjectSWGCore/NGECore2 2013-12-10 00:08:54 +01:00
Ziggeh e3d4fd8aaa Added Profession Master Badges 2013-12-10 00:07:39 +01:00
darkk1138 64a0e2898d correct xp, still not right though 2013-12-09 23:30:16 +01:00