projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-03 04:16:19 -04:00
Code Issues Projects Releases Wiki Activity
511 Commits 11 Branches 4 Tags
c3cf8713bf786eefca65c323b8f3c809ce08ca13
Commit Graph
284 Commits
Author SHA1 Message Date
Light2 c3cf8713bf Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/services/SimulationService.java
 2013-12-16 20:58:14 +01:00
Light2 56a735c9b1 fixed object db exception, updated engine to reduce desync on zoning in 2013-12-16 20:53:38 +01:00
Treeku d7d2f327a5 Fixed lifeday gifts, swoop deed, inspire, +fixme 2013-12-16 13:41:47 +00:00
Treeku 352937d77e Fixed /inspire, moved playflags, remove cols spam 2013-12-16 11:28:11 +00:00
Treeku 9add0094ec FactionService will now read from table 2013-12-16 09:48:44 +00:00
Treeku a0da317c9b LD flag is now removed on logging in 2013-12-16 05:48:11 +00:00
Light2 dce213cab1 Refactored disconnect handling, updated engine 2013-12-15 23:49:12 +01:00
Light2 8de830bb86 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-15 22:01:35 +01:00
Light2 3aa9fc88c5 removed some starting items 2013-12-15 22:01:26 +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
Waverunner 747860eedc Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-15 13:14:46 -05:00
Waverunner 6fc258a8f8 Waypoint color can be changed now, added missing starports to planet map, player flags now work 2013-12-15 13:14:36 -05:00
Treeku 1508bbe37b Client null checks 2013-12-15 17:55:30 +00:00
Treeku d6fb78e658 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-15 17:01:54 +00:00
Treeku d2ddc29ca0 Fixed disconnect bluffs deleting client objects 
~experimental
 2013-12-15 17:01:26 +00:00
darkk1138 95e372fb82 Add a factor for dance XP. 
Note, this implementation is not yet 100% accurate, but it should match
XP values from Entertainer FAQ for all dances.
 2013-12-15 10:07:08 +01:00
Treeku fac5422198 ServerFirsts now award a badge 2013-12-15 08:53:50 +00: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 60373502e1 Added shutdown command, added character limit 2013-12-15 02:15:08 +01: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 a35aad38e8 Fixed group invite persistance bug 2013-12-14 22:16:40 +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
darkk1138 6b565dcd65 fix name reservation query .. i hope. :p 2013-12-14 20:39:52 +01:00
darkk1138 ff44d1ba96 add debug output for login method return value. 2013-12-14 18:08:27 +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 8cd935a9b3 Profession roadmap rewards fix 2013-12-14 09:19:06 +00:00
Treeku 9336aaaf0c Fixed minor custom object script issue 2013-12-14 09:11:34 +00:00
Light2 3fc02b8f1f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-12 17:25:24 +01:00
Light2 512fbfec72 bug fixes 2013-12-12 17:24:26 +01:00
Treeku 948a4bdb0d Fixed minor merge blip 2013-12-12 14:44:34 +00:00
Treeku b6c9e74859 Merge branch 'master' of https://github.com/xbang21/NGECore2 into xbang21-master 
Conflicts:
	src/services/combat/CombatCommands.java
 2013-12-12 14:34:24 +00:00
Treeku 001bf1b390 Renamed ListObject -> Delta. Guild null fix 
Delete your ODB for this
 2013-12-12 14:17:50 +00:00
Treeku 2ff1a8e803 Minor profession resource adjustment 2013-12-12 13:17:10 +00:00
Treeku ed8e5c0ec5 Fixed GCW Zone transactions 2013-12-12 12:34:30 +00:00
Treeku ba3954d9fb Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-12 11:56:42 +00:00
Treeku e190bc78f6 Added ChangeRoleIcon (gold icons), fixed titles 2013-12-12 11:54:52 +00:00
xbang21 d54033a0c6 Finished Medic Buffs and Debuffs 
Medic buff times with expertise tested and work properly in and out of a
group
 2013-12-11 20:15:02 -05:00
Waverunner 26b7bbbff4 Merge pull request #139 from DAK-/master 
Bounty Hunter: Return Fire, Take Cover & Armor Sprint
 2013-12-11 15:49:36 -08:00
Treeku c33fcc6715 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-11 12:34:20 +00:00
Treeku 62167880ac Buff callbacks run in a separate schedule 2013-12-11 12:31:51 +00:00
DAK- 5f88bab13b Bounty Hunter: Take Cover & Armor Sprint 
Registered commands, added buff and command scripts.
Buffs apply, needs further testing.
 2013-12-11 04:48:45 -06:00
DAK- 251b159b13 Bounty Hunter: Return Fire 
Buff and command works, cools down and is modified by skill mods, (i.e.
from "Enforcer set")
 2013-12-11 03:20:55 -06:00
Waverunner 5515618b0f Merge pull request #130 from Ziggeh/master 
Fixed stackable buffs, Bounty Hunter expertise and the healing potency for LSJ
 2013-12-10 16:26:31 -08:00
Waverunner d6eedfd2ce Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-10 18:53:47 -05:00
Waverunner 1065c70c55 friendAdd and friendRemove update PlayerObject FriendList now 2013-12-10 18:53:42 -05:00
Wefi 06d22cae9e Added "Addability" to Setgodmode and experimenting with Mediate 
Use /Setgodmod addability <String format> IE bh_sh3
 2013-12-10 17:33:56 -06:00