darkk1138
c19e2e20ba
Merge branch 'master' of github.com:ProjectSWGCore/NGECore2
2013-12-09 22:54:57 +01:00
darkk1138
14f75cc1b4
dancers can now gain experience by performing flourishes
...
(calculations might still be off though. :p)
2013-12-09 22:54:21 +01:00
Light2
69642c0f60
Fixed loading of server templates and refactored child object spawns, update engine
2013-12-09 21:17:54 +01:00
darkk1138
760aea96f2
fix SWGList on audience, however, the old field needs removing.
...
depend inspire on watching
2013-12-09 18:09:40 +01:00
darkk1138
471fab10d8
refactored slightly.. wasted a lot of time with that. :p
2013-12-09 17:19:53 +01:00
darkk1138
a5b31ac5a5
add preliminary watch/stopwatching implementation
2013-12-09 16:04:33 +01:00
darkk1138
c0ba5ba1c0
add expertise stubs for entertainer
2013-12-09 13:52:01 +01:00
Treeku
3a66043f70
Collections can use radial_filename=collection
...
In an object that is always a collection that can be added to
collections, you can put this in setup():
object.setAttachment('radial_filename', 'collection')
Then define use(core, actor, object) and make it use addCollection().
2013-12-09 10:52:04 +00:00
Treeku
94bb6f9a66
Fixed use(), needs radial_filename to be 'usable'
...
If use() is broken in any of your object scripts, add the following to
setup():
object.setAttachment('radial_filename', 'usable')
2013-12-09 10:30:09 +00:00
darkk1138
93ba62cd4f
fix note bubbles for dance (both for starting and stopping)
2013-12-09 10:36:21 +01:00
Waverunner
64a01d4d88
getNearestTravelPoint takes into account more than 1 travel point now
2013-12-08 15:48:39 -05:00
Light2
f2200711cf
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
src/services/SimulationService.java
2013-12-08 18:21:50 +01:00
Light2
93195f7d5f
Added dynamic lair spawns, fixed equip exploit, fixed some bugs and client crashes, updated engine
2013-12-08 18:17:01 +01:00
darkk1138
4e78f9064e
Merge branch 'master' of github.com:ProjectSWGCore/NGECore2
2013-12-08 17:25:20 +01:00
darkk1138
6471d7e118
add /groupdance command
2013-12-08 17:25:04 +01:00
Waverunner
9d7892188c
FindFriend added, Bank tips no longer produces an error
2013-12-08 11:08:24 -05:00
Waverunner
ba858e2c28
Friend Notification only on login/logout now, Chat messages for ignored players no longer display
...
Use Travel Ticket for travel tickets added
2013-12-07 22:37:51 -05:00
Waverunner
576c03db14
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2013-12-07 17:59:03 -05:00
Waverunner
ae0b06f917
Fixed MissionObject Delta's, Synchronized MissionObject, Fixed MissionListRequest Opcode
2013-12-07 17:58:49 -05:00
Waverunner
7fbd1206ab
Merge pull request #113 from Ziggeh/master
...
Some general fixes
2013-12-07 14:31:34 -08:00
Ziggeh
4039379583
Fixed creating waypoints through planetary map
2013-12-07 23:12:41 +01:00
darkk1138
a2c94acaf8
optimise /bandflo script, it just didn't look right to me. :p
2013-12-07 21:32:15 +01:00
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