Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46271 commits 71 branches 56 tags 1.2 GiB
Commit graph

46271 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
01ee6e9e98 Merge branch 'arrow-actions' of github.com:sethalves/hifi into arrow-actions 2016-08-30 09:42:57 -07:00
Seth Alves
a9400119ab Merge branch 'joints-for-controllers' of github.com:sethalves/hifi into arrow-actions 2016-08-30 09:13:16 -07:00
Seth Alves
f4eee8d480 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-30 09:12:53 -07:00
Seth Alves
314b7617ac Merge pull request #8543 from hyperlogic/bug-fix/entity-pointer-events 
Bug fix for click events received by entity scripts
 2016-08-29 17:57:56 -07:00
Seth Alves
c022c2e705 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-29 17:43:53 -07:00
Seth Alves
87fbbd68ae Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-29 17:37:58 -07:00
James B. Pollack
ed2ebd122b Merge pull request #8542 from imgntn/nobackspace 
No more delete with backspace in edit.js
 2016-08-29 17:31:44 -07:00
Brad Hefta-Gaub
f3d157c396 Merge pull request #8500 from jherico/gl_context 
Custom OpenGL context creation
 2016-08-29 16:22:21 -07:00
Anthony J. Thibault
e34aecde49 Bug fix for click events received by entity scripts 
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
 2016-08-29 16:21:39 -07:00
James B. Pollack
cceae50b90 no more delete with backspace 2016-08-29 14:28:05 -07:00
Brad Davis
3890197efe Merge pull request #8535 from zzmp/fix/skybox-black 
allow black skybox
 2016-08-29 13:11:46 -07:00
Howard Stearns
a1ae9eebf2 Merge pull request #8534 from howard-stearns/silence-address-bar-log-warning 
Silence address bar log warning
 2016-08-29 11:48:43 -07:00
Brad Davis
179e3565ef More render-perf tweaks 2016-08-29 11:22:56 -07:00
Brad Davis
617633b85c Moving to custom context creation 2016-08-29 11:21:54 -07:00
Zach Pomerantz
5f699072d9 allow black skybox 2016-08-29 10:58:09 -07:00
howard-stearns
01af8899bf silence address bar dialog qml warning 2016-08-29 10:47:22 -07:00
Seth Alves
55b68ad4b1 fix warning 2016-08-29 10:21:58 -07:00
Seth Alves
178a68c967 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-29 10:21:07 -07:00
Brad Davis
c3e345150b Merge pull request #8531 from jherico/gl_fixes 
(AMD) OpenGL Fixes
 2016-08-29 09:59:22 -07:00
howard-stearns
3aa387ddb9 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-08-29 09:44:06 -07:00
Seth Alves
b31bb7bc06 Merge branch 'joints-for-controllers' of github.com:sethalves/hifi into arrow-actions 2016-08-29 08:22:44 -07:00
Seth Alves
3c90413ebb don't render stray/invalid hand-lasers in HMD mode 2016-08-29 04:06:53 -07:00
Seth Alves
be1332532f disable debugging prints 2016-08-29 03:39:52 -07:00
Seth Alves
a729a95378 fix math 2016-08-28 21:03:32 -07:00
Seth Alves
670e85994d fix arrow action 2016-08-28 20:05:29 -07:00
Seth Alves
3fb10d0eea action for arrow flight, etc 2016-08-28 19:08:13 -07:00
Seth Alves
5daf334a0e avoid extra grab-point spheres when resetting scripts 2016-08-27 20:42:03 -07:00
Seth Alves
d69e712bef keep near-grab radius small but still allow large equip hotspots 2016-08-27 20:23:19 -07:00
Seth Alves
2a5d686a76 don't show grab-point sphere when near grabbing or equipping 2016-08-27 20:11:16 -07:00
Seth Alves
3355097bd0 handle another type of abandoned grab 2016-08-27 19:46:15 -07:00
Seth Alves
7dad303ce7 don't leave stray blue search sphere when near-grabbing 2016-08-27 19:25:05 -07:00
Seth Alves
765cd72e0e fix code that prints relative offsets of an equipped entity after it's been adjusted by the other hand 2016-08-27 19:13:32 -07:00
Seth Alves
cfca32e0b4 fix code that notices and fixes an abandoned grab 2016-08-27 16:00:27 -07:00
Brad Davis
92fa1d5776 Use stream draw for object position updates 2016-08-27 15:08:38 -07:00
Seth Alves
e4b2b7158f hotspots with large radius work correctly, again 2016-08-27 09:30:26 -07:00
Seth Alves
76b72e32f0 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-27 09:06:45 -07:00
Brad Davis
587d015c57 Give names to offscreen contexts for easier debugging 2016-08-26 19:09:26 -07:00
Brad Davis
0213dd0359 Don't bottleneck the render-perf tool on new frame creation 2016-08-26 19:08:50 -07:00
Brad Davis
e4334be0cf Use synchronous logging (may impact performance when debugging is enabled) 2016-08-26 19:08:15 -07:00
Brad Davis
1652965ac2 Destroy contexts properly 2016-08-26 19:07:44 -07:00
Brad Davis
02c79d9714 Fix the OpenVR issues on AMD 2016-08-26 19:05:29 -07:00
Brad Davis
95b5a23c7a Properly destroy GL programs 2016-08-26 19:04:46 -07:00
Brad Davis
7ffa212006 Don't use textures that are in the transfer pipeline 2016-08-26 19:04:24 -07:00
James B. Pollack
44d102d723 Merge pull request #8529 from imgntn/edit_fix 
Fix some edit.js bugs
 2016-08-26 15:43:14 -07:00
Brad Hefta-Gaub
3d6691f3d1 Merge pull request #8527 from zzmp/fix/skybox-default-color 
fix skybox default
 2016-08-26 15:14:44 -07:00
Seth Alves
9394a25a1c remove some anti-jitter code that was doing more harm than good 2016-08-26 12:47:19 -07:00
Brad Hefta-Gaub
ecb43a9589 Merge pull request #8523 from ZappoMan/fixAgentAvatarAudio 
include the codec name in the agent avatar audio stream
 2016-08-26 12:42:20 -07:00
James B. Pollack
53a2281918 better 2016-08-26 11:57:15 -07:00
James B. Pollack
f6bd04780d add a print to catch errors 2016-08-26 11:56:40 -07:00
Brad Hefta-Gaub
6e26916b65 Merge branch 'master' of https://github.com/highfidelity/hifi into fixAgentAvatarAudio 2016-08-26 10:57:27 -07:00