Mesagoppinmypants
8b1f20cdce
Removed Reset Expertise From Frog
...
This is no longer needed now that you can respec expertise properly from NPC.
2014-05-02 16:50:09 -04:00
Treeku
57dcb72718
Additional null checks
2014-05-02 21:24:37 +01:00
Treeku
78569244b8
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-02 21:15:57 +01:00
Treeku
cdbf244b27
Reset pvp bitmask on disconnect
2014-05-02 21:14:49 +01:00
Treeku
5e522cf03b
Added getObjectByFirstName null checks
2014-05-02 21:12:45 +01:00
Treeku
f7fc2dbb2e
Add gmflag bypass, fix char delete on wiped odb
...
Put in nge.cfg: ADMIN=1
2014-05-02 21:04:52 +01:00
Light2
5d4bf6a0a2
odb fix
2014-05-02 20:51:44 +02:00
Treeku
70d63139e6
Temp patchfix for creating chars issue
...
Will fix it properly soon, atm everyone needs to be able to create
chars.
2014-05-02 18:19:39 +01:00
Treeku
48ec7c46ed
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-02 16:30:46 +01:00
Treeku
da93a05b96
Characters faction no longer "neutral"
2014-05-02 16:30:30 +01:00
Light2
2ab32b376c
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-02 00:35:39 +02:00
Light2
d5f9adc7b2
more odb fixes
2014-05-02 00:34:01 +02:00
Waverunner
5d0444ca7c
Disable bounty missions for now
...
They'll be enabled again once the probe droids are finished.
2014-05-01 16:32:57 -04:00
Waverunner
3f049e615b
Merge
2014-05-01 16:29:05 -04:00
Waverunner
7a6360e235
Comm message when accepting bounties, basework for probe droids
2014-05-01 16:14:20 -04:00
Light2
ce55d15e97
merge fixes
2014-05-01 21:27:16 +02:00
Light2
6cd794a6c3
minor fix
2014-05-01 21:25:35 +02:00
Light2
536b51d953
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
.gitignore
src/main/NGECore.java
src/resources/objects/creature/CreatureObject.java
src/resources/objects/mission/MissionObject.java
src/resources/objects/tangible/TangibleObject.java
src/services/chat/Mail.java
src/services/mission/MissionObjective.java
src/services/object/ObjectService.java
src/services/playercities/PlayerCity.java
2014-05-01 21:08:20 +02:00
Light2
62593b08de
Merge branch 'refactor'
2014-05-01 20:43:47 +02:00
Light2
7d457101f3
Refactored odb system (read extended), added implementation of Dynamic World Spawns
...
ODB no longer uses DPL layer of Berkeley DB, persistent classes have to
implement the Serializable interface, annotations are no longer used,
use transient modifier for variables that should not be persistent.
Entity reference errors will no longer occur, however it is better to
use ids if the entity that is being referenced is stored in the db too!
(or you will have two different objects). DB is cached for 5 minutes
then it will write its log/cache to disk, transactions are no longer
used.
2014-05-01 20:33:38 +02:00
Treeku
44f9c4bce5
Added stealth detection/camo consideration
2014-05-01 14:45:48 +01:00
Treeku
a1a4c40b30
Reduced initial time delay
...
The sky always takes 45 seconds to sync after logging in, after which
you visibly see the sky change from light to dark and vice versa.
2014-05-01 12:42:57 +01:00
Levarrishawk
12ca3ae661
Added Subfolders for Planetary Statics
...
Pending move of all static spawn scripts to these subfolders.
2014-05-01 07:42:55 -04:00
Levarrishawk
f32074094e
Modified Kaas Script
...
Commented out all POB structures pending a possible relocation to
snapshot.
2014-05-01 07:38:35 -04:00
Treeku
4b6a7e3667
Added TEFs
2014-05-01 12:33:34 +01:00
Waverunner
9b0ca0e2c5
Merge pull request #569 from Socome/patch-2
...
Update landspeeder_tantive4_deed.py (Same as barc, also, Sorry for dual pr's. edited on github.)
2014-04-30 23:24:24 -04:00
Freddiec
36a947b369
Update landspeeder_tantive4_deed.py
2014-04-30 22:20:34 -05:00
Waverunner
fe2c9a83a5
Merge pull request #567 from tacef/master
...
Updated Terminal scripts to use STF Strings
2014-04-30 23:09:16 -04:00
tacef
29a88981e0
Updated Terminal scripts to use STF Strings
2014-05-01 04:27:25 +02:00
Waverunner
e6f7ffeed9
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-04-30 19:30:30 -04:00
Waverunner
2ce98833ea
Null error fix for Mails
2014-04-30 19:30:12 -04:00
Treeku
5b5ebaf11c
Vehicles now have ranged gb buffs
2014-04-30 23:49:55 +01:00
CharonInferar
81aa0bb850
Merge pull request #565 from tacef/master
...
Added Scripts for imperial and Rebel recruiter NPC's
2014-04-30 22:09:07 +02:00
tacef
091d540ae8
Added Rebel Recruiter script
...
Added Rebelrecruiter to mos eisley cantina for testing reasons
2014-04-30 22:05:59 +02:00
Waverunner
66002081ea
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
src/resources/common/BountyListItem.java
2014-04-30 15:57:30 -04:00
Waverunner
6e9be7e610
Setting bounties now accounts for all of your available funds
2014-04-30 15:54:44 -04:00
CharonInferar
bb91f41bed
Merge pull request #564 from CharonInferar/PlayerCityUpdate
...
Player city update
2014-04-30 21:53:10 +02:00
CharonInferar
717f1951f0
Reconstruction of classes
2014-04-30 21:48:07 +02:00
tacef
8818a821d6
Added Imperial Recruiter scripts
...
Also added 1 recruiter to mos eisley for testing purpose
2014-04-30 21:46:25 +02:00
CharonInferar
a3d4bb326c
merge conflict
2014-04-30 20:30:25 +02:00
CharonInferar
5c599e341e
merge conflict
2014-04-30 20:00:11 +02:00
CharonInferar
4f2b50fa97
merge conflict
2014-04-30 19:58:18 +02:00
CharonInferar
2a23dd8076
merge conflict resolve
2014-04-30 19:45:12 +02:00
CharonInferar
924d52b3b0
Merge remote-tracking branch 'upstream/master'
2014-04-30 18:46:49 +02:00
CharonInferar
ee5be99699
Disabled automatic shuttleport placement in sandbox city
2014-04-30 18:44:30 +02:00
Treeku
6d88bcb90a
Static building criteria fixes
2014-04-30 10:44:42 +01:00
Treeku
1663091d95
Static buildings also spawn cells
2014-04-30 01:01:14 +01:00
Treeku
086ab7cd02
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-04-29 23:37:05 +01:00
Treeku
fac4c7fe3b
Moved Loot objs out of baseline dir
2014-04-29 23:04:53 +01:00
Waverunner
d2c77d8906
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-04-29 17:49:19 -04:00
Mesagoppinmypants