Commit Graph
134 Commits
Author SHA1 Message Date
Waverunner 38441e069e Refactored guild creation, enabled access to guild creation device, guild disband, guild kick, guild members, moved server motd to motd.txt 2014-05-26 12:43:06 -04:00
Treeku 28ccc21d10 Fixed some nulls that can occur locally 2014-05-17 22:01:33 +01:00
Treeku ea32f86c8a Moved equipment service to equipment folder 2014-05-15 05:14:20 +01:00
Waverunner d2164ce8b6 Added option to clean odb folders on startup
Change 0 to 1 to enable this feature in options.cfg
2014-05-13 20:32:49 -04:00
Waverunner 34a7a58089 Create Guild script for PDA, PDA Added to Frog, moved GuildService
Note that the PDA is only available on the frog if you have GM access right now.
2014-05-13 18:59:24 -04:00
Light2 4a100d9ae3 fixed loading errors 2014-05-12 19:47:57 +02:00
Treeku 60eee0d4dd Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-11 15:56:36 +01:00
Treeku 67fda7163a Fixed staticService ordering 2014-05-11 12:06:08 +01:00
Treeku 7fd08bc7ad Baseline changes, cleaned some things 2014-05-11 09:54:50 +01:00
Light2 ce15656ff3 begin work on vendors, fixed highestid sql query(might fix crash bug) 2014-05-06 00:55:02 +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 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 73f8ad85bc useObject adds the UseTarget 2014-04-29 04:49:42 +01:00
Waverunner b0e2a490f6 Changes to MissionObjective, started working on player bounties 2014-04-28 17:37:23 -04:00
Treeku c1505e5974 Moved resource functions to resourceService 2014-04-26 00:36:13 +01:00
Waverunner 14ce2f5a8d Merge pull request #531 from ProjectSWGCore/Wave_Missions
Delivery Missions
2014-04-25 17:29:42 -04:00
CharonInferar 02fafa5e73 Player city service methods added
added administrative methods
2014-04-21 22:56:40 +02:00
Waverunner e9065c480f Randomize mission strings, foundation for objectives 2014-04-21 16:14:29 -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 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
Treeku f58b7b6a5b Overhauled Mounts (still buggy) 2014-04-18 19:09:45 +01:00
Levarrishawk d25ac73965 Enabled loading of all Kashyyyk TRNs
Enabled loading of all kashyyyk terrains by default.   Begun adding
"gate" transportation.
2014-04-17 22:32:18 -04:00
Waverunner ff6c2d7d4c Added GroupChat, PlanetChat, and basic chat channels 2014-04-16 16:52:11 -04:00
CharonInferar b36081e630 Improvements on loot system
Loot icon
Loot system messages
2014-04-16 17:18:59 +02:00
CharonInferar 37dc1a45c2 Loot window added
Loot window implemented
Loot info effect added
2014-04-16 05:23:30 +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
Treeku b436353904 godLevel is now set and used 2014-04-13 13:17:23 +01: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
Seefo be67ca3c45 Merge pull request #409 from CharonInferar/Harvesters
Harvesters and generators added
2014-04-10 19:58:16 -04:00
CharonInferar 646476c17d Harvesters introduced
Working harvesters and generators
Big update
2014-04-11 01:48:27 +02:00
Waverunner e23fd23c2a Fixed null error on startup 2014-04-10 15:32:45 -04:00
CharonInferar ebe705f338 Merge remote-tracking branch 'origin/master' into LootSystem 2014-04-10 18:51:02 +02:00
Waverunner 931404bf3f Organized chat packets, disabled chat channels temporarily 2014-04-09 18:50:14 -04:00
CharonInferar d776b52292 restored loot NGECore and Devservice 2014-04-10 00:46:38 +02:00
CharonInferar b12e47ad3a merge conflict resolve 2014-04-10 00:41:17 +02:00
CharonInferar abe8d6475f Merge remote-tracking branch 'origin/master' into LootSystem
Conflicts:
	src/main/NGECore.java
	src/services/DevService.java
2014-04-10 00:38:13 +02:00
Seefo 46c2c1bf2c Preliminary housing 2014-04-08 23:47:59 -04:00
CharonInferar 9526eee9d6 Object-orientated approach to storing the loot info 2014-04-08 02:12:36 +02:00
Waverunner 1fbf0613a7 Fixed #386: Wookies/Ithorians cant gain CL 90 via frog
Added option to load resources or not too (enabled by default)
2014-04-06 12:11:27 -04:00
CharonInferar b5ba0bb688 Fixed 3 classes 2014-04-06 04:19:24 +02:00
CharonInferar e448a41bb0 Merge remote-tracking branch 'origin/master' into ResourceSpawn
Conflicts:
	src/main/NGECore.java
	src/services/DevService.java
	src/services/command/CommandService.java
2014-04-06 03:59:55 +02:00
CharonInferar 065fe79945 Clean up of code
Cleaned up some classes
Moved functionalities into more appropriate methods/classes
2014-04-06 02:08:55 +02:00
Seefo 349eb33090 Added framework for bonus sets 2014-04-01 16:08:03 -04:00
Light2 760e9726a9 more work on conversations 2014-04-01 15:31:14 +02:00
CharonInferar e692120b8f Surveying debugging
Improved surveying
2014-03-31 19:50:02 +02:00
CharonInferar 4b2f15db05 Resource Spawn System
Persistence to object database implemented
2014-03-30 23:35:48 +02:00