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

1320 commits

Author SHA1 Message Date
Atlante45
fd20686f0f Removed Systime.h includes 2014-04-21 17:23:06 -07:00
Atlante45
be2db49e08 Last touch to removing gettimeofday 2014-04-21 16:44:21 -07:00
Atlante45
f7f30e118c More gettimeofday cleanup 2014-04-21 15:17:11 -07:00
Andrzej Kapolka
58b063ee12 Make sure we call allReferencesCleared on the right thread. 2014-04-17 11:13:22 -07:00
Andrzej Kapolka
21fa833f19 Merge branch 'master' of https://github.com/highfidelity/hifi into animate 
Conflicts:
	interface/src/Application.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
 2014-04-17 10:58:34 -07:00
ZappoMan
836913f1f0 Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-16 15:21:15 -07:00
ZappoMan
bdf39186de Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-15 21:04:15 -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
Stojce Slavkovski
1a3e6595c5 Allow users to set the destination of Snapshots 2014-04-15 19:36:02 +02:00
Andrzej Kapolka
a2dc58f7f9 Moved FBX code to its own library so that we can use it for bots. 2014-04-14 17:15:58 -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
Andrzej Kapolka
873541dd7b Trying out basic pushback for other avatars. 2014-04-10 11:56:17 -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
186c588d5a remove doubled timeval definition from SharedUtil 2014-04-10 10:48:50 -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
Andrzej Kapolka
9f58264cb6 Working on plane collisions, pushing back camera from intersecting avatars. 2014-04-09 18:07:56 -07:00
Andrew Meadows
22d2f84cff merge upstream/master into andrew/scripting 2014-04-09 15:38:56 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Stephen Birarda
c208af2246 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 15:10:48 -07:00
Stephen Birarda
3fe5af1505 update boilerplate and include guards for other new files 2014-04-09 15:08:56 -07:00
Stephen Birarda
5a79079c09 fix boilerplates in new DTLS files 2014-04-09 15:03:56 -07:00
Stephen Birarda
d4f2c9e631 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-09 14:40:14 -07:00
Andrew Meadows
635f832dfe rename shapeShape() to be collideShapes() 
Also add collideShapesCoarse()
 2014-04-09 13:04:17 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
ced5e72d39 add date to capsule shape 2014-04-09 10:46:36 -07:00
Stephen Birarda
2d755adfc0 repairs to good code blown away by regex 2014-04-09 10:46:20 -07:00
Stephen Birarda
11c235a29e fixes to source files for code remove in regex replace 2014-04-09 10:16:56 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427 prepare header files for regex run against cpp 2014-04-09 09:35:05 -07:00
Stephen Birarda
7ce91b3f96 fix headers who had their comments removed 2014-04-08 17:43:35 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Stephen Birarda
f3cbd120ce header comment tweaks prior to regex match 2014-04-08 17:19:23 -07:00
Stephen Birarda
6681754994 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 14:26:10 -07:00