Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-31 15:42:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22522 commits 23 branches 28 tags 1.2 GiB
Commit graph

22522 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
01cac7445a add suppressions for log-spam caused by idle assignment-client 2015-02-27 10:58:04 -08:00
Philip Rosedale
1663fcb489 Merge pull request #4348 from Atlante45/relax_face_tracker 
Relax face tracker
 2015-02-27 08:37:49 -08:00
Philip Rosedale
df553ac65e Merge pull request #4335 from sethalves/assignment-client-keep-a-spare-x 
Assignment client keep a spare
 2015-02-27 07:39:06 -08:00
Atlante45
db90fcdb62 Simplify expression 2015-02-27 16:09:15 +01:00
Atlante45
8615bb7cff Make relaxation go to EPSILON within TIME 2015-02-27 15:58:28 +01:00
Atlante45
9849efe013 Exponential relaxation 2015-02-27 15:33:24 +01:00
Seth Alves
b8322556a6 address code-review comments 2015-02-26 17:34:24 -08:00
Seth Alves
c80995170a -n and -t are okay together 2015-02-26 17:17:19 -08:00
Andrew Meadows
375255f22e Merge pull request #4345 from virneo/20305 
CR for Job #20305 - Physics: V-HACD convex decomposition utilities
 2015-02-26 13:24:49 -08:00
Virendra Singh
695cfb3397 VHACD dependency build instructions 2015-02-27 01:04:23 +05:30
Virendra Singh
d4367924ad Clean up coding standard violations 2015-02-27 00:59:59 +05:30
Virendra Singh
93106be466 VHACD dependency build instructions 2015-02-27 00:58:55 +05:30
Atlante45
5a556a06d2 Merge branch 'master' of https://github.com/highfidelity/hifi into relax_face_tracker 2015-02-26 20:06:20 +01:00
Atlante45
fdf9fdd877 Relax head/lean when not tracking 2015-02-26 20:05:47 +01:00
Virendra Singh
95839dd64e untabify the source files 2015-02-27 00:27:18 +05:30
Virendra Singh
36c3131524 Rectifying bad merge in BUILD.md and BUILD_WIN.md 2015-02-27 00:14:46 +05:30
Atlante45
e37ef226fc Simplify lookForward compute 2015-02-26 19:21:14 +01:00
Atlante45
682b3f5e61 Remove unused angular velocity 2015-02-26 19:18:52 +01:00
Atlante45
f560f97c6b Only update active FaceTracker 2015-02-26 19:18:05 +01:00
Atlante45
b6968a6b15 Update Facetrackers 2015-02-26 19:15:49 +01:00
Atlante45
8eb4abc49c Rework FaceTracker 2015-02-26 19:14:09 +01:00
Seth Alves
7c7d727b55 mv ShutdownEventListener into class which is a child of QCoreApplication 2015-02-26 10:07:48 -08:00
Seth Alves
0918d4989b mv ShutdownEventListener into class which is a child of QCoreApplication 2015-02-26 09:53:23 -08:00
Virendra Singh
19912930dd Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 2015-02-26 22:57:27 +05:30
Virendra Singh
bdb79f2619 Resetting from master 2015-02-26 22:56:21 +05:30
Seth Alves
9f83eabaad Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x 2015-02-26 09:21:53 -08:00
Philip Rosedale
c2e559342a Merge pull request #4341 from AndrewMeadows/bispinor 
load non-moving dynamic objects as "inactive" in physics engine
 2015-02-26 09:21:49 -08:00
Virendra Singh
ce60bb40d7 removed tags for *.md files 2015-02-26 22:32:47 +05:30
Virendra Singh
b3fdb19cad Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 
Conflicts:
	BUILD.md
	BUILD_WIN.md
 2015-02-26 22:16:35 +05:30
Leonardo Murillo
cfa6352c3a Merge pull request #4344 from birarda/master 
better handling for externals folder name for msvc12
 2015-02-25 17:58:07 -08:00
Stephen Birarda
53f265bca2 Merge branch 'master' of github.com:highfidelity/hifi 2015-02-25 17:49:02 -08:00
Stephen Birarda
f8627c8233 fix handling for vc12 externals 2015-02-25 17:48:26 -08:00
Andrew Meadows
7b68916010 Merge pull request #4343 from ZappoMan/hangOnExit 
BUG FIX: Hang on exit
 2015-02-25 17:02:26 -08:00
Virendra Singh
434c0b569f Make vhacd tool optional 2015-02-26 06:28:28 +05:30
ZappoMan
05d7d47045 some cleanup 2015-02-25 16:32:48 -08:00
ZappoMan
b03928cec7 some cleanup 2015-02-25 16:31:43 -08:00
ZappoMan
af43ba3444 used a registered quad for the audio box since its color constantly changes 2015-02-25 15:21:24 -08:00
ZappoMan
5eecb6a837 correctly delete glbuffers 2015-02-25 14:44:10 -08:00
Seth Alves
128a38100f Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x 2015-02-25 14:13:55 -08:00
Stephen Birarda
db7bfc1e6e Merge pull request #4342 from birarda/master 
look directly in Xcode app for 10.9 SDK
 2015-02-25 14:04:41 -08:00
Stephen Birarda
a7a9ede744 handle an SDK in Xcode beta 2015-02-25 13:53:57 -08:00
Stephen Birarda
e0d31f6e61 remove extra added spaces 2015-02-25 13:52:14 -08:00
Stephen Birarda
994c0386d3 cleanup command that looks for SDK 2015-02-25 13:50:59 -08:00
Stephen Birarda
d24287f627 look in Xcode application for 10.9 SDK 2015-02-25 13:48:28 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
Stephen Birarda
1c2606c6db fail out if windeployqt is not found 2015-02-25 13:12:37 -08:00
Stephen Birarda
a9fcde6265 fix two typos in BUILD guides 2015-02-25 13:07:52 -08:00
ZappoMan
912b851eb7 remove crufty references to QGLWidget 2015-02-25 12:54:34 -08:00
ZappoMan
d1e648b392 remove unused references to QGLWidget* parent in Overlay and Overlays 2015-02-25 12:34:38 -08:00
Brad Hefta-Gaub
e7b36166ec Merge pull request #4340 from huffman/fix-repeat-captured-keys 
Make KeyEvent objects equal even if they have differing isAutoRepeat val...
 2015-02-25 12:24:19 -08:00