projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-03 18:13:11 -04:00
Code Issues Projects Releases Wiki Activity
392 Commits 11 Branches 4 Tags
e3d4fd8aaaf35ed957c93bb8f562dad050a00d49
Commit Graph
244 Commits
Author SHA1 Message Date
Ziggeh e3d4fd8aaa Added Profession Master Badges 2013-12-10 00:07:39 +01:00
Ziggeh 6f42cb6ebb Merge remote-tracking branch 'upstream/master' 2013-12-08 19:06:48 +01:00
Light2 8e82bb238b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-08 19:04:58 +01:00
Light2 d9997bd796 fixed loading of server templates 2013-12-08 19:04:43 +01:00
Ziggeh 95b46419bc Merge remote-tracking branch 'upstream/master' 2013-12-08 18:59:10 +01:00
darkk1138 3ec7223773 Merge branch 'darkk_login' 
Conflicts:
	src/main/NGECore.java
 2013-12-08 18:51:22 +01:00
Light2 4038205994 merge 2013-12-08 18:23:52 +01: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 a564f8c7d9 Merge branch 'master' into darkk_login 
Conflicts:
	src/main/NGECore.java
	src/services/object/ObjectService.java
 2013-12-08 17:50:55 +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
Ziggeh 8b21e32f6a Added First Aid Training (commando) 2013-12-08 12:16:26 +01:00
Ziggeh bba4153f47 Heal CD reduction is now done through scripts 2013-12-08 05:51:03 +01: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
darkk1138 5bea91f1cf allow /flo ;) 2013-12-07 21:32:14 +01:00
darkk1138 1f4d72fa16 add aliases to command service 2013-12-07 21:32:05 +01:00
Ziggeh 55411e0f23 Fixed incorrect calculation for heal CD and added BH heal 2013-12-07 17:34:37 +01:00
darkk1138 9cefd424ce need object version change 2013-12-07 16:45:12 +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
Ziggeh 2a8760a474 Fixed heal cooldown expertise for Officer 2013-12-07 16:22:42 +01:00
Ziggeh 805ef52f73 Soothing Aura for LSJ 
This expertise now functions as intended.
 2013-12-07 05:11:52 +01:00
Ziggeh 14fece35b6 Fixed incorrect math (Healing Potency) 
Healing Potency now functions properly.
 2013-12-07 04:28:11 +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 23731091c8 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-06 12:15:32 +00:00
Treeku e94fc930ce FactionService, helper funcs, factionResponseMsg 2013-12-06 12:14:13 +00:00
Waverunner ff772a1f79 MissionObject Delta's added, Debug print to try and fix Travel Points showing on other planets 2013-12-05 18:48:58 -05:00
Light2 7af18344bc Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-05 17:33:43 +01:00
Light2 2c66ab67d8 More work on lairs 2013-12-05 17:33:26 +01:00
Treeku 3bb0d0534c setDifficulty(Difficulty.NORMAL/ELITE/BOSS) 2013-12-05 12:53:34 +00:00
Treeku 42fca91fa5 Objects with no radial file given default options 2013-12-05 05:22:06 +00:00
Treeku 82e513363e Fixed use() in object scripts. It should work now 2013-12-05 04:17:06 +00: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
Light2 470215c05d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/resources/objects/tangible/TangibleObject.java
 2013-12-04 19:13:08 +01:00
Light2 b22b1d818d More work on AI and spawns 2013-12-04 19:05:02 +01:00
Treeku d3d9dcc461 Fixed factonService ordering 2013-12-04 09:59:33 +00: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 2bb9d4e42e Fixed minor PlayerObject persistent error 2013-12-04 03:43:07 +00:00
Treeku befd10c98f Condition attribute updates when condition is set 2013-12-03 22:47:18 +00:00
Treeku 8bfad21de1 Add buff callbacks (buff effcts can be removed) 
If the buff as a callback field, define it as a function in the buff
script and do whatever it's supposed to do.  It uses the same params as
the other functions in there do.  For example:

def handleClearBuffEffect(core, actor, buff):
 2013-12-03 22:32:38 +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 0edf9610df Start of FactionStanding, Custom Object Scripts 2013-12-03 16:43:01 +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