 tacef
|
b8ff47bbdd
|
Fixed Typo in Restuss Emperors Hand
|
2014-05-23 15:45:37 +02:00 |
|
|
tacef
|
ad0203fe27
|
More work on Faction NPC scripts
|
2014-05-23 13:38:14 +02:00 |
|
|
tacef
|
ee130086af
|
Merge pull request #5 from ProjectSWGCore/master
Fork Update
|
2014-05-23 13:36:07 +02:00 |
|
|
Waverunner
|
f4947d4a33
|
Added guild sponsorship system, added methods to send guild mails
|
2014-05-22 20:04:11 -04:00 |
|
|
CharonInferar
|
7ebbca39ff
|
Merge pull request #700 from tacef/master
Updated Rebel and imperial Recruiter Conversation
|
2014-05-22 19:34:21 +02:00 |
|
|
tacef
|
a64119e96a
|
Fixed Rebel recruiter Conversation
|
2014-05-22 19:06:01 +02:00 |
|
|
tacef
|
a431ff53a1
|
Updated Imperial Recruiter Convo to support recent changes to the Factionservice
Updated Factionservice, you weren´t combatant when joining faction
|
2014-05-22 19:04:24 +02:00 |
|
|
CharonInferar
|
8185fd0188
|
Merge pull request #698 from CharonInferar/DathomirSpawns
Dathomir Nightsisters and Singing mountain clan added
|
2014-05-22 17:33:42 +02:00 |
|
|
CharonInferar
|
1a10796e0e
|
Debug outs commented out
|
2014-05-22 17:31:43 +02:00 |
|
|
CharonInferar
|
c28fea3cf9
|
Dathomir Nighsisters and Singing Mountain Clan added
- Nightsister vs Singing Mountain Clan Battle
- Wild NS and SMC spawns in some areas of the planet
|
2014-05-22 17:24:44 +02:00 |
|
|
Seefo
|
33ddb83207
|
Fixed #690
|
2014-05-21 19:15:09 -04:00 |
|
|
Light2
|
c455bcbb18
|
minor fix
|
2014-05-22 00:45:30 +02:00 |
|
|
Light2
|
88bb8a4ee2
|
fixed krayt sizes to more realistic values
|
2014-05-22 00:35:11 +02:00 |
|
|
Light2
|
b03b4164cd
|
fixed mobile template name for krayt spawns
|
2014-05-22 00:23:17 +02:00 |
|
|
Light2
|
54b93d4b19
|
Changed krayt spawns to static spawns like on live
|
2014-05-21 20:35:23 +02:00 |
|
|
Light2
|
c7e41a83e9
|
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
src/services/bazaar/BazaarService.java
|
2014-05-21 19:16:21 +02:00 |
|
|
CharonInferar
|
c4578eb953
|
Merge pull request #695 from CharonInferar/ForceCrystalCave
Force crystal hunters cave and some fixes
|
2014-05-21 19:03:52 +02:00 |
|
|
Light2
|
4e8a9ae47c
|
bit more work on vendors
|
2014-05-21 19:02:12 +02:00 |
|
|
CharonInferar
|
e8f7fe50a4
|
Merge remote-tracking branch 'origin/master' into ForceCrystalCave
|
2014-05-21 18:51:58 +02:00 |
|
|
CharonInferar
|
164ed38fc4
|
Added imperial outpost, fixed visibility issue
- Added force crystal hunter's cave
- Added imperial outpost NPCs
- Fixed creature visibility while mounted
- Tweaked some spawn areas
- Debugged some spawn issues
|
2014-05-21 18:50:02 +02:00 |
|
|
Treeku
|
d743776927
|
Fixed #690
|
2014-05-21 15:38:42 +01:00 |
|
|
Treeku
|
605dcebb3a
|
Merge pull request #679 from Tipho/master
Changes to Creature Scripts
|
2014-05-21 15:29:31 +01:00 |
|
|
Nathan
|
f165511c47
|
Added Remaining Talus Animals
|
2014-05-21 10:22:13 -04:00 |
|
|
Nathan
|
9d6e255e7e
|
Merge branch 'master' of https://github.com/Tipho/NGECore2
|
2014-05-20 21:11:55 -04:00 |
|
|
Tipho
|
4f09514870
|
Began Work on Talus Animals
|
2014-05-20 20:38:00 -04:00 |
|
|
Waverunner
|
8b5e3100fb
|
Fixed attribute error, added missing guildchat scripts from last commit
|
2014-05-20 19:01:50 -04:00 |
|
|
Waverunner
|
c9b2d1c2a2
|
Added guild chat, guild information window added, added variables in future for sponsor system
|
2014-05-20 18:34:53 -04:00 |
|
|
Treeku
|
b9e477ddf0
|
Fixed SWGSet bug
|
2014-05-20 22:07:38 +01:00 |
|
|
Tipho
|
4a923aa2da
|
Small Fix
|
2014-05-20 15:47:43 -04:00 |
|
|
Treeku
|
6c20fc545c
|
Merge pull request #687 from tacef/master
More work on Factional NPC scripts
|
2014-05-20 20:29:16 +01:00 |
|
|
tacef
|
b982d78860
|
More work on Factional NPC scripts
|
2014-05-20 21:21:51 +02:00 |
|
|
Tipho
|
be407331ba
|
Merge pull request #2 from ProjectSWGCore/master
Merge
|
2014-05-20 15:09:58 -04:00 |
|
|
Tipho
|
9bfe54fbd0
|
Deleted Duplicates
|
2014-05-20 15:09:20 -04:00 |
|
|
CharonInferar
|
4a402abfc9
|
Conflict resolve
|
2014-05-20 19:45:58 +02:00 |
|
|
Tipho
|
67bd596854
|
Added Remaining Endor Animals, Fixed Small Bugs
|
2014-05-20 13:14:02 -04:00 |
|
|
CharonInferar
|
f97ecc58d2
|
Merge pull request #686 from CharonInferar/DantooineSpawns
Dantooine planetary mob and NPC spawns added
|
2014-05-20 18:49:10 +02:00 |
|
|
CharonInferar
|
9b0986521e
|
Edits to some mobiles
Corrections
|
2014-05-20 18:40:57 +02:00 |
|
|
Tipho
|
b629bd57ef
|
Merge pull request #1 from ProjectSWGCore/master
Merge
|
2014-05-19 15:59:50 -04:00 |
|
|
Treeku
|
4d1f484fdc
|
Merge pull request #682 from tacef/master
Fixed Filenameerror
|
2014-05-19 20:36:39 +01:00 |
|
|
Treeku
|
4109cf5c6d
|
Fixed illegal argument exception in SWGSet
|
2014-05-19 20:34:18 +01:00 |
|
|
tacef
|
8f0a9861f6
|
Continued Work on Factional NPC scripts
Updated Restuss hand with Optionbitmask
|
2014-05-19 21:20:30 +02:00 |
|
|
Tipho
|
6d64a82d74
|
Small Changes and Added Most Endor Animals
|
2014-05-19 15:10:38 -04:00 |
|
|
tacef
|
1b03c4ea1f
|
Merge pull request #4 from ProjectSWGCore/master
Update local fork
|
2014-05-19 20:01:53 +02:00 |
|
|
tacef
|
43324cf4fa
|
Fixed Filename error with Probotdrone
|
2014-05-19 20:00:50 +02:00 |
|
|
Treeku
|
ff220a116e
|
Merge pull request #681 from tacef/master
Fixed Error in MobileTemplate factionStatus
|
2014-05-19 18:57:55 +01:00 |
|
|
tacef
|
8592841b35
|
Fixed Error in MobileTemplate factionStatus
|
2014-05-19 19:56:52 +02:00 |
|
|
Treeku
|
a10fb20373
|
Merge pull request #680 from tacef/master
Started work on Factional NPC's
|
2014-05-19 18:50:37 +01:00 |
|
|
tacef
|
d470489ad8
|
More work on Faction NPC's
|
2014-05-19 19:31:40 +02:00 |
|
|
Tipho
|
37637da689
|
Added more creatures pt. 3
|
2014-05-19 11:53:59 -04:00 |
|
|
Treeku
|
a8aaae692b
|
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
src/resources/objects/player/PlayerObject.java
|
2014-05-19 16:37:27 +01:00 |
|