Brad Hefta-Gaub
f1278894c7
Merge pull request #7941 from zzmp/fix/vsync-halving
...
fix vsync halving fps
2016-05-20 09:30:13 -07:00
Zach Pomerantz
fff260c2b9
Guard against zero-sized gl buffer copy
2016-05-20 09:27:50 -07:00
howard-stearns
1801e270af
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-20 09:26:25 -07:00
Zach Pomerantz
2026226fe2
Handle vsync without halving fps
2016-05-20 09:04:39 -07:00
Brad Hefta-Gaub
1cce891f7c
Merge pull request #7947 from ZappoMan/zzmp-fix/avatar-inputs-pos
...
fix AvatarInputs spawning on bottom-left
2016-05-20 08:59:54 -07:00
Howard Stearns
3088a84035
Just bringing the code up to date and forcing a build to see how Jenkins/osx is doing.
...
Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving
2016-05-20 08:04:38 -07:00
Brad Hefta-Gaub
472c735d60
Merge branch 'master' of https://github.com/highfidelity/hifi into zzmp-fix/avatar-inputs-pos
2016-05-20 07:44:29 -07:00
Brad Hefta-Gaub
354661cc44
Merge branch 'fix/avatar-inputs-pos' of https://github.com/zzmp/hifi into zzmp-fix/avatar-inputs-pos
2016-05-20 07:44:07 -07:00
Brad Hefta-Gaub
313708ab5f
Merge pull request #7946 from Atlante45/fix/osx-warnings
...
Fix OSX warnings
2016-05-20 07:31:35 -07:00
David Rowe
17b3101ca5
Merge branch 'master' into 20917
2016-05-20 18:50:01 +12:00
David Rowe
b2bbf72be2
Replace drive drop-down plus text field with a paths drop-down
2016-05-20 18:48:51 +12:00
Atlante45
8be6bc6460
Add missing overrides
2016-05-19 22:00:22 -07:00
Anthony J. Thibault
c73943ee19
macosx warning fixes
2016-05-19 20:32:08 -07:00
Anthony J. Thibault
b95ba8141c
AvatarData packet overhaul, uses a structure instead of raw memcpy
2016-05-19 20:26:00 -07:00
Stephen Birarda
d3304ee65c
make some overriding methods as override
2016-05-19 18:01:13 -07:00
Stephen Birarda
e8d7f9614a
refresh API info during re-connect - case 570
2016-05-19 17:59:42 -07:00
Geenz
e2f5d22c98
Merge remote-tracking branch 'highfidelity/master' into 20901
2016-05-19 20:57:31 -04:00
Brad Hefta-Gaub
a1ec6c2961
Merge pull request #7938 from sethalves/set-age-of-imported-to-zero
...
fix age of imported entities
2016-05-19 17:53:31 -07:00
Brad Hefta-Gaub
d521cd82a0
Merge pull request #7908 from Atlante45/fix/settings
...
fix settings getting reset
2016-05-19 17:53:15 -07:00
Geenz
75532cda08
Document evalLightAttenuation's parameters.
2016-05-19 20:52:28 -04:00
Brad Hefta-Gaub
8ff7af28be
Merge pull request #7925 from sethalves/overlay-or-grab-not-both
...
fix mouse-grab moving both an overlay and an entity at the same time
2016-05-19 17:38:32 -07:00
Brad Hefta-Gaub
f85d5d3ca8
Merge pull request #7935 from ZappoMan/fixLogSpam
...
reduce log spam
2016-05-19 17:38:16 -07:00
Geenz
a54e8206fa
Switch back to using the light's radius + spacing
2016-05-19 20:10:49 -04:00
Geenz
6ecbdc6b9a
Modify evalLightAttenuation to "fade" edges of lights.
...
This provides a more attractive light falloff around the bounds of a
light - removing harsh edges.
This also adds a new parameter to evalLightAttenuation - the
unnormalized light vector.
2016-05-19 20:03:05 -04:00
Anthony J. Thibault
13a057513a
Removed jointIndices transmission experiment
2016-05-19 16:46:17 -07:00
Seth Alves
1de9598243
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 16:37:40 -07:00
David Rowe
11aeaba114
Capitalize drive letter of chosen file
2016-05-20 11:32:14 +12:00
Seth Alves
3f5ed4bef8
set isStopping on other calls to stop
2016-05-19 16:15:33 -07:00
Seth Alves
9ad488ba7b
fix method name to match coding standard
2016-05-19 16:08:44 -07:00
David Rowe
dac043a52d
Provide navigation up to the PC level to display drives in table
2016-05-20 10:49:38 +12:00
Geenz
9793f7ef36
Merge remote-tracking branch 'highfidelity/master' into 20901
2016-05-19 18:17:28 -04:00
Anthony J. Thibault
7f131e2c4f
Reset avatar as well as displayPlugin when "driving"
2016-05-19 15:00:08 -07:00
Seth Alves
4e862941cb
fix a race when restarting scripts -- avoid the old not-yet-stopped script from being considered the restart script
2016-05-19 14:51:56 -07:00
Anthony J. Thibault
8381e74fb3
OpenVRDispalyPlugin: fix one-frame lag in resetSensors.
...
resetSensors() should take place immediately, so that the getHeadPose() after the reset should be identity. (or close to it)
2016-05-19 13:56:40 -07:00
Zach Pomerantz
9a4b30a50b
Fix AvatarInputs phantom movement
2016-05-19 13:19:15 -07:00
Brad Hefta-Gaub
cef4a49c35
Merge pull request #7867 from huffman/fix/query-octree-crash
...
Fix crash in JurisdictionMap
2016-05-19 11:53:54 -07:00
Brad Hefta-Gaub
ac15097f47
Merge pull request #7834 from huffman/feat/user-agent-plugins
...
Add system information to UserAgent in AccountManager requests
2016-05-19 11:53:14 -07:00
samcake
67929a018c
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-05-19 11:52:47 -07:00
Clément Brisset
cddf587d6b
Merge pull request #7919 from zzmp/fix/osx-warnings
...
Fix OSX warnings
2016-05-19 11:11:30 -07:00
samcake
039bb3ac3c
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-05-19 10:21:38 -07:00
Seth Alves
7ea7bd3e1d
set created-time for imported entities to 'now'
2016-05-19 10:21:04 -07:00
samcake
2d7118dacc
clening up the code
2016-05-19 10:21:00 -07:00
samcake
d0c883f75a
Merge pull request #7923 from jherico/gpu_breakup2
...
breaking up OpenGL GPU backend
2016-05-19 10:02:42 -07:00
Brad Hefta-Gaub
232bd475df
Merge pull request #7927 from zzmp/fix/script-timer-crash
...
fix crash on shutdown from script timers
2016-05-19 09:52:04 -07:00
Seth Alves
74520f5c92
Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones
2016-05-19 09:49:44 -07:00
Seth Alves
419c744bd4
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 09:49:18 -07:00
Seth Alves
6c3c9f45d1
Merge branch 'master' of github.com:highfidelity/hifi into overlay-or-grab-not-both
2016-05-19 09:48:50 -07:00
Brad Hefta-Gaub
53956c8210
reduce log spam
2016-05-19 07:50:06 -07:00
Brad Davis
7efcad38d2
PR feedback
2016-05-18 23:11:36 -07:00
David Rowe
41311bc3df
Finish decoupling FolderListModel
2016-05-19 17:13:07 +12:00
