Skip to content
Permalink
Browse files

Merge pull request #22 from EvoTM/develop

Develop
  • Loading branch information...
brakerb committed Aug 11, 2019
2 parents 1270cd1 + afb4604 commit 62bf51e5b5a573200affe3f224efcc1e61cbe279
Showing with 8,333 additions and 4,265 deletions.
  1. +2 −1 .gitignore
  2. +3 −3 Migrations/1525006285_create-groups-table.php
  3. +42 −0 Migrations/1563894071_remove-gbx-from-database.php
  4. +11 −1 composer.json
  5. +340 −108 composer.lock
  6. +1 −1 config/default/colors.config.json
  7. +88 −0 core/Classes/Cache.php
  8. +35 −24 core/Classes/ChatCommand.php
  9. +16 −7 core/Classes/File.php
  10. +0 −88 core/Classes/HideScript.php
  11. +35 −23 core/Classes/Hook.php
  12. +12 −11 core/Classes/Log.php
  13. +7 −0 core/Classes/ManiaLinkDrag.php
  14. +24 −16 core/Classes/ManiaLinkEvent.php
  15. +42 −11 core/Classes/RestClient.php
  16. +15 −12 core/Classes/Server.php
  17. +12 −8 core/Classes/Template.php
  18. +99 −0 core/Commands/AddAdmin.php
  19. +66 −54 core/{run.php → Commands/EscRun.php}
  20. +59 −0 core/Commands/FakeLocals.php
  21. +15 −7 core/{fix_scores.php → Commands/FixScores.php}
  22. +32 −23 core/{import_uaseco.php → Commands/ImportUaseco.php}
  23. +69 −0 core/Commands/MakeMigration.php
  24. +34 −17 core/{migrate.php → Commands/Migrate.php}
  25. +67 −43 core/Controllers/AfkController.php
  26. +5 −5 core/Controllers/BansController.php
  27. +33 −26 core/Controllers/ChatController.php
  28. +24 −16 core/Controllers/ConfigController.php
  29. +75 −20 core/Controllers/CountdownController.php
  30. +37 −35 core/Controllers/EventController.php
  31. +11 −10 core/Controllers/HookController.php
  32. +204 −110 core/Controllers/MapController.php
  33. +105 −20 core/Controllers/MatchSettingsController.php
  34. +7 −3 core/Controllers/ModeScriptEventController.php
  35. +10 −6 core/Controllers/ModuleController.php
  36. +31 −13 core/Controllers/PlanetsController.php
  37. +103 −38 core/Controllers/PlayerController.php
  38. +41 −14 core/Controllers/QueueController.php
  39. +57 −24 core/Controllers/SetupController.php
  40. +8 −11 core/Controllers/TemplateController.php
  41. +15 −0 core/Interfaces/ModuleInterface.php
  42. +8 −1 core/Models/AccessRight.php
  43. +1 −1 core/Models/Group.php
  44. +123 −22 core/Models/Map.php
  45. +42 −17 core/Models/Player.php
  46. +11 −1 core/Modules/_tester/Templates/test.latte.xml
  47. +6 −2 core/Modules/_tester/TestModule.php
  48. +1 −0 core/Modules/added-time-info/AddedTimeInfo.php
  49. +1 −1 core/Modules/added-time-info/Templates/widget.latte.xml
  50. +2 −2 core/Modules/admin-serv/AdminServ.php
  51. +2 −4 core/Modules/alter-ui/AlterUi.php
  52. +1 −1 core/Modules/ban-gui/BanGUI.php
  53. +0 −2 core/Modules/clock/Clock.php
  54. +111 −69 core/Modules/clock/Templates/clock.latte.xml
  55. +3 −3 core/Modules/clock/clock.config.json
  56. +2 −1 core/Modules/cp-records/cp-records.config.json
  57. +106 −45 core/Modules/dedimania-records/Dedimania.php
  58. +114 −93 core/Modules/dedimania-records/DedimaniaApi.php
  59. +42 −300 core/Modules/dedimania-records/Templates/manialink.latte.xml
  60. +5 −4 core/Modules/dedimania-records/dedimania.config.json
  61. +33 −58 core/Modules/discord/Template/widget.latte.xml
  62. +5 −4 core/Modules/discord/discord.config.json
  63. +56 −52 core/Modules/donations/Templates/widget.latte.xml
  64. +3 −3 core/Modules/donations/donations.config.json
  65. +6 −4 core/Modules/group-manager/GroupManager.php
  66. BIN core/Modules/help/GitHub-Mark-Light-32px.png
  67. +26 −3 core/Modules/help/Help.php
  68. +51 −0 core/Modules/help/Templates/about.latte.xml
  69. +137 −0 core/Modules/help/Templates/cmds.latte.xml
  70. +0 −136 core/Modules/help/Templates/window.latte.xml
  71. +0 −50 core/Modules/hide-settings/HideSettings.php
  72. +0 −95 core/Modules/hide-settings/Templates/manialink.latte.xml
  73. +0 −9 core/Modules/hide-settings/Templates/update.latte.xml
  74. +0 −5 core/Modules/hide-settings/module.json
  75. +5 −3 core/Modules/key-binds/KeyBinds.php
  76. +47 −43 core/Modules/live-rankings/Templates/widget.latte.xml
  77. +7 −3 core/Modules/live-rankings/live-rankings.config.json
  78. +174 −95 core/Modules/local-records/LocalRecords.php
  79. +44 −333 core/Modules/local-records/Templates/manialink.latte.xml
  80. +4 −3 core/Modules/local-records/Templates/update.latte.xml
  81. +8 −6 core/Modules/local-records/locals.config.json
  82. +10 −10 core/Modules/map-list/MapList.php
  83. +125 −123 core/Modules/map-list/Templates/{manialink.latte.xml → map-list.latte.xml}
  84. +4 −5 core/Modules/map-list/map-list.config.json
  85. +0 −100 core/Modules/matchsettings-manager/MatchSettings.php
  86. +97 −235 core/Modules/matchsettings-manager/MatchSettingsManager.php
  87. +68 −0 core/Modules/matchsettings-manager/MatchSettingsRepo/chase.xml
  88. +63 −0 core/Modules/matchsettings-manager/MatchSettingsRepo/cup.xml
  89. +35 −0 core/Modules/matchsettings-manager/MatchSettingsRepo/laps.xml
  90. +41 −0 core/Modules/matchsettings-manager/MatchSettingsRepo/rounds.xml
  91. +63 −0 core/Modules/matchsettings-manager/MatchSettingsRepo/team.xml
  92. +33 −0 core/Modules/matchsettings-manager/MatchSettingsRepo/timeattack.xml
  93. +55 −0 core/Modules/matchsettings-manager/Templates/create.latte.xml
  94. +0 −85 core/Modules/matchsettings-manager/Templates/edit-filter.latte.xml
  95. +0 −85 core/Modules/matchsettings-manager/Templates/edit-gameinfo.latte.xml
  96. +0 −182 core/Modules/matchsettings-manager/Templates/edit-maps.latte.xml
  97. +0 −162 core/Modules/matchsettings-manager/Templates/edit-modescript-settings.latte.xml
  98. +160 −0 core/Modules/matchsettings-manager/Templates/edit.latte.xml
  99. +109 −91 core/Modules/matchsettings-manager/Templates/overview.latte.xml
  100. +2 −3 core/Modules/matchsettings-manager/module.json
  101. +8 −6 core/Modules/music-client/MusicClient.php
  102. +169 −164 core/Modules/music-client/Templates/music-client.latte.xml
  103. +3 −4 core/Modules/music-client/music.config.json
  104. +6 −6 core/Modules/mx-details/MxMapDetails.php
  105. +2 −2 core/Modules/mx-details/Templates/window.latte.xml
  106. +55 −40 core/Modules/mx-download/Classes/MxMap.php
  107. +167 −86 core/Modules/mx-download/MxDownload.php
  108. +46 −0 core/Modules/mx-download/Templates/add-map-info.latte.xml
  109. +6 −6 core/Modules/mx-karma/MxKarma.php
  110. +70 −67 core/Modules/mx-karma/Templates/mx-karma.latte.xml
  111. +5 −1 core/Modules/mx-karma/mx-karma.config.json
  112. +160 −0 core/Modules/mx-packs/MxPackJob.php
  113. +100 −0 core/Modules/mx-packs/MxPackLoader.php
  114. +47 −0 core/Modules/mx-packs/Templates/confirm.latte.xml
  115. +42 −18 core/Modules/next-map/Templates/widget.latte.xml
  116. +7 −0 core/Modules/next-map/next-map.config.json
  117. +33 −58 core/Modules/patreon-button/Template/widget.latte.xml
  118. +4 −3 core/Modules/patreon-button/patreon.config.json
  119. +22 −16 core/Modules/pay2play/Pay2Play.php
  120. +36 −0 core/Modules/pay2play/Templates/add-time.latte.xml
  121. +36 −0 core/Modules/pay2play/Templates/skip-map.latte.xml
  122. +0 −1 core/Modules/pay2play/Templates/widget.latte.xml
  123. +14 −12 core/Modules/pay2play/pay2play.config.json
  124. +32 −61 core/Modules/paypal/Template/widget.latte.xml
  125. +4 −3 core/Modules/paypal/paypal.config.json
  126. +1 −1 core/Modules/profile-viewer/ProfileViewer.php
  127. +2 −2 core/Modules/quick-buttons/QuickButtons.php
  128. +1 −1 core/Modules/quick-buttons/quick-buttons.config.json
  129. +31 −0 core/Modules/records-table/RecordsTable.php
  130. +63 −0 core/Modules/records-table/Templates/table.latte.xml
  131. +1 −1 core/Modules/roundtime/RoundTime.php
  132. +1 −1 core/Modules/server-hopper/ServerHopper.php
  133. +35 −26 core/Modules/server-hopper/Template/widget.latte.xml
  134. +12 −9 core/Modules/server-hopper/server-hopper.config.json
  135. +1 −1 core/Modules/statistics/Classes/StatisticWidget.php
  136. +28 −3 core/Modules/statistics/Models/Stats.php
  137. +53 −38 core/Modules/statistics/Statistics.php
  138. +1 −1 core/Modules/statistics/Templates/widgets.latte.xml
  139. +24 −14 core/Modules/statistics/statistics.config.json
  140. +72 −0 core/Modules/ui-settings/Templates/manialink.latte.xml
  141. +20 −0 core/Modules/ui-settings/Templates/update.latte.xml
  142. +41 −0 core/Modules/ui-settings/UiSettings.php
  143. +4 −0 core/Modules/ui-settings/module.json
  144. +15 −23 core/Modules/votes/Templates/vote.latte.xml
  145. +138 −87 core/Modules/votes/Votes.php
  146. +13 −2 core/Modules/votes/votes.config.json
  147. +53 −0 core/TemplateComponents/components/tabbed-window.latte.xml
  148. +14 −0 core/TemplateComponents/components/tabs.latte.xml
  149. +196 −0 core/TemplateComponents/components/widget-base.latte.xml
  150. +50 −0 core/TemplateComponents/components/window.latte.xml
  151. +42 −0 core/TemplateComponents/dialogues/confirm.latte.xml
  152. +30 −0 core/TemplateComponents/pinger.latte.xml
  153. +73 −0 core/TemplateComponents/scripts/drag.latte.xml
  154. +57 −0 core/TemplateComponents/scripts/hide.latte.xml
  155. +5 −0 core/TemplateComponents/scripts/includes.latte.xml
  156. +41 −0 core/TemplateComponents/scripts/resize.latte.xml
  157. +31 −24 core/autoload.php
  158. +1,570 −0 core/gbxdatafetcher/gbxdatafetcher.inc.php
  159. +221 −32 core/global-functions.php
  160. +5 −2 core/index.php
  161. +42 −79 esc
  162. +328 −0 manialink_v3.xsd
@@ -7,4 +7,5 @@ logs/
cache/

config/*
!config/default
!config/default
*.pid
@@ -24,9 +24,9 @@ public function up(Builder $schemaBuilder)
});
$seed = [
['id' => 1, 'Name' => 'Masteradmin', 'Protected' => true],
['id' => 2, 'Name' => 'Admin', 'Protected' => true],
['id' => 3, 'Name' => 'Player', 'Protected' => true],
['id' => 1, 'Name' => 'Masteradmin', 'chat_prefix' => '', 'color' => 'd00', 'Protected' => true],
['id' => 2, 'Name' => 'Admin', 'chat_prefix' => '', 'color' => 'd00', 'Protected' => true],
['id' => 3, 'Name' => 'Player', 'chat_prefix' => '', 'color' => 'ff0', 'Protected' => true],
];
$schemaBuilder->getConnection()->table('groups')->insert($seed);
@@ -0,0 +1,42 @@
<?php
namespace esc\Migrations;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Schema\Builder;
class UpdateMapsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up(Builder $schemaBuilder)
{
$schemaBuilder->table('maps', function (Blueprint $table) {
$table->dropColumn('gbx');
$table->string('name')->nullable();
$table->string('environment')->nullable();
$table->string('title_id')->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down(Builder $schemaBuilder)
{
$schemaBuilder->table('maps', function (Blueprint $table) {
$table->text('gbx')->nullable();
$table->dropColumn('name');
$table->dropColumn('environment');
$table->dropColumn('title_id');
});
}
}
@@ -1,5 +1,9 @@
{
"require": {
"php" : "^7.2",
"ext-json" : "*",
"ext-simplexml" : "*",
"ext-mbstring" : "*",
"maniaplanet/dedicated-server-api": "^5.0",
"illuminate/database" : "^5.5",
"symfony/console" : "^4.0",
@@ -8,6 +12,12 @@
"illuminate/pagination" : "^5.6",
"symfony/process" : "^4.2",
"symfony/event-dispatcher" : "^4.2",
"composer/ca-bundle": "^1.1"
"composer/ca-bundle" : "^1.1",
"manialib/gbx" : "^4.1"
},
"autoload": {
"psr-4": {
"esc\\": "core/"
}
}
}

0 comments on commit 62bf51e

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