Commit graph

4259 commits

Author SHA1 Message Date
oy cf8212a663
Merge pull request #2042 from Dune-jr/feature-chat-commands
Chat commands
2019-03-24 11:32:09 +01:00
Jordy Ruiz 2762e6466c Resolve conflicts 2019-03-23 22:28:21 +01:00
oy 6934f440e8 fixed nethash and net messages 2019-03-23 19:51:13 +01:00
oy 132cfa764f Merge branch 'master' of https://github.com/teeworlds/teeworlds 2019-03-22 20:05:11 +01:00
oy 975baecb3d made it possible to change the skin ingame. closes #2063 2019-03-22 20:04:57 +01:00
oy d436fdb426 added some online checks before trying to send messages to a server 2019-03-22 19:05:48 +01:00
oy 995ba19f20
Merge pull request #2072 from Dune-jr/code-fixes
Small code fixes
2019-03-22 18:13:52 +01:00
Jordy Ruiz b31557ac88 Small code fixes 2019-03-22 17:17:10 +01:00
oy 6dc6fe343b
Merge pull request #2068 from heinrich5991/pr_translatable_teams
Make messages relating to teams more translatable
2019-03-20 21:40:56 +01:00
oy 972a5d1349
Merge pull request #2069 from nheir/fix/whisper-2
check whisper messages
2019-03-20 21:39:06 +01:00
Henri Derycke 63f4b3ec3f check whisper messages
don't trust the server
2019-03-18 22:45:55 +01:00
heinrich5991 e5e8eb0840 Add "the" to the "you were moved to xyz" message 2019-03-18 21:15:24 +01:00
heinrich5991 e7f764383a Make messages relating to teams more translatable
Many languages other than English have cases that make it hard or
impossible to use the same "red team" or "blue team" formulation across
multiple sentences.

This allows these languages to translate the strings separately.

This comes at the cost of some code duplication.
2019-03-18 21:15:24 +01:00
oy e59c927ec5
Merge pull request #2067 from heinrich5991/pr_token_use_secure_rand
Use the secure RNG for network tokens
2019-03-18 16:41:45 +01:00
heinrich5991 0edf336426 Use the secure RNG for network tokens
These tokens benefit from being unpredictable by an adversary, so let's
make them unpredictable.
2019-03-17 22:54:52 +01:00
oy 594796cd42
Merge pull request #2065 from Dune-jr/feature-stayasspec
Make it so that spectators stay as spectators when map changes
2019-03-17 19:15:30 +01:00
Jordy Ruiz a200bd380f Fix clients connecting as spec getting stuck on map download (@Oy) 2019-03-17 18:43:57 +01:00
oy 86f0075334
Merge pull request #2064 from Dune-jr/fix-notifications-init
Fix sound notifications being displayed when client loads too quick
2019-03-17 18:07:16 +01:00
Jordy Ruiz c9fc5c6cb6 Make it so that spectators stay as spectators when map changes 2019-03-16 21:57:02 +01:00
Jordy Ruiz 5b8ce27682 Fix sound notifs being displayed when client loads too quick 2019-03-16 19:22:24 +01:00
oy f4c0f57bef
Merge pull request #2022 from heinrich5991/pr_readme_build
Add build instructions to readme.md
2019-03-11 19:09:44 +01:00
heinrich5991 ef651cfeb0 Add macOS and MinGW build instructions to readme.md 2019-03-11 18:59:06 +01:00
oy adf4035c31
Merge pull request #2061 from heinrich5991/pr_fix_deps
Fix version of teeworlds-libs to download
2019-03-11 17:51:11 +01:00
oy bde59d73de
Merge pull request #2060 from heinrich5991/pr_mac_ci
Add Travis CI for macOS builds
2019-03-11 17:50:45 +01:00
oy ba0c090a4c
Merge pull request #2059 from Dune-jr/feature-soundnotif2
Upscale sound_icons
2019-03-11 17:49:14 +01:00
heinrich5991 b0725775e8 Fix version of teeworlds-libs to download
This allows us to update the repository without breaking old builds.
2019-03-11 16:03:34 +01:00
heinrich5991 963292d0f0 Fix clang warnings
src/engine/client/sound.cpp:54:43: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
static CSample m_aSamples[NUM_SAMPLES] = {0};
                                          ^
                                          {}
src/engine/client/sound.cpp:55:40: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
static CVoice m_aVoices[NUM_VOICES] = {0};
                                       ^
                                       {}
2019-03-10 18:53:27 +01:00
heinrich5991 dae85e244c Stop using deprecated APIs on macOS in server launcher
(cherry picked from commit dcbd8197a4)
2019-03-10 18:53:27 +01:00
heinrich5991 94bbe2bc09 Add Travis CI for macOS builds 2019-03-10 18:53:27 +01:00
Jordy Ruiz b34fbe07ce Upscale sound_icons 2019-03-10 12:35:48 +01:00
oy e7a716aff4
Merge pull request #2039 from Dune-jr/feature-soundnotif
Implement audio toggling with visual effects
2019-03-08 19:35:59 +01:00
Jordy Ruiz bc430595eb Abort in RenderSoundNotification if no active notification 2019-03-08 19:18:37 +01:00
Jordy Ruiz 456c4ac79b Clean up notifications code, fix variable naming 2019-03-08 19:17:05 +01:00
oy ac6f1ac506
Merge pull request #2055 from heinrich5991/pr_sha256
Use more secure hash function for map downloads
2019-03-08 19:10:56 +01:00
heinrich5991 1f0b2f6ee5 Use more secure hash function for map downloads
SHA256 was chosen because it is reasonably standard, the file names
don't explode in length (this rules out SHA512) and it is supported by
basically all versions of OpenSSL (this rules out SHA512/256 and SHA3).

The protocol is changed in a backward compatible way: The supporting
server sends the SHA256 corresponding to the map in the `MAP_CHANGE`
message after the previously known fields.

For servers not supporting this protocol, the client falls back to
simply opening maps like in the previous scheme.

The filename scheme for downloaded maps changed from `{name}_{crc}.map`
to `{name}_{sha256}.map` if the SHA256 is known, otherwise it falls back
to the previous scheme.

Fixes #1691.
2019-03-08 18:59:20 +01:00
heinrich5991 b986e54039 Add the SHA256 cryptographic hash function
Use the OpenSSL implementation of SHA256 if it is supported, otherwise
fall back to a public domain one.
2019-03-08 02:22:57 +01:00
oy 993c21dff5
Merge pull request #2053 from heinrich5991/pr_fix_findfile
Fix `IStorage::FindFile` in case no CRC or size are specified
2019-03-07 19:29:31 +01:00
oy 2c4d241d07
Merge pull request #2054 from heinrich5991/pr_gitignore_gtest
Add GTest-related stuff to .gitignore
2019-03-07 19:18:35 +01:00
oy 225d3243f0
Merge pull request #2052 from heinrich5991/pr_cmake_invalidorder
Add a notification when files are not sorted in CMake
2019-03-07 19:17:30 +01:00
oy b7823b2886
Merge pull request #2047 from tsoding/joystick-support
Add Joystick Support
2019-03-07 19:11:25 +01:00
rexim 9e7762113d Make default joystick axis assume the standard left stick 2019-03-07 22:09:16 +07:00
rexim b42d26f611 Move m_pJoystick zeroing to ctor 2019-03-07 22:02:48 +07:00
rexim 9af7fca265 Fix code style 2019-03-07 22:01:18 +07:00
heinrich5991 34c15adc33 Add GTest-related stuff to .gitignore 2019-03-07 14:53:54 +01:00
heinrich5991 00cfc4f205 Fix IStorage::FindFile in case no CRC or size are specified
Previously, it only returned files with CRC 0 and size 0 (so empty
files) in case you didn't specify CRC and size.

Also add some tests covering that behavior.
2019-03-07 13:05:47 +01:00
heinrich5991 fbdc6d69be Add a notification when files are not sorted in CMake
Would've solved the problem in #2039 faster.
2019-03-07 12:19:44 +01:00
Jordy Ruiz d62df6e42e Add missing sound icons in CMakeLists.txt 2019-03-07 12:16:44 +01:00
oy 9e16b376bb reset reason field after calling a vote. closes #2041 2019-03-06 18:49:23 +01:00
masahirotoyomura b6c0abe993 added Padding to some dialogs 2019-03-06 17:37:20 +01:00
rexim 23b8508352 Remove verbose debug logging 2019-03-06 02:50:23 +07:00