projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-04 05:16:21 -04:00
Code Issues Projects Releases Wiki Activity
492 Commits 11 Branches 4 Tags
747860eedc30fdc0dcbcdd237cb80ed3d47668ea
Commit Graph
492 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Waverunner 67bd59da7d Change nge.backup Encoding to UTF-8 and compress to tar for console compatibility (tested on pgadmin3 and psql console and it works) 2013-12-15 08:08:31 -05:00
Waverunner 8f9fe4305a Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-15 07:51:04 -05:00
Waverunner 27ca83caef Fixed nge.backup for pgadmin3 restore's 2013-12-15 07:50:56 -05: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 05bb5808b0 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-15 02:16:31 +00:00
Treeku 3550c7ff4b Lifeday gifts fix 2013-12-15 02:15:57 +00:00
Light2 f9a04c30ea shutdown command fix 2013-12-15 02:51:59 +01: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 8f1c15102c Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-15 02:15:20 +01:00
Light2 60373502e1 Added shutdown command, added character limit 2013-12-15 02:15:08 +01:00
Waverunner f5e44ecd83 changed bitmask to 0 2013-12-14 20:11:15 -05:00
Waverunner 86c202f5db Added player flags 2013-12-14 20:02:49 -05:00
Light2 1f4458997b Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/resources/objects/building/BuildingObject.java
 2013-12-15 01:35:02 +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
Levarrishawk 7525dbcd71 Corrected commenting on unneeded script. 2013-12-14 18:48:26 -05:00
Levarrishawk a892eb3891 Commented out Unneeded Scripts 2013-12-14 18:31:17 -05:00
Treeku 79e8b2507a Removed BaseObject (delete ODB again) 2013-12-14 23:25:15 +00:00
Treeku 5b0833f2ed Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-14 22:00:16 +00:00
Treeku bdb626d4d1 Added baseline inheritance (delete ODBs) 2013-12-14 21:58:50 +00: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 5fd06f87c1 added missing templates 2013-12-14 21:45:24 +01:00
Light2 9a67e1c7a3 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	.gitignore
 2013-12-14 21:42:46 +01:00
Light2 5d824324c4 merge 2013-12-14 21:41:00 +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 a67cbb0992 Export string/ as well 2013-12-14 09:21:53 +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
Treeku d86614b2bd Fixed Quest error, it was .gitignored 2013-12-14 00:35:48 +00:00
Treeku 9ceaa761c9 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-13 13:44:41 +00:00
Treeku b0e0431437 Baseline work from a few months ago for reference 2013-12-13 13:43:00 +00:00
Waverunner 46ba2151b7 Added default quest object scripts, fixed waypoint system messages 2013-12-12 15:22:55 -05: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