projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-14 00:02:07 -04:00
Code Issues Projects Releases Wiki Activity
1,467 Commits 11 Branches 4 Tags
6184d2142008cfb01154dae0ce84f64ad90fa3bc
Commit Graph
115 Commits
Author SHA1 Message Date
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
Light2 814f800dbf Added cleanup method for creature ODB. 2014-03-30 22:04:20 +02:00
Waverunner dfab6ac265 Fixed #308 and added foundation work for chat channels 2014-03-29 16:47:05 -04:00
Light2 932302d1e9 Refactored loading a bit to fix an issue where objects "steal" fixed client object ids before the client object can be loaded,fixed 2 errors 2014-03-28 18:22:21 +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
Treeku 78f8832fed Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-03-24 20:05:54 +00:00
Treeku 94ae856f6f Made duplicate ID handling more efficient 
Shouldn't create a new objectId each server run, by using a duplicateId
database that takes other things (such as planetcrc, templatecrc,
building, container, cell, coordinates)

Currently best solution I can see that doesn't consume a brand new lot
of 20,000 objectids each bootup.
 2014-03-24 19:20:06 +00:00
Seefo c7c56b5c81 Initial work on Character Builder Terminal 
For some reason after using  the blue frog, you will have to wait a
minute or so to use it again.
 2014-03-23 19:19:18 -04:00
Treeku 0948a68c3b Enabled heroic dungeons, fixed radials 
getOptionType() seems to work now
 2014-03-19 22:07:29 +00:00
Treeku 45426e576c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/services/ConnectionService.java
 2014-03-19 19:50:13 +00:00
Treeku 0ef12787bb Instance implementation 2014-03-19 19:43:29 +00:00
Waverunner f14f656924 Fixed server errors, removed loading of space instances to save memory 2014-03-16 13:19:59 -04:00
Levarrishawk f99098d157 Added Dungeon & Space Terrains 
Added all Kashyyyk / Mustafar / Heroic Dungeon terrain files.   Added
framework for post-release content additions.
 2014-03-15 21:22:48 -04:00
Light2 52136c2b36 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/protocol/swg/ObjControllerMessage.java
	src/resources/objects/player/PlayerMessageBuilder.java
	src/services/travel/TravelService.java
 2014-03-10 00:42:19 +01:00
Light2 807025ec0b more work on AI, added odb for object id(should hopefully fix object id duplicates), fixed tons of bugs 2014-03-10 00:33:34 +01:00
Waverunner 1216cf6d45 Changes to variables and MISO3 baseline 2014-02-06 17:50:11 -05:00
Treeku 6ecdede66a Added system for making changes retroactive 2014-01-04 20:29:23 +00:00
Light2 acf78858a6 some bug fixes + updated engine with networking fixes 2013-12-28 19:16:51 +01:00
Light2 56a735c9b1 fixed object db exception, updated engine to reduce desync on zoning in 2013-12-16 20:53:38 +01:00
Light2 dce213cab1 Refactored disconnect handling, updated engine 2013-12-15 23:49:12 +01:00