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
David Rowe
c4e9807259
Merge branch 'master' into 20531
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2015-05-07 21:01:22 -07:00
Seth Alves
a775c1fb98
Merge pull request #4792 from howard-stearns/objReader-tweak
...
Obj reader tweak
2015-05-07 18:39:37 -07:00
David Rowe
e20df0e2bf
Delete Leap and RealSense devices on shutdown
...
Leaving them running prevents a clean shutdown on Windows when running
Interface.exe from a command line: the interface.exe process stays alive
preventing Interface from being run again from the command line without
manually terminating the running process.
2015-05-07 18:28:49 -07:00
Stephen Birarda
3e0029e6e6
use .data on QPointer for slot connection
2015-05-07 17:29:31 -07:00
Sam Gateau
deb303838d
Cleaning code
2015-05-07 17:15:45 -07:00
Sam Gateau
351b92627a
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-07 17:06:41 -07:00
Sam Gateau
ce5295a55f
THese is not final but we have a basic working framework so let's try to share
2015-05-07 17:06:15 -07:00
Stephen Birarda
a3ce02181e
fix ThreadedAssignment setFinished debug
2015-05-07 17:06:09 -07:00
Stephen Birarda
4c8c24eb00
remove an extra debug
2015-05-07 17:04:45 -07:00
Stephen Birarda
d75d204ff6
standardize cleanup of ThreadedAssignments
2015-05-07 17:03:43 -07:00
Andrew Meadows
0942ed5654
Merge pull request #4790 from ctrlaltdavid/face-mute-shortcut
...
Add shortcut key for face tracker muting
2015-05-07 16:56:19 -07:00
Andrew Meadows
c7952311e5
Merge pull request #4784 from thoys/20522
...
Added transparency and positioning updating of Planky button
2015-05-07 16:55:06 -07:00
Howard Stearns
6e0cf57711
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak
2015-05-07 16:43:45 -07:00
Howard Stearns
8db8e56af0
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak
2015-05-07 16:41:52 -07:00
Seth Alves
70cfd5a2a5
Merge pull request #4794 from AndrewMeadows/nova
...
fix crash when script deletes entity
2015-05-07 16:12:14 -07:00
Seth Alves
20f138989c
Merge branch 'master' of github.com:highfidelity/hifi into fix-octree-max-pps
2015-05-07 16:01:23 -07:00
Seth Alves
c1e3500f3c
voxelDetailsForCode returns a ratio, cubeinfrustrum takes meters
2015-05-07 16:01:08 -07:00
Seth Alves
8c3a57566b
fix name of settings key for max octree pps
2015-05-07 16:00:30 -07:00
Stephen Birarda
305835ea79
Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers
2015-05-07 15:38:35 -07:00
Stephen Birarda
bfccf02912
use lamdbas for linkedDataCreateCallback
2015-05-07 15:37:02 -07:00
Andrew Meadows
e7e4d80be5
always remove from _pendingAdds just in case
2015-05-07 15:22:58 -07:00
Andrew Meadows
1879a67804
cleanup
2015-05-07 14:42:09 -07:00
Stephen Birarda
790f7a08cf
clean up sequence numbers for killed sending nodes
2015-05-07 14:34:06 -07:00
Philip Rosedale
b7b62c8d42
Merge pull request #4772 from AndrewMeadows/nova
...
PhysicsEngine cleanup in preparation for collidable avatars
2015-05-07 14:33:35 -07:00
Stephen Birarda
fe011e6752
keep track of out of order sends in AM
2015-05-07 14:13:27 -07:00
Stephen Birarda
e3acf861ff
fix for unverified datagram writes
2015-05-07 14:07:14 -07:00
Seth Alves
0347af9682
minor cleanup
2015-05-07 14:03:50 -07:00
Sam Gateau
72e01a7929
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-07 13:49:48 -07:00
samcake
bb77ba95d0
Merge pull request #4793 from ZappoMan/moreZoneProperties
...
Wire up the atmosphere and skybox properties into edit.js
2015-05-07 13:48:19 -07:00
David Rowe
cac6ae1148
Merge branch 'master' into 20530
2015-05-07 13:34:42 -07:00
ZappoMan
20fe43c852
wire up new zone properties, fix bug in group proprties decode
2015-05-07 13:05:00 -07:00
Howard Stearns
aad4c06244
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak
2015-05-07 12:03:56 -07:00
Bradley Austin Davis
c31d36be59
Fixing scale resolution issues
2015-05-07 12:01:56 -07:00
Seth Alves
f52747d8c1
re-enable code that ignores old packets
2015-05-07 11:53:57 -07:00
ZappoMan
d9f17d010c
first cut at adding new zone properties to edit tools
2015-05-07 11:41:23 -07:00
Sam Gateau
54c47fe3f9
merging
2015-05-07 11:35:58 -07:00
Seth Alves
d52a45b57e
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-07 11:30:46 -07:00
Andrew Meadows
f0618501dd
fix non-physical kinematic motion
...
also can set objects collisionless again
2015-05-07 11:29:42 -07:00
Sam Gateau
653d2e72b1
Skybox kind of working
2015-05-07 11:23:11 -07:00
samcake
12c26f9c3c
Merge pull request #4789 from Atlante45/display_zones
...
Display zones
2015-05-07 11:20:46 -07:00
