Ryan Huffman
a422103e89
Merge pull request #6662 from AlessandroSigna/overlays
...
Exposing emmisive property of the Image3DOverlay
2015-12-16 10:29:34 -08:00
AlessandroSigna
08f7591787
Fix misspelling
2015-12-16 10:02:47 -08:00
samcake
7c8f12b9c4
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-16 09:55:37 -08:00
samcake
b4b541178d
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-16 09:42:06 -08:00
Brad Davis
1e5793893b
Merge pull request #6665 from ZappoMan/rightClickMenu
...
fix bug in simulated left click - make qml menus work
2015-12-15 21:40:00 -08:00
samcake
d2ebaef69e
Adding a simple manual exposure control to configure the tonemapping and expose it to js. Add a convenient way to access the Job._concept._data with template
2015-12-15 18:18:42 -08:00
Andrew Meadows
0e1e5db7eb
only need one animateScaleChanges() implementation
2015-12-15 18:18:08 -08:00
Andrew Meadows
9b0c199ed7
updateAvatarPhysicsShape-->addAvatarToSimulation
2015-12-15 18:18:08 -08:00
Andrew Meadows
c3823de353
setClampedTargetScale()-->setTargetScaleVerbose()
2015-12-15 18:18:08 -08:00
Andrew Meadows
cd1e3810ca
set the scale of avatar on login, don't animate
2015-12-15 18:18:08 -08:00
Andrew Meadows
bab07516f0
fix size of rendered bounding capsule
2015-12-15 18:18:08 -08:00
Andrew Meadows
33634cdaa1
properly delete departing avatars
2015-12-15 18:18:08 -08:00
Andrew Meadows
e9f52b1211
properly scale avatar collision shape
2015-12-15 18:18:08 -08:00
Brad Hefta-Gaub
76da3a14ac
fix bug in simulated left click - make qml menus work
2015-12-15 17:58:07 -08:00
Anthony J. Thibault
30480f126b
Improved idle to walk forward transition
...
Hooked up a transition animation from idle to walk in the animation json.
Also fixed a bug in the AnimBlendLinearMove which was preventing the interpolation
into idle from being correct.
2015-12-15 17:26:17 -08:00
Brad Davis
29516619ee
Merge pull request #6661 from ZappoMan/rightClickMenu
...
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 16:08:59 -08:00
AlessandroSigna
8e7a2ac536
Exposing emmisive property of the Image3DOverlay
2015-12-15 15:41:36 -08:00
Brad Hefta-Gaub
aa53900fa3
CR feedback
2015-12-15 15:40:50 -08:00
Brad Hefta-Gaub
3e1e85aa18
Merge pull request #6659 from ctrlaltdavid/20757
...
Fix signal connection to ScriptEngine::finished()
2015-12-15 14:42:24 -08:00
Brad Hefta-Gaub
7d43504c0c
Merge pull request #6615 from hyperlogic/tony/js-avatar-default-pose
...
Expose Avatar default pose to JavaScript
2015-12-15 14:27:53 -08:00
Brad Hefta-Gaub
3dcdfbc0f1
first cut at simulating mouse/reticle behavior with input contorllers
2015-12-15 13:59:22 -08:00
David Rowe
541af36794
Fix signal connection to ScriptEngine::finished
2015-12-16 09:12:07 +13:00
samcake
e70ab472af
Merging with upstream master/graphics
2015-12-14 18:38:29 -08:00
samcake
84d1e3b123
Merged with upstream master
2015-12-14 18:30:24 -08:00
samcake
a50b14dfae
Merging with upstream graphics
2015-12-14 18:18:39 -08:00
Brad Hefta-Gaub
1bcf275b53
Merge pull request #6652 from samcake/red
...
Fix Full screen mirror behavior
2015-12-14 18:12:19 -08:00
samcake
3554f54e17
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-14 17:38:56 -08:00
samcake
571ccb3c20
cleaning up the code
2015-12-14 17:14:45 -08:00
samcake
9f1f0798cb
cleaning up the code
2015-12-14 17:04:26 -08:00
samcake
ed2d45d0b6
HMD Mirror looks correct
2015-12-14 16:18:44 -08:00
Anthony J. Thibault
3f0cdb3c02
Merge branch 'master' into tony/js-avatar-default-pose
2015-12-14 11:19:24 -08:00
samcake
1597d3d466
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2015-12-14 10:25:22 -08:00
samcake
2aad26154e
THis should fix the mirror and the skybox issue
2015-12-14 10:24:51 -08:00
samcake
e005bb7b5a
MAybe a mirror solution ?
2015-12-14 09:25:32 -08:00
Brad Hefta-Gaub
be058398a2
remove blue sphere while speaking
2015-12-13 12:02:39 -08:00
Brad Hefta-Gaub
2815cb0fef
first cut at adding advanced and developer menu groupings
2015-12-12 18:12:36 -08:00
Sam Cake
6288e99798
Playing with mirror
2015-12-11 23:28:04 -08:00
Atlante45
b8495a6912
Merge branch 'master' of https://github.com/highfidelity/hifi into warnings-win
2015-12-11 18:05:47 -08:00
samcake
b3acde4462
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-11 17:49:00 -08:00
samcake
1ddbc15df4
Exploring how to solve the mirror fullscreen bug
2015-12-11 17:47:33 -08:00
Clément Brisset
c160a98c5c
Merge pull request #6636 from samcake/controllers
...
Fix the broken skybox and simplify a bit the vertex shader used
2015-12-11 17:06:33 -08:00
samcake
7ee066b9ed
Merge branch 'controllers' of https://github.com/samcake/hifi into red
2015-12-11 16:35:18 -08:00
Atlante45
c782b01fde
More warning fixes
2015-12-11 16:31:27 -08:00
Atlante45
8bd301e45e
More warning fixes
2015-12-11 16:31:27 -08:00
Atlante45
79fdb2e882
Fix warnings on windows 64bit
2015-12-11 16:31:27 -08:00
Atlante45
0f49653da3
More OS X warning cleanup
2015-12-11 16:31:27 -08:00
samcake
68134aafe5
Fix the broken skybox and simplify a bit the vertex shader used
2015-12-11 16:14:55 -08:00
Brad Davis
1bcf42a799
Merge pull request #6629 from ZappoMan/resetSkyBoxOnDomainChange
...
reset skybox on changing domains
2015-12-11 15:48:20 -08:00
Brad Hefta-Gaub
d918eca030
reset skybox on changing domains
2015-12-11 11:36:02 -08:00
Brad Hefta-Gaub
a1a3c4470c
reload own avatar on Content Reload
2015-12-11 11:02:16 -08:00
Brad Hefta-Gaub
a7a924153a
Merge pull request #6617 from huffman/entity-query-keyhole
...
Add keyhole radius to OctreeQuery
2015-12-11 09:35:46 -08:00
samcake
5d395ae54f
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-10 18:06:43 -08:00
Brad Hefta-Gaub
a472d293bb
Merge pull request #6599 from jherico/aeryn-sdl2
...
Moving SDL2 to external plugin
2015-12-10 18:02:15 -08:00
Howard Stearns
585911fe98
Merge pull request #6612 from sethalves/no-physics-until-ready
...
No physics until ready
2015-12-10 16:09:49 -08:00
Brad Davis
98263f0c0d
Moving sdl2 to external plugin
2015-12-10 14:56:41 -08:00
Ryan Huffman
b6ecd539df
Merge branch 'master' of https://github.com/highfidelity/hifi into entity-query-keyhole
2015-12-10 14:36:03 -08:00
Ryan Huffman
b5e3dce376
Add keyhole radius to OctreeQuery
2015-12-10 14:34:28 -08:00
Anthony J. Thibault
652ce5501f
Expose Avatar default pose to JavaScript
...
New JavaScript API to get the avatar's default pose.
MyAvatar.getDefaultJointRotation(index);
MyAvatar.getDefaultJointTranslation(index);
See `examples/tPose.js` for example usage
2015-12-10 13:57:31 -08:00
Brad Hefta-Gaub
e133bd867a
Merge pull request #6600 from jherico/aeryn-sixense
...
Moving Sixense to external plugin
2015-12-10 13:33:17 -08:00
Bradley Austin Davis
c5f5e8de60
Trying to fix build problem
2015-12-10 12:00:40 -08:00
Seth Alves
8ca6c7acc3
Merge pull request #6611 from Atlante45/attachments
...
Fix Attachments jitter
2015-12-10 11:46:19 -08:00
Seth Alves
dbde0b641e
Merge branch 'attachments' of github.com:Atlante45/hifi into no-physics-until-ready
2015-12-10 11:38:08 -08:00
Seth Alves
d10221f53a
merge from upstream
2015-12-10 11:21:36 -08:00
Atlante45
739e184b52
Fix attachments jitter
2015-12-10 11:19:11 -08:00
Brad Hefta-Gaub
589adde41e
Merge pull request #6541 from howard-stearns/correct-target-frame-rate
...
Don't limit avatar rendering when not vsync'd
2015-12-10 11:17:23 -08:00
James B. Pollack
d21e4ff5e1
Merge pull request #6592 from huffman/script-engine-fixes
...
Fix concurrency issues for bools in ScriptEngine
2015-12-10 10:48:54 -08:00
Brad Davis
645695d5d5
Moving sixense to external plugin
2015-12-10 10:44:23 -08:00
Seth Alves
a59af2c1b2
Merge branch 'master' of github.com:highfidelity/hifi into no-physics-until-ready
2015-12-10 09:03:57 -08:00
Seth Alves
d09f70239c
make entity-tree a global. change how network-requests to load model geometry are triggered
2015-12-10 09:03:53 -08:00
Howard Stearns
83078b9d8c
Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate
2015-12-10 08:44:08 -08:00
Brad Hefta-Gaub
3d325351fb
Merge pull request #6602 from AndrewMeadows/character-cleanup
...
move raw bullet code from interface to physics lib
2015-12-10 07:26:29 -08:00
Ryan Huffman
ad0865171b
Fix unused variable in scriptFinished
2015-12-09 15:52:30 -08:00
Howard Stearns
dd2d040253
Merge branch 'fix-sync-period-calc' into correct-target-frame-rate
2015-12-09 15:43:43 -08:00
Howard Stearns
d964032572
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-09 15:23:00 -08:00
Howard Stearns
270cfe8af7
coding standards
2015-12-09 15:22:44 -08:00
Ryan Huffman
fc6a78d9ef
Update scriptFinished signal to be a DirectConnection
2015-12-09 14:49:05 -08:00
Ryan Huffman
4bfce768ca
Add locks around read/writes of _scriptEnginesHash
2015-12-09 14:48:33 -08:00
Seth Alves
446ca8236f
disable physics disabler
2015-12-09 11:25:44 -08:00
Andrew Meadows
d59311f258
Merge pull request #6594 from sethalves/no-physics-until-ready
...
No physics until ready
2015-12-09 10:51:07 -08:00
howard-stearns
1d65cbce88
Remove unneeded getTargetFramePeriod and isVSynchronized.
2015-12-08 18:08:57 -08:00
howard-stearns
9ae22800fe
Merge branch 'fix-sync-period-calc' into correct-target-frame-rate
2015-12-08 17:32:53 -08:00
Andrew Meadows
8c109fd623
move raw bullet code from interface to physics lib
2015-12-08 17:21:43 -08:00
howard-stearns
32e4967ee0
cleanup
2015-12-08 16:38:05 -08:00
howard-stearns
7afc803fb5
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-08 15:30:48 -08:00
howard-stearns
5b41d4da1c
Snapshot of "working" version.
2015-12-08 15:30:23 -08:00
Leonardo Murillo
9ba5670c76
Fix
2015-12-08 14:20:19 -08:00
Leonardo Murillo
dda99bfea6
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-12-08 14:07:50 -08:00
Seth Alves
c462bda86c
disable physics when moving to a new domain
2015-12-08 14:01:18 -08:00
Seth Alves
164439b303
don't enable physics until an entire scene has been received from the entity server and until nearby (to MyAvatar) entities are ready
2015-12-08 13:53:39 -08:00
Leonardo Murillo
9062cca8c4
Restoring
2015-12-08 13:33:15 -08:00
samcake
ede375a889
Merge branch 'graphics' of https://github.com/highfidelity/hifi into hdr
2015-12-08 12:28:16 -08:00
samcake
83279489f3
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-08 09:46:29 -08:00
Seth Alves
dffa37c0e7
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-12-08 09:44:50 -08:00
Howard Stearns
faec4639b1
cap
2015-12-08 09:14:40 -08:00
Howard Stearns
481fe5a7d0
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 18:52:29 -08:00
samcake
d12fdb9726
Merge pull request #6584 from birarda/pref-no-auto
...
fix for avatar URL text editing, assert in Model.cpp
2015-12-07 18:11:49 -08:00
Brad Hefta-Gaub
4cbbd252d5
Merge pull request #6587 from jherico/rigel
...
Fix crashes on exit due to poor cleanup
2015-12-07 18:04:52 -08:00
Bradley Austin Davis
b7aeb34a8c
Fix crashes on exit due to poor cleanup
2015-12-07 17:50:08 -08:00
Seth Alves
742288c583
Merge pull request #6586 from Atlante45/master
...
Fix grab behavior
2015-12-07 17:47:47 -08:00
James B. Pollack
6cf1ad464f
Merge pull request #6583 from birarda/extension-ci
...
use a case insensitive check for extensions in Application
2015-12-07 17:33:03 -08:00
