projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-30 15:13:10 -04:00
Code Issues Projects Releases Wiki Activity
1,834 Commits 11 Branches 4 Tags
8f660e92ba728a2f496ba7375e5da75b878f0ec3
Commit Graph
177 Commits
Author SHA1 Message Date
Light2 e78f1ec8fa Added harvesting and milking of creatures, fixed odb save bug 2014-05-04 17:37:58 +02:00
Treeku 464c10ddd7 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-05-03 17:37:43 +01:00
Light2 f05da881ab Fixed odb bugs, fixed some null pointers 2014-05-03 18:12:27 +02:00
Treeku dba74a6ebc Fixed calculatePvpStatus 2014-05-03 15:32:07 +01:00
Treeku 70d63139e6 Temp patchfix for creating chars issue 
Will fix it properly soon, atm everyone needs to be able to create
chars.
 2014-05-02 18:19:39 +01:00
Light2 d5f9adc7b2 more odb fixes 2014-05-02 00:34:01 +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 985cd6b779 Moved buff and skillmod objects 2014-04-29 03:56:52 +01:00
Treeku 919eb5ea44 Added UseTarget to CreatureObject 2014-04-29 03:29:03 +01:00
Treeku 09a6aa05ac Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
 2014-04-26 00:12:22 +01:00
Treeku 5203f23524 Minor other skillMod changes 2014-04-26 00:09:22 +01:00
Treeku 565fdc20da Refactored skillMods 2014-04-25 23:25:01 +01: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
Treeku 6aa1295eb9 Updated variable labeling a bit for CREOs 2014-04-25 12:19:35 +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 ff6c2d7d4c Added GroupChat, PlanetChat, and basic chat channels 2014-04-16 16:52:11 -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 b968b9ad1f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-13 19:41:33 +01:00
Seefo 1b1294136a Fixed a bunch of vehicle bugs - will probably change the way vehicles are being handled soon to account for other vehicle templates 2014-04-13 13:37:54 -04: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
Treeku 432700ab20 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-04-13 13:19:57 +01:00
Treeku 33614f4c48 Moved factionStatus from CREO to TANO 2014-04-13 11:06:27 +01:00
CharonInferar fa00c85290 Swoop is mountable for further tests 2014-04-13 03:50:45 +02:00
Treeku 03c5201cf4 Command fixes, command removing 2014-04-13 00:29:30 +01:00
Treeku e91362a12f Fixed most warnings 2014-04-10 11:52:09 +01:00
Waverunner 931404bf3f Organized chat packets, disabled chat channels temporarily 2014-04-09 18:50:14 -04:00
Seefo 8025bc7ad0 Changes to housing, added real player lot count to character sheet 2014-04-09 11:56:56 -04:00
Treeku 615a998384 Made cooldowns more efficient 
Isn't really necessary for them to have their own thread each.

There's an old trick from a time before thread pools were possible: System.currentTimeMillis().
 2014-04-07 14:47:56 +01:00
Treeku 124fb6747f Minor cooldown change 2014-04-06 22:52:45 +01:00
Treeku 74b1c107af Minor cooldown fix 2014-04-06 19:36:42 +01:00
Treeku 4f56b40d84 Changed cooldowns to correctly use a float 2014-04-06 19:30:11 +01:00
Seefo 890d395e3a Fixed an armour calculation bug 2014-04-05 14:37:42 -04:00
Seefo 52e92f7da9 Fixed delta related crash 2014-04-05 00:03:17 -04:00
Seefo 6502471e19 Fixed crashing temporarily 2014-04-04 20:06:04 -04:00
Seefo 973ab6da62 Fixed zoning error 2014-04-04 13:32:48 -04:00
Treeku ab3c32e15d Changed sendListDelta a bit 2014-04-04 18:02:45 +01:00
Treeku abb68a74b6 Temp fix for skills crash 2014-04-04 17:01:20 +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
Seefo f6c03c19aa Fixed remove skill mod error, some equipment stuff aswell 2014-04-03 13:42:53 -04:00
Treeku 0683983710 Added null check for removing skillMods 2014-04-03 18:01:52 +01:00
Treeku 40e17095f7 Fixed crash 2014-04-03 17:14:38 +01:00
Treeku 401c575ead Fixed skillMod-related crash 2014-04-03 16:59:09 +01:00
Treeku 977f18e533 Fixed error 2014-04-03 16:54:38 +01:00
Treeku 4f45f62d0b Updated skillMod baseline, removed old deltas 2014-04-03 16:51:20 +01:00
Treeku d187b0b3ea Removed skillModUpdateCounter functions 2014-04-03 16:46:12 +01:00