Merge branch 'release'

* release: (92 commits) Fixed incorrect network library use Sentry guns and turrets will now correctly proc while instagib is active Removed disabled mods and unused code Updated base mutator IsEnabled Removed old mutators Game will start once all modded clients have reported mutator status instead of waiting for the timeout Mutators will be loaded from the folder instead of per file name Mutators menu will darken background when opened Mutators uses the new localization system Fixed exploding bullets mutator for BLT Fixed Addicts mutator for BLT changes Fixed StartTheGame override on MenuCallbackHandler not passing through the handler reference Removed unused localization keys Fixed crash on exit game from preplanning screen while using mutators Added UpgradesTweakData hooks Fixed localization overriding the localization example hook Merged goontest's Blackmarket Grenade tab change from legacy branch Added bypass auto-disable on update to options menu Added Disable Inventory Notifications mods Added Custom Enemy Weapon Laser mod Cleaned up custom laser/flashlight mods Added Infamy Outliner mod Added SkillTreeGUI and SkillTreeManager hooks Moved ColorHSVRGB to req folder Reimplemented custom player and teammate lasers Fixed up hooks on custom flashlights and world lasers Mods menu will darken the background and remove the contract gui to make it easier to read Added ExperienceManager hooks ... Conflicts: GoonBase/mods/colour_grading.lua GoonBase/req/autils.lua GoonBase/req/menus.lua GoonBase/req/updates.lua GoonMod/goonbase.lua GoonMod/lua/BlackMarketGUI.lua GoonMod/mods/mutators.lua GoonMod/req/mods.lua update_version.txt
JamesWilko · Mar 31, 2015 · 9923931 · 9923931
2 parents 30b324a + ae70006
commit 9923931
Show file tree

Hide file tree

Showing 170 changed files with 5,969 additions and 7,224 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+GoonMod/mods/akimbo_autoaim.lua
+GoonMod/mods/riot_shields.lua
+GoonMod/mods/perkdeck_jacket.lua
+GoonMod/mods/choose_any_character.lua
+GoonMod/loc/pd_jacket_en.txt
diff --git a/GoonBase/lua/ElementSpawnGrenade.lua b/GoonBase/lua/ElementSpawnGrenade.lua
diff --git a/GoonBase/lua/FPCameraPlayerBase.lua b/GoonBase/lua/FPCameraPlayerBase.lua
diff --git a/GoonBase/lua/GroupAIManager.lua b/GoonBase/lua/GroupAIManager.lua
diff --git a/GoonBase/lua/HUDManager.lua b/GoonBase/lua/HUDManager.lua
diff --git a/GoonBase/lua/InfamyTweakData.lua b/GoonBase/lua/InfamyTweakData.lua
diff --git a/GoonBase/lua/LocalizationManager.lua b/GoonBase/lua/LocalizationManager.lua
diff --git a/GoonBase/lua/MenuItemCustomizeController.lua b/GoonBase/lua/MenuItemCustomizeController.lua
diff --git a/GoonBase/lua/MenuManager.lua b/GoonBase/lua/MenuManager.lua