projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-18 08:02:53 -04:00
Code Issues Projects Releases Wiki Activity
1,735 Commits 11 Branches 4 Tags
536b51d9536aeb04469211e53e2c5c2801d8abb7
Commit Graph
439 Commits
Author SHA1 Message Date
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
CharonInferar 14f774447f More Treasure map work 
Mysterious disk radials implemented
Treasure guards added
 2014-04-21 03:23:07 +02:00
Waverunner 851ba61252 More work on Missions 2014-04-20 20:21:38 -04:00
CharonInferar db8365cea3 Merge remote-tracking branch 'origin/master' into TreasureMaps 2014-04-20 17:07:58 +02:00
CharonInferar 44f5c0bd92 Forage enemies now attack the forager 
Worms/goons attack
 2014-04-20 17:00:34 +02: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
CharonInferar ea947869eb Added foraged items and worms 
worms spawn
Enzymes and maps can be foraged
 2014-04-19 23:56:15 +02:00
Ziggeh 9b6127402d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-19 15:15:21 +02: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