Treeku
|
676da223e2
|
Fixed transferitemmisc error
|
2014-06-18 19:44:30 +01:00 |
|
Treeku
|
4e0a283e4d
|
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
scripts/radial/item/collection/loot_collection.py
src/resources/objects/mission/MissionObject.java
|
2014-06-18 10:21:31 +01:00 |
|
Treeku
|
8fd5a7fbf6
|
Fixed #895 with zing's fix
|
2014-06-18 08:55:09 +01:00 |
|
tacef
|
ffc58953cb
|
Populated Squill Cave
Updated Squill scripts to be agressive
|
2014-06-17 21:22:20 +02:00 |
|
Treeku
|
e5f78de757
|
Fixed issue where you could ID non-players
|
2014-06-17 18:27:01 +01:00 |
|
Treeku
|
2e363e720f
|
Fixed import error with Position Secured
|
2014-06-17 17:02:22 +01:00 |
|
Treeku
|
acbc136022
|
Fixed issue where smugglers got officer badge
|
2014-06-17 16:59:17 +01:00 |
|
Treeku
|
830b6a42d2
|
Merge pull request #888 from zingzing175/master
Adjusted loot collection radial. Added more Loot Collections.
|
2014-06-17 16:12:54 +01:00 |
|
Zing
|
dd08a2fb61
|
Adjusted loot collection radial. Added more Loot Collections.
|
2014-06-16 19:05:49 -07:00 |
|
Treeku
|
8c026f0324
|
Merge pull request #887 from tacef/master
More NPC Work
|
2014-06-16 22:13:58 +01:00 |
|
Treeku
|
90e762bc6e
|
Added some getPermissions null checks
This needs fixing properly, it's been throwing a null error for a long
time in transferitemmisc.
|
2014-06-16 20:28:09 +01:00 |
|
Treeku
|
cbb3cc464b
|
Fixed a null error with loot_collection
|
2014-06-16 20:25:48 +01:00 |
|
tacef
|
e599d81412
|
Fixed description in leg camp
|
2014-06-16 20:45:59 +02:00 |
|
tacef
|
0b8511a0c4
|
Populated wounded miners camp
|
2014-06-16 20:39:59 +02:00 |
|
tacef
|
05e69763dc
|
Populated Miners Camp
|
2014-06-16 20:22:20 +02:00 |
|
tacef
|
348190ab91
|
Populated Slumthief spot outside Mos Espa
|
2014-06-16 19:30:04 +02:00 |
|
Treeku
|
b4dc3ad042
|
Merge pull request #883 from zingzing175/master
Loot Collections!
|
2014-06-16 12:42:09 +01:00 |
|
Ziggeh
|
c259136c4d
|
Merge pull request #880 from tacef/master
More NPC Work
|
2014-06-16 13:36:14 +02:00 |
|
Zing
|
05e405b2d5
|
Loot Collections!
Started. Working.
|
2014-06-15 19:06:42 -07:00 |
|
tacef
|
9db2c03dcf
|
More NPC Work
Populated Jem Lavar place outside Darklighter cave
|
2014-06-15 21:09:45 +02:00 |
|
tacef
|
9a7b1b9f4d
|
More NPC work
Populated Darklighter Cave
Altered NPC's to use the correct Bitmask
Fixed Desert Demon error
|
2014-06-15 20:04:15 +02:00 |
|
Bronco69
|
6b0b5eae29
|
Naboo planetary spawns
fix and add of missing spawn areas
|
2014-06-15 15:49:02 +02:00 |
|
tacef
|
f80068d0b0
|
Updated Valarian Depot scripts to be aggressive
|
2014-06-15 13:17:38 +02:00 |
|
tacef
|
0317636792
|
Populated Valarian Depot
|
2014-06-15 13:16:56 +02:00 |
|
tacef
|
0cc0f78ee5
|
Updated Tusken Outrider Bitmask
|
2014-06-15 08:50:41 +02:00 |
|
Ziggeh
|
b3b5f6582c
|
Merge pull request #879 from zingzing175/master
Created reverse engineering junk loot groups
|
2014-06-15 08:41:36 +02:00 |
|
Zing
|
e9737eb1be
|
Created reverse engineering junk loot groups
|
2014-06-14 22:49:42 -07:00 |
|
tacef
|
447695f911
|
Populated Tusken spots around Jawa Sandcrawler Legacy Part
|
2014-06-15 06:38:26 +02:00 |
|
tacef
|
9aa21c96e2
|
More work on Legacy NPC Spawns
Added Modified Battle Droid
Added Droids to lars homestead
|
2014-06-15 06:27:21 +02:00 |
|
tacef
|
f41299a818
|
More work on Legacy Spawns
Added NPC's to Tosche Station
Altered Desert Demon to fit the Legacy description
|
2014-06-15 06:25:45 +02:00 |
|
Light2
|
4871a071d6
|
Added city voting terminal radials and SUI windows, fixed lots of city bugs
|
2014-06-15 02:27:15 +02:00 |
|
Light2
|
5ec61fa27b
|
Merge pull request #876 from tacef/master
Added Content to Planetary Maps for Naboo, Tatooine and Corellia
|
2014-06-14 21:07:17 +02:00 |
|
tacef
|
a0441f1612
|
Added Content to Planetary Maps
Added Salons to Corellia, Naboo and Tatooine (Planetary Map)
Added Hotel to Theed (Planetary Map)
|
2014-06-14 21:04:49 +02:00 |
|
tacef
|
349207f6bb
|
Added Content to Naboo Planetary Map
Added remaining content to Corellia Planetary Map
|
2014-06-14 21:02:00 +02:00 |
|
tacef
|
9b4a4e5968
|
Added Content to Tatooine Planetary Map
|
2014-06-14 20:56:37 +02:00 |
|
Light2
|
9b5677420b
|
Begin work on city elections
|
2014-06-14 20:55:17 +02:00 |
|
tacef
|
0d89c4db2c
|
Added Content to Corellia Planetary Map
|
2014-06-14 20:54:16 +02:00 |
|
Light2
|
8b0bc0c9b0
|
Merge pull request #874 from zingzing175/master
Junk loot color naming and small template fix for Re ing.
|
2014-06-14 20:27:09 +02:00 |
|
tacef
|
f27ff777f9
|
More Work on White Thranta Bunker
Added Brok Ziam
Added Durr Rodak
|
2014-06-14 20:24:14 +02:00 |
|
Light2
|
a0cd4df053
|
Making a treasury deposit will now inform the mayor of the depositor name and amount by mail.
|
2014-06-14 20:24:06 +02:00 |
|
Light2
|
9fff30c9f2
|
Added revoke citizenship
|
2014-06-14 20:15:42 +02:00 |
|
Light2
|
8148f398b7
|
Added structure report, treasury report and manage militia to city management terminal
|
2014-06-14 18:57:55 +02:00 |
|
Zing
|
ab32a0c1d1
|
Colored junk naming convention
|
2014-06-14 09:12:27 -07:00 |
|
Light2
|
3a1d3b4651
|
Merge pull request #873 from tacef/master
Added NPC's to corellia
|
2014-06-14 14:50:41 +02:00 |
|
tacef
|
bbde632355
|
Added more NPC's to Tatooine
Added Remaining Junkdealers to mos espa
Added Toggi Bok
|
2014-06-14 12:13:57 +02:00 |
|
Ziggeh
|
89632f4259
|
Moved GCW officer collection scripts
Moved the scripts to the collections directory
|
2014-06-14 08:57:20 +02:00 |
|
tacef
|
b945a2133d
|
Added NPC's to corellia
Added Junkdealers
Added Profession counselor to cnet
|
2014-06-14 07:23:14 +02:00 |
|
Treeku
|
0702e1ae1e
|
Merge pull request #870 from zingzing175/master
Junk Loot, the rest of it.
|
2014-06-14 06:10:54 +01:00 |
|
Zing
|
d1db54db33
|
Junk Loot, the rest of it.
Correct templates for all junk loot. Removed npc_loot folder (not
needed).
|
2014-06-13 21:59:43 -07:00 |
|
Treeku
|
e137060955
|
Merge pull request #869 from zingzing175/master
Junk loot naming and correct templates (A-D)
|
2014-06-13 08:19:41 +01:00 |
|