zingzing175
|
3e02e080cf
|
Revert "Fixed agility.py issue"
This reverts commit 8afe1e4af1.
|
2014-04-26 15:52:46 -07: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 |
|
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 |
|
CharonInferar
|
5987b86a3d
|
Updated Housing service
Housing service detects if new citizen builds structure
and adds him as citizen to the city
|
2014-04-24 14:10:46 +02:00 |
|
CharonInferar
|
982c4604b8
|
Continued work on terminal
Differentiated taxes and ranks
|
2014-04-24 14:10:46 +02:00 |
|
CharonInferar
|
83ae55ec7c
|
Worked on City Maintenance Console
Implementation of SUI windows and menus
|
2014-04-24 14:10:45 +02:00 |
|
CharonInferar
|
9da8803100
|
Player city service methods added
added administrative methods
|
2014-04-24 14:10:44 +02:00 |
|
CharonInferar
|
8476bb36ee
|
Merge remote-tracking branch 'origin/master' into LootDrops
|
2014-04-24 14:09:03 +02:00 |
|
CharonInferar
|
0425810f51
|
Added more very rare loot and prof jewelry
|
2014-04-24 04:59:51 +02:00 |
|
LordAlfonso
|
3abe70681c
|
Added - Rancor, NS Slave
|
2014-04-24 00:13:02 +02:00 |
|
CharonInferar
|
627ffdedf8
|
merge conflict fix for added houses
|
2014-04-23 21:57:20 +02:00 |
|
Waverunner
|
98a1ea773f
|
Merge pull request #508 from tacef/master
Fixed Cityhall deeds
|
2014-04-23 15:43:51 -04:00 |
|
Waverunner
|
17c2be4d6b
|
Merge pull request #507 from Socome/master
Added: Durni, Fambaa, Bantha and Dewback
|
2014-04-23 15:43:05 -04:00 |
|
tacef
|
dddee40679
|
Fixed NPC's
Fixed Kreetle's and Womprats to spawn outside eisley again.
|
2014-04-23 21:22:12 +02:00 |
|
tacef
|
78deb6ee8c
|
Fixed Typo in House deeds
|
2014-04-23 20:49:10 +02:00 |
|
tacef
|
76b3674182
|
Updated House Templates
addBuildingSign is now in the correct position, needs testing.
|
2014-04-23 20:18:16 +02:00 |
|
tacef
|
c98c220979
|
Fixed Cityhall deeds
Cityhall deeds are more accurate with BMR
Cityhall deeds aren´t deducting lots anymore
Fixed Tatooine Cityhall Cityterminal position
|
2014-04-23 19:24:15 +02:00 |
|
Seefo
|
cb162badd2
|
Merge pull request #503 from tacef/master
Continued Work on City Hall deeds
|
2014-04-23 12:23:20 -04:00 |
|
Seefo
|
064e733cba
|
Fixed vehicle passenger stuff
|
2014-04-23 00:11:26 -04:00 |
|
Freddiec
|
545d10760c
|
Added: Durni, Fambaa, Bantha and Dewback
|
2014-04-22 18:15:07 -05:00 |
|