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,666 Commits 11 Branches 4 Tags
2a23dd8076adff03bf64e97ad305e87c043c2f14
Commit Graph
1666 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CharonInferar 2a23dd8076 merge conflict resolve 2014-04-30 19:45:12 +02:00
CharonInferar ee5be99699 Disabled automatic shuttleport placement in sandbox city 2014-04-30 18:44:30 +02:00
CharonInferar bec401c57b continued sandbox city, public structure problem 2014-04-28 22:52:04 +02:00
CharonInferar 3948fe11f3 Sandbox city building 2014-04-28 04:31:45 +02:00
CharonInferar 4e6ae6d478 Merge remote-tracking branch 'origin/master' into PlayerCityUpdate 2014-04-27 20:55:03 +02:00
CharonInferar 4da21fd9db Merge remote-tracking branch 'upstream/master' 2014-04-27 20:53:14 +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 4cef2c09cc Scripted Stormtrooper Squad Leader NPC 
Tested and works.
 2014-04-27 03:07:43 +02:00
Treeku 2010163228 Fixed minor agility_modified.py error 2014-04-27 03:07:42 +02:00
zingzing175 07e1f7c9f6 Added action add to Officer Inspiration, fixed a couple base skill mods, fixed officer buffs. 2014-04-27 03:07:42 +02:00
zingzing175 410257723e Revert "Revert "Fixed agility.py issue"" 
This reverts commit 3e02e080cf.
 2014-04-27 03:07:41 +02:00
zingzing175 989ee0a772 Revert "Fixed agility.py issue" 
This reverts commit 8afe1e4af1.
 2014-04-27 03:07:41 +02:00
Treeku 60d2820156 Fixed agility.py issue 2014-04-27 03:07:40 +02:00
tacef f0e345bf37 Updated Objectservice 
to just load playerdeed out of TCG and Saga_system
 2014-04-27 03:07:40 +02:00
tacef 50ddd6f42f Continued Work on Playerhouse deed 
Altered Objectservice again to support storyteller house deeds
 2014-04-27 03:07:39 +02:00
tacef 41589dd0cb Naboo House Deed's added 
Also fixed typos corellia house deed's
 2014-04-27 03:07:39 +02:00
Treeku 9b3397923a Fixed Agility.py 2014-04-27 03:07:38 +02:00
Treeku 7dca8b362f Moved resource functions to resourceService 2014-04-27 03:07:38 +02:00
Treeku 7eb6c16b4f Merge pull request #537 from Mesagoppinmypants/patch-38 
Scripted Stormtrooper Squad Leader NPC
 2014-04-27 01:28:56 +01: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
Treeku 87f5c709f8 Merge pull request #536 from zingzing175/master 
Added action add to Officer Inspiration, fixed a couple base skill mods, fixed officer buffs.
 2014-04-27 01:05:41 +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 caf9bf2f4b Updated Objectservice 
to just load playerdeed out of TCG and Saga_system
 2014-04-26 15:40:12 +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
Treeku c1505e5974 Moved resource functions to resourceService 2014-04-26 00:36:13 +01:00
CharonInferar 76f9ff6be8 Merge remote-tracking branch 'origin/master' into PlayerCityUpdate 2014-04-26 01:30:41 +02:00
Treeku 61748a3545 Some more skillMod improvements 2014-04-26 00:25:25 +01: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 5203f23524 Minor other skillMod changes 2014-04-26 00:09:22 +01:00
Treeku 565fdc20da Refactored skillMods 2014-04-25 23:25:01 +01:00
Waverunner 6fc8c53bb9 Fixed errors in MountService.java 2014-04-25 17:38:28 -04: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