Commit Graph

1165 Commits

Author SHA1 Message Date
in1tiate
ba17334fb8
Merge pull request #1 from AttorneyOnline/master
bring master up to date with upstream
2020-03-06 15:57:36 -06:00
sD
80bf49ee90 ok bass 2020-03-06 22:14:59 +01:00
Crystalwarrior
e4b90d36a9 Fix the rightclick options for editing files not working 2020-03-06 23:29:26 +03:00
sD
2701fab91f indentation 2020-03-06 17:14:49 +01:00
sD
27a101d010 fix compiler warnings for unused vars 2020-03-06 17:14:42 +01:00
stonedDiscord
b668bb2276
Merge branch 'master' into music_list_update 2020-03-06 16:43:03 +01:00
stonedDiscord
8c93cce0be
Merge pull request #118 from in1tiate/pngfix
Check root of character folder for PNG emote without prefix
2020-03-06 16:41:43 +01:00
BuildTools
b9aba62071 added file to .gitignore 2020-03-05 23:01:40 -06:00
BuildTools
21314271ae Add condition for classic PNG folders 2020-03-05 20:14:53 -06:00
Crystalwarrior
ee9de222ad Fix a bug where you couldn't join servers from your favorites list
Make column 0 the area index instead so that the areas take the full width of the treewidget
2020-03-06 01:14:05 +03:00
Crystalwarrior
39f9d1043e Add sorting by name for lobby 2020-03-05 21:23:42 +03:00
stonedDiscord
b44338996b make volume scale log 2020-03-01 16:05:40 +01:00
stonedDiscord
d276f14766 full music path in log 2020-03-01 15:59:44 +01:00
stonedDiscord
a3f7482ced wrong punctuation in german localization 2020-03-01 14:39:48 +01:00
stonedDiscord
88b686b9d1 put full path in debug log 2020-03-01 14:37:32 +01:00
Crystalwarrior
a4e448576b Make pos dropdown more abstract and actually useful by letting servers send only pos you can actually access.
Pos dropdown system also reads the actual bg folder of the current BG to see all the created pos.
2020-02-24 22:20:43 +03:00
sD
2e8ae44167 Revert "reactivate discord and bass so they get used in the CI pipeline"
This reverts commit d077bab4e3.
2020-02-24 19:20:34 +01:00
sD
d077bab4e3 reactivate discord and bass so they get used in the CI pipeline 2020-02-24 00:49:49 +01:00
sD
0319bdf0ab get the submodules too 2020-02-24 00:29:32 +01:00
sD
521cc27ec5 theme submodule 2020-02-23 23:54:13 +01:00
sD
868dd59e14 delete theme folder to replace with submodule 2020-02-23 23:52:39 +01:00
sD
8bf0e6e250 Revert "CI: Use Ubuntu image for Linux deploy"
This reverts commit 15efd0a68f.
2020-02-23 20:53:48 +01:00
sD
15efd0a68f CI: Use Ubuntu image for Linux deploy
i stole longbytes commit ehehe
2020-02-23 20:48:56 +01:00
sD
8ebe52d340 ok gitlab pls work 2020-02-23 20:22:01 +01:00
sD
a6f980f444 rename modcalls 2020-02-23 20:12:41 +01:00
sD
b48752dfb9 what is wrong with gitlab 2020-02-23 19:38:21 +01:00
stonedDiscord
149f04dc84
Merge pull request #117 from AttorneyOnline/2.7
2.7
2020-02-23 13:53:44 +01:00
sD
ad80e6413f disable modcalls is longer than guiard 2020-02-23 13:21:05 +01:00
sD
b6eb61c187 move language setting to the correct position 2020-02-23 13:18:51 +01:00
sD
f9442709c2 missing german localizations 2020-02-23 13:14:54 +01:00
sD
aaf3f6f043 thanks qt linguini 2020-02-23 13:08:31 +01:00
sD
3c30098360 translate char not found 2020-02-23 13:08:19 +01:00
sD
ea099a5141 loading lost in translation 2020-02-23 12:59:20 +01:00
sD
1d10cf1a08 make UI buttons wider to make localizations fit 2020-02-23 12:52:59 +01:00
sD
4af8ba9c38 what was graphmeme even fot 2020-02-23 12:28:07 +01:00
sD
1291e776b6 handle all types of musiclists 2020-02-23 12:25:10 +01:00
sD
444b0ff60f replace music loading 2020-02-23 11:43:41 +01:00
sD
16bd89b6ad detect == as music start 2020-02-23 11:35:32 +01:00
sD
0123b4d192 move the click event back to the slots 2020-02-23 03:19:05 +01:00
sD
5cf1fdcc2d connect the signal to char_clicked 2020-02-23 03:13:07 +01:00
sD
0b16ac863c the charselect works again 2020-02-23 02:56:57 +01:00
sD
b5c5141007 make network debug depend on if its a debug build or not 2020-02-21 18:47:46 +01:00
sD
ed240c6ab0 same here 2020-02-21 18:33:04 +01:00
sD
4580816f96 character is a little nondescriptive for the button 2020-02-21 18:29:36 +01:00
sD
2716416b62 only load bass plugins when bass is included 2020-02-21 18:00:23 +01:00
sD
87e359487d combine these conditions 2020-02-21 17:57:46 +01:00
sD
9f5343e0bd put the old char loading back 2020-02-21 17:18:39 +01:00
sD
f93459ed0e remove fuck 2020-02-21 17:18:25 +01:00
sD
8d6b69e2f2 replace mycourt_fuck 2020-02-21 17:02:55 +01:00
sD
6c154841c3 area count got renamed 2020-02-21 16:54:06 +01:00