Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-06 06:55:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11936 commits 25 branches 0 tags 1.1 GiB
Commit graph

3440 commits

Author SHA1 Message Date
ZappoMan
bdf39186de Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-15 21:04:15 -07:00
ZappoMan
579710e4bd some cleanup 2014-04-15 13:36:20 -07:00
ZappoMan
60c6b27ab2 cleanup code a bit, add support for diffusions even with no ray intersection 2014-04-15 11:38:11 -07:00
Stephen Birarda
5904d19603 Merge pull request #2637 from birarda/authentication 
add optional DTLS option for domain-server to node communication
 2014-04-14 10:24:17 -07:00
ZappoMan
7a993939bf Merge branch 'master' of https://github.com/worklist/hifi into moonshot 
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.h
	libraries/shared/src/SharedUtil.h
 2014-04-14 09:43:29 -07:00
ZappoMan
a37921c1d5 move isNaN() to shared utils 2014-04-13 19:09:07 -07:00
Andrew Meadows
508d4f216d fix #2656 avatar jumps very far away 
This was caused by a bad CapsuleShape::_radius when the default
CapsuleShape was used to create a default bounding capsule.  The
penetration against such a shape could be arbitrarily large.
 2014-04-11 15:55:18 -07:00
Stephen Birarda
1cd5fec71c push packet version for assignments 2014-04-11 11:42:33 -07:00
Stephen Birarda
6431d35f86 add a missing newline to DomainHandler 2014-04-11 10:19:31 -07:00
Andrzej Kapolka
806bcc8e6f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-10 18:49:52 -07:00
Clément Brisset
5f6dee6c64 Merge pull request #2635 from thoys/windows-script-path-fix 
Fixed loading local stored scripts on Windows machines
 2014-04-10 16:40:47 -07:00
Stephen Birarda
86b0b78692 add a missing semi-colon for windows build 2014-04-10 12:27:52 -07:00
Stephen Birarda
9912c4c9a7 just call free instead of gnutls_free on windows 2014-04-10 12:24:41 -07:00
Stephen Birarda
38867a2f09 fix for re-declarations of xgnutls_free 2014-04-10 12:14:37 -07:00
Stephen Birarda
97444eac1c put gnutls_free fix in DTLSSession header 2014-04-10 12:11:41 -07:00
Andrzej Kapolka
873541dd7b Trying out basic pushback for other avatars. 2014-04-10 11:56:17 -07:00
Stephen Birarda
2c96ce08ae add stackoverflow fix for lnk2001 error in gnutls_free 2014-04-10 11:50:26 -07:00
Stephen Birarda
cfc2431a59 don't be a dummy and include Systime header from implementation 2014-04-10 11:37:09 -07:00
Stephen Birarda
00a826330e use GetSystemTimeAsFileTime with previous gettimeofday setup 2014-04-10 11:34:43 -07:00
Stephen Birarda
ea8f0df17d use extern C in Systime header 2014-04-10 11:30:20 -07:00
Stephen Birarda
885cee28c5 guard Systime against being included on UNIX/OS X 2014-04-10 11:28:22 -07:00
Stephen Birarda
1daaf561de don't include missing sys/time, declare gettimeofday in Systime header 2014-04-10 11:26:47 -07:00
Stephen Birarda
3651eff3d6 cleanup Systime to gettimeofday without lean and mean windows 2014-04-10 11:24:54 -07:00
Andrzej Kapolka
a12dd916fa More plane intersection bits. 2014-04-10 11:24:45 -07:00
Stephen Birarda
7c9e0927ab define WIN32_LEAN_AND_MEAN before include windows.h in Systime 2014-04-10 11:17:03 -07:00
Stephen Birarda
53aafd6897 rely on winsock2 for timeval declaration 2014-04-10 11:06:22 -07:00
Stephen Birarda
7d4399da35 don't use reserved word causing issues on windows 2014-04-10 11:01:17 -07:00
Stephen Birarda
52203bd36e another attempt to repair QNetworkInterface call on windows 2014-04-10 10:58:20 -07:00
Stephen Birarda
ad0776be4e repair QNetworkConfigurationManager include 2014-04-10 10:55:02 -07:00
Stephen Birarda
714db42f87 include QNetworkConfigManager to fix HifiSockAddr error on windows 2014-04-10 10:51:20 -07:00
Stephen Birarda
186c588d5a remove doubled timeval definition from SharedUtil 2014-04-10 10:48:50 -07:00
Stephen Birarda
da24483d7c include WS2tcpip for socklen_t on windows 2014-04-10 10:45:43 -07:00
Stephen Birarda
b87c04444e include winsock2 from HifiSockAddr 2014-04-10 10:41:01 -07:00
Stephen Birarda
8b19982e61 commit missing Syssocket removals to Node and Logging 2014-04-10 10:36:30 -07:00
Stephen Birarda
7cef2def66 remove Syssocket which is from our pre-Qt days 2014-04-10 10:34:31 -07:00
Stephen Birarda
54647f0f08 make sure gnutls define for ssize_t comes before gnutls include 2014-04-10 10:27:08 -07:00
Stephen Birarda
2518d314ac add ssize_t definition for gnutls.h include on Windows 2014-04-10 10:19:45 -07:00
Stephen Birarda
4e2e3b7b6d fix GnuTLS include dir variable name 2014-04-10 10:15:18 -07:00
Stephen Birarda
11cce7640e link to GnuTLS library from script-engine 2014-04-10 10:12:09 -07:00
Stephen Birarda
16bb28a4fa make GnuTLS a system include to suppress warnings 2014-04-10 10:04:02 -07:00
Stephen Birarda
68c445e718 link GnuTLS to targets linking the networking library 2014-04-10 10:00:10 -07:00
Stephen Birarda
ba6f861ad8 fix unmatched #ifdef in Syssocket 2014-04-10 09:54:37 -07:00
Stephen Birarda
58298984d3 link GnuTLS to the assignment-client, fix timeval in SharedUtil 2014-04-10 09:48:47 -07:00
Stephen Birarda
1d5644a85f link GnuTLS to octree library 2014-04-10 09:45:57 -07:00
Andrzej Kapolka
f61c746b4a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-10 09:45:23 -07:00
Stephen Birarda
7e2b73906c remove Syssocket include from SharedUtil 2014-04-10 09:35:25 -07:00
Stephen Birarda
d5d52f804f add a networking library and link from appropriate targets 2014-04-10 09:32:17 -07:00
Andrew Meadows
4942e93daa replace .f with .0f as per coding standard 2014-04-10 07:53:11 -07:00
Thijs Wenker
825acbbd9c Update ScriptEngine.cpp 
DWORD is not defined in UNIX based systems. int should be fine
 2014-04-10 10:47:21 +02:00
Andrzej Kapolka
9f58264cb6 Working on plane collisions, pushing back camera from intersecting avatars. 2014-04-09 18:07:56 -07:00