heinrich5991
b904822d57
Merge pull request #680 from necropotame/pr-i586-killborder
...
Fix #586 (display the killing clipping rectangle)
2017-03-16 17:00:57 +01:00
necropotame
c63c54d68e
Changes after heinrich5991's review of #586 - Fix code alignment
2017-03-16 16:51:52 +01:00
necropotame
5ddf0a5421
Changes after heinrich5991's review of #586 - Fix some more comments
2017-03-16 16:41:58 +01:00
necropotame
9bae313929
Changes after heinrich5991's review of #586 - Code cleanup, Fix typo, Fix bug with Y clipping
2017-03-16 16:39:29 +01:00
Dennis Felsing
a03d87a537
Merge pull request #682 from heinrich5991/pr_ddnet_revert_gameplay_change
...
Partially revert #681
2017-03-16 10:22:43 +01:00
heinrich5991
f7dde1e061
Partially revert #681
...
The refactoring can cause a gameplay change, laws of associativity like
`x * (1 / z) == (x * 1) / z` don't hold for floating point numbers.
2017-03-16 10:19:08 +01:00
necropotame
6c3ac82f31
Merge pull request #681 from Ryozuki/pr_vmath
...
Fix a typo and refactor the normalize function
2017-03-16 08:19:39 +01:00
Ryozuki
d0c317d7c7
Fix a typo and refactor the normalize function
2017-03-16 07:55:49 +01:00
heinrich5991
afce3c9d3d
Merge pull request #678 from necropotame/pr-i662-timer
...
Fix #662 (timer command displays the wrong state)
2017-03-15 12:32:32 +01:00
necropotame
4027b3dc01
Add error message in case of invalid argument for /timer
2017-03-15 12:22:13 +01:00
necropotame
6f58c49f7d
Fix #586 (display the killing clipping rectangle)
2017-03-15 12:06:13 +01:00
necropotame
e4345307c1
Fix #662 (timer command displays the wrong state)
2017-03-15 11:11:01 +01:00
Dennis Felsing
7f407aa303
Remove useless comment
2017-03-14 08:46:24 +01:00
necropotame
a7532a5153
Merge pull request #674 from heinrich5991/pr_ddnet_cmake_check_fortify_source_harder
...
CMakeLists.txt: Check for _FORTIFY_SOURCE defines even harder
2017-03-13 18:23:59 +01:00
heinrich5991
5b8052ff9d
CMakeLists.txt: Check for _FORTIFY_SOURCE defines even harder
2017-03-13 16:45:27 +01:00
Dennis Felsing
32a1fa0c07
Merge pull request #672 from Learath2/dd_pr_hearts
...
Forgot m_Friend isn't initialized, also align the messages
2017-03-13 12:04:47 +01:00
Dennis Felsing
f488c82bd6
Merge pull request #671 from heinrich5991/pr_ddnet_cytral_refactor
...
Completed the refactor
2017-03-13 12:04:15 +01:00
Learath2
3bd94b9ada
Forgot m_Friend isn't initialized, also align the messages
2017-03-12 22:32:05 +01:00
heinrich5991
54c5faa64c
Complete the refactor
2017-03-12 19:52:29 +01:00
Alexandre Díaz
3589ed0b0f
Start refactor...
2017-03-12 19:30:55 +01:00
heinrich5991
ccb9db9899
Merge pull request #652 from Learath2/dd_pr_invite
...
Add /invite for locked teams. Fixes #647
2017-03-12 19:04:55 +01:00
heinrich5991
b3b512b27e
Merge pull request #667 from Redix/pc_cmake
...
CMake improvements
2017-03-12 18:53:17 +01:00
Redix
50be0ab7cf
Use static CRT on windows
2017-03-12 17:41:57 +01:00
heinrich5991
7cc4f8bf48
Merge pull request #668 from Learath2/dd_pr_chatoops
...
Fix array subscript below array bounds
2017-03-12 17:40:23 +01:00
Learath2
c81f53ab6b
Forgot CID can be -1
2017-03-12 17:37:16 +01:00
Redix
2b91785415
Use multiple cores in MSVC
2017-03-12 17:28:42 +01:00
Redix
dfdd08ae7a
Disable some warnings on win64
2017-03-12 17:28:40 +01:00
heinrich5991
d91cca728d
Partially revert warning-fixing, it caused warnings on other systems
2017-03-12 16:47:37 +01:00
Redix
3911504bd9
Minor cmake fixes
...
zlib is already included in DEPS_CLIENT
2017-03-12 16:19:23 +01:00
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