Commit Graph
828 Commits
Author SHA1 Message Date
Seefo ebe52b49aa Fixed combat bug, read extended
Fixed the combat bug, where if an enemy were to be incapacitated and you
were not the attacker, you would remain in combat.
2014-03-27 20:57:51 -04:00
Waverunner 570d6d1e14 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-27 20:19:29 -04:00
Waverunner 0047c73493 Added Unity Ring to CBT 2014-03-27 20:19:22 -04:00
Light2 06c0df11c3 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-28 00:57:58 +01:00
Light2 d4a9aa327f Added /broadcast GM command 2014-03-28 00:55:22 +01:00
Waverunner 87a90c6855 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-27 19:34:11 -04:00
Waverunner d8eb437348 Incap debuff uses new format, added MOTD on login 2014-03-27 19:33:38 -04:00
Seefo c4cc98fad0 Fixed cloning windows not being sent 2014-03-27 19:27:59 -04:00
Seefo 1464f5b428 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-27 19:06:35 -04:00
Seefo bce1aa7ffa Fixed #267 2014-03-27 19:06:22 -04:00
Waverunner 24dddc6607 fixed /holoemote without a command string 2014-03-27 18:43:24 -04:00
Seefo c1df38b45a Fixed PlayClientEffectObjectMessage 2014-03-27 18:32:13 -04:00
Seefo e8c4bc5bc8 Fixed #150 2014-03-27 18:21:12 -04:00
Seefo 84a0cb9b1a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-27 18:12:30 -04:00
Seefo 5d920292d8 Fixed #265 2014-03-27 18:12:17 -04:00
Waverunner 1ec8471b32 Changed holo-emote script checks, fixed playerobject version, fixed hair check 2014-03-27 18:08:04 -04:00
Waverunner b2fc43efa2 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-27 17:35:54 -04:00
Waverunner a5a0fa1d9a Helmet and backpacks now show for player, server will store player creation date
(BugFix) /showhelmet and /showbackpack works and helmet/backpacks now
showed for the person wearing the item
(Code) Server will store player creation date for future use in baseline
2014-03-27 17:35:42 -04:00
Seefo 47bb841588 Fixed #255 2014-03-27 17:32:03 -04:00
Seefo 1a0b36e8f3 Fixed #197, #250, and #233 2014-03-27 17:07:14 -04:00
Seefo 2dd4e986ca Fixed #251 2014-03-27 16:29:57 -04:00
Waverunner 2af59e2212 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-27 14:43:14 -04:00
Waverunner 27759a53fd Fixed Out of Bounds error for expertise, changed modifier on skillmods to float
(BugFix) Fixed out of bounds error when assigning expertise points
(Code) Changed SkillMod's modifier variable to float value
(Code) Changed Charge! and Scatter! to use updated addBuffToCreature
2014-03-27 14:43:04 -04:00
Waverunner a52eb7de1a Merge pull request #259 from Ziggeh/master
Duels - Fixed /endduel
2014-03-27 14:17:40 -04:00
Ziggeh 915a1319ac Duels - Fixed /endduel 2014-03-27 18:45:11 +01:00
Waverunner a3f7909e8d Merge pull request #253 from Ziggeh/master
Added armour bypass to some specials and fixed Saber Flurry
2014-03-27 12:04:05 -04:00
Ziggeh c4f6ad360f Combat - Added attack_rolls 2014-03-27 16:55:28 +01:00
Ziggeh e6c2ba0a69 Merge remote-tracking branch 'upstream/master' 2014-03-27 16:50:11 +01:00
Waverunner bb85682bd6 Bug Fixes: Issue #215 + #235 & Minor improvements.
(BugFix) Officer group buff's will now check ranges
(BugFix) Group buffs applied when a player joins a group as long as they
are within range
(BugFix) /inspire will now take a command string for target
(BugFix) /imagedesign will now take a command string for target
2014-03-27 11:23:15 -04:00
Seefo c63c602367 Fixed expertise and image design checks
also added options.cfg to gitignore
2014-03-26 22:38:39 -04:00
Seefo 8f8364b58a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-26 22:02:31 -04:00
Seefo 7970be3656 Fixed #126, updated git ignore list 2014-03-26 22:02:19 -04:00
Ziggeh 423c26199e Jedi - Added Armor Bypass to Dark Lightning 2014-03-27 02:21:48 +01:00
Ziggeh 234c7d43dc Abilities - Fixed abilities that send multiple attacks
Such as Flurry for LSJ.
2014-03-27 02:20:43 +01:00
Waverunner 158a6b387f ID Window closes when other player closes window now 2014-03-26 20:37:55 -04:00
Waverunner c31c24d7ec Remove print in stopPerformance 2014-03-26 20:16:33 -04:00
Waverunner d15b0d83e9 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/services/EntertainmentService.java
2014-03-26 20:08:30 -04:00
Seefo f8336c15c0 Updated file ignore list 2014-03-26 20:01:36 -04:00
Waverunner 66e29893ac Added holoemotes, work on imagedesign, bug fixes, new visitor class 2014-03-26 19:53:04 -04:00
Seefo e60ffb32c5 Fixed #245, also uncommented skill mod deltas 2014-03-26 19:20:05 -04:00
Light2 a46847d0fd Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	scripts/commands/setgodmode.py
2014-03-26 23:51:14 +01:00
Light2 c3772e3246 Added xp gain on killing NPCs, fixed some bugs, added 2 new config options 2014-03-26 23:37:10 +01:00
Light2 6acea47f5e Merge pull request #248 from Undercova/master
Fixed BH + Commando armor upgrades
2014-03-26 23:22:13 +01:00
Bronco69 da33dba33e Fixed BH + Commando armor upgrades
- pinpoint shielding for commando expertise fixed
- energy + kinetic for BH expertise fixed
2014-03-26 22:34:43 +01:00
Bronco69 010797ac47 Fixed innate armor commando 2014-03-26 21:26:35 +01:00
Waverunner 37507a1c68 Update .classpath 2014-03-26 08:09:09 -04:00
Waverunner d1630ae3c9 Fixed commit b9ed655f 2014-03-26 08:02:01 -04:00
Waverunner 39602755bb Commented out createStarterClothing temporarily 2014-03-25 22:54:59 -04:00
Waverunner 9b60524b19 Fixed import error temporarily
Will add in the class tomorrow, forgot to stage it :S
2014-03-25 22:51:46 -04:00
Waverunner 9e8bfb01de Fixed my previous change to disconnecting (oops D:) 2014-03-25 22:09:58 -04:00