Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 00:35:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12002 commits 76 branches 59 tags 1.2 GiB
Commit graph

12002 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
ef418f09b3 don't let windows.h include winsock 2014-04-10 11:15:33 -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
f51b7a78c6 look only in lib for GnuTLS library 2014-04-10 09:32:44 -07:00
Stephen Birarda
d5d52f804f add a networking library and link from appropriate targets 2014-04-10 09:32:17 -07:00
Philip Rosedale
67c8fd5630 Merge pull request #2641 from AndrewMeadows/scripting 
avatar-avatar collisions are now exposed to JS
 2014-04-10 09:20:29 -07:00
Andrew Meadows
3755aee3e0 merge upstream/master into andrew/scripting 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-10 08:32:14 -07:00
Andrew Meadows
f9fb8b46a5 adding names to arguments in collisionWithAvatar() declaration 2014-04-10 07:53:39 -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
Philip Rosedale
e08dfeae2a Merge pull request #2642 from Atlante45/persistant_script_location 
Persistant script location
 2014-04-09 22:16:20 -07:00
Philip Rosedale
de6b55644b Merge pull request #2636 from ey6es/faceplus 
Basic Faceplus integration, cleanup for handling the various face trackers.
 2014-04-09 22:13:34 -07:00
Philip Rosedale
3b2b075414 Merge pull request #2640 from birarda/kill-scope 
remove the audio scope
 2014-04-09 22:11:02 -07:00
Philip Rosedale
d4bfffe518 Merge pull request #2628 from AndrewMeadows/oculus-with-thrust 
fix glitchy oculus when looking directly behind
 2014-04-09 21:59:11 -07:00
Andrzej Kapolka
9f58264cb6 Working on plane collisions, pushing back camera from intersecting avatars. 2014-04-09 18:07:56 -07:00
Stephen Birarda
31382b7e12 add a message for Win32 users to generate the MSVC GnuTLS import library 2014-04-09 17:41:18 -07:00
Atlante45
ef89b8c386 Removed extra line 2014-04-09 17:37:37 -07:00
Stephen Birarda
3d071e85d5 link GnuTLS to the assignment-client 2014-04-09 17:37:23 -07:00
Atlante45
fad71266a1 Merge branch 'master' of https://github.com/highfidelity/hifi into persistant_script_location 2014-04-09 17:35:12 -07:00
Atlante45
2b44b03a27 Added temp fix to ModelUploader dialog too 2014-04-09 17:34:17 -07:00
Stephen Birarda
17d2e14f0f find correct parent include folder for gnutls 2014-04-09 17:33:41 -07:00
Stephen Birarda
8b23addc47 prepend the gnutls library with lib for windows find 2014-04-09 17:31:11 -07:00
Stephen Birarda
35519e07dc quote dashed library name to potentially fix find on windows 2014-04-09 17:27:37 -07:00
Andrew Meadows
c88be1ac34 remove unnecessary change 2014-04-09 17:26:05 -07:00
Stephen Birarda
d54c21cdf1 fix path suffixes for gnutls headers 2014-04-09 17:23:13 -07:00
Andrew Meadows
f27f8e39c8 example JS for handling avatar collisions 2014-04-09 17:22:17 -07:00
Stephen Birarda
03bb2573d1 look in bin folder to find GnuTLS on windows 2014-04-09 17:18:34 -07:00
Stephen Birarda
cf47418d58 remove the audio scope 2014-04-09 17:16:29 -07:00
Atlante45
e33da2a741 Some QSettings cleanup + persistant script location 2014-04-09 17:08:50 -07:00
Andrew Meadows
22d2f84cff merge upstream/master into andrew/scripting 2014-04-09 15:38:56 -07:00
Andrzej Kapolka
f0dfb7fc38 Updated headers to match the new standard. 2014-04-09 15:38:54 -07:00