projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-13 03:13:26 -04:00
Code Issues Projects Releases Wiki Activity
1,838 Commits 11 Branches 4 Tags
fabeaed919e91ebb77de5cebf14eb148676b8f01
Commit Graph
455 Commits
Author SHA1 Message Date
CharonInferar 41d6aa9db8 upstream merge 2014-05-04 12:38:39 +02:00
Waverunner 4831f6d8ca Added handling of deathblow for bounties 2014-05-03 20:04:27 -04:00
CharonInferar 43d1bd5ea4 Attempts to fix loot bugs 2014-05-04 01:31:00 +02:00
Waverunner 44678d8c18 Merge 2014-05-03 18:10:55 -04:00
Waverunner 7860a8b668 Added Tracking Droids, refined Bounty Missions 
A few things need to be done like the stacks for the droids. Right now
they won't be destroyed from inventory until this is implemented.
 2014-05-03 18:03:00 -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
CharonInferar 5e4062ae38 Fixed some bugs 2014-05-02 01:18:50 +02: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 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 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
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 a3d4bb326c merge conflict 2014-04-30 20:30:25 +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
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 ea9a1fdd82 Added setting of player bounties 
Mission for bounties still needs to be ironed out so you won't see them
in the bounty mission terminal, however you can now set bounties for
players.
 2014-04-29 17:49:03 -04: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 608fb42e2f removed system.outs and system messages related to rolls 2014-04-25 17:07:12 +02: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 05be4b0620 Merge remote-tracking branch 'origin/master' into TreasureMaps 2014-04-24 15:24:40 +02: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
CharonInferar b8d4187a78 More treasure loot items and pools added 
Rare items
profession bracelets
 2014-04-21 04:23:54 +02:00