Commit Graph

  • a83f3626db Merge pull request #1260 from RobCubed/master master Undercova 2015-03-30 11:50:07 +02:00
  • 4029cb0927 Merge pull request #1289 from ProjectSWGCore/master experimental Matt Parnell 2014-11-16 18:48:02 -06:00
  • cf21cd4f84 Changed imperial guards in quarantine zone to invulnerable Bronco69 2014-11-13 09:42:26 +01:00
  • ce3f7cae92 Disabled Jedi belt again Undercova 2014-11-13 08:44:10 +01:00
  • 85285ba06c Merge pull request #1284 from Mesagoppinmypants/master Undercova 2014-11-13 08:42:19 +01:00
  • e465252584 Merge pull request #1287 from wallaceg09/Musician Undercova 2014-11-13 08:33:01 +01:00
  • 8f8f139f5f Merge branch 'musician_hotfix' into Musician wallaceg09 2014-11-12 21:09:21 -06:00
  • d567fec250 Fixed issue with Xantha and Mandoviol not working properly. wallaceg09 2014-11-12 21:08:15 -06:00
  • 23afe9f46f Merge pull request #1285 from wallaceg09/Musician Undercova 2014-11-13 02:22:10 +01:00
  • 4038ef1726 Minor fix to imperial gate keeper script Iosnowore Kun 2014-11-12 19:16:36 -05:00
  • 4e3448e53d Fixed padded armor error Iosnowore Kun 2014-11-12 19:16:04 -05:00
  • ff27dd931d Merge branch 'master' into Musician wallaceg09 2014-11-11 19:06:01 -06:00
  • cfcff81cc9 Fixed some problems where wookiee armor wouldn't generate Iosnowore Kun 2014-11-11 15:24:18 -05:00
  • 807adf4de6 Removed quarantine Stormtrooper leader script Iosnowore Kun 2014-11-11 14:34:03 -05:00
  • c5d71667c9 Fixed conversation script for Imp gate keeper, fixed some static spawns, fixed small typo in PlayerService Iosnowore Kun 2014-11-11 13:53:11 -05:00
  • e30661ceac Merge pull request #1283 from Mesagoppinmypants/master Lewis 2014-11-11 00:44:06 -05:00
  • 0b6d9c992b Another Quarantine Zone Update Iosnowore Kun 2014-11-11 00:29:24 -05:00
  • 1b7d3cc279 Merge pull request #1280 from Mesagoppinmypants/master Lewis 2014-11-10 23:52:53 -05:00
  • 49e27b7979 Added level and class restrictios to several instruments wallaceg09 2014-11-10 22:19:48 -06:00
  • 9c1988dd2b Ironed out last of the bugs Iosnowore Kun 2014-11-10 19:24:39 -05:00
  • c095112027 Fixed some stats on Quarantine NPCs and Added new spawns/conversations Iosnowore Kun 2014-11-10 18:17:35 -05:00
  • a029a8e1ad Updated Deathtroopers Iosnowore Kun 2014-11-09 21:15:09 -05:00
  • d15eec7c2d Updated undead rancor boss Iosnowore Kun 2014-11-09 20:57:22 -05:00
  • 50b1533aca Updated Afflicted NPCs Iosnowore Kun 2014-11-09 20:47:07 -05:00
  • 30e49c5528 Added dynamic groups for Quarantine Zone Iosnowore Kun 2014-11-09 20:31:38 -05:00
  • bbc2bf583f Fixed stf names and started conversation script for gate keeper Iosnowore Kun 2014-11-09 20:20:28 -05:00
  • bf24791cd6 Added backbone of Quarantine NPCs Iosnowore Kun 2014-11-09 20:13:19 -05:00
  • 0faf3fee57 Merge branch 'master' into Musician wallaceg09 2014-11-09 16:37:45 -06:00
  • def749ddaa Merge pull request #1281 from ilikenwf/experimental Matt Parnell 2014-11-09 14:55:23 -06:00
  • 3aa1d11e1d Merge pull request #1282 from ilikenwf/master Matt Parnell 2014-11-09 14:55:13 -06:00
  • 5dd3955b78 Merge branch 'master' into experimental Matt Parnell 2014-11-09 14:50:33 -06:00
  • 3fc3af0451 Revert "Fixed some warnings in ObjectService" Matt Parnell 2014-11-09 14:50:22 -06:00
  • 7a86d19b38 Added base guards to Quarantine Zone Iosnowore Kun 2014-11-09 15:24:09 -05:00
  • ec6624b177 Added imperial captain to quarantine zone, fixed ent roadmap reward name Iosnowore Kun 2014-11-09 13:50:51 -05:00
  • 844f13cc1c Fixed last of NPC spawn errors Iosnowore Kun 2014-11-09 13:28:59 -05:00
  • 92fe0e05af Fixed small typo Iosnowore Kun 2014-11-09 13:27:00 -05:00
  • fd27b58bae Added static spawn script for quarantine zone guards Iosnowore Kun 2014-11-09 13:22:52 -05:00
  • 58b9f28a70 Fixed storm_commando mobile script Iosnowore Kun 2014-11-09 13:08:43 -05:00
  • 1b9a383f98 Fixed stormtrooper mobile script Iosnowore Kun 2014-11-09 13:06:29 -05:00
  • 643cc80856 Moved faction NPC scripts to faction NPC folder Iosnowore Kun 2014-11-09 13:01:31 -05:00
  • cc85b44e11 Merge pull request #5 from ProjectSWGCore/master Iosnowore-Kun 2014-11-09 12:52:14 -05:00
  • ba840980c1 Added no trade and bio link to camo scout trooper armor Iosnowore Kun 2014-11-09 12:40:48 -05:00
  • 6dccc7ba44 Fixed faction restriction bug Iosnowore Kun 2014-11-09 12:31:45 -05:00
  • e4f91cece4 Fixed bug where static spawns weren't spawning, added scout trooper belt, removed unneeded placeholders, changed quarantine zone static spaw Iosnowore Kun 2014-11-09 12:16:07 -05:00
  • 99cfc90945 Removed extra protection from imp and reb snow armor and added belts to each set Iosnowore Kun 2014-11-09 10:17:09 -05:00
  • 563257bf84 Added stats to Imperial and Rebel snow armor Iosnowore Kun 2014-11-09 10:12:24 -05:00
  • 116ae6c4f0 Fixed faction restriction bug on imperial and rebel armor Iosnowore Kun 2014-11-09 10:06:25 -05:00
  • 8894330e64 Fixed a bug where the marauder assault armor gave you 2 left bracers Iosnowore Kun 2014-11-09 09:42:54 -05:00
  • 85f8ea724a Added protection to wookiee and ithorian armor Iosnowore Kun 2014-11-09 09:20:24 -05:00
  • 6ef67f3b4c More bug fixes Iosnowore Kun 2014-11-09 09:11:53 -05:00
  • 7f0b630fc7 Fixed some bugs with armor Iosnowore Kun 2014-11-09 09:05:11 -05:00
  • d98fb86011 Changed options.cfg back to default Iosnowore Kun 2014-11-09 01:13:18 -05:00
  • 39e59d4036 Added wider variety of armor to frog Iosnowore Kun 2014-11-09 01:12:08 -05:00
  • deb7feca91 Merge pull request #1278 from Undercova/patch-2 tacef 2014-11-09 05:49:41 +01:00
  • b74a971dde Reverse of ObjectService change Undercova 2014-11-09 05:13:37 +01:00
  • 20912b1d6b Merge pull request #1277 from ProjectSWGCore/master Skorpios0 2014-11-09 03:57:30 +00:00
  • 16d52e6782 Merge pull request #1274 from wallaceg09/Musician Lewis 2014-11-08 22:34:03 -05:00
  • 641eda2766 Merge pull request #1276 from Undercova/patch-1 Skorpios0 2014-11-09 03:33:10 +00:00
  • 2ad1646cb2 Merge pull request #1275 from Mesagoppinmypants/master Skorpios0 2014-11-09 03:19:01 +00:00
  • 98fff30c93 Moved instrumentAudioId code from startmusic.py to EntertainmentService wallaceg09 2014-11-08 20:26:36 -06:00
  • bd33445757 Added more static spawn areas for deathtroopers Iosnowore Kun 2014-11-08 19:18:31 -05:00
  • 3602627658 Changed deathtrooper loot, aggro/assist range and attacks Iosnowore Kun 2014-11-08 19:18:19 -05:00
  • 9552da49db Fixed invalid weapon Iosnowore Kun 2014-11-08 18:59:05 -05:00
  • a7a4f78164 Added level 5 deathtroopers Iosnowore Kun 2014-11-08 18:48:42 -05:00
  • 0f296ea96d Update character_builder_terminal.py Undercova 2014-11-08 23:06:18 +01:00
  • d558296881 REMOVED server spam related to Entertainment services wallaceg09 2014-11-08 15:41:48 -06:00
  • 30917c1e0e Removed protection from katarn armor Iosnowore Kun 2014-11-08 15:25:41 -05:00
  • b80a7493d1 Merge pull request #4 from ProjectSWGCore/master Iosnowore-Kun 2014-11-08 15:22:06 -05:00
  • d90e9a97b8 Added stats to blackwing crystal Iosnowore Kun 2014-11-08 15:19:56 -05:00
  • 842abb6d87 Added cooldown to binoculars Iosnowore Kun 2014-11-08 15:19:12 -05:00
  • d0e22aeed6 Changed invasions back to 0 Iosnowore Kun 2014-11-08 15:15:58 -05:00
  • 84a209f7ec Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 into Musician wallaceg09 2014-11-08 09:47:33 -06:00
  • 2d24e8d8ae FIXED server crash when a player stops performing. wallaceg09 2014-11-08 09:44:57 -06:00
  • 3666877027 Merge pull request #1273 from wallaceg09/Musician Skorpios0 2014-11-08 15:12:30 +00:00
  • 92deb58321 MODIFIED CreatureObject.setPosture to use refactored stopPerformance method wallaceg09 2014-11-07 22:04:37 -06:00
  • 88a0271216 MOVED stopPerformance code from CreatureObject to EntertainmentService MOVED stopAudience code from CreatureObject to EntertainmentService MODIFIED stopdance to utilize refactored stopPerformance code MODIFIED stopmusic to utilize refactored stopPerformance code wallaceg09 2014-11-07 21:51:19 -06:00
  • b4b45951a9 ADDED basic implementation for the stopmusic command MODIFIED stopdance to indicate the use of a deprecated method wallaceg09 2014-11-07 20:37:57 -06:00
  • de430bd3e5 FIXED animations while playing instruments wallaceg09 2014-11-07 13:52:50 -06:00
  • ea4c8f06f8 FIXED Incorrect music playing for each instrument ADDED Player Ability check to playing music ADDED Player notification messages for failed music performance checks ADDED 'canPerform' method to EntertainmentService ADDED 'getAvailableSongs' method to EntertainmentService wallaceg09 2014-11-07 11:16:09 -06:00
  • 6dab500e42 Experimented with startmusic.py Added some client messages to the startmusic command code wallaceg09 2014-11-06 22:26:01 -06:00
  • d3bd0220dc Added xp gain to music performance. wallaceg09 2014-11-06 08:44:06 -06:00
  • d808fdd48e Refactored startmusic.py a bit wallaceg09 2014-11-06 08:41:52 -06:00
  • 1aac844428 Added entertainer music (very rough and buggy) Added stopmusic.py in commands (currently does nothing) Modified startdance.py: removed some debugging print statements wallaceg09 2014-11-05 21:40:58 -06:00
  • d04c8c11cc Added getInstrument method to EntertainmentService wallaceg09 2014-11-05 10:15:26 -06:00
  • bfc1653d68 Refactored EntertainmentService to to allow music to function properly Modified startdance script to work with the refactored EntertainmentService wallaceg09 2014-11-04 22:22:05 -06:00
  • 9fbb415687 Merge pull request #1268 from ProjectSWGCore/master tacef 2014-11-05 19:11:35 +01:00
  • 473e7be4c6 Fixed some issues that cause crashes Seefo 2014-11-05 12:39:18 -05:00
  • b980bd5480 Merge pull request #1267 from ProjectSWGCore/master Skorpios0 2014-11-04 22:17:47 +00:00
  • dd25011531 Merge pull request #1265 from wallaceg09/bugfix_0000248_heroics2 Skorpios0 2014-11-04 22:13:48 +00:00
  • 9365c98d12 Merge pull request #1266 from Undercova/master Skorpios0 2014-11-04 22:13:26 +00:00
  • 6120f8c14c Added Assault Trooper armor to frog Bronco69 2014-11-04 22:53:47 +01:00
  • 1b343a7f3a Fixed comments that were removed by accident wallaceg09 2014-11-04 08:21:10 -06:00
  • 8488bd5037 Fixed an issue where equipping an item on top of a set-bonus item wouldn't remove the set buff. wallaceg09 2014-11-04 08:13:17 -06:00
  • 7040e8ee88 Merge pull request #1264 from ProjectSWGCore/master Skorpios0 2014-11-04 00:51:59 +00:00
  • b0234b9ae1 Merge pull request #1261 from wallaceg09/bugfix_0000248_heroics Skorpios0 2014-11-04 00:43:08 +00:00
  • 67d1ad416a Merge pull request #1263 from Undercova/master Skorpios0 2014-11-04 00:42:39 +00:00
  • bfb28e5c53 Fixed SpawnDistance to 150m Bronco69 2014-11-04 00:02:14 +01:00
  • 5156682084 Added planetary prefix to most dynamic spawn groups Bronco69 2014-11-03 22:37:56 +01:00
  • d5d3fa49f2 Fixed some warnings in ObjectService Iosnowore Kun 2014-11-02 14:22:06 -05:00
  • 6f7e04e8e8 Merge pull request #3 from ProjectSWGCore/master Iosnowore-Kun 2014-11-02 13:52:32 -05:00