Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
Atlante45
ee13407066
Fix smart pointer casts
2015-07-01 19:22:40 -07:00
Brad Hefta-Gaub
af932fde29
Merge pull request #5247 from ericrius1/handRender
...
Fixed broken rendering of hydra visualization paraphernalia
2015-07-01 16:21:32 -07:00
ericrius1
8b00864175
hydra hand spheres and lasers are rendering again
2015-07-01 15:04:19 -07:00
Clément Brisset
eb3bddfe4c
Merge pull request #5209 from ctrlaltdavid/20589
...
QA for #20589 - Vertical field of view preference change should be applied immediately
2015-07-01 13:53:25 -07:00
Seth Alves
97cd5b8b99
Merge pull request #5223 from SamGondelman/cameraMode
...
misc. key binding/camera fixes
2015-06-27 10:55:34 -07:00
Sam Gondelman
2f0fcba1eb
key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode
2015-06-26 17:28:02 -07:00
David Rowe
1898c6bd55
Merge branch 'master' into 20547
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-06-26 13:05:51 -07:00
Seth Alves
a0d77c061c
lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does
2015-06-26 07:00:28 -07:00
Brad Hefta-Gaub
63812f28ad
Merge pull request #5206 from SamGondelman/cameraMode
...
fix bug that was preventing camera mode switches
2015-06-25 18:55:13 -07:00
David Rowe
377979e380
Make field of view preference change be applied immediately
2015-06-25 15:41:10 -07:00
Sam Gondelman
56944afd39
avatar doesn't move in independent mode, alphabetized menu options
2015-06-25 12:36:36 -07:00
Brad Hefta-Gaub
77bbb23a1e
Merge pull request #5175 from hyperlogic/ajt/first-person-avatar
...
Render a different model when in first person view.
2015-06-24 18:54:47 -07:00
Anthony J. Thibault
b88d7c2e05
Added FIXME comment to preRender
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Brad Hefta-Gaub
734a11e12a
Merge pull request #5199 from jherico/scale_rez_fix
...
Fixing misplaced UI on scale resolution
2015-06-24 16:10:33 -07:00
Sam Gondelman
19ec080e2b
Merge with master
2015-06-24 15:04:03 -07:00
Ryan Huffman
4df1bea4ec
Merge pull request #5167 from SamGondelman/hmdControls
...
hmdControls.js for movement when wearing an HMD
2015-06-24 14:40:31 -07:00
Brad Davis
fb2fb06371
Fixing misplaced UI on scale resolution, PC edition
2015-06-23 15:42:32 -07:00
Sam Gondelman
778e19ac11
fixed camera mode issue
2015-06-23 11:45:08 -07:00
Sam Gondelman
824c219fa0
started fixing camera mode issue
2015-06-23 09:26:38 -07:00
Bradley Austin Davis
f833121032
Fixing the initial missing UI on retina displays, again
2015-06-22 19:55:52 -07:00
Brad Davis
4cd1c52987
Fixing HMD position offset bug in picking & stereo rendering in HMD
2015-06-22 11:20:48 -07:00
Brad Davis
3231bbba5a
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
2015-06-22 09:44:16 -07:00
bwent
c315bcec24
Expose mouseDoublePressEvents to js
2015-06-19 15:52:27 -07:00
Brad Davis
cc6b589ae5
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-19 14:48:38 -07:00
Brad Davis
99c217184b
Fixing the mic/camera buttons and the mirror UI buttons
2015-06-19 14:46:39 -07:00
Sam Gateau
31633eca10
IMproving the probe system and cleaning the engine script
2015-06-19 10:41:40 +02:00
Brad Davis
9bef5f011b
Reverting mirror functionality
2015-06-19 00:03:46 -07:00
Brad Davis
0fa6ac175f
Merge branch 'master' into overlay
2015-06-18 21:56:11 -07:00
Brad Davis
48b27acc79
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
Brad Hefta-Gaub
a7a53d8be7
Merge pull request #5148 from SamGondelman/rotationModes
...
center player in view mode
2015-06-18 18:02:47 -07:00
Seth Alves
b258aeaa3d
merge from master
2015-06-18 10:04:14 -07:00
Sam Gondelman
f752534f7c
actionEvent signal, captureActions, began work on hmdControls.js
2015-06-18 09:52:36 -07:00
Brad Davis
5c4fa77acd
Merge branch 'temp' into overlay
2015-06-18 00:59:31 -07:00
Brad Davis
a83a4fb0a1
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-17 19:53:31 -07:00
David Rowe
67206332e6
Make individual reload buttons reload scripts
2015-06-17 16:11:30 -07:00
David Rowe
2a00586e21
Fix missing hack
...
Matches hack in stopScript().
2015-06-17 16:11:29 -07:00
David Rowe
17f7d76025
Redownload scripts that are loaded via Script.load() when reloading all
2015-06-17 16:11:28 -07:00
David Rowe
5dab977c28
Add a reload script button after each script in list of running scripts
2015-06-17 16:11:26 -07:00
David Rowe
f220d40bb8
Re-download scripts upon Reload All
2015-06-17 16:11:25 -07:00
Bradley Austin Davis
1705eb8f80
Reverting some changes, putting overlay rendering in its own state manager
2015-06-17 16:08:19 -07:00
Brad Davis
8a1b519071
Working on overlays
2015-06-17 16:06:06 -07:00
Brad Davis
ae1c9603b9
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 15:13:04 -07:00
Bradley Austin Davis
11fff7c6e5
debugging stack on OSX
2015-06-17 13:49:42 -07:00
Bradley Austin Davis
2172445db7
Merge remote-tracking branch 'upstream/master' into ovr6
2015-06-17 12:56:41 -07:00
Brad Davis
4282c044ef
Working on mirror and overlay
2015-06-17 12:01:39 -07:00
Andrew Meadows
61f62f96b0
Merge pull request #5129 from SamGondelman/master
...
Integrating gamepads/hydras to input mapping system, zooming
2015-06-17 11:39:38 -07:00
Brad Davis
1e90aaf9c3
Working on overlays still, mirror rendering and overlay order
2015-06-17 11:35:30 -07:00
Brad Davis
5ded9e7eb9
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 10:50:01 -07:00
