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
tacef
b982d78860
More work on Factional NPC scripts
2014-05-20 21:21:51 +02:00
tacef
8f0a9861f6
Continued Work on Factional NPC scripts
...
Updated Restuss hand with Optionbitmask
2014-05-19 21:20:30 +02: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
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
Treeku
b1650cc668
Minor changes
...
Not sure why the gcw time is always 888d, 33h ahead. The epoch time is
definitely sent correct in seconds. Adding and subtracting server
times, born date or anything else hasn't had an effect.
2014-05-19 16:32:54 +01:00
Treeku
1e864be3f1
Added gcw award for pvp
2014-05-19 16:28:14 +01:00
Treeku
7a94d4438b
Fixed type error
2014-05-18 21:40:48 +01:00
Treeku
8e5c7afaa6
Changed nextUpdateTime calculations
2014-05-18 20:59:51 +01:00
Treeku
efeb66f965
Fixed potential crash
2014-05-18 20:16:39 +01:00
Treeku
43a609f9df
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-18 20:03:27 +01:00
Treeku
4c643a4cb6
Updated engine
2014-05-18 19:58:20 +01:00
tacef
48e721f831
Continued Work on Factional NPC scripts
2014-05-18 20:32:16 +02:00
Treeku
eddcf01202
Implemented gcwPoints and gcwRanks
2014-05-18 19:07:13 +01:00
Treeku
54a00a45cf
Refactored PLAY
2014-05-18 19:04:23 +01:00
tacef
ef4e73e24e
Started work on Factional NPC's
...
Added setFaction and setFactionStatus to Mobiletemplate
2014-05-18 18:08:49 +02:00
tacef
25ab7d3abe
Merge pull request #3 from ProjectSWGCore/master
...
gdxg
2014-05-18 10:51:15 +02:00
Light
b3ae56e37d
Added Group Kick command
2014-05-18 01:09:38 +02:00
Light
682e04da5d
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-18 00:42:01 +02:00
Light
c990690726
Implemented PvP Zones
2014-05-18 00:40:45 +02:00
Waverunner
a92a3675b2
Merge pull request #678 from Ziggeh/master
...
Buffs - add() and remove() no longer used
2014-05-17 18:03:23 -04:00
Treeku
8bca0d625d
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-17 22:15:55 +01:00
Treeku
28ccc21d10
Fixed some nulls that can occur locally
2014-05-17 22:01:33 +01:00
tacef
ec91b5c33f
Merge pull request #2 from ProjectSWGCore/master
...
merge
2014-05-17 20:11:06 +02:00
Light
499e4aa877
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-17 19:56:17 +02:00
Light
f1096094d0
fixed some mobile bugs
2014-05-17 19:56:00 +02:00
Treeku
424cc8fe23
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-17 18:42:12 +01:00
Treeku
94667c1f17
Added a Static Object constructor for convenience
2014-05-17 18:40:47 +01:00
Treeku
ce613c638d
Fixed minor error
2014-05-17 17:48:25 +01:00
Ziggeh
9d99462dd0
Buffs - add() and remove() no longer used
2014-05-17 15:27:29 +02:00
Treeku
f25055710d
Corrected mistake
2014-05-17 09:59:53 +01:00
Treeku
8390234880
Merge pull request #674 from Ziggeh/master
...
Minor CombatService enhancement
2014-05-17 09:49:55 +01:00
tacef
c95ce01e1d
Merge pull request #1 from ProjectSWGCore/master
...
test
2014-05-17 09:56:28 +02:00
Treeku
255aa29578
Merge pull request #675 from tacef/master
...
Updated Tatooine creatures with their respective attacks
2014-05-17 08:52:37 +01:00
tacef
4f2a9e4aba
Updated some NPC scripts
...
Updated some NPC scripts to reflect the latest changed to OPtionBitmask
2014-05-16 21:59:44 +02:00
tacef
2d76c23ac3
Updated Tatooine NPC scripts
...
Updated their Bitmask so they are aggressive if they have to be
2014-05-16 19:37:41 +02:00
tacef
063b430956
Revert "Updated Tatooine creatures with their respective attacks"
...
This reverts commit 6421efcce2
2014-05-16 18:19:31 +02:00
Treeku
5da4f05c62
Added GM reporting of buildingId in buildings
2014-05-16 15:16:04 +01:00
tacef
6421efcce2
Updated Tatooine creatures with their respective attacks
2014-05-16 15:52:37 +02:00
Ziggeh
c07454533b
Minor changes to CombatService
2014-05-16 15:29:40 +02:00
Treeku
e4eb874e18
Temp-fixed startup script errors
2014-05-16 12:20:19 +01:00
Treeku
84af262129
Fixed syntax err with previous commit
2014-05-16 11:57:27 +01:00
Treeku
721ed17050
Added cellId null check for static obj scripts
2014-05-16 11:56:34 +01:00
Ziggeh
70c228cbd5
Jedi - Fixed Stance Saber Block
2014-05-16 12:42:25 +02:00
Treeku
c2806c4ceb
Updated java src files to diff prose constructor
2014-05-16 10:21:42 +01:00
tacef