Commit Graph
182 Commits
Author SHA1 Message Date
darkk1138 131092de60 Merge branch 'master' into darkk_ent
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
2013-12-07 16:37:52 +01:00
darkk1138 9683f4c164 add startdance, stopdance, flourish and bandflourish commands 2013-12-07 16:34:19 +01:00
Waverunner 3b55f972a6 Merge pull request #110 from Ziggeh/master
Fixed Healing Potency and cleaned up Supply Drop (officer)
2013-12-06 19:52:51 -08:00
Levarrishawk 4f1142a8d1 Corrected "Doaba Guerfel Starport" travel point. 2013-12-06 22:46:07 -05:00
Ziggeh 64f332bea2 Supply Drop now uses the correct crate 2013-12-07 02:19:31 +01:00
Ziggeh abf7e90329 Deleted another unused command script 2013-12-07 02:17:20 +01:00
Ziggeh aa0fe46fba Fixed Supply Drop command for officers.
The Tactical Supply Drop command was removed from the game and was
merged with the Medical Supply Drop and then became Supply Drop.

The script can properly check if the actor has the tactical serum
expertise box or not.
2013-12-06 23:21:31 +01:00
Treeku e94fc930ce FactionService, helper funcs, factionResponseMsg 2013-12-06 12:14:13 +00:00
Treeku 42fca91fa5 Objects with no radial file given default options 2013-12-05 05:22:06 +00:00
Treeku 0bf9320b2f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-05 04:18:17 +00:00
Treeku 82e513363e Fixed use() in object scripts. It should work now 2013-12-05 04:17:06 +00:00
Levarrishawk b0a1d2f3d8 Added Stats to Light Jedi Robes 2013-12-04 20:27:29 -05:00
Levarrishawk 222dde4b18 Added stats to Dark Jedi Robes 2013-12-04 20:05:27 -05:00
Levarrishawk def49ed671 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-04 19:41:33 -05:00
Levarrishawk 8df7abc8d3 Corrected Deeja Peak Location 2013-12-04 19:39:46 -05:00
Waverunner ca807ae5ae Added MissionObject Baselines, Waypoints can be added via Planetary Map now 2013-12-04 19:10:15 -05:00
darkk1138 c4dc69fd92 Merge branch 'master' into darkk_ent 2013-12-04 22:43:41 +01:00
darkk1138 6bd1c7b02c temp commit before merge 2013-12-04 22:43:34 +01:00
Treeku bbf1c7c99d Added quick GM commands for QA
We can put permissions on these or whatever is needed later
2013-12-04 08:22:37 +00:00
Treeku 9cbbc71e84 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/services/object/ObjectService.java
2013-12-03 17:02:35 +00:00
Treeku 0809361349 PvP & OptionsBitmask refactor
These will need to be used in scripts to make NPCs invulnerable,
conversable, always aggressive, etc.
2013-12-03 16:29:17 +00:00
Treeku d0fe165024 Merge pull request #97 from Ziggeh/master
Cleaned up the Comfortable clothing script for trandoshan males
2013-12-02 15:47:33 -08:00
Ziggeh 18f0c6cc74 Removed unreferenced variable 2013-12-03 00:38:51 +01:00
DAK- ccc3ddf244 Update static_map_locations.py
Vreni Island and Tyrena coordinates fixed.
2013-12-02 17:29:46 -06:00
Light2 f8362d338b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-02 23:59:28 +01:00
Light2 30e1e1c8ec Added collidable areas which can trigger a script, started work on AI, fixed position secured, updated engine 2013-12-02 23:58:22 +01:00
Treeku d85e17775d Added cAble's innate_reduction_all_mob for armor break 2013-12-02 22:18:27 +00:00
Waverunner 6520004a6c Missing return statement 2013-12-02 17:14:28 -05:00
Waverunner 4245bb120a Added Tactical Supply drops, fixed Ithorian clothing error, minor bug fixes and tweaks 2013-12-02 17:08:53 -05:00
darkk1138 2e3879321b temp commit for ent stuff 2013-11-30 12:32:19 +01:00
Treeku 453cf3e7d2 Merge pull request #77 from Skalex223/master
revised item (wearables without bonus stats) window attributes
2013-11-29 20:53:58 -08:00
Skalex223 f0bb7014c9 missed 1
add 1
2013-11-29 23:35:13 -05:00
Skalex223 b7a5280521 items
3rd times the charm
2013-11-29 23:30:25 -05:00
Skalex223 15827ae754 ns bracer
forgot ns bracer
2013-11-29 20:01:43 -05:00
Skalex223 8c19d8ffc0 revised item (wearables) window display attributes
removed inventory line, changed volume to int
2013-11-29 19:49:03 -05:00
Skalex223 ce7a362d1c item data entry
basic item data entry to add condition and volume to item examine window
2013-11-29 14:28:18 -05:00
Waverunner f61b2f761a Added Ignore List & cleaned up code in TravelService 2013-11-27 10:28:02 -05:00
Light2 f2b156cb61 Added group buffs 2013-11-27 00:11:48 +01:00
Light2 3ee31a9825 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	scripts/static_travel_points.py
2013-11-26 22:31:08 +01:00
Light2 0a040424f6 Added loading of objects from datatables/buildout, added building and cell baseline packets, fixed crash on spawning of static objects....
...updated engine, added restuss shuttleport and theed starport spawns,
increased view range for large objects loaded from buildout datatables
like jabbas/theed palace etc.
2013-11-26 22:28:38 +01:00
Levarrishawk 9fd820b93d Commented out Kaas Entries
Commented out Dromund Kaas related entries for future use.
2013-11-26 07:34:18 -05:00
Levarrishawk ce21c18ce7 Updated Travel Points
Added foundation for future planet additions.
2013-11-26 03:49:54 -05:00
Levarrishawk 0dd1de0e4a Added Mos Taike to Tatooine Map
Added Mos Taike and foundations for future planet additions.
2013-11-26 01:24:33 -05:00
Light2 e5595240c6 Merge pull request #71 from Skalex223/master
travel points
2013-11-25 15:54:14 -08:00
Waverunner 4f94664584 Added ent skillmods, fixed attribute points in buff workshop 2013-11-25 17:00:32 -05:00
Skalex223 096b2c33d3 travel points
modified some names, added qz, kachiro, mensix, restuss starport,
restuss shuttleport is a placeholder (needs exact points)
2013-11-25 16:34:57 -05:00
Light2 bb085477c4 Added Heal Over Time buffs, finished most of commando except kill meter and some abilities 2013-11-25 22:10:33 +01:00
Light2 23aeb02249 Updated engine, added bank terminals to bank buildings 2013-11-25 16:29:01 +01:00
Light2 a089d6c590 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-11-25 00:09:58 +01:00
Light2 cf485b33b7 Fixed radials, refactored shuttle timer (works now), shuttleport can no longer travel to starports on other planets and vice versa...
...added almost all of the missing travel points
2013-11-25 00:09:41 +01:00