Treeku
fa63eacc3c
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-04 23:22:55 +01:00
Treeku
a5ee3ff2b4
StaticService can now use mobileTemplates
...
Just put a mobileTemplate in place of the objectTemplate.
2014-05-04 23:22:15 +01:00
Light2
ae33de15c5
fixed tons of null pointers after loading objects from db
2014-05-04 22:47:05 +02:00
Light2
db4a47b35a
Equipment list now uses ids instead of the referencing the object to avoid storing duplicate objects in the db
2014-05-04 20:54:41 +02:00
Light2
a5411ab44b
fixed another null pointer
2014-05-04 19:34:16 +02:00
Light2
8f660e92ba
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-04 17:38:22 +02:00
Light2
e78f1ec8fa
Added harvesting and milking of creatures, fixed odb save bug
2014-05-04 17:37:58 +02:00
Waverunner
4831f6d8ca
Added handling of deathblow for bounties
2014-05-03 20:04:27 -04:00
Treeku
62bc6a5771
StaticService now reads from planetName folders
...
Put any scripts in there, named anything.
They could be separated into questlines, such as Jabbas Themepark, Rebel
Themepark, Imperial Themepark, lifeday, corellia themepark. They can
also be names of planet areas.
This makes it easier for multiple people to work on different spawns on
the same planet and makes the spawns for a particular subject easy to
find.
2014-05-03 20:18:00 +01:00
Treeku
464c10ddd7
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-03 17:37:43 +01:00
Light2
f05da881ab
Fixed odb bugs, fixed some null pointers
2014-05-03 18:12:27 +02:00
Treeku
dba74a6ebc
Fixed calculatePvpStatus
2014-05-03 15:32:07 +01: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
Light2
d5f9adc7b2
more odb fixes
2014-05-02 00:34:01 +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
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
fac4c7fe3b
Moved Loot objs out of baseline dir
2014-04-29 23:04:53 +01:00
Treeku
3368682443
Static objects now use doids
2014-04-29 08:36:44 +01:00
Treeku
02ff93312e
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
scripts/houses/player_house_corellia_large_style_01.py
scripts/houses/player_house_corellia_large_style_02.py
src/resources/objects/tangible/Deed.java
src/resources/objects/tangible/Harvester_Deed.java
src/resources/objects/tangible/Player_House_Deed.java
src/services/PlayerService.java
src/services/object/ObjectService.java
2014-04-29 05:04:23 +01:00
Treeku
985cd6b779
Moved buff and skillmod objects
2014-04-29 03:56:52 +01:00
Treeku
919eb5ea44
Added UseTarget to CreatureObject
2014-04-29 03:29:03 +01:00
Waverunner
b0e2a490f6
Changes to MissionObjective, started working on player bounties
2014-04-28 17:37:23 -04:00
Treeku
9fc30d10c4
Removed DeedObject, made buildings simpler
2014-04-28 22:07:32 +01:00
Light2
97743da840
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-04-28 16:17:40 +02:00
Light2
a740e0c6ca
bazaar retrieve item fix
2014-04-28 16:17:31 +02:00
Treeku
61748a3545
Some more skillMod improvements
2014-04-26 00:25:25 +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
5203f23524
Minor other skillMod changes
2014-04-26 00:09: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
CharonInferar
df7c10dc6d
Merge remote-tracking branch 'origin/master' into TreasureMaps
2014-04-25 16:57:59 +02:00
Treeku
6aa1295eb9
Updated variable labeling a bit for CREOs
2014-04-25 12:19:35 +01: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
CharonInferar
42724a76d6
Updated Housing service
...
Housing service detects if new citizen builds structure
and adds him as citizen to the city
2014-04-24 01:20:02 +02:00
Waverunner
a00f637f13
More randomization's for delivery missions, more work on objectives
2014-04-22 17:54:05 -04:00
Waverunner
e9065c480f
Randomize mission strings, foundation for objectives
2014-04-21 16:14:29 -04:00
Waverunner
851ba61252
More work on Missions
2014-04-20 20:21:38 -04:00
Waverunner
6184d21420
Merge remote-tracking branch 'origin/master' into Wave_Missions
...
Conflicts:
src/main/NGECore.java
src/protocol/swg/chat/ChatFriendsListUpdate.java
src/services/MissionService.java
2014-04-19 18:33:02 -04:00
Treeku
506e1f160e
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-04-19 00:39:51 +01:00
Waverunner
b6158a4014
leaveChatChannel removes from list of players channels
2014-04-18 18:14:59 -04:00
Treeku
50e88d2300
Cut down a few warnings
2014-04-18 22:38:07 +01:00
Treeku
bcbcbde34a
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
src/resources/objects/tangible/TangibleObject.java
2014-04-18 21:29:57 +01:00
Treeku
e8a1959f9d
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
...
Conflicts:
scripts/radial/vehicle.py
src/main/NGECore.java
src/resources/objects/creature/CreatureObject.java
src/resources/objects/player/PlayerObject.java
src/resources/objects/tangible/TangibleObject.java
src/services/SimulationService.java
src/services/combat/CombatService.java
src/services/object/ObjectService.java
2014-04-18 21:10:53 +01:00
CharonInferar
69266f2896
Merge remote-tracking branch 'origin/master' into JunkDealer
2014-04-18 21:07:52 +02:00
CharonInferar
4f60260e53
Menu functionality improved
...
Lootkit implemented
Loot price and further stats considered
2014-04-18 20:57:56 +02:00
Treeku
f58b7b6a5b
Overhauled Mounts (still buggy)
2014-04-18 19:09:45 +01:00
CharonInferar
2b4527e165
Conversation menu improvements
...
SUI window functionality
storage of items in collections
2014-04-18 04:45:12 +02:00
Waverunner
9252ebaaea
Added Enter & Leave Messages for ChatRooms as well as info stats for the
...
room
2014-04-17 16:01:12 -04:00
Treeku