projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-12 02:13:48 -04:00
Code Issues Projects Releases Wiki Activity
3,925 Commits 11 Branches 4 Tags
3aa1d11e1d9b28c7179abd48b9ecd4a3eebd2ca9
Commit Graph
3925 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Parnell 3aa1d11e1d Merge pull request #1282 from ilikenwf/master 
Revert "Fixed some warnings in ObjectService"
 2014-11-09 14:55:13 -06:00
Matt Parnell 3fc3af0451 Revert "Fixed some warnings in ObjectService" 
This reverts commit d5d3fa49f2.
 2014-11-09 14:50:22 -06:00
Lewis 16d52e6782 Merge pull request #1274 from wallaceg09/Musician 
Musician
 2014-11-08 22:34:03 -05:00
Skorpios0 641eda2766 Merge pull request #1276 from Undercova/patch-1 
Added music instrument to frog
 2014-11-09 03:33:10 +00:00
Skorpios0 2ad1646cb2 Merge pull request #1275 from Mesagoppinmypants/master 
Read Description
 2014-11-09 03:19:01 +00:00
Iosnowore Kun bd33445757 Added more static spawn areas for deathtroopers 2014-11-08 19:18:31 -05:00
Iosnowore Kun 3602627658 Changed deathtrooper loot, aggro/assist range and attacks 2014-11-08 19:18:19 -05:00
Iosnowore Kun 9552da49db Fixed invalid weapon 2014-11-08 18:59:05 -05:00
Iosnowore Kun a7a4f78164 Added level 5 deathtroopers 
Started work on Quarantine zone NPCs.
 2014-11-08 18:48:42 -05:00
Undercova 0f296ea96d Update character_builder_terminal.py 2014-11-08 23:06:18 +01:00
Iosnowore Kun 30917c1e0e Removed protection from katarn armor 
This caused a bug with protection because the protection was already
coded as shown here:
https://github.com/ProjectSWGCore/NGECore2/tree/master/scripts/object/tangible/wearables/armor/clone_trooper
 2014-11-08 15:25:41 -05:00
Iosnowore-Kun b80a7493d1 Merge pull request #4 from ProjectSWGCore/master 
Update fork
 2014-11-08 15:22:06 -05:00
Iosnowore Kun d90e9a97b8 Added stats to blackwing crystal 2014-11-08 15:19:56 -05:00
Iosnowore Kun 842abb6d87 Added cooldown to binoculars 2014-11-08 15:19:12 -05:00
Iosnowore Kun d0e22aeed6 Changed invasions back to 0 2014-11-08 15:15:58 -05:00
wallaceg09 84a209f7ec Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2 into Musician 2014-11-08 09:47:33 -06:00
wallaceg09 2d24e8d8ae FIXED server crash when a player stops performing. 2014-11-08 09:44:57 -06:00
Skorpios0 3666877027 Merge pull request #1273 from wallaceg09/Musician 
Added player music functionality
 2014-11-08 15:12:30 +00:00
wallaceg09 92deb58321 MODIFIED CreatureObject.setPosture to use refactored stopPerformance method 2014-11-07 22:04:37 -06:00
wallaceg09 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
 2014-11-07 21:51:19 -06:00
wallaceg09 b4b45951a9 ADDED basic implementation for the stopmusic command 
MODIFIED stopdance to indicate the use of a deprecated method
 2014-11-07 20:37:57 -06:00
wallaceg09 de430bd3e5 FIXED animations while playing instruments 2014-11-07 14:32:00 -06:00
wallaceg09 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
 2014-11-07 14:31:59 -06:00
wallaceg09 6dab500e42 Experimented with startmusic.py 
Added some client messages to the startmusic command code
 2014-11-07 14:31:58 -06:00
wallaceg09 d3bd0220dc Added xp gain to music performance. 2014-11-07 14:31:57 -06:00
wallaceg09 d808fdd48e Refactored startmusic.py a bit 2014-11-07 14:31:56 -06:00
wallaceg09 1aac844428 Added entertainer music (very rough and buggy) 
Added stopmusic.py in commands (currently does nothing)
Modified startdance.py: removed some debugging print statements
 2014-11-07 14:31:55 -06:00
wallaceg09 d04c8c11cc Added getInstrument method to EntertainmentService 2014-11-07 14:31:54 -06:00
wallaceg09 bfc1653d68 Refactored EntertainmentService to to allow music to function properly 
Modified startdance script to work with the refactored EntertainmentService
 2014-11-07 14:31:53 -06:00
Seefo 473e7be4c6 Fixed some issues that cause crashes 
The rest of the scripts need to be modified, I don't have time to do
them all.
 2014-11-05 12:39:18 -05:00
Skorpios0 dd25011531 Merge pull request #1265 from wallaceg09/bugfix_0000248_heroics2 
Fixed an issue with item set buffs not properly being removed when replaced
 2014-11-04 22:13:48 +00:00
Skorpios0 9365c98d12 Merge pull request #1266 from Undercova/master 
Added Assault Trooper armor to frog
 2014-11-04 22:13:26 +00:00
Bronco69 6120f8c14c Added Assault Trooper armor to frog 
- Added Clone Trooper armor to frog
- Added Marine armor to frog
- Added RIS armor to frog
- Added Rebel snow armor to frog
- Added Stormtrooper armor to frog
- Added Scout Trooper armor to frog
- Added Snow Trooper armor to frog
- Added Ubese armor to frog
 2014-11-04 22:53:47 +01:00
wallaceg09 1b343a7f3a Fixed comments that were removed by accident 2014-11-04 08:21:10 -06:00
wallaceg09 8488bd5037 Fixed an issue where equipping an item on top of a set-bonus item wouldn't remove the set buff. 2014-11-04 08:13:17 -06:00
Skorpios0 b0234b9ae1 Merge pull request #1261 from wallaceg09/bugfix_0000248_heroics 
Bugfix 0000248 heroics
 2014-11-04 00:43:08 +00:00
Skorpios0 67d1ad416a Merge pull request #1263 from Undercova/master 
Merge
 2014-11-04 00:42:39 +00:00
Bronco69 bfb28e5c53 Fixed SpawnDistance to 150m 
Fixed the group size of dynamic spawns to max 5 instead of 15+
 2014-11-04 00:02:14 +01:00
Bronco69 5156682084 Added planetary prefix to most dynamic spawn groups 
Fixed nge.cfg.example (got deleted by accident in previous commit)
 2014-11-03 22:37:56 +01:00
Iosnowore Kun d5d3fa49f2 Fixed some warnings in ObjectService 2014-11-02 14:22:06 -05:00
Iosnowore-Kun 6f7e04e8e8 Merge pull request #3 from ProjectSWGCore/master 
test
 2014-11-02 13:52:32 -05:00
wallaceg09 88fe815f05 Fixed local .classpath to match upstream. 2014-11-01 16:54:11 -05:00
wallaceg09 0fb7aa97cb FIXED bug 0000248: Incorrect Heroism Jewelry set buffs. 2014-11-01 15:42:45 -05:00
Lewis c438ee3590 Merge pull request #1259 from Undercova/master 
Changed medic buffs from frog to 3 hours duration
 2014-10-29 16:38:10 -04:00
Bronco69 339c5ec446 Changed medic buffs from frog to 3 hours duration 
- Added new Jedi Cloak/Robes to frog
- Changed standard melee and ranged weapons to more rare ones
- Added mandalorian armor to frog
 2014-10-29 21:22:04 +01:00
Lewis 017ba6d379 Merge pull request #1255 from Undercova/master 
Merge
 2014-10-28 11:08:26 -04:00
Undercova b64acae587 Update ObjectService.java 2014-10-28 16:06:26 +01:00
Bronco69 a32ba0444f Added spawn areas to Corellia 
- Added spawn areas to Dantooine
- Added spawn areas to Dathomir
- Added spawn areas to Endor
- Added spawn areas to Lok
- Added spawn areas to Rori
- Added spawn areas to Talus
- Added spawn areas to Tatooine
- Added spawn areas to Yavin IV
 2014-10-28 06:22:08 +01:00
Bronco69 0d4c83e43f Added dynamic spawn groups for various planets 2014-10-28 06:19:44 +01:00
Bronco69 110a97121f Added missing Lok mobile template 2014-10-28 06:18:45 +01:00