Commit graph

11676 commits

Author SHA1 Message Date
Learath f9ab06476d Lighten tee colors of others 2019-04-30 19:49:53 +03:00
bors[bot] 547521cfcb Merge #1695
1695: Fix FillSelection with no selected brush r=def- a=12pm

As reported by BannZay on Discord

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2019-04-30 12:30:43 +00:00
12pm 3f76e17830 Fix FillSelection with no selected brush
As reported by BannZay on Discord
2019-04-30 14:24:13 +02:00
bors[bot] 9699d4ef06 Merge #1694
1694: Fix inconsistant uppercase server in logs r=def- a=ChillerDragon

```
$ grep -nr 'IConsole::OUTPUT_LEVEL_STANDARD, "server"' src/ | wc -l
31
$ grep -nr 'IConsole::OUTPUT_LEVEL_STANDARD, "Server"' src/ | wc -l
1
```

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-04-30 07:35:26 +00:00
ChillerDragon 7a7caabbec Fix inconsistant uppercase server in logs 2019-04-30 09:03:06 +02:00
def a910d9eff7 Persist show_ips setting on map changes 2019-04-29 21:39:17 +02:00
bors[bot] d8964ceedb Merge #1654 #1685
1654: Try working on colors a bit r=def- a=Learath2

There were color functions everywhere, I tried cleaning it up a little. I still couldn't get the roundtrip from Hsl to Rgb to be exactly the same, but I think this is the best possible.

1685: Work on compound binds r=def- a=Learath2

Closes #1417 

Co-authored-by: Learath <learath2@gmail.com>
2019-04-29 15:56:16 +00:00
bors[bot] 70b3f1db21 Merge #1675
1675: Remove unused vanilla code (closed #1658) r=def- a=ChillerDragon

Removed vanilla code from gamecontext and gamecontroller. I didn't search for the code all over the place I just remember seing it there a lot. Also removed some empty lines. Wanted to do this for a long time :)

thought there is an reason it is there. But we have git and the vanilla repo so I don't see any point keeping it there.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-04-29 07:24:01 +00:00
bors[bot] 6034bf6a85 Merge #1687
1687: Highlight same clan as dummy too r=heinrich5991 a=12pm

Fixes #1686

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2019-04-28 23:10:53 +00:00
12pm 8fa6dada95 Highlight same clan as dummy too
Fixes #1686
2019-04-29 00:48:40 +02:00
Learath 6a1ef1af62 Can't access a siblings protected members? 2019-04-28 20:34:34 +03:00
Learath 2975d6998d Block ctrl+shift+ binds. Fixes #1490 2019-04-28 20:30:17 +03:00
Learath 66c89eafb2 Allow binding with modifiers in settings 2019-04-28 20:22:19 +03:00
Learath 1da935f4c1 Fix stuck input 2019-04-28 16:52:10 +03:00
Learath c0c79c69c3 Fix output 2019-04-28 16:37:20 +03:00
Learath 6b815b2375 Work on compound binds 2019-04-28 16:32:49 +03:00
bors[bot] a5096c4de0 Merge #1663
1663: Use freeze end tick instead of a flag. Fix #1659 r=def- a=Learath2

I used -1 for deep frozen, and 0 for not frozen. Not really sure if this is the best way.

Co-authored-by: Learath <learath2@gmail.com>
2019-04-27 08:53:38 +00:00
Learath 05b3df0afa Add the default constructors 2019-04-27 02:07:11 +03:00
Learath 588acdda0d Consolidate color configs, extend debugging 2019-04-27 02:02:31 +03:00
Learath 979d58f830 Use colors in CTextRender 2019-04-27 01:34:20 +03:00
Learath 6c371a9a57 Even more refactoring 2019-04-27 01:11:15 +03:00
Learath 15058330fa Don't inherit from vector, more cleanup 2019-04-27 00:47:34 +03:00
Learath be26789872 Remove unused function 2019-04-26 22:57:40 +03:00
Learath 929d772071 Collateral 2019-04-26 22:38:18 +03:00
Learath 93d14a1eca Inconvenience for windows 2019-04-26 22:36:49 +03:00
Learath 1b668916f2 Fix the test, fix small bug 2019-04-26 21:01:41 +03:00
Learath ffa07d88cb Please -WError 2019-04-26 19:11:34 +03:00
Learath 69d78c21b4 Lighten tee colors 2019-04-26 16:38:16 +03:00
Learath 54afd2c5af No iostream 2019-04-26 15:09:12 +03:00
Learath 65a17599e1 Add ColorHSVA, phase out more vec3's 2019-04-26 15:06:32 +03:00
Learath 987b9f69de Only lighten if too dark 2019-04-25 23:29:31 +03:00
Dennis Felsing 4e3099db6d
Merge pull request #1679 from Ryozuki/patch-4
Set make -j to use actual number of threads on readme
2019-04-25 21:02:00 +02:00
Ryozuki fd6d8fe027
Update README.md 2019-04-25 20:53:53 +02:00
Learath 93265dbb9c Please MSVC 2019-04-25 21:09:32 +03:00
Ryozuki 52d51d8004
set make -j to use actual number of threads 2019-04-25 19:11:29 +02:00
Learath f53f09339a Default constructor 2019-04-25 19:59:04 +03:00
Learath e637064a68 Don't store HSL separately 2019-04-25 19:49:27 +03:00
Learath 95a3a69e08 Start phasing out vectors for colors 2019-04-25 18:21:35 +03:00
Learath cc319e0152 Fix warnings and style 2019-04-25 15:04:36 +03:00
Learath 0f781df1dd Try handling colors in console 2019-04-25 14:48:53 +03:00
Dennis Felsing aa5458b81d Version 12.3.1 2019-04-25 08:20:01 +02:00
Dennis Felsing ab8b807c5d Shorten strings correctly (fixes #1652)
Using a string to format itself is undefined behaviour.
2019-04-25 08:19:31 +02:00
Learath 5e5def314f Add tests 2019-04-24 23:53:38 +03:00
Learath cc36af73be Cleanup colors 2019-04-24 23:53:26 +03:00
ChillerDragon ad7a2cdef2 Remove unused vanilla code (closed #1658) 2019-04-24 22:36:47 +02:00
def 4f99623b5e Version 12.3 2019-04-24 19:49:00 +02:00
Dennis Felsing a1a581ecc2
Merge pull request #1653 from Ryozuki/pr_use_ddnetnetchar
Use the DDNet Network Character
2019-04-24 19:47:12 +02:00
def b6d2ed268a another one 2019-04-24 18:33:31 +02:00
Learath 24408e6f3c Oops 2019-04-24 19:12:46 +03:00
def 6cf8999a2f Restore old FindEntities behaviour, make it usable to count entities 2019-04-24 18:01:30 +02:00