projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-16 06:13:45 -04:00
Code Issues Projects Releases Wiki Activity
462 Commits 11 Branches 4 Tags
9a67e1c7a3f809ee17daf691cd1795d9721a77ec
Commit Graph
159 Commits
Author SHA1 Message Date
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 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
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 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 e190bc78f6 Added ChangeRoleIcon (gold icons), fixed titles 2013-12-12 11:54:52 +00:00
Waverunner 1065c70c55 friendAdd and friendRemove update PlayerObject FriendList now 2013-12-10 18:53:42 -05:00
Light2 140848e3ab Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-10 17:40:21 +01:00
Light2 4ffc7138c9 Updated engine 2013-12-10 17:37:20 +01:00
darkk1138 c19e2e20ba Merge branch 'master' of github.com:ProjectSWGCore/NGECore2 2013-12-09 22:54:57 +01:00
darkk1138 14f75cc1b4 dancers can now gain experience by performing flourishes 
(calculations might still be off though. :p)
 2013-12-09 22:54:21 +01:00
Treeku fc3cde90a7 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-09 20:26:40 +00:00
Treeku a2f74f550d Deleted unneeded file 2013-12-09 20:26:18 +00:00
darkk1138 6177ed69f3 remove flawed field audience 2013-12-09 18:15:34 +01:00
darkk1138 760aea96f2 fix SWGList on audience, however, the old field needs removing. 
depend inspire on watching
 2013-12-09 18:09:40 +01:00
darkk1138 471fab10d8 refactored slightly.. wasted a lot of time with that. :p 2013-12-09 17:19:53 +01:00
darkk1138 a5b31ac5a5 add preliminary watch/stopwatching implementation 2013-12-09 16:04:33 +01:00
Treeku 53871fcbb6 Cut warnings down 2013-12-09 11:11:18 +00:00
Treeku 59e58ebf27 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-09 09:46:08 +00:00
Treeku ae1aa9a425 Moved enumerations somewhere tidier 2013-12-09 09:45:21 +00:00
darkk1138 93ba62cd4f fix note bubbles for dance (both for starting and stopping) 2013-12-09 10:36:21 +01:00
Treeku 9453b85477 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-09 08:45:41 +00:00
Treeku 09beefe817 FactionService fixes 2013-12-09 08:43:06 +00:00
darkk1138 3ec7223773 Merge branch 'darkk_login' 
Conflicts:
	src/main/NGECore.java
 2013-12-08 18:51:22 +01:00
Light2 f2200711cf Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/services/SimulationService.java
 2013-12-08 18:21:50 +01:00
Light2 93195f7d5f Added dynamic lair spawns, fixed equip exploit, fixed some bugs and client crashes, updated engine 2013-12-08 18:17:01 +01:00
darkk1138 6471d7e118 add /groupdance command 2013-12-08 17:25:04 +01:00
Waverunner 576c03db14 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-07 17:59:03 -05:00
Waverunner ae0b06f917 Fixed MissionObject Delta's, Synchronized MissionObject, Fixed MissionListRequest Opcode 2013-12-07 17:58:49 -05:00
darkk1138 9cefd424ce need object version change 2013-12-07 16:45:12 +01:00
darkk1138 131092de60 Merge branch 'master' into darkk_ent 
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
 2013-12-07 16:37:52 +01:00
darkk1138 9683f4c164 add startdance, stopdance, flourish and bandflourish commands 2013-12-07 16:34:19 +01:00
Treeku 23731091c8 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-06 12:15:32 +00:00
Treeku e94fc930ce FactionService, helper funcs, factionResponseMsg 2013-12-06 12:14:13 +00:00
Waverunner ff772a1f79 MissionObject Delta's added, Debug print to try and fix Travel Points showing on other planets 2013-12-05 18:48:58 -05:00
Light2 7af18344bc Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2013-12-05 17:33:43 +01:00
Light2 2c66ab67d8 More work on lairs 2013-12-05 17:33:26 +01:00
Treeku 3bb0d0534c setDifficulty(Difficulty.NORMAL/ELITE/BOSS) 2013-12-05 12:53:34 +00:00
Treeku 82e513363e Fixed use() in object scripts. It should work now 2013-12-05 04:17:06 +00:00
Waverunner ca807ae5ae Added MissionObject Baselines, Waypoints can be added via Planetary Map now 2013-12-04 19:10:15 -05:00
darkk1138 c4dc69fd92 Merge branch 'master' into darkk_ent 2013-12-04 22:43:41 +01:00
darkk1138 6bd1c7b02c temp commit before merge 2013-12-04 22:43:34 +01:00
Light2 470215c05d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/resources/objects/tangible/TangibleObject.java
 2013-12-04 19:13:08 +01:00
Light2 b22b1d818d More work on AI and spawns 2013-12-04 19:05:02 +01:00
Treeku 2bb9d4e42e Fixed minor PlayerObject persistent error 2013-12-04 03:43:07 +00:00
Treeku befd10c98f Condition attribute updates when condition is set 2013-12-03 22:47:18 +00:00