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

13507 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
12a563193f first cut at new version of ModelItem::appendModelData 2014-06-09 08:04:41 -07:00
ZappoMan
f3dd34ae54 tweak 2014-06-09 08:03:31 -07:00
ZappoMan
f6e5962593 added new versions of appendData for QString and QByteArray 2014-06-09 08:02:42 -07:00
ZappoMan
165984ff31 clean up includes 2014-06-05 16:02:21 -07:00
ZappoMan
751c27041b add additional assert to guard proper usage of ByteCountCoding 2014-06-05 16:01:58 -07:00
ZappoMan
76731be8c0 added some extra libraries 2014-06-05 16:01:11 -07:00
ZappoMan
9d1106885d added tests for ByteCountCoding 2014-06-05 12:52:18 -07:00
ZappoMan
2a73a91775 first cut at ByteCountCoding template, additional features in PropertyFlags template 2014-06-05 12:52:03 -07:00
ZappoMan
b74676de0d add more tests for decode 2014-06-04 15:33:22 -07:00
ZappoMan
152d99d810 removed some old debug code and updated a comment 2014-06-04 15:23:17 -07:00
ZappoMan
c7a502e2c9 removed empty file 2014-06-04 15:18:11 -07:00
ZappoMan
2066dbcec7 cleanup 2014-06-04 15:16:51 -07:00
ZappoMan
10f7eae7a0 implemented decode 2014-06-04 14:56:13 -07:00
ZappoMan
78d3f1454c more operators 2014-06-04 14:19:35 -07:00
ZappoMan
2b85145325 added test suite for PropertyFlags, latest work on PropertyFlags 2014-06-04 11:41:09 -07:00
ZappoMan
b48c70a7f7 first cut at PropertyFlags template class 2014-06-04 10:23:50 -07:00
ZappoMan
8d4a8f7e67 first cut at partial model elements 2014-06-04 10:22:49 -07:00
ZappoMan
23ef5b5404 added some comments 2014-06-04 10:22:19 -07:00
Philip Rosedale
e48cfb84c1 Merge pull request #2978 from Barnold1953/OculusOverlay 
Fixed bug that disabled cursor for windows
 2014-06-04 08:40:11 -07:00
barnold1953
edf5d5bda1 Fixed bug that disabled cursor for windows 2014-06-04 08:38:01 -07:00
Andrzej Kapolka
6faa7f8f77 Merge pull request #2977 from Barnold1953/OculusOverlay 
Stopped Oculus Overlay Glow
 2014-06-03 16:13:35 -07:00
barnold1953
9373fff05d Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 2014-06-03 16:04:18 -07:00
barnold1953
d4fd1e9515 Stopped Oculus UI from glowing. 2014-06-03 16:01:47 -07:00
Andrzej Kapolka
948415d4b4 Merge pull request #2974 from Barnold1953/OculusOverlay 
Curved Oculus Overlay
 2014-06-03 15:44:12 -07:00
barnold1953
036bdf5d07 Removed pointless 1.0f 2014-06-03 15:26:12 -07:00
barnold1953
611c68d0d8 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 2014-06-03 15:23:58 -07:00
barnold1953
d1b7882c6f Mouse input and magnification for Oculus Overlay 2014-06-03 15:23:17 -07:00
Brad Hefta-Gaub
03f0ff111f Merge pull request #2976 from talentraspel/19751 
dynamically malloc/free arrays to avoid stack overflow on windows.
 2014-06-03 12:10:44 -07:00
Stephen Birarda
c02d87fdf7 Merge pull request #2975 from talentraspel/19749 
start timer BEFORE moving it to another thread, because Qt otherwise wil...
 2014-06-03 11:31:53 -07:00
Kai Ludwig
23b56bf174 start timer BEFORE moving it to another thread, because Qt otherwise will protest and the timer does not run at all - at least on windows. 
this fixes restarted servers not getting properly recognized by the interface - at least on windows.
 2014-06-03 20:10:55 +02:00
barnold1953
75bee69ef8 Fixed coding standard 2014-06-03 10:49:54 -07:00
Kai Ludwig
162939fda1 dynamically malloc/free arrays to avoid stack overflow on windows. 
starting with 0 for array index will give a reasonable value for 'first'.
 2014-06-03 19:11:53 +02:00
Brad Hefta-Gaub
6061330826 Merge pull request #2973 from matsukaze/master 
Job #19700 BUG: Crash in NodeBounds::draw() fixed.
 2014-06-02 22:41:02 -07:00
barnold1953
f4391bcdbe _distance variable 2014-06-02 17:23:32 -07:00
barnold1953
10d0b6af03 Fixed Oculus overlay color bug 2014-06-02 16:47:51 -07:00
barnold1953
4ed03e996a Added Oculus Options menu 2014-06-02 16:15:51 -07:00
barnold1953
90754e320d Curved Oculus overlay around camera as a semicircle 2014-06-02 16:05:07 -07:00
Brad Hefta-Gaub
6f5d2ba233 Merge pull request #2970 from Barnold1953/master 
Mirror mode fix, particleBirds.js
 2014-06-02 13:02:05 -07:00
Clément Brisset
2121648c7d Merge pull request #2972 from polac/19748 
Fixing the BUG #19748: Sit.js doesn't handle overlays correctly.
 2014-06-02 12:18:28 -07:00
Clément Brisset
12a40106f5 Merge pull request #2968 from AndrewMeadows/inertia 
Make JointState a proper class: Part 1
 2014-06-02 12:15:50 -07:00
Mika Impola
da3a272475 Fixing the BUG #19748: Sit.js doesn't handle overlays correctly. 2014-06-02 21:47:31 +03:00
barnold1953
e669f1d835 Fixed and tested particle birds 2014-06-02 11:41:50 -07:00
Andrew Meadows
8e7daed2b3 Merge upsrtream/master into andrew/inertia 
Conflicts:
	interface/src/renderer/Model.cpp
 2014-06-02 11:32:23 -07:00
AndrewMeadows
c3646d2421 Merge pull request #2969 from ZappoMan/silencewarnings 
silence some unused variable warnings and move some debug code to only execute in debug mode
 2014-06-02 11:04:18 -07:00
AndrewMeadows
a9a7580e8b Merge pull request #2971 from ZappoMan/editModelsInDefaultScripts 
Edit models in default scripts
 2014-06-02 11:04:03 -07:00
AndrewMeadows
8146520c35 Merge pull request #2967 from ZappoMan/editModelsInDefaultScripts 
Added Edit Models to default scripts
 2014-06-02 10:51:22 -07:00
barnold1953
9e882957c4 Removed debug prints from particleBirds.js 2014-06-02 10:44:50 -07:00
ZappoMan
758df4f58b silence some unused variable warnings and move some debug code to only execute in debug mode 2014-06-02 10:43:50 -07:00
barnold1953
863e2c56ae Fixed mirror mode for non-headless models. 2014-06-02 10:41:10 -07:00
barnold1953
7997946389 Added particleBirds.js example script 2014-06-02 09:43:01 -07:00