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

24664 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
0dbc4780ab use numerical constants header from LeapMotion 2015-05-01 17:18:35 -07:00
Stephen Birarda
455b91c2a5 add back string header for memset 2015-05-01 17:06:39 -07:00
Stephen Birarda
19a95cb25a remove string header that is not needed 2015-05-01 16:56:32 -07:00
Stephen Birarda
ddb08da4b7 include cstdlib for std::abs in AudioNoiseGate 2015-05-01 16:54:23 -07:00
Stephen Birarda
b9c9ff6a14 clean up various warnings 2015-05-01 16:49:13 -07:00
Stephen Birarda
7ce62f49e2 fix absolute value checks in MovingMinMaxAvgTests.cpp 2015-05-01 16:37:53 -07:00
Stephen Birarda
83d6569aa1 reference QTimer member variable for AvatarMixer 2015-05-01 16:34:50 -07:00
Stephen Birarda
841da65eaf fix abs value call warning 2015-05-01 16:34:34 -07:00
Stephen Birarda
a24789b721 remove extra space from SetupHifiProject 2015-05-01 16:32:05 -07:00
Stephen Birarda
475861c4be move KILO_PER_MEGA to numerical constants 2015-05-01 16:30:25 -07:00
Stephen Birarda
edade7baba resolve conflicts on merge with upstream master 2015-05-01 16:24:16 -07:00
Stephen Birarda
7b4522e950 nullify the current Highchart when modal closed 2015-05-01 16:21:05 -07:00
Stephen Birarda
6d0e612923 remove other tabs from moveJoints 2015-05-01 16:16:01 -07:00
Stephen Birarda
b32aecc456 fix tabs/spaces in moveJoints 2015-05-01 16:15:35 -07:00
Stephen Birarda
d602c71346 cleanup audio-mixer stats, add username interpolation 2015-05-01 16:12:46 -07:00
Stephen Birarda
5e2a22a006 perform requested interpolation when unpacking 2015-05-01 15:58:22 -07:00
Stephen Birarda
99bddcc102 insert usernames to JSONBreakableMarshal interpolate map 2015-05-01 15:45:53 -07:00
Stephen Birarda
8037d383b1 remove extra debugging from AvatarMixer 2015-05-01 15:20:07 -07:00
Stephen Birarda
a7bff474e3 use JSONBreakableMarshal in AC monitor to get QJsonObject 2015-05-01 15:18:49 -07:00
Stephen Birarda
4b777f09e6 repairs to JSONBreakableMarshal for array values 2015-05-01 15:14:41 -07:00
Stephen Birarda
532bcc9376 complete initial algorithm for AM throttle 2015-05-01 14:56:40 -07:00
Seth Alves
5390630497 Merge pull request #4743 from huffman/sphere-color 
Add support for changing sphere color in edit.js
 2015-05-01 13:17:46 -07:00
Brad Hefta-Gaub
62ba82198c Merge pull request #4737 from samcake/temp1 
Fix the shadow Bug on Mac and the errors on shader compilation
 2015-05-01 12:01:00 -07:00
Seth Alves
4f483afd10 Merge pull request #4742 from huffman/osx-warnings 
Update compiler flags to produce warnings on non-gnu compilers
 2015-05-01 12:00:57 -07:00
Ryan Huffman
7f84b27880 Add support for changing sphere color in edit.js 2015-05-01 11:59:39 -07:00
Seth Alves
6139fc0d73 Merge pull request #4738 from huffman/entity-naming 
Add 'name' property to entities
 2015-05-01 11:58:30 -07:00
Stephen Birarda
7a2a391852 add script to move joints for av rate testing 2015-05-01 11:53:20 -07:00
Ryan Huffman
0883bde1be Update compiler flags to produce warnings on non-gnu compilers 2015-05-01 11:29:23 -07:00
Ryan Huffman
c506c36d7c Fix initialized-out-of-order warnings for name property 2015-05-01 11:26:43 -07:00
samcake
2bf7387723 Merge pull request #4733 from sethalves/box-stacking 
improve display of owned boxes and models when simulation-ownership debug menu is enabled
 2015-05-01 11:00:28 -07:00
Stephen Birarda
67efa7796f use only AD rate for FRD adjustment 2015-05-01 10:38:32 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Seth Alves
ef4e271732 Merge pull request #4739 from ericrius1/mouseGrab 
refactored grab script using velocity and spring force, and added lotsoblocks.js to quickly generate lots of physical blocks
 2015-05-01 10:07:25 -07:00
Eric Levin
3ee111d757 added script to generate a lot of physical blocks within a specified range 2015-05-01 09:56:21 -07:00
Eric Levin
cac5fa1371 refactored grab script using velocity and spring force 2015-05-01 09:39:39 -07:00
Seth Alves
7ad6cf5c8f Merge branch 'master' of github.com:highfidelity/hifi into box-stacking 2015-05-01 09:19:37 -07:00
Ryan Huffman
73a5b8c4e2 Add support for 'name' to edit.js 2015-05-01 08:42:23 -07:00
Ryan Huffman
b49a04c638 Add name property to entities 2015-05-01 08:40:24 -07:00
samcake
2b631efb5d shader not compiling properly have been fixed 2015-05-01 00:21:58 -07:00
samcake
e560687371 fixing the shader not compiling 2015-05-01 00:14:23 -07:00
samcake
6da796f735 fix the bug with sahdows on Mac due to the fbo needing a colorbuffer even though it's not needed 2015-04-30 23:31:56 -07:00
Philip Rosedale
dc9e5cad24 Merge pull request #4729 from ericrius1/mouseGrab 
can now fling up and down as well as in xz plane
 2015-04-30 20:15:11 -07:00
Philip Rosedale
0322e64a79 Merge pull request #4718 from ctrlaltdavid/20513 
CR for 20513 - Adapt DDE control of eyes to be predominantly open or closed
 2015-04-30 20:13:59 -07:00
Brad Hefta-Gaub
3477bc5323 Merge pull request #4732 from sethalves/json-skip-default-values 
Json skip default values
 2015-04-30 17:56:24 -07:00
David Rowe
e45ecbe2c8 Merge branch 'master' into 20513 
Conflicts:
	interface/src/devices/DdeFaceTracker.cpp
	interface/src/devices/DdeFaceTracker.h
 2015-04-30 17:22:35 -07:00
Stephen Birarda
744d026e81 initial pass at tailoring the FRD for send rate 2015-04-30 17:16:31 -07:00
Eric Levin
4c80633a41 fixed bug where non-script related content would be deleted on script ending 2015-04-30 16:42:32 -07:00
Stephen Birarda
5b55a52a04 add check in AvatarMixer for next adjustment 2015-04-30 15:36:31 -07:00
Stephen Birarda
3e842d7e34 add debug for result values from DS settings 2015-04-30 14:59:03 -07:00
Stephen Birarda
5936073425 get avatar-mixer settings from domain-server 2015-04-30 14:55:53 -07:00