James B. Pollack
3cee569bae
pass parameters to entities
2015-11-05 16:57:39 -08:00
James Pollack
b229b5289c
entity call params
2015-11-05 14:24:21 -08:00
James Pollack
751d51ee72
entity call params
2015-11-05 14:19:11 -08:00
James B. Pollack
f83c0e7db7
Merge pull request #6310 from imgntn/build_text_edits
...
Update OpenSSL Binaries Link in Build docs
2015-11-05 12:56:22 -08:00
Howard Stearns
673de7f3e6
Merge pull request #6308 from hyperlogic/tony/mac-fixes
...
Fixes for Mac build and crash on startup
2015-11-05 11:52:52 -08:00
Anthony J. Thibault
50370479e4
Application.h: coding standard fixes
2015-11-05 11:03:32 -08:00
Anthony J. Thibault
50e8f49f52
SpacemouseManager Moved stub init into cpp file.
...
This should fix the windows build. For some reason
the linker was having a problem resolving this.
2015-11-05 10:56:24 -08:00
Seth Alves
669609d310
Merge pull request #6319 from imgntn/quickgrabfix
...
Set wantsTrigger correctly on lightswitch.js
2015-11-05 10:52:18 -08:00
James B. Pollack
c898d9a474
set wantstrigger correctly on lightswitch
2015-11-05 10:48:16 -08:00
Ryan Downe Karpf
ce80b2d7e5
Merge pull request #6318 from sethalves/non-colliding-to-trigger
...
grab changes
2015-11-05 10:43:23 -08:00
Seth Alves
4a3b434fd4
change grabbing-non-colliding to trigger. fix whiteboard and some other scripts
2015-11-05 10:35:02 -08:00
Anthony J. Thibault
2318e48fa8
AvatarRig: fix for crash when index was -1
2015-11-05 09:43:41 -08:00
Anthony J. Thibault
8d16f60b15
Removed hardcoded define HAVE_3DCONNEXIONCLIENT
...
This should be set from cmake, right?
2015-11-05 09:02:39 -08:00
Anthony J. Thibault
d9f4b0218e
Merge branch 'master' into tony/mac-fixes
2015-11-05 08:26:44 -08:00
samcake
dba6031703
Merge pull request #6311 from jherico/marge
...
Fix crash in Oculus simulator
2015-11-05 00:57:05 -08:00
samcake
00797b4dea
Merge pull request #6314 from jherico/homer
...
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 23:33:45 -08:00
Brad Davis
86b852231e
Merge pull request #6286 from EdgarPironti/master
...
Spacemouse migration
2015-11-04 19:15:35 -08:00
Philip Rosedale
8dc3d62d17
Merge pull request #6316 from sethalves/grab-release-velocity-experiment
...
don't set release velocity
2015-11-04 16:37:04 -08:00
Seth Alves
05a977e31b
get rid of code that computes release velocity
2015-11-04 16:26:30 -08:00
samcake
8dd8793fc0
Merge pull request #6315 from jherico/rec1
...
Creating recording library
2015-11-04 16:24:23 -08:00
Seth Alves
adb9118dc1
don't set release velocity
2015-11-04 16:21:02 -08:00
Brad Davis
69d29bbbbb
Creating recording library
2015-11-04 16:18:55 -08:00
Brad Davis
067a058799
Merge pull request #6312 from sethalves/dont-grab-zones
...
don't attempt to grab particles or zones
2015-11-04 16:03:05 -08:00
Brad Davis
20d1035821
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 15:54:50 -08:00
Anthony J. Thibault
d46d521d81
Added #else branch to #if 0
2015-11-04 15:10:23 -08:00
Seth Alves
1cbe6c4463
don't attempt to grab particles or zones
2015-11-04 13:59:37 -08:00
Brad Davis
4dec31d524
Fix crash in Oculus simulator
2015-11-04 13:20:47 -08:00
James B. Pollack
6cfc0b9487
update openssl binaries link
2015-11-04 13:07:38 -08:00
Anthony J. Thibault
69f1cfbcb9
Fixes for Mac build and crash on startup
...
For some reason the qt code gen is getting confused by the #if 0
in 3DConnextionClient.h, so I added a stub implementation.
In Application.cpp the change of moving idle into paintGL had a sideeffect
of calling OffscreenGlCanvas before it was initialized. To work around this
I added a guard to prevent calling idle before all the gl windows/widgets have
been initialized.
2015-11-04 12:04:34 -08:00
samcake
f4cc8c4c2e
Merge pull request #6306 from jherico/barney
...
Fix ability to enable mappings parsed from JSON in JS
2015-11-04 11:47:04 -08:00
Brad Davis
18d2b184dc
Fix ability to enable mappings parsed from JSON in JS
2015-11-04 11:39:34 -08:00
Philip Rosedale
8954d21ed1
Merge pull request #6303 from sethalves/fix-grab-again
...
rework grab search logic
2015-11-04 11:26:13 -08:00
Anthony Thibault
275b248547
Merge pull request #6302 from AndrewMeadows/fix-avatar-drift
...
fix slow drift of avatar when wearing HMD
2015-11-04 11:19:45 -08:00
Seth Alves
c2f9a49598
don't grab light
2015-11-04 11:15:57 -08:00
Brad Davis
a0d26fed70
Merge pull request #6304 from samcake/controllers
...
Controllers: Fixing the step pulse behavior and changes to standard mapping
2015-11-04 11:14:35 -08:00
samcake
d4259931b2
Setting the step yaw to 22.5 degrees
2015-11-04 10:57:39 -08:00
samcake
ce5e89ce66
removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file
2015-11-04 10:53:53 -08:00
U-GAPOS\andrew
f260c6b12b
fix bad time measurment in AtRestDetector
2015-11-04 10:47:39 -08:00
Seth Alves
1e498a41f0
rework search logic
2015-11-04 10:46:20 -08:00
U-GAPOS\andrew
9de5721a48
set _hmdFollowVelocity to zero when done following
2015-11-04 10:23:55 -08:00
Philip Rosedale
bbe74f2e55
Merge pull request #6301 from sethalves/fix-grab-velocity
...
make held objects move tightly with hand (again)
2015-11-04 09:28:20 -08:00
Seth Alves
270b4b97fc
remove a left-over kludge that was causing the appearence of frame-lag in held objects
2015-11-04 02:26:02 -08:00
EdgarPironti
ade0862948
Spacemouse fixes
2015-11-04 00:49:40 -08:00
EdgarPironti
1ab683643c
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-04 00:36:38 -08:00
Brad Davis
439bdbc0e4
Merge pull request #6298 from samcake/controllers
...
Controllers : Removing dead files
2015-11-03 19:57:37 -08:00
EdgarPironti
7adf38f781
Spacemouse migration
2015-11-03 18:22:55 -08:00
EdgarPironti
2a84cadd5d
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 18:22:29 -08:00
Brad Hefta-Gaub
71e4092276
Merge pull request #6283 from hyperlogic/tony/one-update-for-every-render
...
Remove idleTimer and call idle directly from paintGL.
2015-11-03 16:38:43 -08:00
Seth Alves
a85358085d
Merge pull request #6299 from Atlante45/master
...
handControllerGrab.js fix
2015-11-03 16:11:18 -08:00
Atlante45
d8797ef9d7
Initialize relativePosition/Rotation
2015-11-03 16:07:37 -08:00
