projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-01 02:16:15 -04:00
Code Issues Projects Releases Wiki Activity
2,513 Commits 11 Branches 4 Tags
bb28323a7a62e37aa4e00a0ce4d2fd3ca1173bdf
Commit Graph
1250 Commits
Author SHA1 Message Date
Ziggeh 1383f3694c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-27 23:29:10 +02:00
Treeku 3c589c2f1c Merge pull request #557 from tacef/master 
Added more creatures to mos eisley
 2014-04-27 21:19:58 +01:00
tacef b77d99328a Added more creatures to mos eisley 
Added Worrts
Added Rills
 2014-04-27 22:16:59 +02:00
Treeku 136e9355bf Merge pull request #541 from Mesagoppinmypants/patch-42 
Fixed Loot Item
 2014-04-27 20:39:30 +01:00
Treeku f183bd3c74 Merge pull request #540 from Mesagoppinmypants/patch-41 
Scripted Imperial Scout Trooper NPC
 2014-04-27 20:38:42 +01:00
Treeku c6012c3c51 Merge pull request #538 from Mesagoppinmypants/patch-39 
Scripted Imperial Swamp Trooper
 2014-04-27 20:38:20 +01:00
Treeku 3038660c62 Merge pull request #534 from Ziggeh/master 
Fixed some BH expertise
 2014-04-27 20:37:43 +01:00
Treeku 3978046496 Merge pull request #555 from tacef/master 
Added Rebel Recruiter Conversation
 2014-04-27 20:37:08 +01:00
tacef ac776668b8 Added Rebel Recruiter Conversation 
Fixed error in Imperial recruiter Conversation
 2014-04-27 21:11:32 +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
Ziggeh 37cf8300d6 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-27 13:53:58 +02:00
tacef b6693334fe Added Medical Cloning Droid Conversation 2014-04-27 11:14:17 +02:00
Mesagoppinmypants 2ce108ce44 Fixed Loot Item 2014-04-26 23:05:07 -04:00
Mesagoppinmypants 80556f169c Scripted Imperial Scout Trooper NPC 
Tested and works.
 2014-04-26 21:42:57 -04:00
Mesagoppinmypants 2c39bc74fb Scripted Imperial Swamp Trooper 
Tested and works.
 2014-04-26 21:33:24 -04: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
Ziggeh 2785b6176e Collections - Refactored profession master badges 2014-04-26 22:05:42 +02:00
tacef 983c94c692 Started Work on Imperial Recruiter 2014-04-26 21:46:32 +02:00
Ziggeh 8f72fa4ed2 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-26 20:12:31 +02:00
tacef 114bcd85e5 Added more House deeds 
Also fixed structureterminal positions in Cityhalls. (need testing)
 2014-04-26 20:10:11 +02:00
Ziggeh ec2e010c7e Bounty Hunter - Fixed Fumble expertise 
Was granting unused abilities that were removed in a BH expertise
revamp.
 2014-04-26 19:23:55 +02:00
Ziggeh 4c29a54689 Bounty Hunter - Fixed Dread Strike expertise 
It was granting unused abilities
 2014-04-26 19:22:50 +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