projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-28 23:15:53 -04:00
Code Issues Projects Releases Wiki Activity
2,261 Commits 11 Branches 4 Tags
b2d3be0486aada4828bcc503f96e64d0a3e14b41
Commit Graph
172 Commits
Author SHA1 Message Date
CharonInferar e877a44713 Jedi Loot templates inserted 
Buried treasure loot realized
 2014-04-25 01:49:50 +02:00
tacef 2355215567 Added more Houses, reed description 
Added Guildhalls
Started preliminary City hall for testing
Altered Objectservice to work with guild and city deeds
Altered SUI Service to support the new folderstructure for structures
and harvesters
Fixed Structureterminal Radial
 2014-04-21 22:45:58 +02:00
Treeku 50e88d2300 Cut down a few warnings 2014-04-18 22:38:07 +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
Treeku f58b7b6a5b Overhauled Mounts (still buggy) 2014-04-18 19:09:45 +01: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
Treeku db3f0368a0 Items now have cooldowns and play anims 
Grenades, heal stims, heavy weapons.

Heavy weapons seem to be considered usable items and it calls the heavy
weapon command dependent on the template in template_command_mapping.

You can't fire it from the toolbar due to a checkbox.
 2014-04-14 11:55:40 +01:00
CharonInferar a99edcc2bc restored file 2014-04-13 23:08:29 +02:00
CharonInferar a95b8964f0 access modifer changed back 2014-04-13 23:03:40 +02:00
CharonInferar 1decfaa081 first commit of addidtions 2014-04-13 22:29:02 +02:00
Treeku b968b9ad1f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-13 19:41:33 +01:00
Treeku e3c0332924 serverTemplates now load on login 
Make sure your script setup() funcs don't have anything in them that
can't be run twice
 2014-04-13 17:29:05 +01:00
Treeku 7cee1990b5 Serial number uses attribute 2014-04-13 16:33:18 +01:00
Light2 cf9bcf66f9 Fixed vehicles 2014-04-13 17:17:25 +02:00
CharonInferar a3d7472197 Exception handling for Harvester Service future executor handler 
This should show any runtime exceptions of the Runnable(), because
something kills the task after some time, probably an exception.
 2014-04-13 14:38:39 +02:00
CharonInferar fa00c85290 Swoop is mountable for further tests 2014-04-13 03:50:45 +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 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