Commit Graph

909 Commits

Author SHA1 Message Date
likeawindrammer
7a3ebc8362 Revert faster blip speed
Without an option to change it users will complain
Thanks Initiate for telling me how to change this
2020-04-19 17:04:19 -06:00
cents
5f88b1fd30 Removed Duplicates 2020-04-19 12:47:50 -07:00
likeawindrammer
5bd8c960c9 Fix crash on saving settings
Thanks Initiate for actually fixing this
2020-04-19 12:35:03 -06:00
likeawindrammer
609fedfbf4 Merge branch 'master' into 2.7-rc 2020-04-18 16:45:11 -06:00
windrammer
dca156ec01
Merge pull request #145 from Pyraqq/master
Polish translation update
2020-04-18 16:39:57 -06:00
likeawindrammer
dfa5436427 Change "IC log colorido" to "Log IC colorido" on the Spanish translation 2020-04-18 16:16:38 -06:00
likeawindrammer
33c8cf7793 Update Portuguese translation with the strings added on the CR branch 2020-04-18 16:14:45 -06:00
likeawindrammer
f224ea0589 Add Polish to the language options 2020-04-18 15:04:34 -06:00
Pyraq
76a2a12511 Updated Polish translation. 2020-04-18 18:00:13 +02:00
likeawindrammer
696e4169d3 Update Spanish translation 2020-04-18 03:26:46 -06:00
likeawindrammer
58b7725406 Change second exclamation to period on tooltip
No need for two exclamations
2020-04-18 02:40:46 -06:00
likeawindrammer
26872be05d Add missing periods on two tooltips 2020-04-18 02:35:09 -06:00
likeawindrammer
9faf41a89f "interupted" -> "interrupted"; "expierence" -> "experience" 2020-04-18 00:45:13 -06:00
likeawindrammer
ac60466ac9 "IC_Log" -> "IC Log" 2020-04-18 00:14:59 -06:00
likeawindrammer
9a041bdf2a Change some tooltips 2020-04-18 00:00:43 -06:00
likeawindrammer
ee709f3c92 Change tickbox to checkbox on README.md ☑
As far as I know checkbox is more popular than tickbox, on Wikipedia for example it's called checkbox.
And some spell checkers will highlight tickbox as a typo, but not checkbox.
2020-04-17 23:36:26 -06:00
likeawindrammer
50d5aa2a0e Revert "Change "Custom shownames:" to "Show custom IC names:""
This reverts commit cd034b996a.
2020-04-17 23:26:44 -06:00
likeawindrammer
aed4396584 Change tickbox to checkbox
As far as I know checkbox is more common
2020-04-17 23:21:05 -06:00
likeawindrammer
cd034b996a Change "Custom shownames:" to "Show custom IC names:"
"shownames" isn't a word, and what does "Custom shownames" even mean anyway?
"Show custom IC names" should do a better job at explaining what this option does.
2020-04-17 23:13:18 -06:00
oldmud0
13942345c6 Run clang-format on entire project
Indentation fixed to 2 spaces per tab. Braces set to Stroustrup style.
Lines reflow at 80 characters. One-line method bodies are on the same
line as the signature. Space always after `//`. No indentation
on preprocessor macros. Includes are sorted lexicographically.

If you don't want to see this commit on blames, use the hidden
whitespace option on GitHub, or use `-w` in git-blame.
2020-04-17 21:57:16 -05:00
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
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