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
126 Commits
Author SHA1 Message Date
Waverunner 4831f6d8ca Added handling of deathblow for bounties 2014-05-03 20:04:27 -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 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
Waverunner b0e2a490f6 Changes to MissionObjective, started working on player bounties 2014-04-28 17:37:23 -04: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 e877a44713 Jedi Loot templates inserted 
Buried treasure loot realized
 2014-04-25 01:49:50 +02:00
Waverunner a00f637f13 More randomization's for delivery missions, more work on objectives 2014-04-22 17:54:05 -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
CharonInferar 44f5c0bd92 Forage enemies now attack the forager 
Worms/goons attack
 2014-04-20 17:00:34 +02:00
CharonInferar ea947869eb Added foraged items and worms 
worms spawn
Enzymes and maps can be foraged
 2014-04-19 23:56:15 +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
Light2 0ec275cf7b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/services/bazaar/BazaarService.java
 2014-04-15 01:12:44 +02:00
Light2 bd0a30aa96 Added basic bazaar functionality - see extended 
Categories are not working right now, Auctions and Vendors are not yet
implemented
 2014-04-15 01:11:33 +02:00
CharonInferar 7091c4bbb3 more preparations 
Preparations for crafting
 2014-04-13 22:59:31 +02:00
Treeku 60972655dd Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/services/command/CommandService.java
	src/services/object/ObjectService.java
 2014-04-13 00:49:58 +01:00
Treeku eeb1ea54af Flytext, System, Comms now use ProsePackages 2014-04-13 00:27:02 +01:00
Light2 e5ed3a356c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/main/NGECore.java
 2014-04-11 23:53:15 +02:00
Light2 ea8bc53394 Started work on bazaar 2014-04-11 23:47:03 +02:00
CharonInferar 646476c17d Harvesters introduced 
Working harvesters and generators
Big update
 2014-04-11 01:48:27 +02:00
Treeku e91362a12f Fixed most warnings 2014-04-10 11:52:09 +01:00
Treeku c8aeff3d1d Add OutOfBand constructor for simpler conv scripts 2014-04-07 09:46:12 +01:00
Waverunner 9e80b5eeae Added basis for server-side cooldown checks, added warmup checks, closed #273 
Note that cooldown check is currently used only for the holoemote
command. To add a cooldown to any command, all you have to do is
CreatureObject.addCooldown(name). In this commit I also moved some
cooldown variables from CombatCommand to BaseSWGCommand since many
non-combat commands had cooldowns (Wookie Roar, Holo-Emotes). I also put
in a warmup cooldown (time before command is called) for non-combat
commands.
 2014-04-03 19:23:31 -04:00
Light2 b245efdce6 Finished NPC conversations, fixed disconnect bug, fixed AI atk speed check 2014-04-02 18:12:08 +02:00
Light2 760e9726a9 more work on conversations 2014-04-01 15:31:14 +02:00
Light2 4ccbf89727 More work on NPC conversation packets 2014-03-31 20:13:37 +02:00
Light2 c30b0bdd1a Started work on NPC conversations, added prose package and out of band package for packets that require them 2014-03-31 19:42:36 +02:00
Waverunner 64bfdb2b8b Added pistol to frog, more work on chat channels 2014-03-30 15:09:48 -04:00
Waverunner dfab6ac265 Fixed #308 and added foundation work for chat channels 2014-03-29 16:47:05 -04:00
Waverunner a5a0fa1d9a Helmet and backpacks now show for player, server will store player creation date 
(BugFix) /showhelmet and /showbackpack works and helmet/backpacks now
showed for the person wearing the item
(Code) Server will store player creation date for future use in baseline
 2014-03-27 17:35:42 -04:00
Waverunner d15b0d83e9 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/services/EntertainmentService.java
 2014-03-26 20:08:30 -04:00
Waverunner 66e29893ac Added holoemotes, work on imagedesign, bug fixes, new visitor class 2014-03-26 19:53:04 -04:00
Light2 a46847d0fd Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	scripts/commands/setgodmode.py
 2014-03-26 23:51:14 +01:00
Light2 c3772e3246 Added xp gain on killing NPCs, fixed some bugs, added 2 new config options 2014-03-26 23:37:10 +01:00
Waverunner b9ed655f53 Refactored Starter Clothing, Added CustomizationDelta, basework for Image Design 
(Bug) Fixed hair and items on char create not being added to equip list
(Code) Minor change to BuffBuilderMessage
(Code) Added base work for Image Design
(Code) Refactored how starter clothing is assigned
(Code) Added delta for customization data on tangible objects
(Code) Created ProfessionTemplateVisitor for profession template iff's
 2014-03-25 22:06:38 -04:00
Waverunner d108353614 Merge remote-tracking branch 'origin/master' into Wave_Entertainer 
Conflicts:
	src/services/BuffService.java
	src/services/collections/CollectionService.java
 2014-03-23 14:32:45 -04:00
Treeku efdb69ff57 Fixed major counter-type collection bugs 2014-03-23 15:08:46 +00:00