Redix
8b418292c2
Fix typo in CMakeLists.txt
2017-03-12 15:56:44 +01:00
heinrich5991
94e8e26f8d
Merge pull request #664 from Learath2/dd_pr_friends2
...
Just color the heart preserving team information. Fixes #606
2017-03-12 15:18:04 +01:00
heinrich5991
5eb036a1a9
Merge pull request #666 from Ryozuki/pr_fix_warnings
...
Fix some warnings
2017-03-12 15:16:25 +01:00
Ryozuki
84726547aa
Fix warning also for server.cpp, and fixed client.cpp
2017-03-12 14:49:18 +01:00
Ryozuki
79f5b26cf7
Moved _WIN32_WINNT to the top instead
2017-03-12 14:45:57 +01:00
Ryozuki
1614e59e8f
Fix some warnings
2017-03-12 12:12:39 +01:00
Learath2
1b6071c71b
Merge pull request #665 from heinrich5991/pr_ddnet_cmakelists_mkdir_generated
...
CMakeLists.txt: Create the generated source directory
2017-03-11 13:38:57 +01:00
heinrich5991
253857e236
CMakeLists.txt: Create the generated source directory
...
Problem was reported on IRC, in #teeworlds on Quakenet.
2017-03-11 13:25:52 +01:00
Learath2
9919173ceb
Just color the heart preserving team information. Fixes #606
2017-03-10 18:49:39 +01:00
Learath2
0b0783f13c
Fix styling issues, use uint for bitmask
2017-03-10 14:52:49 +01:00
Dennis Felsing
1d67e29c74
Merge pull request #663 from heinrich5991/pr_ddnet_fix_default_pws
...
Fix handling of default passwords
2017-03-10 12:45:01 +01:00
heinrich5991
87596c30ac
Fix handling of default passwords
...
It was horribly broken before. :) Only the first password set via
`sv_rcon*_password` worked, and that only due to a bug in `AddHashKey`
-- `AddHashKey` incorrectly assumed that only key slots greater than 0
are valid, but 0 is valid too.
Fix default passwords on password removal, fix no admin password being
generated if you only had `sv_rcon_mod_password` or
`sv_rcon_helper_password` set. Add an assert that would have caught our
mistake.
2017-03-10 12:33:34 +01:00
heinrich5991
f2b2eb8639
Allow easier login for passwords with spaces
2017-03-10 12:30:41 +01:00
Dennis Felsing
4e39aea2f7
Version 10.4.3
2017-03-09 14:23:40 +01:00
east
9d12b764c3
Merge pull request #661 from heinrich5991/pr_ddnet_minor_fixes
...
Fix wording in scripts/hash_passwords.py, fix brace in other file
2017-03-09 13:44:29 +01:00
heinrich5991
72f2eb32ee
Fix wording in scripts/hash_passwords.py, fix brace in other file
2017-03-09 13:37:54 +01:00
Dennis Felsing
9d475f1301
Merge pull request #660 from heinrich5991/pr_ddnet_hash_pw_tool
...
Add a tool to hash new passwords or to update config files
2017-03-09 13:34:06 +01:00
Dennis Felsing
761c3c9be1
Merge pull request #646 from heinrich5991/pr_ddnet_brace_style
...
Fix the brace style in some places
2017-03-09 13:31:21 +01:00
heinrich5991
e707749fac
Add a tool to hash new passwords or to update config files
...
Usage:
```
$ python scripts/hash_passwords.py --new username admin password
auth_add_p username admin 9415aef5cc5043800377584cff32b90c 26fd308aad6b04f2
```
```
$ python scripts/hash_passwords.py autoexec.cfg
```
updates all instances of `auth_add` to `auth_add_p`.
```
$ python scripts/hash_passwords.py autoexec.cfg \
--new user1 admin password1 \
--new user2 admin password2
```
updates all instances of `auth_add` to `auth_add_p` and adds two new
users.
On Windows, you should be able to drag-and-drop your config file onto
this script and have it automatically updated (not tested).
2017-03-09 12:48:06 +01:00
Learath2
acd8bc1fe0
Merge pull request #656 from heinrich5991/pr_ddnet_cmake_check_fortify_source
...
CMakeLists.txt: Check for _FORTIFY_SOURCE before defining it
2017-03-07 17:04:44 +01:00
heinrich5991
fad7989243
CMakeLists.txt: Check for _FORTIFY_SOURCE before defining it
2017-03-07 16:47:27 +01:00
Dennis Felsing
3c22a3279e
Merge pull request #655 from heinrich5991/pr_ddnet_cmake_even_more
...
Enhance CMakeLists.txt
2017-03-07 16:02:43 +01:00
heinrich5991
51b4a793b8
CMakeLists.txt: Add icon to DDNet executable on Windows
2017-03-07 15:32:11 +01:00
heinrich5991
a6983d329c
CMakeLists.txt: Copy over data files and DLLs
2017-03-07 15:24:08 +01:00
heinrich5991
4389737288
CMakeLists.txt: Handle the static library case on Linux
2017-03-07 13:39:23 +01:00
heinrich5991
d98abf35db
Rename WEBSOCKETS
to CONF_WEBSOCKETS
2017-03-07 13:03:37 +01:00
heinrich5991
c201d7959c
Enable -Wdeclaration-after-statement for compat with MSVC
2017-03-07 13:02:37 +01:00
Dennis Felsing
97bd89d1dc
Merge pull request #645 from heinrich5991/pr_ddnet_line_ending
...
Fix a line ending in autoexec_server.cfg
2017-03-06 22:44:16 +01:00
Dennis Felsing
b04c7c0f43
Merge pull request #644 from heinrich5991/pr_ddnet_cmake_more
...
Extend CMakeLists.txt
2017-03-06 22:36:47 +01:00
heinrich5991
5b63a33095
Merge pull request #639 from Learath2/dd_pr_rconauth2
...
New auth system for rcon.
2017-03-06 20:57:42 +01:00
Dennis Felsing
28113c6a6e
Merge pull request #654 from heinrich5991/pr_ddnet_fixdummyreset
...
Fix dummy input reset
2017-03-06 20:31:52 +01:00
heinrich5991
6302e4d7e0
Fix some style issues and a > to >=
2017-03-06 20:11:23 +01:00
heinrich5991
e08ca70b1f
Fix dummy input reset
2017-03-06 19:45:39 +01:00
heinrich5991
8e7e2be54a
Merge pull request #653 from Learath2/dd_pr_binds
...
Remove dump_binds. Let bind_print dump all. Fixes #634
2017-03-06 18:10:04 +01:00
Learath2
0d4499a027
Rename bind_print to dump_binds.
2017-03-06 18:06:55 +01:00
heinrich5991
c1e826e853
Fix key slot indices after removing a key
2017-03-06 18:02:19 +01:00
Learath2
759799953f
Remove dump_binds. Let bind_print dump all. Fixes #634
2017-03-06 15:32:11 +01:00
Learath2
8c79f28802
Fix a crash on malformed input
2017-03-06 15:18:52 +01:00
Learath2
b49c13e617
KeySlots are 0 indexed...
2017-03-06 14:14:45 +01:00
heinrich5991
5ab2afeabd
Merge pull request #651 from Learath2/dd_pr_teamchat
...
Fix coloring of team chat. Fixes #648
2017-03-06 14:06:37 +01:00
Learath2
a87edad978
Move to a cpp file
2017-03-06 14:04:09 +01:00
Learath2
cbb5891263
Introduce ugly workaround to allow empty usernames
2017-03-06 13:49:08 +01:00
Learath2
71fb030443
Fix a comparison. Hate backwards compatibility...
2017-03-06 13:46:02 +01:00
Learath2
4d0f036b4f
Forgot to negate the comparisons
2017-03-06 13:22:17 +01:00
Learath2
9800360340
Check the return from str_hex_decode. Remove comment
2017-03-06 12:59:47 +01:00
Learath2
3c6a21ace2
dbg_assert felt more appropriate
2017-03-06 12:58:49 +01:00
Learath2
c5a12e3eba
Fix the status command for logged out people
2017-03-06 12:35:37 +01:00
Learath2
6f1f348715
Fix c&p fail
2017-03-06 12:35:09 +01:00
Learath2
939a7f0d3f
This time actually add error checking to str_hex_decode
2017-03-06 12:33:29 +01:00
Learath2
9319a82c6e
Add /invite for locked teams. Fixes #647
2017-03-06 12:14:38 +01:00