Commit Graph
104 Commits
Author SHA1 Message Date
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 03c5201cf4 Command fixes, command removing 2014-04-13 00:29:30 +01:00
Light2 e144118364 more cleanup + fixes
Harvesters and house terminal work now
2014-04-12 18:31:37 +02:00
CharonInferar 1ab23231f6 Structure terminal work
Creation of player_house_deed class
terminal menus made
py scripts arranged
2014-04-11 04:14:29 +02:00
WaverunnerandCharonInferar 4cb78da62c Added SWG, Server, and other parent channels 2014-04-11 02:25:08 +02:00
CharonInferar a1370a9b60 Harvesters introduced
Working harvesters and generators
Big update
2014-04-11 02:25:07 +02:00
WaverunnerandCharonInferar 8c76695a9f Added chat channels for all planets (system and planetary chat) 2014-04-11 02:25:07 +02:00
Waverunner 931404bf3f Organized chat packets, disabled chat channels temporarily 2014-04-09 18:50:14 -04:00
Seefo 46c2c1bf2c Preliminary housing 2014-04-08 23:47:59 -04: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 531acac7c6 More quality assurance work
- Resource container split/join
- Surveying test runs
- Balancing
2014-04-02 23:28:08 +02:00
CharonInferar 438017efcc ResourceMessenger removed 2014-04-01 16:26:35 +02:00
Seefo f93a7b68db Added action skill mod 2014-03-31 22:03:39 -04:00
Seefo 515cb92ce7 Added option for buffs on items and wearables 2014-03-31 21:06:43 -04:00
CharonInferar e692120b8f Surveying debugging
Improved surveying
2014-03-31 19:50:02 +02:00
Light2 c22213cbe9 fixed startup error, temp fix for radial bug 2014-03-31 17:33:53 +02:00
Light2 8a0bc99eb5 fixed #325, fixed ai warping to 0 0 0 2014-03-31 02:58:29 +02:00
CharonInferar 4b2f15db05 Resource Spawn System
Persistence to object database implemented
2014-03-30 23:35:48 +02:00
Waverunner dfab6ac265 Fixed #308 and added foundation work for chat channels 2014-03-29 16:47:05 -04:00
Light2 d9c94f74fc fixed client crash 2014-03-28 22:03:08 +01: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
Waverunner d8eb437348 Incap debuff uses new format, added MOTD on login 2014-03-27 19:33:38 -04: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
Light2 d1a7f20177 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
	src/services/PlayerService.java
2014-03-25 20:14:16 +01:00
Light2 3e265ed6c5 some bug fixes, updated engine with support for new .trn versions, refactored some code with new Java 8 syntax, changed compiler to java 8 2014-03-25 20:08:01 +01: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
Treeku 6412a8914a Fixed bug with previous buildout id change 2014-03-19 23:07:57 +00:00
Treeku 604d1f7aef Changed duplicate id handling, static objids
- I noticed when targetting a client-spawned object (EK brazier), it
sent a target packet to the client with all 8 bytes filled, instead of
just the 4 stated in the buildout.  It seems the same 4 digits get added
to all buildout ids.  As a result, all buildout int-objectIds now have
the follow bytes added to them: FF FF 86 F9

Not sure about snapshot objects, but I imagine it's the same for them.

- I had to allow duplicate objects to be spawned in order for heroics
and instances to work.  It gives every duplicate object a new objectId
and also replaces the parentIds as well by storing the changes in a map
on each buildout area cycle.
2014-03-19 18:23:25 +00:00
Waverunner afb5c58447 Reverted Changes
Light's already fixed this
2014-03-12 15:19:27 -04:00
Waverunner 18c0f070fd Fixed bug related to deleting characters
Also added 2 new variables to destroyObject for certain cases.
2014-03-12 15:01:09 -04:00
Light2 31b7413c88 fixed startup crash 2014-03-10 03:44:51 +01: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 41d8fcf841 Uncommented line in destroyObject 2014-03-09 14:08:43 -04:00
Treeku d0ab910e06 Set default object options 2014-01-04 18:34:41 +00:00
Light2 e8da49a12f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-28 19:17:41 +01:00
Light2 acf78858a6 some bug fixes + updated engine with networking fixes 2013-12-28 19:16:51 +01:00
Waverunner aea5f3a4b8 Fixed list update issues with friend and ignore list, /findfriend now destroys existing wp's, fixed string bug on updating wps 2013-12-17 19:00:24 -05:00
Treeku 352937d77e Fixed /inspire, moved playflags, remove cols spam 2013-12-16 11:28:11 +00:00
Light2 dce213cab1 Refactored disconnect handling, updated engine 2013-12-15 23:49:12 +01:00
Waverunner 71d48111e0 LinkDead status will now show on logged out characters, added factionrank flag bitmask 2013-12-15 15:19:56 -05:00
Treeku 0c93b74f1e Synchronized objectId generation
Not sure if it helps, but a few of the problems seemed to look like lack
of synchronization.  Easy to reverse later.
2013-12-15 08:53:07 +00:00
Treeku b9a46acd98 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-15 01:43:01 +00:00
Treeku b6184fb05a Lifeday gifts and collections 2013-12-15 01:41:11 +00:00
Light2 1e68c71177 Fixed spawning in the buildout buildings, fixed gm permissions, added command to lock and unlock server for gms 2013-12-15 01:31:15 +01:00
Light2 6daca0347c Fixed double login bug, added gm permissions, added checks to gm commands, update your postgresql db 2013-12-14 22:14:45 +01:00
Light2 9a67e1c7a3 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Conflicts:
	.gitignore
2013-12-14 21:42:46 +01:00
Light2 896b342972 Fixed crash caused by buildings, fixed weapon object superclass, added equipment and appearance equipment deltas 2013-12-14 21:25:31 +01:00
Treeku 44422ffb42 Added buildout option (may clash, PM if need help)
If you have snapshot objects disabled, I recommend setting the option in
options.cfg to 1 before syncing, then setting it back afterwards, to
avoid a merge clash.
2013-12-14 10:25:56 +00:00
Treeku 9336aaaf0c Fixed minor custom object script issue 2013-12-14 09:11:34 +00:00