Treeku 02ff93312e Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 ...

Conflicts:
	scripts/houses/player_house_corellia_large_style_01.py
	scripts/houses/player_house_corellia_large_style_02.py
	src/resources/objects/tangible/Deed.java
	src/resources/objects/tangible/Harvester_Deed.java
	src/resources/objects/tangible/Player_House_Deed.java
	src/services/PlayerService.java
	src/services/object/ObjectService.java

2014-04-29 05:04:23 +01:00

..

combat

Temporarily Fixes #442: Position secured cant be removed

2014-04-16 18:51:32 -04:00

addfriend.py

Fixed list update issues with friend and ignore list, /findfriend now destroys existing wp's, fixed string bug on updating wps

2013-12-17 19:00:24 -05:00

addignore.py

Fixed list update issues with friend and ignore list, /findfriend now destroys existing wp's, fixed string bug on updating wps

2013-12-17 19:00:24 -05:00

auction.py

Added Enter & Leave Messages for ChatRooms as well as info stats for the

2014-04-17 16:01:12 -04:00

bandflourish.py

Added performance effects, fixed band flos, minor ent service code changes

2014-03-20 18:00:13 -04:00

bh_armor_sprint_1.py

Added Abilities and Bug Fixes

2014-03-30 05:00:44 -07:00

bh_cover_1.py

Bounty Hunter: Take Cover & Armor Sprint

2013-12-11 04:48:45 -06:00

bh_shields_1.py

Added Abilities and Bug Fixes

2014-03-30 05:00:44 -07:00

boardshuttle.py

…

broadcast.py

Added /broadcast GM command

2014-03-28 00:55:22 +01:00

centerstage.py

Fixed system message errors from previous commit

2014-03-20 18:14:40 -04:00

co_ae_hw_dot.py

…

co_first_aid_training.py

Fixed some debuffs and buffs

2014-03-14 21:35:53 -04:00

co_hw_dot.py

Refactored WeaponObject

2014-04-14 19:58:43 +02:00

colorlights.py

Added /covercharge, p. effect abilities use highest effect for your level, bug fixes

2014-03-24 11:07:30 -04:00

colorSwirl.py

Fixed system message errors from previous commit

2014-03-20 18:14:40 -04:00

covercharge.py

Created new SkillMod class for SWGList, minor fix to Inspiration buff applying to self

2014-03-24 16:25:37 -04:00

dazzle.py

Added /covercharge, p. effect abilities use highest effect for your level, bug fixes

2014-03-24 11:07:30 -04:00

deathblow.py

…

decline.py

…

disband.py

…

dismount.py

Overhauled Mounts (still buggy)

2014-04-18 19:09:45 +01:00

distract.py

Added /covercharge, p. effect abilities use highest effect for your level, bug fixes

2014-03-24 11:07:30 -04:00

duel.py

Fixed issue #227 and #202

2014-03-23 15:03:44 -04:00

editbiography.py

Added biographies, fixed title commands error

2014-02-19 14:45:02 -05:00

eject.py

Instance implementation

2014-03-19 19:43:29 +00:00

en_action_regen.py

Fixed some debuffs and buffs

2014-03-14 21:35:53 -04:00

en_holographic_image.py

Refactored Starter Clothing, Added CustomizationDelta, basework for Image Design

2014-03-25 22:06:38 -04:00

en_holographic_recall.py

Refactored Starter Clothing, Added CustomizationDelta, basework for Image Design

2014-03-25 22:06:38 -04:00

en_sprint_1.py

Fixed some debuffs and buffs

2014-03-14 21:35:53 -04:00

endduel.py

Duels - Fixed /endduel

2014-03-27 18:45:11 +01:00

equip.py

…

faction.py

…

featuredSolo.py

Fixed system message errors from previous commit

2014-03-20 18:14:40 -04:00

findfriend.py

Fixed list update issues with friend and ignore list, /findfriend now destroys existing wp's, fixed string bug on updating wps

2013-12-17 19:00:24 -05:00

firejet2.py

Fixed system message errors from previous commit

2014-03-20 18:14:40 -04:00

firejet.py

Added /covercharge, p. effect abilities use highest effect for your level, bug fixes

2014-03-24 11:07:30 -04:00

floorLights.py

Fixed system message errors from previous commit

2014-03-20 18:14:40 -04:00

flourish.py

Added holoemotes, work on imagedesign, bug fixes, new visitor class

2014-03-26 19:53:04 -04:00

forage.py

Jedi Loot templates inserted

2014-04-25 01:49:50 +02:00

forcerun.py

…

fs_buff_ca_1.py

…

fs_buff_def_1_1.py

…

fs_buff_invis_1.py

…

fs_saber_reflect_buff.py

…

gc.py

Fixed #308 and added foundation work for chat channels

2014-03-29 16:47:05 -04:00

getattributesbatch.py

…

getfriendlist.py

Fixed error in getfriendlist.py

2014-04-13 11:05:39 +01:00

getplayerid.py

GMs can now get the accountId of the target (getplayerid)

2014-04-06 17:42:08 -04:00

giveitem.py

Added customization variables

2014-03-30 21:12:04 +02:00

groupchat.py

Removed import in GroupChat and PlanetChat scripts

2014-04-16 17:57:15 -04:00

groupdance.py

add /groupdance command

2013-12-08 17:25:04 +01:00

harvesteractivate.py

Removed DeedObject, made buildings simpler

2014-04-28 22:07:32 +01:00

harvesterdeactivate.py

Removed DeedObject, made buildings simpler

2014-04-28 22:07:32 +01:00

harvesterdiscardhopper.py

Removed DeedObject, made buildings simpler

2014-04-28 22:07:32 +01:00

harvesterselectresource.py

Removed DeedObject, made buildings simpler

2014-04-28 22:07:32 +01:00

holoemote.py

Change holoemote cooldown to seconds

2014-04-06 14:42:02 -04:00

imagedesign.py

Changed holo-emote script checks, fixed playerobject version, fixed hair check

2014-03-27 18:08:04 -04:00

inspire.py

Bug Fixes: Issue #215 + #235 & Minor improvements.

2014-03-27 11:23:15 -04:00

invite.py

…

join.py

…

kneel.py

Cleanup of options.cfg

2014-04-06 04:44:40 +02:00

laserShow.py

mis-spelled laser

2014-03-20 18:39:48 -04:00

lfg.py

Added biographies, fixed title commands error

2014-02-19 14:45:02 -05:00

lootall.py

Improvements on loot system

2014-04-16 17:18:59 +02:00

me_buff_health_1.py

Medic - Nutrient Injection mk. 1 now grants the correct buff

2014-04-05 08:02:24 +02:00

me_buff_health_2.py

Medic - Fixed Nutrient Injection mk. 2 and 3

2014-03-31 01:25:26 +02:00

me_buff_health_3.py

Medic - Fixed Nutrient Injection mk. 2 and 3

2014-03-31 01:25:26 +02:00

me_cure_affliction_1.py

Finished Medic Buffs and Debuffs

2013-12-11 20:15:02 -05:00

me_drag_1.py

…

me_enhance_action_1.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_enhance_action_2.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_enhance_action_3.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_enhance_agility_1.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_enhance_agility_2.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_enhance_agility_3.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_enhance_block_1.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_enhance_dodge_1.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_enhance_precision_1.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_enhance_precision_2.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_enhance_precision_3.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_enhance_strength_1.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_enhance_strength_2.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_enhance_strength_3.py

Medic - Buffs now apply correctly when targeting non-players

2014-03-24 17:17:48 +01:00

me_evasion_1.py

Finished Medic Buffs and Debuffs

2013-12-11 20:15:02 -05:00

me_reckless_stimulation_1.py

…

me_reckless_stimulation_2.py

…

me_reckless_stimulation_3.py

…

me_reckless_stimulation_4.py

…

me_reckless_stimulation_5.py

…

me_reckless_stimulation_6.py

…

me_serotonin_boost_1.py

Finished Medic Buffs and Debuffs

2013-12-11 20:15:02 -05:00

me_stasis_self_1.py

…

meditate.py

Fixed an error in the setgodmode command

2014-04-16 13:35:00 -04:00

mount.py

Overhauled Mounts (still buggy)

2014-04-18 19:09:45 +01:00

movefurniture.py

Removed DeedObject, made buildings simpler

2014-04-28 22:07:32 +01:00

newbiehelper.py

Added biographies, fixed title commands error

2014-02-19 14:45:02 -05:00

npcconversationselect.py

Finished NPC conversations, fixed disconnect bug, fixed AI atk speed check

2014-04-02 18:12:08 +02:00

npcconversationstop.py

Finished NPC conversations, fixed disconnect bug, fixed AI atk speed check

2014-04-02 18:12:08 +02:00

object.py

…

of_buff_def_1.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_buff_def_2.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_buff_def_3.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_buff_def_4.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_buff_def_5.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_buff_def_6.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_buff_def_7.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_buff_def_8.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_buff_def_9.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_charge_1.py

Fixed Out of Bounds error for expertise, changed modifier on skillmods to float

2014-03-27 14:43:04 -04:00

of_drillmaster_1.py

Fixed #378

2014-04-05 18:57:24 -04:00

of_emergency_shield.py

…

of_firepower_1.py

…

of_focus_fire_1.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_focus_fire_2.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_focus_fire_3.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_focus_fire_4.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_focus_fire_5.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_focus_fire_6.py

Helmet and backpacks now show for player, server will store player creation date

2014-03-27 17:35:42 -04:00

of_inspiration_1.py

Officer - Inspiration and Drillmaster are now added to the group

2014-03-23 03:09:47 +01:00

of_inspiration_2.py

Officer - Inspiration and Drillmaster are now added to the group

2014-03-23 03:09:47 +01:00

of_inspiration_3.py

Officer - Inspiration and Drillmaster are now added to the group

2014-03-23 03:09:47 +01:00

of_inspiration_4.py

Officer - Inspiration and Drillmaster are now added to the group

2014-03-23 03:09:47 +01:00

of_inspiration_5.py

Officer - Inspiration and Drillmaster are now added to the group

2014-03-23 03:09:47 +01:00

of_inspiration_6.py

Officer - Inspiration and Drillmaster are now added to the group

2014-03-23 03:09:47 +01:00

of_medical_sup_1.py

Added option for buffs on items and wearables

2014-03-31 21:06:43 -04:00

of_purge_1.py

…

of_scatter_1.py

Fixed Out of Bounds error for expertise, changed modifier on skillmods to float

2014-03-27 14:43:04 -04:00

of_stimulator_1.py

…

opencontainer.py

…

permissionlistmodify.py

Removed DeedObject, made buildings simpler

2014-04-28 22:07:32 +01:00

placestructure.py

More removed DeedObject stuff

2014-04-29 03:48:32 +01:00

planetchat.py

Removed import in GroupChat and PlanetChat scripts

2014-04-16 17:57:15 -04:00

prone.py

…

purchaseticket.py

…

pvp.py

temp fix for /pvp bug, fixed null pointer on buffing ai

2014-03-30 00:54:09 +01:00

removeBuff.py

Fixed #368

2014-04-03 15:12:09 -04:00

removefriend.py

friendAdd and friendRemove update PlayerObject FriendList now

2013-12-10 18:53:42 -05:00

removeignore.py

…

requestbiography.py

Added biographies, fixed title commands error

2014-02-19 14:45:02 -05:00

requestcoresample.py

Clean up of code

2014-04-06 02:08:55 +02:00

requestsurvey.py

Clean up of code

2014-04-06 02:08:55 +02:00

requestwaypointatposition.py

Cleaned up waypoint scripts

2013-12-08 15:12:43 +01:00

resourcecontainersplit.py

More quality assurance work

2014-04-02 23:28:08 +02:00

resourcecontainertransfer.py

More quality assurance work

2014-04-02 23:28:08 +02:00

resourceemptyhopper.py

Removed DeedObject, made buildings simpler

2014-04-28 22:07:32 +01:00

roleplay.py

Added biographies, fixed title commands error

2014-02-19 14:45:02 -05:00

rotatefurniture.py

Removed DeedObject, made buildings simpler

2014-04-28 22:07:32 +01:00

saberblock.py

…

server.py

some bug fixes, updated engine with support for new .trn versions, refactored some code with new Java 8 syntax, changed compiler to java 8

2014-03-25 20:08:01 +01:00

serverdestroyobject.py

Added xp gain on killing NPCs, fixed some bugs, added 2 new config options

2014-03-26 23:37:10 +01:00

setbiography.py

Added biographies, fixed title commands error

2014-02-19 14:45:02 -05:00

setcurrentskilltitle.py

Fixed a few exploits. See extended.

2014-03-23 12:27:42 -04:00

setgodmode.py

Changes to MissionObjective, started working on player bounties

2014-04-28 17:37:23 -04:00

setspeed.py

Fixed issue where non combat commands would be created as a combat command

2014-04-12 21:20:05 +02:00

setwaypointactivestatus.py

…

setwaypointname.py

…

sitserver.py

Fixed #313

2014-03-29 18:36:31 -04:00

smokebomb.py

Added /covercharge, p. effect abilities use highest effect for your level, bug fixes

2014-03-24 11:07:30 -04:00

socialinternal.py

…

spatialchatinternal.py

Fixed a chat crash bug

2014-04-19 08:30:12 +01:00

spotlight.py

Added /covercharge, p. effect abilities use highest effect for your level, bug fixes

2014-03-24 11:07:30 -04:00

stand.py

…

startdance.py

Fixed #336, Fixed #320, able to use basic dance

2014-04-01 17:26:46 -04:00

stopdance.py

Fixed #336, Fixed #320, able to use basic dance

2014-04-01 17:26:46 -04:00

stopwatching.py

Fixed #336, Fixed #320, able to use basic dance

2014-04-01 17:26:46 -04:00

suspendtest.py

Added foraged items and worms

2014-04-19 23:56:15 +02:00

teleporttarget.py

Added /teleporttarget GM command

2014-03-30 21:12:05 +02:00

tip.py

FindFriend added, Bank tips no longer produces an error

2013-12-08 11:08:24 -05:00

toggleawayfromkeyboard.py

Fixed toggleawayfromkeyboard

2013-12-28 16:14:52 +00:00

toggledisplayingfactionrank.py

Fixed toggledisplayingfactionrank

2013-12-28 16:16:11 +00:00

transferitem.py

…

transferitemarmor.py

Added message if a player cannot equip an item.

2014-03-23 20:03:15 -04:00

transferitemmisc.py

Improvements on loot system

2014-04-16 17:18:59 +02:00

transferitemweapon.py

Added more items to Character Builder Terminal

2014-03-23 21:16:01 -04:00

ventriloquism.py

Added /covercharge, p. effect abilities use highest effect for your level, bug fixes

2014-03-24 11:07:30 -04:00

watch.py

fixed #318

2014-03-31 01:23:58 +02:00

waypoint.py

Fixed list update issues with friend and ignore list, /findfriend now destroys existing wp's, fixed string bug on updating wps

2013-12-17 19:00:24 -05:00