projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-07 22:13:08 -04:00
Code Issues Projects Releases Wiki Activity
3,305 Commits 11 Branches 4 Tags
80ae2392edbca85fd8f463e779e1651515d0fe71
Commit Graph
1809 Commits
Author SHA1 Message Date
Obique 80ae2392ed Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-09 12:10:34 -05:00
Waverunner 90fc62ccff Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-09 13:06:44 -04:00
Waverunner 4615f10537 Fixed skills set not being initialized 2014-08-09 13:06:28 -04:00
Obique 2ae903285d Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-09 11:32:09 -05:00
CharonInferar 4af373b44e Fixed RifleBug preliminarily 2014-08-09 17:52:54 +02:00
tacef 1113012ef1 Merge pull request #1117 from tacef/master 
Added Standard Issued Clothing box
 2014-08-09 09:11:30 +02:00
tacef f03b39cc7e Added Standard Issued Clothing box 
Todo: Custom scripts for some items.
 2014-08-09 09:09:43 +02:00
Obique 61d699010b Fixed loading issue for SWGObject ODB, and removed the Creature ODB 2014-08-08 20:53:11 -05:00
CharonInferar 0ce705ec8a Commit to kick pull request (Github bug) 
self-explanatory
 2014-08-09 02:53:02 +02:00
CharonInferar 73180b5f83 Removed rifles from frog temorarily to prevent client-lockups 2014-08-09 02:48:14 +02:00
CharonInferar 05dca03015 Little fix for WeaponObject Commit 2014-08-09 02:36:10 +02:00
CharonInferar 1047348e1a Merge remote-tracking branch 'origin/master' into RifleBugFix 2014-08-09 02:24:17 +02:00
CharonInferar d010a6b3f3 Analyzed rifle bug 2014-08-09 02:20:58 +02:00
Treeku e634b5e62e Refactored WeaponObject 2014-08-09 01:04:47 +01:00
Treeku 51c14284eb Revert "Refactored WeaponObject" 
This reverts commit 6b8461f1a5.
 2014-08-08 21:53:18 +01:00
Treeku 6b8461f1a5 Refactored WeaponObject 2014-08-08 20:21:26 +01:00
CharonInferar cda47597a9 Merge pull request #1112 from CharonInferar/LairUpdate 
Added Lair template overloads and Boss spawns for lairs
 2014-08-08 18:32:24 +02:00
CharonInferar d3a7d47b1a Added Lair template overloads and Boss spawns for lairs 
- Content devs can now add lairCRC vectors and bosses
- The boss spawns will only work after the invasion commit because then
lairs will get health bars and the lair will spawn more waves
 2014-08-08 18:25:57 +02:00
Waverunner 92a207056f Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 
Conflicts:
	src/resources/objects/creature/CreatureObject.java
 2014-08-08 10:05:09 -04:00
Waverunner 3003a3b62e Fixed wrong SWG collection type for Skills and added missing params causing a crash 2014-08-08 10:02:48 -04:00
Zing dff394c077 Configured /server admin command for server related needs. 
Added initiateStop to NGECore.
 2014-08-07 23:49:20 -07:00
Zing 04f41a0f41 Revert "Removed printAnalysis for CREO3 baseline, Added SWGList for Skills" 
This reverts commit d9ca531c5d.
 2014-08-07 21:47:43 -07:00
Waverunner d9ca531c5d Removed printAnalysis for CREO3 baseline, Added SWGList for Skills 2014-08-07 17:56:30 -04:00
Waverunner 79de1c89ce Fixed group decline message being sent to invited instead of leader 2014-08-07 17:21:52 -04:00
tacef cdd85219e8 Merge pull request #1101 from tacef/master 
Changed Removed Frogbuilding placed Frog only
 2014-08-07 20:17:26 +02:00
tacef 83d97679a7 Changed Removed Frogbuilding placed Frog only 2014-08-07 20:16:41 +02:00
Obique bc8f2544ee Fixed some server crashes with some engine changes; also added a creature ODB 2014-08-07 12:43:27 -05:00
tacef 25d301d406 Merge pull request #1100 from tacef/master 
Fixed Readded Frogbuilding in Mos Espa
 2014-08-07 19:35:53 +02:00
tacef aabe5c5b9a Fixed Readded Frogbuilding in Mos Espa 2014-08-07 19:34:45 +02:00
Waverunner 544b8194fe Merge pull request #1087 from voronius/master 
Fix for 139 - bug of inspiration buff stacking
 2014-08-07 10:29:57 -04:00
voronius 76b552bc29 Fix for 139 part 2 
Inspiration buffs should no longer stack -
https://www.youtube.com/upload. Removed a new file I shouldn't have
commited.
 2014-08-06 20:20:29 +03:00
voronius 3b1568339d Fix for issue 136 
Fix for issue 136. Inspiration buffs should no longer stack.
 2014-08-06 20:05:04 +03:00
Waverunner 8b4aa5086f Added constructor for EnterTicketPurchaseModeMessage, Removed duplicate travel packet 2014-08-05 16:26:35 -04:00
tacef 582912cdd2 Merge pull request #1079 from tacef/master 
Added a few things
 2014-08-05 21:00:06 +02:00
Waverunner 1959110961 Merge pull request #1078 from voronius/master 
Fix for inspiration buff
 2014-08-05 13:59:54 -04:00
tacef 2e99c287e9 Fixed Setgodmode str error(temp) 
Added TicketPurchaseModeMessageItv for Itv's
Changed Travel_terminal_itv to use the new Purchasemode
 2014-08-05 07:58:58 +02:00
Obique 5df6aec213 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-05 00:20:32 -05:00
voronius 4d99a84935 Fix for inspiration buff 
Buff is now properly applied, stat mods are properly computed and
changes to stats are clearly visible . Sample test at
https://www.youtube.com/watch?v=KOV2C4z5VAw
 2014-08-05 04:14:13 +03:00
Waverunner 413a89e924 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-08-04 16:40:15 -04:00
Waverunner e16e0373d6 Added system err print for combat commands being considered regular scripted commands 
Removed loading of buildout objects temporarily to help make it easier
to resolve major loading crashes

Commands that are considered combat commands by the client but are using
regular command format will work, it'll just give an error. They should
be moved to the proper combat command format.
 2014-08-04 16:39:43 -04:00
Waverunner cb91738fd1 Merge pull request #1077 from voronius/master 
2 Small fixes, one for a query and the other for the inspiration buffs
 2014-08-04 15:35:42 -04:00
voronius ca004a162c fix for not being able to reuse or delete char 
Fix for not being able to reuse or delete char after creation. All chars
were only available once as the query to the result set used wrong field
name to get the char id.
 2014-08-02 11:01:16 +03:00
voronius 48a1014fb0 Fix for inspiration and group buffs 
Fix for inspiration and group buffs, they used distance check with
different coordinate systems. Now watching and inspiration buff is
possible.
 2014-08-02 10:45:03 +03:00
Josh-Larson 6f6d802b55 Fixed a null pointer exception when loading previous resources 2014-07-30 21:58:35 -05:00
Josh-Larson 3b39539601 Fixed ObjectService so that it re-loads old objects, and allows characters to persist over server instances 2014-07-30 21:10:44 -05:00
Josh-Larson 1f5df031b9 Fixed an issue where the survey device would be bricked, and added more debug output 2014-07-30 00:50:41 -05:00
Josh-Larson bb9355b7e1 Changed resource spawns so that they are more rare 2014-07-30 00:22:47 -05:00
Josh-Larson dd010b8778 Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 2014-07-29 23:31:36 -05:00
Josh-Larson ba3a4a9139 Changed NGECore/ResourceService to remove an obsolete Resource/ResourceRoot ODB 2014-07-29 18:34:28 -05:00
Josh-Larson 24f11c0cdc Fixed an issue with previous commit where many resources wouldn't load 2014-07-29 18:24:37 -05:00