Philip Rosedale
|
c3828e4152
|
Merge pull request #4782 from ctrlaltdavid/20531
DO NOT MERGE - QA for #20531 - Don't flash whole screen when audio clips
|
2015-05-11 10:18:07 -07:00 |
|
Clément Brisset
|
d2046c0685
|
Merge pull request #4821 from sethalves/fix-http-cache
Fix http cache
|
2015-05-11 18:19:00 +02:00 |
|
Brad Hefta-Gaub
|
12269ff475
|
Merge pull request #4822 from Atlante45/edit_js
Hide/Show Skybox/Atmosphere props only when needed
|
2015-05-11 09:10:03 -07:00 |
|
Brad Hefta-Gaub
|
9d573fa0fc
|
Merge pull request #4801 from Atlante45/fix_wireframe
Fix wireframe render for meshes with special properties
|
2015-05-11 09:07:47 -07:00 |
|
Clément Brisset
|
7f8ac5013d
|
Merge pull request #4818 from sethalves/no-grab-gravity
while grabbing an entity, zero out its gravity.
|
2015-05-11 16:06:00 +02:00 |
|
Atlante45
|
beba293d96
|
Hide Skybox/Atmosphere prps when not needed
|
2015-05-11 15:54:30 +02:00 |
|
Atlante45
|
94765f0c53
|
Add print type
|
2015-05-11 15:54:14 +02:00 |
|
Atlante45
|
e51040db53
|
CR
|
2015-05-11 14:31:22 +02:00 |
|
Atlante45
|
f941ca9601
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_wireframe
|
2015-05-11 14:20:16 +02:00 |
|
Brad Hefta-Gaub
|
b572c13660
|
Merge pull request #4817 from sethalves/fix-octree-max-pps
undo mistaken change of setting name
|
2015-05-10 21:26:46 -07:00 |
|
Seth Alves
|
d6475a4634
|
Merge pull request #4814 from howard-stearns/empty-faces
Handle empty face groups...
|
2015-05-10 17:36:33 -07:00 |
|
Seth Alves
|
e6023c59c1
|
if _reply is NULL, it doesn't make sense to worry about if it's finished loading or not.
|
2015-05-10 17:15:48 -07:00 |
|
Seth Alves
|
68e01d2bd9
|
quiet compiler
|
2015-05-10 17:03:42 -07:00 |
|
Seth Alves
|
8da3490a4c
|
when grabbing an entity, zero out its gravity.
|
2015-05-10 09:32:03 -07:00 |
|
Seth Alves
|
34deba7fff
|
undo mistaken change of setting name
|
2015-05-09 17:59:45 -07:00 |
|
Howard Stearns
|
c0a71da9e3
|
Handle empty face groups, such as in the rama cyclinder that crashed the Friday meeting (http://headache.hungry.com/~seth/hifi/stickCollisionModel.obj).
|
2015-05-09 13:16:34 -07:00 |
|
Philip Rosedale
|
72e1ea688a
|
Merge pull request #4808 from ZappoMan/moreZoneProperties
add has stars to edit.js & fix background mode: nothing bug
|
2015-05-08 17:10:45 -07:00 |
|
Brad Hefta-Gaub
|
8d211957e0
|
Merge pull request #4812 from howard-stearns/edit-script-typo
Edit script typo
|
2015-05-08 16:25:29 -07:00 |
|
Brad Hefta-Gaub
|
a517e773f4
|
Merge pull request #4786 from ctrlaltdavid/20530
CR for #20530 - Add DDE calibration
|
2015-05-08 16:25:02 -07:00 |
|
Howard Stearns
|
abc99267af
|
Typo was making edit.js fail and impossible to debug.
|
2015-05-08 16:19:39 -07:00 |
|
Howard Stearns
|
37eb455e38
|
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak
|
2015-05-08 16:06:53 -07:00 |
|
Brad Hefta-Gaub
|
5bab226d64
|
Merge pull request #4811 from AndrewMeadows/isothermal
remove verbose log about failure to build shape
|
2015-05-08 15:55:16 -07:00 |
|
Brad Hefta-Gaub
|
bfb2b278ee
|
Merge pull request #4791 from jherico/scale
Fixing scale resolution issues
|
2015-05-08 15:54:24 -07:00 |
|
ZappoMan
|
9f229dc3b3
|
remove spinners from scatter values
|
2015-05-08 15:03:04 -07:00 |
|
Andrew Meadows
|
a2ffc1029b
|
clear MotionState pointer in body on delete
|
2015-05-08 14:18:44 -07:00 |
|
Andrew Meadows
|
603afefaab
|
silence verbose no-very-helpful log message
|
2015-05-08 14:16:38 -07:00 |
|
Howard Stearns
|
447503d4a6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak
|
2015-05-08 14:09:47 -07:00 |
|
Philip Rosedale
|
6008713a2a
|
Merge pull request #4809 from PhilipRosedale/master
don't apply changes to velocity unless needed
|
2015-05-08 14:06:51 -07:00 |
|
Philip Rosedale
|
d40e4b7218
|
don't apply changes to velocity unless needed
|
2015-05-08 14:05:32 -07:00 |
|
ZappoMan
|
1936f4c114
|
fix zone:nothing bug
|
2015-05-08 14:03:58 -07:00 |
|
Seth Alves
|
60d7e622f6
|
Merge pull request #4805 from PhilipRosedale/master
Add a delete button to dice script
|
2015-05-08 14:02:27 -07:00 |
|
ZappoMan
|
b1d5b2643f
|
add has stars to edit.js
|
2015-05-08 13:17:39 -07:00 |
|
Howard Stearns
|
ebea754997
|
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak
|
2015-05-08 13:04:24 -07:00 |
|
Philip Rosedale
|
671a38beee
|
Merge pull request #4804 from AndrewMeadows/nova
fix for physics wakeup when moving camera view
|
2015-05-08 11:11:26 -07:00 |
|
Clément Brisset
|
c31363ef51
|
Merge pull request #4806 from ZappoMan/moreZoneProperties
set default atmosphere properties to match the default atmosphere
|
2015-05-08 19:20:35 +02:00 |
|
ZappoMan
|
e8f43c7f4b
|
set default atmosphere properties to match the default atmosphere
|
2015-05-08 10:03:24 -07:00 |
|
Philip Rosedale
|
de6a63c69a
|
add delete button to clear existing dice
|
2015-05-08 09:49:58 -07:00 |
|
Brad Hefta-Gaub
|
0e56b49b28
|
Merge pull request #4803 from Atlante45/edit_js
Fix OS X shutdown crash
|
2015-05-08 09:42:32 -07:00 |
|
Atlante45
|
6d0ca40aae
|
Set pointer to nullptr after delete
|
2015-05-08 18:21:42 +02:00 |
|
Andrew Meadows
|
ada48bcb70
|
fix for glitchy physics updates
|
2015-05-08 09:06:31 -07:00 |
|
Brad Hefta-Gaub
|
bbc257199b
|
Merge pull request #4802 from Atlante45/add_debug
Add some debug to edit.js
|
2015-05-08 08:18:45 -07:00 |
|
Brad Hefta-Gaub
|
47630e9a0e
|
Merge pull request #4798 from samcake/blue
Add the loading of cube map and the rendering of skybox but broken
|
2015-05-08 08:13:39 -07:00 |
|
Clément Brisset
|
0e5e6294a5
|
Merge pull request #4800 from PhilipRosedale/master
Minor tweak to grab, fix harmonicOscillator sample
|
2015-05-08 16:39:31 +02:00 |
|
Clément Brisset
|
55bcb992d9
|
Merge pull request #4796 from sethalves/fix-octree-max-pps
Fix octree max pps
|
2015-05-08 16:28:42 +02:00 |
|
Clément Brisset
|
cc4ec8edda
|
Merge pull request #4799 from ctrlaltdavid/destroy-trackers
Delete Leap and RealSense devices on shutdown
|
2015-05-08 16:17:00 +02:00 |
|
Atlante45
|
01e3c33bf1
|
Add some debug to edit.js
|
2015-05-08 16:13:04 +02:00 |
|
Atlante45
|
52397bf87a
|
Fix wireframe render for meshes with special properties
|
2015-05-08 15:59:39 +02:00 |
|
Philip Rosedale
|
32dbbbdc8f
|
normalize a vector that needed it. Correct rolloff of grab force
|
2015-05-07 21:44:09 -07:00 |
|
Philip Rosedale
|
b59352a10e
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2015-05-07 21:08:06 -07:00 |
|
Philip Rosedale
|
d3a977d3f8
|
Fix velocity math error, add random color changes
|
2015-05-07 21:05:13 -07:00 |
|