oldmud0
faac191f0b
Mega-merge of CR fork
...
CR likely stands for "CentsRaidensnake." Like the Case Cafe mega-merge
before it, this was not a clean merge, and it had to be split up into
two parts: the actual changes, and the attempt it made to reformat the
entire code via clang-format.
This branch had a complicated set of changes that would be difficult to
describe in this commit message. It would be better described in a
proper changelog.
2020-04-17 21:48:34 -05:00
stonedDiscord
5901733650
upload artifacts
2020-04-17 19:39:53 +02:00
stonedDiscord
caf20830ea
Create labeler.yml
2020-04-17 18:10:03 +02:00
stonedDiscord
ec0da245a5
Create label.yml
2020-04-17 18:08:08 +02:00
in1tiate
901012eb28
Remove dumb memes ( #141 )
...
* remove memes
* Update courtroom.cpp
2020-04-12 15:43:39 -07:00
oldmud0
21a8b6f6e6
Merge pull request #139 from AttorneyOnline/posdrp
...
Fix an oversight with the pos dropdown, add a small feature
2020-04-11 22:46:57 -05:00
oldmud0
ade12fcd2d
Merge pull request #138 from likeawindrammer/portuguese_translation
...
Add Portuguese translation
2020-04-11 22:45:41 -05:00
in1tiate
ed9632f220
fix dropdown bug, add minor feature
2020-04-11 20:04:41 -05:00
likeawindrammer
8486e19119
Add Portuguese translation
2020-04-11 18:21:04 -06:00
sD
02dd9b0a35
bass being bass again
2020-04-01 12:51:24 +02:00
sD
1b5c1ebb04
don't look in music for URLs
2020-04-01 12:51:13 +02:00
cents02
558fa55be8
Made the shake button useful.
...
Apparently nobody tested it before.
2020-03-27 21:11:33 +02:00
oldmud0
ede1236b70
Fix syntax error introduced in 530721f
2020-03-22 15:25:13 -05:00
cents02
04d186e7c0
Merge pull request #131 from likeawindrammer/update-spanish
...
Update Spanish translation
2020-03-22 20:16:03 +02:00
in1tiate
530721f2d0
frame count check 2 electric boogaloo
...
re-fix the same bug oh joy
2020-03-22 07:44:01 -05:00
likeawindrammer
bb3365aa6c
Update Spanish translation
2020-03-22 03:19:40 -06:00
in1tiate
6db808ec60
If frame count is 0, don't try to play the next frame ( #129 )
...
ya goofus.
2020-03-21 18:03:12 -05:00
stonedDiscord
ac31da6b14
Merge pull request #104 from Crystalwarrior/music_list_update
...
Allow servers to send area list and music list refresh requests
2020-03-15 17:06:22 +01:00
sD
dd2daf55f3
it's basically the same packet minus requesting the next list
2020-03-15 13:20:33 +01:00
sD
beb469cd80
Merge branch 'master' into pr/104
2020-03-15 13:12:52 +01:00
stonedDiscord
4b0110d96c
Merge pull request #123 from in1tiate/oocplaceholder
...
Add placeholder text to OOC message box
2020-03-15 12:34:22 +01:00
in1tiate
64f18ee632
add placeholder to OOC chat message box
2020-03-14 23:00:50 -05:00
in1tiate
a411568676
Merge pull request #8 from AttorneyOnline/master
...
bring up to date
2020-03-14 22:58:47 -05:00
sD
1b0930b977
move area list detection algorithm into a seperate function
2020-03-13 16:29:01 +01:00
sD
ba03fb03e2
musictime is a bad name for this
2020-03-13 16:22:41 +01:00
stonedDiscord
466092b973
Merge pull request #121 from in1tiate/theme_pp
...
Additional theme support
2020-03-08 11:58:42 +01:00
in1tiate
a2f1a79bc9
add theme support
2020-03-08 05:44:49 -05:00
in1tiate
5f69d4e649
Merge pull request #5 from AttorneyOnline/master
...
bring up to date with master
2020-03-08 05:38:24 -05:00
stonedDiscord
0ce577c482
Merge pull request #119 from in1tiate/chatboxfix
...
Re-add support for 2.4-style custom chatboxes
2020-03-07 22:05:57 +01:00
sD
369cc298e4
rename fallback chatbox
2020-03-07 21:45:27 +01:00
in1tiate
cc1afbe30e
add support for 2.4-style chatboxes
2020-03-07 01:49:54 -06:00
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
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
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
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
