projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-29 14:12:52 -04:00
Code Issues Projects Releases Wiki Activity
1,387 Commits 11 Branches 4 Tags
d2da758fdb99affa4e2ea90e008fc435b8a056ce
Commit Graph
1387 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
darkk1138 653a6c9172 nothing to see here folks. And before you ask, I changed my forum password already. :P 2013-12-08 19:04:35 +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 47a2706432 Cleaned up waypoint scripts 2013-12-08 15:12:43 +01: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
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 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
Treeku 21943d1934 Merge pull request #111 from Ziggeh/master 
Soothing Aura for LSJ
 2013-12-06 22:28:42 -08:00
Ziggeh 805ef52f73 Soothing Aura for LSJ 
This expertise now functions as intended.
 2013-12-07 05:11:52 +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 14fece35b6 Fixed incorrect math (Healing Potency) 
Healing Potency now functions properly.
 2013-12-07 04:28:11 +01: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 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 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
Treeku 52d81491e5 Updated readme on avoiding kashyyyk errors 2013-12-05 01:37:28 +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