Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/release/1.6.2'

  • Loading branch information...
Ellypse committed Jul 8, 2019
2 parents 3b2b567 + 982bda4 commit 35cdee3d3f842f93be64ca2d95c082aa8fa37e1a
Showing with 54,093 additions and 44,718 deletions.
  1. +2 −2 .editorconfig
  2. BIN .gitattributes
  3. +5 −2 .gitmodules
  4. +19,433 −0 .luacheckrc
  5. +2 −4 .pkgmeta
  6. +6 −2 .travis.yml
  7. +55 −32 CHANGELOG.md
  8. +0 −52 Documents/Change-logs/0.1.0.md
  9. +0 −39 Documents/Change-logs/0.1.1.md
  10. +0 −62 Documents/Change-logs/0.2.0.md
  11. +0 −31 Documents/Change-logs/0.2.1.md
  12. +0 −14 Documents/Change-logs/0.2.2.md
  13. +0 −23 Documents/Change-logs/0.2.3.md
  14. +0 −20 Documents/Change-logs/0.2.4.md
  15. +0 −12 Documents/Change-logs/0.2.5.md
  16. +0 −39 Documents/Change-logs/0.2.6.md
  17. BIN Documents/Change-logs/0.2.6_data_broker.jpeg
  18. +0 −36 Documents/Change-logs/0.2.7.md
  19. BIN Documents/Change-logs/0.2.7_afg_groups.png
  20. BIN Documents/Change-logs/0.2.7_mount_frame.jpeg
  21. BIN Documents/Change-logs/0.2.7_mount_tooltip.png
  22. BIN Documents/Change-logs/0.2.7_pet_browser.png
  23. +0 −51 Documents/Change-logs/1.0.0.md
  24. +0 −30 Documents/Change-logs/1.0.1.md
  25. BIN Documents/Change-logs/1.0.1_twitter_tag.gif
  26. +0 −16 Documents/Change-logs/1.0.2.md
  27. BIN Documents/Change-logs/1.0.2_resize.gif
  28. +0 −20 Documents/Change-logs/1.0.3.md
  29. BIN Documents/Change-logs/1.0.3_inserting_full_name.gif
  30. BIN Documents/Change-logs/1.0_glance_ui.jpg
  31. BIN Documents/Change-logs/1.0_language_button.jpeg
  32. BIN Documents/Change-logs/1.0_map_button.jpg
  33. BIN Documents/Change-logs/1.0_player_scan.gif
  34. BIN Documents/Change-logs/1.0_whats_new.jpg
  35. +0 −25 Documents/Change-logs/1.1.0.md
  36. +0 −9 Documents/Change-logs/1.1.1.md
  37. +0 −7 Documents/Change-logs/1.1.2.md
  38. +0 −3 Documents/Change-logs/1.1.3.1.md
  39. +0 −3 Documents/Change-logs/1.1.3.md
  40. +0 −9 Documents/Change-logs/1.1.4.md
  41. +0 −270 Documents/Change-logs/1.1.4_new_images.md
  42. +0 −462 Documents/Change-logs/1.1.4_new_musics.md
  43. +0 −43 Documents/Change-logs/1.2.0.md
  44. +0 −1 Documents/Scripts/mature-dict
  45. BIN Documents/mockups/assets/companion_list_character.png
  46. BIN Documents/mockups/assets/targetframe_dragon.png
  47. BIN Documents/mockups/assets/tropframe2.png
  48. +0 −297 Documents/mockups/mockup_character_sheet_about_template_A.bmml
  49. +0 −348 Documents/mockups/mockup_character_sheet_about_template_B.bmml
  50. +0 −371 Documents/mockups/mockup_character_sheet_about_template_C.bmml
  51. +0 −827 Documents/mockups/mockup_character_sheet_characteristics.bmml
  52. +0 −197 Documents/mockups/mockup_character_sheet_presets.bmml
  53. +0 −133 Documents/mockups/mockup_character_sheet_quickpick.bmml
  54. +0 −304 Documents/mockups/mockup_character_sheet_rpstyle.bmml
  55. +0 −97 Documents/mockups/mockup_characters_register_character_tab.bmml
  56. +0 −368 Documents/mockups/mockup_characters_register_companion_tab.bmml
  57. +0 −198 Documents/mockups/mockup_characters_register_list.bmml
  58. +0 −137 Documents/mockups/mockup_chat_tracking.bmml
  59. +0 −154 Documents/mockups/mockup_creation_toolbox_item.bmml
  60. +0 −122 Documents/mockups/mockup_module_localizator_config.bmml
  61. +0 −254 Documents/mockups/mockup_notepad.bmml
  62. +0 −528 Documents/mockups/mockup_popup_fileselection.bmml
  63. +0 −186 Documents/mockups/mockup_profile_management.bmml
  64. +0 −229 Documents/mockups/mockup_profile_management_telkos.bmml
  65. +0 −91 Documents/mockups/mockup_shortcut_bar.bmml
  66. +0 −87 Documents/mockups/mockup_targetframe.bmml
  67. 0 {Documents → }/Scripts/generate_mature_dict.sh
  68. +3 −3 {Documents → }/Scripts/list_icons.sh
  69. +1 −0 Scripts/mature-dict
  70. 0 {Documents → }/Scripts/mature_dictionary_template.lua
  71. +201 −201 totalRP3/LICENSE.txt
  72. +2 −2 totalRP3/VersionCheck.lua
  73. +2 −3 totalRP3/__version.lua
  74. +75 −12 totalRP3/core/Models/Player.lua
  75. +132 −0 totalRP3/core/Models/_tests/Player.lua
  76. +82 −80 totalRP3/core/core.xml
  77. +12 −17 totalRP3/core/impl/AdvancedSettings.lua
  78. +23 −26 totalRP3/core/impl/CommunicationProtocol.lua
  79. +5 −12 totalRP3/core/impl/Compression.lua
  80. +38 −0 totalRP3/core/impl/Enums.lua
  81. +4 −6 totalRP3/core/impl/ProfilesChatLinksModule.lua
  82. +361 −362 totalRP3/core/impl/communication_protocol_broadcast.lua
  83. +470 −455 totalRP3/core/impl/configuration.lua
  84. +129 −135 totalRP3/core/impl/events.lua
  85. +146 −144 totalRP3/core/impl/globals.lua
  86. +456 −454 totalRP3/core/impl/main_structure.lua
  87. +1,004 −1,002 totalRP3/core/impl/popup.lua
  88. +638 −636 totalRP3/core/impl/profiles.lua
  89. +192 −193 totalRP3/core/impl/slash.lua
  90. +184 −185 totalRP3/core/impl/ui_main.lua
  91. +1,142 −1,126 totalRP3/core/impl/ui_tools.lua
  92. +1,137 −1,115 totalRP3/core/impl/utils.lua
  93. +149 −149 totalRP3/core/ui/browsers/colors.xml
  94. +145 −145 totalRP3/core/ui/browsers/companions.xml
  95. +137 −137 totalRP3/core/ui/browsers/icons.xml
  96. +140 −140 totalRP3/core/ui/browsers/images.xml
  97. +182 −182 totalRP3/core/ui/browsers/musics.xml
  98. +185 −185 totalRP3/core/ui/configuration.xml
  99. +526 −526 totalRP3/core/ui/main.xml
  100. +349 −349 totalRP3/core/ui/profiles.xml
  101. +1,166 −1,146 totalRP3/core/ui/widgets.xml
  102. +1 −1 totalRP3/init.lua
  103. +674 −674 totalRP3/libs/AceAddon-3.0/AceAddon-3.0.lua
  104. +3 −3 totalRP3/libs/AceAddon-3.0/AceAddon-3.0.xml
  105. +287 −287 totalRP3/libs/AceSerializer-3.0/AceSerializer-3.0.lua
  106. +3 −3 totalRP3/libs/AceSerializer-3.0/AceSerializer-3.0.xml
  107. +238 −238 totalRP3/libs/CallbackHandler-1.0/CallbackHandler-1.0.lua
  108. +3 −3 totalRP3/libs/CallbackHandler-1.0/CallbackHandler-1.0.xml
  109. +1 −1 totalRP3/libs/Ellyb
  110. +1,259 −1,259 totalRP3/libs/LibCompress/LibCompress.lua
  111. +469 −469 totalRP3/libs/LibDBIcon-1.0/LibDBIcon-1.0.lua
  112. +90 −90 totalRP3/libs/LibDataBroker-1.1/LibDataBroker-1.1.lua
  113. +1 −1 totalRP3/libs/LibMSP
  114. +1 −0 totalRP3/libs/LibRPMedia
  115. +51 −51 totalRP3/libs/LibStub/LibStub.lua
  116. +44 −41 totalRP3/libs/libs.xml
  117. +6 −22 totalRP3/modules/ChatLinks/ChatLink.lua
  118. +12 −18 totalRP3/modules/ChatLinks/ChatLinkActionButton.lua
  119. +15 −22 totalRP3/modules/ChatLinks/ChatLinkModule.lua
  120. +2 −3 totalRP3/modules/ChatLinks/ChatLinkTooltip.lua
  121. +8 −17 totalRP3/modules/ChatLinks/ChatLinkTooltipLines.lua
  122. +21 −23 totalRP3/modules/ChatLinks/ChatLinks.lua
  123. +2 −2 totalRP3/modules/ChatLinks/ChatLinks.xml
  124. +2 −4 totalRP3/modules/ChatLinks/ChatLinksManager.lua
  125. +12 −12 totalRP3/modules/Languages/Language.lua
  126. +2 −3 totalRP3/modules/chatframe/ElvUI.lua
  127. +17 −17 totalRP3/modules/chatframe/WIM.lua
  128. +805 −835 totalRP3/modules/chatframe/chatframe.lua
  129. +26 −26 totalRP3/modules/chatframe/chatframe.xml
  130. +21 −23 totalRP3/modules/chatframe/languages.lua
  131. +6 −6 totalRP3/modules/chatframe/prat.lua
  132. +0 −1 totalRP3/modules/dashboard/AboutTabView.lua
  133. +0 −1 totalRP3/modules/dashboard/Credit.lua
  134. +1 −2 totalRP3/modules/dashboard/HTMLContent.lua
  135. +0 −1 totalRP3/modules/dashboard/ModulesTabView.lua
  136. +3 −8 totalRP3/modules/dashboard/TabFrame.lua
  137. +0 −1 totalRP3/modules/dashboard/TabView.lua
  138. +3 −4 totalRP3/modules/dashboard/WhatsNewTabView.lua
  139. +319 −329 totalRP3/modules/dashboard/dashboard.lua
  140. +212 −212 totalRP3/modules/dashboard/dashboard.xml
  141. +20 −25 totalRP3/modules/dashboard/npc_talk.lua
  142. +46 −46 totalRP3/modules/flyway/flyway.lua
  143. +144 −114 totalRP3/modules/flyway/flyway_patches.lua
  144. +0 −96 totalRP3/modules/importer/FlagRSP2_API.lua
  145. +0 −93 totalRP3/modules/importer/FlagRSP_API.lua
  146. +17 −17 totalRP3/modules/importer/MRP_API.lua
  147. +17 −17 totalRP3/modules/importer/XRP_API.lua
  148. +190 −190 totalRP3/modules/importer/importer.lua
  149. +120 −123 totalRP3/modules/importer/importer.xml
  150. +0 −241 totalRP3/modules/importer/totalRP2_API.lua
  151. +15 −29 totalRP3/modules/map/Map.lua
  152. +13 −13 totalRP3/modules/map/MapDataProvider.lua
  153. +22 −37 totalRP3/modules/map/MapPoiMixins.lua
  154. +12 −16 totalRP3/modules/map/MapScanner.lua
  155. +13 −15 totalRP3/modules/map/MapScannersManager.lua
  156. +21 −25 totalRP3/modules/map/WorldMapButton.lua
  157. +11 −11 totalRP3/modules/map/WorldMapScanLoadingFrame.lua
  158. +111 −114 totalRP3/modules/map/map.xml
  159. +41 −353 totalRP3/modules/map/map_markers.lua
  160. +479 −379 totalRP3/modules/module_management.lua
  161. +138 −138 totalRP3/modules/modules.xml
  162. +13 −13 totalRP3/modules/register/characters/PlayerMapScan/PlayerMapPin.lua
  163. +2 −2 totalRP3/modules/register/characters/PlayerMapScan/PlayerMapScan.xml
  164. +13 −13 totalRP3/modules/register/characters/PlayerMapScan/PlayerMapScanner.lua
  165. +17 −41 totalRP3/modules/register/characters/ReportProfileButton.lua
  166. +966 −908 totalRP3/modules/register/characters/register_about.lua
  167. +1,576 −1,546 totalRP3/modules/register/characters/register_characteristics.lua
  168. +262 −266 totalRP3/modules/register/characters/register_ignore.lua
  169. +97 −66 totalRP3/modules/register/characters/register_main.lua
  170. +544 −554 totalRP3/modules/register/characters/register_misc.lua
  171. +137 −0 totalRP3/modules/register/characters/register_notes.lua
  172. +574 −562 totalRP3/modules/register/characters/register_ui_about.xml
  173. +701 −695 totalRP3/modules/register/characters/register_ui_characteristics.xml
  174. +81 −75 totalRP3/modules/register/characters/register_ui_main.xml
  175. +320 −320 totalRP3/modules/register/characters/register_ui_misc.xml
  176. +120 −0 totalRP3/modules/register/characters/register_ui_notes.xml
  177. +5 −12 totalRP3/modules/register/companions/CompanionProfileChatLinksModule.lua
  178. +465 −470 totalRP3/modules/register/companions/register_companions_main.lua
  179. +491 −497 totalRP3/modules/register/companions/register_companions_page.lua
  180. +659 −661 totalRP3/modules/register/companions/register_companions_profiles.lua
  181. +29 −29 totalRP3/modules/register/companions/register_ui_companions_main.xml
  182. +269 −269 totalRP3/modules/register/companions/register_ui_companions_page.xml
  183. +23 −23 totalRP3/modules/register/companions/register_ui_companions_profiles.xml
  184. +6 −18 totalRP3/modules/register/filter/register_mature_filter.lua
  185. +3 −14 totalRP3/modules/register/main/AtFirstGlanceChatLinksModule.lua
  186. +5 −12 totalRP3/modules/register/main/RegisterCompanionChatLinksModule.lua
  187. +6 −10 totalRP3/modules/register/main/RegisterPlayerChatLinksModule.lua
  188. +12 −14 totalRP3/modules/register/main/register_cursor.lua
  189. +545 −550 totalRP3/modules/register/main/register_exchange.lua
  190. +865 −870 totalRP3/modules/register/main/register_glance.lua
  191. +1,085 −1,090 totalRP3/modules/register/main/register_list.lua
  192. +1,415 −1,469 totalRP3/modules/register/main/register_tooltip.lua
  193. +93 −93 totalRP3/modules/register/main/register_ui_glance.xml
  194. +445 −440 totalRP3/modules/register/main/register_ui_list.xml
  195. +281 −0 totalRP3/modules/register/msp/Fields.lua
  196. +577 −586 totalRP3/modules/register/msp/register_msp.lua
  197. +74 −71 totalRP3/modules/register/register_includes.xml
  198. +412 −411 totalRP3/modules/targetframe/target_frame.lua
  199. +49 −49 totalRP3/modules/targetframe/target_frame.xml
  200. +404 −404 totalRP3/modules/toolbar/toolbar.lua
  201. +83 −83 totalRP3/modules/toolbar/toolbar.xml
  202. +1 −1 totalRP3/modules/tooltip_skins/ElvUI.lua
  203. +2 −2 totalRP3/modules/tooltip_skins/tinytooltip.lua
  204. +17 −17 totalRP3/modules/tooltip_skins/tiptac.lua
  205. BIN totalRP3/resources/160-1.tga
  206. BIN totalRP3/resources/160-2.tga
  207. BIN totalRP3/resources/160-3.tga
  208. BIN totalRP3/resources/160-4.tga
  209. +523 −146 totalRP3/resources/iconList.lua
  210. +4,586 −4,478 totalRP3/resources/imageList.lua
  211. +34 −3,560 totalRP3/resources/musicList.lua
  212. +10 −10 totalRP3/resources/resources.txt
  213. +24 −24 totalRP3/resources/resources.xml
  214. +3 −3 totalRP3/tools/HTML.lua
  215. +89 −58 totalRP3/tools/Locale.lua
  216. +12 −12 totalRP3/tools/workarounds.lua
  217. +18 −17 totalRP3/totalRP3.lua
  218. +13 −13 totalRP3/totalRP3.toc
  219. +34 −34 totalRP3/totalRP3.xml
  220. +22 −21 totalRP3_Data/totalRP3_Data.lua
  221. +10 −10 totalRP3_Data/totalRP3_Data.toc
  222. +0 −148 totalRP3_Localizator/localizator.lua
  223. +0 −10 totalRP3_Localizator/totalRP3_Localizator.toc
  224. +0 −151 totalRP3_Localizator/totalRP3_Localizator.xml
  225. +0 −209 totalRP3_zTest/commuTest.lua
  226. +0 −400 totalRP3_zTest/totalRP3_zTest.lua
  227. +0 −8 totalRP3_zTest/totalRP3_zTest.toc
@@ -8,7 +8,7 @@ root = true
# - UTF-8 encoding
# - TABS!
[*]
end_of_line = crlf
end_of_line = unset
charset = utf-8
indent_style = tab

@@ -18,4 +18,4 @@ end_of_line = lf
# CurseForge's .pkgmeta file has to be indented with spaces
[.pkgmeta]
indent_style = space
indent_size = 2
indent_size = 2
BIN +54 Bytes .gitattributes
Binary file not shown.
@@ -1,12 +1,15 @@
[submodule "totalRP3/libs/Ellyb"]
path = totalRP3/libs/Ellyb
url = https://github.com/Ellypse/Ellyb
[submodule "Documents/Scripts/mature-dict"]
path = Documents/Scripts/mature-dict
[submodule "Scripts/mature-dict"]
path = Scripts/mature-dict
url = https://github.com/Ellypse/List-of-Dirty-Naughty-Obscene-and-Otherwise-Bad-Words
[submodule "totalRP3/libs/LibMSP"]
path = totalRP3/libs/LibMSP
url = https://github.com/Ellypse/LibMSP
[submodule "totalRP3/libs/LibDeflate"]
path = totalRP3/libs/LibDeflate
url = https://github.com/SafeteeWoW/LibDeflate
[submodule "totalRP3/libs/LibRPMedia"]
path = totalRP3/libs/LibRPMedia
url = https://github.com/wow-rp-addons/LibRPMedia

0 comments on commit 35cdee3

Please sign in to comment.
You can’t perform that action at this time.