projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-30 00:15:57 -04:00
Code Issues Projects Releases Wiki Activity
1,666 Commits 11 Branches 4 Tags
2a23dd8076adff03bf64e97ad305e87c043c2f14
Commit Graph
784 Commits
Author SHA1 Message Date
CharonInferar 2a23dd8076 merge conflict resolve 2014-04-30 19:45:12 +02:00
CharonInferar bec401c57b continued sandbox city, public structure problem 2014-04-28 22:52:04 +02:00
CharonInferar 4e6ae6d478 Merge remote-tracking branch 'origin/master' into PlayerCityUpdate 2014-04-27 20:55:03 +02:00
CharonInferar 5934bcfb69 Merge pull request #549 from tacef/master 
Update Imperial Recruiter Conversation
 2014-04-27 20:48:26 +02:00
tacef 34f726f037 Updated Imperial Recruiter again 2014-04-27 19:57:47 +02:00
tacef 4849a16e38 Updated Imperial Recruiter Conversation again 
- Join military
- go Combatant
- go SF
- leave Military
 2014-04-27 17:43:41 +02:00
tacef bc7b2f02cc Updated Imperial Recruiter Conversation 
You are now able to resign from military
 2014-04-27 17:10:03 +02:00
CharonInferar b35c6bbc74 Merge pull request #535 from tacef/master 
Added more House deeds
 2014-04-27 14:14:58 +02:00
tacef b6693334fe Added Medical Cloning Droid Conversation 2014-04-27 11:14:17 +02:00
Mesagoppinmypants ade3071607 Scripted Stormtrooper Squad Leader NPC 
Tested and works.
 2014-04-26 20:23:25 -04:00
Treeku 55622980a6 Fixed minor agility_modified.py error 2014-04-27 01:06:57 +01:00
zingzing175 20970e915b Added action add to Officer Inspiration, fixed a couple base skill mods, fixed officer buffs. 2014-04-26 16:47:03 -07:00
zingzing175 563f2572bf Revert "Revert "Fixed agility.py issue"" 
This reverts commit 3e02e080cf.
 2014-04-26 16:21:30 -07:00
zingzing175 3e02e080cf Revert "Fixed agility.py issue" 
This reverts commit 8afe1e4af1.
 2014-04-26 15:52:46 -07:00
tacef 983c94c692 Started Work on Imperial Recruiter 2014-04-26 21:46:32 +02:00
tacef 114bcd85e5 Added more House deeds 
Also fixed structureterminal positions in Cityhalls. (need testing)
 2014-04-26 20:10:11 +02:00
Treeku 8afe1e4af1 Fixed agility.py issue 2014-04-26 16:15:26 +01:00
CharonInferar 25de95b310 Merge pull request #533 from tacef/master 
Continued Work on Playerhouse deed
 2014-04-26 15:42:45 +02:00
tacef 3e5e748d6b Continued Work on Playerhouse deed 
Altered Objectservice again to support storyteller house deeds
 2014-04-26 15:19:44 +02:00
CharonInferar 73e2c5deae Merge pull request #532 from tacef/master 
Naboo House Deed's added (need testing)
 2014-04-26 14:17:16 +02:00
tacef a96352df9b Naboo House Deed's added 
Also fixed typos corellia house deed's
 2014-04-26 09:27:31 +02:00
Treeku 9a6e37fbbb Fixed Agility.py 2014-04-26 01:07:40 +01:00
CharonInferar 76f9ff6be8 Merge remote-tracking branch 'origin/master' into PlayerCityUpdate 2014-04-26 01:30:41 +02:00
CharonInferar 0c2f4b29a0 Grant zoning added 
test with 2 player chars to increase population to 2 citizens after
zoning and declare residence.
 2014-04-26 01:18:18 +02:00
Treeku ab797e7862 Removed static NPC folder 2014-04-26 00:15:05 +01:00
Treeku 09a6aa05ac Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
 2014-04-26 00:12:22 +01:00
Treeku 565fdc20da Refactored skillMods 2014-04-25 23:25:01 +01:00
Waverunner 14ce2f5a8d Merge pull request #531 from ProjectSWGCore/Wave_Missions 
Delivery Missions
 2014-04-25 17:29:42 -04:00
Waverunner 5e240b00fa Added aborting for missions, finished delivery missions, cleaned up code 2014-04-25 17:26:48 -04:00
Treeku 632d157074 Merge pull request #524 from tacef/master 
Continued work on Playerhouse deeds
 2014-04-25 21:18:00 +01:00
tacef 061adee910 Continued work on Playerhouse deeds 
Added some more houses(need more testing when elevators work)
Also altered objectservice to work with tcg houses
 2014-04-25 17:42:05 +02:00
CharonInferar df7c10dc6d Merge remote-tracking branch 'origin/master' into TreasureMaps 2014-04-25 16:57:59 +02:00
Treeku 84f266f49b Merge pull request #520 from Mesagoppinmypants/patch-37 
Added Loot to Imperial Storm Commando
 2014-04-25 12:10:42 +01:00
Treeku 48d029e7cf Merge pull request #487 from Mesagoppinmypants/patch-35 
Updated Light Jedi Council Robe
 2014-04-25 12:09:27 +01:00
Treeku 593a138079 Merge pull request #486 from Mesagoppinmypants/patch-34 
Updated Dark Jedi Council Robe
 2014-04-25 12:06:44 +01:00
Treeku be4cee0a30 Merge pull request #519 from Mesagoppinmypants/patch-36 
Added "a Storm Commando" NPC
 2014-04-25 12:05:03 +01:00
Treeku 974e1106cb Merge pull request #512 from LordAlfonso/master 
Added - Rancor, NS Slave
 2014-04-25 12:03:51 +01:00
Treeku aed5cf6804 Merge pull request #521 from Socome/master 
Added: N-K Necrosis
 2014-04-25 12:02:26 +01:00
Freddiec 4d119f3069 Added: N-K Necrosis 
and Kashyyyk mobile folder
 2014-04-24 20:45:46 -05:00
CharonInferar f1834d52ff Adv Stim loot pool added 2014-04-25 03:27:45 +02:00
CharonInferar c7a9b8492b Added a preliminary template to gems 2014-04-25 03:14:29 +02:00
Mesagoppinmypants 061787e2c6 Added Loot to Imperial Storm Commando 2014-04-24 20:55:11 -04:00
Mesagoppinmypants 1c62db1305 Added "a Storm Commando" NPC 
Added http://swg.wikia.com/wiki/Imperial_Storm_Commando
Tested and works.
 2014-04-24 20:43:58 -04:00
CharonInferar e877a44713 Jedi Loot templates inserted 
Buried treasure loot realized
 2014-04-25 01:49:50 +02:00
Waverunner 8e481be783 Added accepting for missions, added first phase for delivery missions 2014-04-24 17:46:28 -04:00
LordAlfonso e4eec8921c Merge remote-tracking branch 'upstream/master' 2014-04-24 23:02:48 +02:00
Waverunner 5cf795d250 Merge pull request #518 from Undercova/master 
Fixed bonus sets equip message
 2014-04-24 14:30:31 -04:00
Bronco69 91c487be08 Fixed bonus sets equip message 
Added system message for all bonus sets when activating bonus
 2014-04-24 16:31:52 +02:00
CharonInferar 05be4b0620 Merge remote-tracking branch 'origin/master' into TreasureMaps 2014-04-24 15:24:40 +02:00
CharonInferar f810786e2b Merge remote-tracking branch 'origin/master' into LootDrops 2014-04-24 14:11:29 +02:00