Commit Graph

857 Commits

Author SHA1 Message Date
pierow d2f9ceddd9 crosshair system update and merge with develop 2018-08-01 00:49:49 -04:00
pierow 8563f5b367
Merge pull request #17 from asmodev/asmo/vs2017
Code updates to support VS2017 compilation. Does not include project …
2018-07-31 23:04:13 -04:00
Asmo b840fe80e0 Code updates to support VS2017 compilation. Does not include project updates. 2018-07-30 23:52:29 -04:00
pierow 1e7b6a70aa
Merge pull request #16 from JonnyPower/feature/travis-ci-image
feat: Add build status image for develop to README.md
2018-07-20 23:29:01 -04:00
jonnypower 2dc0e322a6 feat: Add build status image for develop to README.md 2018-07-15 18:08:29 -07:00
pierow dd3e9e2b4e
Merge pull request #11 from JonnyPower/macos
Macos Support & Travis

windows compile seems to work fine  - merging.
2018-07-15 14:13:23 -04:00
jonnypower bd5f6513bc chore: debug instructions for macos 2018-07-15 01:23:05 -07:00
jonnypower 8b9d3d3b8b chore: Readable shifting of icon_number to create byte array 2018-07-14 23:54:24 -07:00
jonnypower 0eaa1b3ff0 chore: Compare index 0 against null terminator 2018-07-14 23:51:46 -07:00
pierow f0f16adfe6 WIP crosshair system 2018-06-10 19:14:31 -04:00
pierow b3fcf00ea8 FPS independent alien movement sounds 2018-06-06 18:56:58 -04:00
pierow 38e748c26a centers cursor with raw input in popup menu. half-working fix for OS cursor displaying over game cursor (reappears after esc menu is opened). 2018-06-06 18:54:37 -04:00
jonnypower 41791848fa fix: compiles particles as static lib 2018-05-12 18:03:45 -07:00
jonnypower cfcde19373 Merge remote-tracking branch 'ensl/develop' into macos 2018-05-12 17:38:59 -07:00
jonnypower cf809b82e7 Merge remote-tracking branch 'ensl/master' into macos 2018-05-12 17:38:53 -07:00
pierow ca37f785ec
Merge pull request #10 from ENSL/pierow-commfix
added cl_widescreen and fix for commander item placement and background
2018-05-06 20:16:47 -04:00
pierow b6862645ec added cl_widescreen and fix for commander item placement and background 2018-05-06 19:56:32 -04:00
Ari Timonen 85e5aa9e7d
Update README.md 2018-05-01 19:10:04 +00:00
Ari Timonen f64577edf5 Update COPYING.txt
Remove all HTML.
2018-05-01 14:15:30 -04:00
Ari Timonen 960814bbe5 Merge remote-tracking branch 'origin/master' into develop 2018-05-01 14:07:10 -04:00
Ari Timonen 11c35b4cce
Merge pull request #6 from ENSL/release-v3.2.1b
Remove debug symbols for Linux release build
2018-04-30 23:10:05 +00:00
Ari Timonen 5b5dc323b0 Remove debug symbols for Linux release build 2018-04-30 19:07:51 -04:00
Ari Timonen abbcb5b4ba
Merge pull request #5 from ENSL/release-v3.2.1b
Release v3.2.1b
2018-04-30 16:04:16 +00:00
jonnypower 585876d45c chore: whitespace / ifdef cleanup 2018-04-29 23:10:26 -07:00
jonnypower e6ae628b5b fix: Wasn't missing lib - it's GL/gl.h on linux 2018-04-29 22:57:11 -07:00
jonnypower 67c62bbb89 fix: Add libgl1 to travis 2018-04-29 22:52:40 -07:00
jonnypower 19d92bfe65 feat: Build libparticles for use when compiling hl_cdll and ns 2018-04-29 22:48:44 -07:00
jonnypower 186da9bf3f Merge remote-tracking branch 'origin/macos' into macos 2018-04-29 22:14:30 -07:00
jonnypower 141f21081c chore: add deleted libparticleMP.a binary from particles directory 2018-04-29 22:14:05 -07:00
jonnypower 259b735221 chore: fix libparticle changes - use dylib binary for macos 2018-04-29 22:14:05 -07:00
jonnypower 84f75425e4 fix: Strongly typed collision tests for linux compile
- Regression from macos source changes
2018-04-29 22:14:05 -07:00
jonnypower 05c7826537 feat: Travis-ci linux build 2018-04-29 22:14:05 -07:00
jonnypower 9711f583c4 chore: Reset particles opengl 2018-04-29 22:14:05 -07:00
jonnypower 0a97abc3c1 chore: Reset particles makefile 2018-04-29 22:14:05 -07:00
jonnypower b54ede04f5 chore: Linux travis needs someone who knows what they are doing - stick with osx ci for now 2018-04-29 22:14:05 -07:00
jonnypower 22b9c2de70 fix: include libcurl 4 ssl for tavis 2018-04-29 22:14:05 -07:00
jonnypower f57a9fdf0a fix: gcc multilib 2018-04-29 22:14:05 -07:00
jonnypower 2ccb671db0 fix: gcc multilib 2018-04-29 22:14:05 -07:00
jonnypower aa013ca998 fix: was doubling up os builds 2018-04-29 22:14:05 -07:00
jonnypower e24b9b7fe2 feat: OSX vgui dylib 2018-04-29 22:14:05 -07:00
jonnypower 69af0a19a6 chore: Makefile OSX cleanup / travis test 2018-04-29 22:14:05 -07:00
jonnypower 414d80b68d feat: Add os yml flags for linux / osx 2018-04-29 22:14:05 -07:00
jonnypower 23f9b87158 feat: Add os yml flags for linux / osx 2018-04-29 22:14:05 -07:00
jonnypower aed76e92b2 feat: travis-ci for osx / linux wip 2018-04-29 22:14:05 -07:00
jonnypower 054f8d929b fix: Mem leak, use auto boxing for temp value 2018-04-29 22:14:05 -07:00
jonnypower ea2a5833b7 feat: Compileable Mac OS 2018-04-29 22:14:05 -07:00
Ari Timonen b7625be69a
Merge pull request #2 from unknownworlds/master
Add the missing GPL license from UWE repo
2018-04-30 05:13:44 +00:00
jonnypower 4b3742f515 chore: add deleted libparticleMP.a binary from particles directory 2018-04-29 22:12:09 -07:00
jonnypower e735f87302 chore: fix libparticle changes - use dylib binary for macos 2018-04-29 22:08:40 -07:00
jonnypower 8a1fc7ded6 fix: Strongly typed collision tests for linux compile
- Regression from macos source changes
2018-04-29 21:48:30 -07:00