Commit Graph

488 Commits

Author SHA1 Message Date
Night Owl
b31b4e86b2 Fix some warnings. 2018-02-12 21:09:39 +05:00
Night Owl
c7a1490337 Merge remote-tracking branch 'origin/travis' into sohl1.2 2018-02-12 13:11:18 +05:00
Night Owl
abf8c33a89 Merge branch 'master' into sohl1.2 2018-02-12 13:10:16 +05:00
Alibek Omarov
53626b9965 Add custom makefont from #46 2018-01-20 17:04:06 +03:00
Alibek Omarov
0e7b7ccf73
Merge pull request #47 from FreeSlave/unicode_copyright
Copyright symbol to utf-8
2018-01-19 22:34:49 +03:00
Roman Chistokhodov
48733fd1a1 All copyright symbols to (c) 2018-01-19 20:00:32 +03:00
Roman Chistokhodov
8dc9245fe3 Copyright symbol to utf-8 2018-01-18 22:36:32 +03:00
Alibek Omarov
c64b300050
Merge pull request #45 from FreeSlave/fix_warnings
Fix some warnings. Disable warning about invalid offsetof as it produ…
2018-01-18 22:15:30 +03:00
Alibek Omarov
88d1a860d7
Merge pull request #44 from nekonomicon/angles
Fix typo.
2018-01-18 22:13:35 +03:00
Roman Chistokhodov
c135463774 add_compile_options for older cmake versions 2018-01-16 15:45:53 +03:00
Roman Chistokhodov
31c1e121b5 Fix some warnings. Disable warning about invalid offsetof as it produces billion warnings in save-restore code 2018-01-13 18:05:13 +03:00
Night Owl
8abffc9371 Fix typo. 2018-01-13 09:01:38 +05:00
mittorn
c5aa3aa40e Fix amd64 build 2017-12-30 22:22:14 +07:00
Alibek Omarov
9a02d7116f It's better to use MSVC here instead of WIN32, so it wouldn't break MinGW builds 2017-12-28 02:05:47 +03:00
Alibek Omarov
3dda2ec590 Fix compiling on MSVC2017 2017-12-28 02:02:23 +03:00
Night Owl
3b33997b2e Merge remote-tracking branch 'origin/scoreboard' into travis 2017-12-28 00:28:05 +05:00
Alibek Omarov
6d715cfea0
Merge pull request #43 from nekonomicon/scoreboard
Fix scoreboard position.
2017-12-23 20:07:22 +03:00
Night Owl
b66ceab4e5 Fix scoreboard position. 2017-12-23 14:02:59 +05:00
Night Owl
df737ff88d Update .travis.yml 2017-12-21 17:12:05 +05:00
Night Owl
20016e330b Merge branch 'master' into travis 2017-12-21 16:57:45 +05:00
Alibek Omarov
bc1bb3e358
Merge pull request #41 from FreeSlave/delete_files
Remove redundant files of original xash3d hlsdk
2017-12-20 18:48:43 +03:00
Alibek Omarov
4f71ed9e2d
Merge pull request #40 from FreeSlave/gitignore
Ignore dlls, pdb, some cmake generated files and orig files produced …
2017-12-20 18:48:31 +03:00
Roman Chistokhodov
6be68c49f3 Remove redundant files of original xash3d hlsdk 2017-12-20 04:35:54 +03:00
Roman Chistokhodov
113135f7b9 Ignore dlls, pdb, some cmake generated files and orig files produced by some diff programs 2017-12-19 15:43:56 +03:00
Alibek Omarov
7981bad606 Fix weapon selection being broken at the start of demo(or manual fullupdate call) 2017-12-19 00:28:34 +03:00
Alibek Omarov
c128c69ceb Add install() for CMake. 2017-12-19 00:27:56 +03:00
Roman Chistokhodov
30f2409952 Merge branch 'master' into sohl1.2 2017-12-18 23:47:12 +03:00
Alibek Omarov
e1dce5fce9
Merge pull request #39 from nekonomicon/cmake
Fix linking with libdl on some environments.
2017-12-18 03:03:09 +03:00
Night Owl
b5650d5610 Do not use cpu-dependent optimization. 2017-12-18 05:01:29 +05:00
Roman Chistokhodov
22026b90b5 Spirit 1.2 2017-12-18 02:39:44 +03:00
Night Owl
d8c422e1eb Merge remote-tracking branch 'origin/cmake' into travis 2017-12-18 02:55:00 +05:00
Night Owl
a2f0ecf741 Fix linking with libdl on some environments. 2017-12-18 02:44:42 +05:00
Night Owl
e0f475e80e Use branch name and OS name as tarball name. 2017-12-17 23:02:45 +05:00
Night Owl
1285d48347 Update .travis.yml. 2017-12-17 04:59:35 +05:00
Alibek Omarov
063deae258
Merge pull request #38 from FreeSlave/item_soda_fix
Fix item soda precache
2017-12-16 13:09:47 +03:00
Roman Chistokhodov
bf429f0709 Fix item soda precache 2017-12-16 04:56:23 +03:00
Alibek Omarov
08951f5783
Merge pull request #30 from FreeSlave/joystick_win32_nosdl
Joystick support for non-sdl win32 (untested)
2017-12-13 16:49:01 +03:00
Alibek Omarov
a319233322
Merge pull request #37 from nekonomicon/string_t
A little fixes.
2017-12-11 17:53:08 +03:00
Night Owl
f27d1028ac Do not reorganize variables in classes. Add missing #pragma once directives and more #include guards. 2017-12-11 02:44:30 +05:00
Night Owl
41c9b072e5 Add missing #include guards. 2017-12-10 22:41:27 +05:00
Night Owl
83c0505ffe Add missing precache calls. 2017-12-10 21:08:10 +05:00
Night Owl
2802050329 Add missing break. 2017-12-10 21:05:13 +05:00
Night Owl
18adf0979f Redefine string_t. Fix wrong variables type. 2017-12-10 20:56:46 +05:00
Roman Chistokhodov
5a60f08a59 Joystick support for non-sdl win32 (untested) 2017-12-09 19:57:12 +03:00
Alibek Omarov
64f2858473
Merge pull request #36 from FreeSlave/update_readme_and_build_systems
Update README.md, update makefiles, add .bat scripts for msvc
2017-12-09 14:51:13 +03:00
Roman Chistokhodov
87d6ca3b68 Add instructions for using chroot toolchain in QtCreator 2017-12-09 14:45:54 +03:00
Roman Chistokhodov
0d56674e28 Add steam runtime chroot method 2017-12-09 13:50:14 +03:00
Roman Chistokhodov
e6ea89705f Update README.md, update makefiles, add .bat scripts for msvc 2017-12-09 00:16:29 +03:00
Alibek Omarov
f9267125c1
Merge pull request #35 from FreeSlave/dynamic_sdl
Dynamic sdl2 loading from client
2017-12-08 22:34:37 +03:00
Roman Chistokhodov
3574e73a91 sdl loading refactoring 2017-12-07 21:25:26 +03:00