Commit graph

10439 commits

Author SHA1 Message Date
Dennis Felsing 4afe702985 Merge pull request #913 from heinrich5991/pr_ddnet_fix_warning
Fix `-Wtypedef-redefinition` for `struct ASYNCIO`
2017-10-20 14:12:49 +02:00
Dennis Felsing 7600bed0fe Merge pull request #906 from heinrich5991/pr_ddnet_dont_copy_twice
Don't copy files twice in `CMakeLists.txt`
2017-10-20 14:10:57 +02:00
Dennis Felsing 03ec3c0145 No glew32.dll 2017-10-20 13:41:30 +02:00
heinrich5991 d01c892bbd Don't copy files twice in CMakeLists.txt 2017-10-20 12:22:46 +02:00
Dennis Felsing f679c3e1bd GLEW_STATIC 2017-10-20 11:52:18 +02:00
Dennis Felsing 6c7f6e3a7e glew on macosx as well... 2017-10-20 11:49:00 +02:00
Dennis Felsing 9e6282d470 Update readme (no glew) 2017-10-20 11:36:37 +02:00
Dennis Felsing 3d2322cb73 Don't use glew for automated builds 2017-10-20 11:36:19 +02:00
Dennis Felsing 5a75dc7f27 New glew try 2017-10-20 11:35:44 +02:00
heinrich5991 c654d82fd2 Fix -Wtypedef-redefinition for struct ASYNCIO
Fixes #912.
2017-10-20 11:24:45 +02:00
Dennis Felsing 88c0778b21 Bundle glew instead 2017-10-20 11:12:27 +02:00
Dennis Felsing 02ccc03bea Travis: No glew on mac 2017-10-20 10:42:51 +02:00
Dennis Felsing 07db95ed59 Mac build fix 2017-10-20 10:20:29 +02:00
Dennis Felsing d7eabb0ea9 Further macosx fixes 2017-10-20 09:31:42 +02:00
Dennis Felsing db46d18e71 No GLEW on OSX necessary (untested) 2017-10-20 09:08:49 +02:00
Dennis Felsing 96bad9f3f2 Add glew32.dll on Windows 2017-10-20 09:01:22 +02:00
Learath2 b8b4f7771d Rename the callback 2017-10-19 18:13:28 +02:00
Dennis Felsing a9f072d4a6 Merge pull request #909 from heinrich5991/pr_ddnet_update_libs
Update DDNet libs for GLEW on Windows
2017-10-19 15:13:07 +02:00
heinrich5991 024c894e7f Update DDNet libs for GLEW on Windows 2017-10-19 12:09:49 +02:00
Redix 9289deb5c7 Stop ghost rendering when touching the start line again 2017-10-18 21:37:25 +02:00
Dennis Felsing d6999bb726 Merge "Pull Request using OpenGL 3.3" 2017-10-18 12:49:27 +02:00
Dennis Felsing cc9bcb5b9f Merge pull request #900 from Learath2/dd_pr_authname
Reset the username on disconnect
2017-10-18 12:43:08 +02:00
Dennis Felsing 97619ede53 Merge pull request #905 from Ryozuki/pr_mingw_workaround
MinGW putenv workaround
2017-10-18 12:42:36 +02:00
Edgar Luque 3408d4f016 MinGW putenv workaround. 2017-10-17 16:38:40 +02:00
Learath 30aebc9cf4 Destroy() implies Abort() 2017-10-17 15:42:17 +02:00
Learath 96acddb57f Fix the other use after free 2017-10-17 15:39:20 +02:00
Learath 7f8356e37e Fix a heap-use-after-free 2017-10-17 14:23:56 +02:00
bors[bot] 5aca38e50e Merge #902
902: Fix victim handling r=Learath2 a=heinrich5991
2017-10-16 23:41:15 +00:00
heinrich5991 dfc53b48cf Fix victim handling 2017-10-17 01:32:40 +02:00
Learath 9ae2c16235 Allow changing UsernameReq while connected 2017-10-16 20:08:39 +02:00
Learath 81135d17de Reset the username on disconnect 2017-10-16 20:01:33 +02:00
Dennis Felsing 648452ca60 Update hungarian.txt (by Cellegen) 2017-10-16 15:21:26 +02:00
Dennis Felsing 943decd627 Update hungarian.txt (by Cellegen) 2017-10-16 09:34:07 +02:00
bors[bot] f38b007c31 Merge #892
892: Use a random token for serverbrowse requests r=Learath2 a=heinrich5991

This alleviates the risk for spoofed servers.
2017-10-15 22:24:24 +00:00
bors[bot] 138492a94a Merge #894
894: Add a flag `-DDOWNLOAD_GTEST` to automatically download and build GTest r=Learath2 a=heinrich5991

Enable tests on Circle CI, macOS on Travis and Appveyor.
2017-10-15 19:44:22 +00:00
bors[bot] 25e7fff0ee Merge #896
896: Ignore `staging.tmp` for bors r=heinrich5991 a=heinrich5991
2017-10-15 13:23:50 +00:00
heinrich5991 a8afa9c547 Ignore staging.tmp for bors 2017-10-15 15:18:53 +02:00
bors[bot] 119ef44dd6 Merge #895
895: Add Bors-NG r=heinrich5991 a=heinrich5991
2017-10-15 11:46:51 +00:00
heinrich5991 5f4bc09962 Add Bors-NG 2017-10-15 13:41:45 +02:00
heinrich5991 6452c7e5c3 Enable automatic download of GTest on Windows by default 2017-10-15 10:25:26 +02:00
heinrich5991 ea978e1db7 Add a flag -DDOWNLOAD_GTEST to automatically download and build GTest
Enable tests on Circle CI, macOS on Travis and Appveyor.
2017-10-15 09:57:21 +02:00
Jupeyy cc54c4acdf also out the LOD to the fragment shader to make sure we use the same LOD
on every hardware
2017-10-14 23:27:14 +02:00
HMH c52862a852 Fix macOS build on Travis 2017-10-14 22:17:24 +02:00
heinrich5991 16694a0d7b Use a random token for serverbrowse requests
This alleviates the risk for spoofed servers.
2017-10-14 21:58:23 +02:00
Jupeyy 5389dd9666 fix border amount for right and bottom border lines 2017-10-14 16:37:48 +02:00
Learath2 732419de69 Merge pull request #891 from heinrich5991/pr_ddnet_duh
Fix a syntax error
2017-10-13 16:34:19 +02:00
heinrich5991 525b643e18 Fix a syntax error
Sorry. :/
2017-10-13 16:33:23 +02:00
Learath2 8770a980f1 Merge pull request #890 from heinrich5991/pr_ddnet_teehistorian_hide_chat
teehistorian: Hide chat from teehistorian
2017-10-13 16:30:46 +02:00
heinrich5991 c439b04a2d teehistorian: Hide chat from teehistorian
There was a missing check that allowed chat messages to be written to
disk.
2017-10-13 16:25:26 +02:00
Learath2 4394933d6c Merge pull request #887 from heinrich5991/pr_ddnet_async
Add asynchronous output system and use it for teehistorian and `dbg_msg()`s
2017-10-13 15:30:24 +02:00