Treeku
4fe246975c
Fixed various bugs
2014-05-12 04:56:29 +01:00
Treeku
9b4272e434
Refactored ITNO
2014-05-11 16:55:52 +01:00
Treeku
60eee0d4dd
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-11 15:56:36 +01:00
Treeku
7fd08bc7ad
Baseline changes, cleaned some things
2014-05-11 09:54:50 +01:00
Waverunner
f57444e942
Fixed setCustomizationVariable not updating customization byte array
2014-05-10 19:56:02 -04:00
Waverunner
b5344eab07
Added bindLocation variable, clone location shows bind spot in yellow, fixed incap and db messages
2014-05-10 16:38:59 -04:00
Seefo
6e80bd7b28
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-06 20:55:19 -04:00
Seefo
b714ea093d
Fixed references to getEquipmentList - might fix crashing
2014-05-06 20:55:15 -04:00
Waverunner
892f9cb7db
Bounty mark will enter combat now if attacked, entering combat will now break stealth
2014-05-06 20:34:35 -04:00
Waverunner
4e36321ca3
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-06 19:08:13 -04:00
Waverunner
f8c26e9658
Fixed customization delta, changed bounty list to bounty map, added SurveyMissionObjective
2014-05-06 19:08:00 -04:00
Seefo
bd9db1c0c8
Added container limit checks
2014-05-06 18:40:19 -04:00
Waverunner
023f5bfef9
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-06 17:27:19 -04:00
Waverunner
7b14c94d40
Fixed #621 , added missing sys message for tracking droids, fixed bounties db null error & wp null error
2014-05-06 17:27:06 -04:00
Seefo
fcd155e100
Fixed TangibleObject.getTrueName()
2014-05-06 17:20:51 -04:00
Seefo
f394dd6e19
Fixed loot system message, added functions to TangibleObject to obtain different variants of the object's name
2014-05-06 13:03:54 -04:00
Seefo
b4d7b1c95a
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-05 20:19:22 -04:00
Seefo
8dd5f5d053
Initial commit of lightsaber customization - see extended
...
The majority of lightsaber customization now works.
All that I can think of that needs to be done is:
* Rare/Unique color crystals names/palette index to
resources.datatables.LightsaberColors
* Weapon element types and damage bonus based on color crystal
* Random stats when tuning power crystals/krayt dragon pearls
* Checks to see if lightsaber is full - container size is in IFFs, we
should implement it for all containers
2014-05-05 20:19:07 -04:00
Light2
61bfc193ec
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
2014-05-06 00:55:19 +02:00
Light2
ce15656ff3
begin work on vendors, fixed highestid sql query(might fix crash bug)
2014-05-06 00:55:02 +02:00
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