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

47407 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Kelly
ef844cbd00 Cleanup artifacts 
Seems playAvatarSound could be called from a thread other than
the Agent's thread.  So, artifacts happen when that pointer changes
while a 'tick' is happening.  Also cleaned up code a bit, got rid
of some hard-coded stuff I had in just for dev purposes.
 2016-10-11 09:33:55 -07:00
Gabriel Calero
834d9c0710 Adapt shader for GL ES support which requires operators of the same datatype 2016-10-11 12:15:49 -03:00
David Kelly
0794d95bdc Fix merge 
Take the new crowd-agent.js, my changes were temporary.
 2016-10-10 19:58:16 -07:00
David Kelly
fa9c3951c7 Merge branch 'master' into dk/codecInAgentAvatar 2016-10-10 19:51:56 -07:00
samcake
0951ca6bbe Add check for bad texture resource slot 2016-10-10 18:43:24 -07:00
Anthony J. Thibault
ace8639f5b Bug fixes in oculus_touch default mapping 
* Made sticks less sensitive. Raised deadSpot min from 0.05 to 0.3.
* Fixed problem were grip and trigger was mapped to Standard triggers. This was causing all sorts of problems
  with the handControllerGrab script.  Including double lasers and a stuck right hand laser.
* mapped grip to standard grip. So now you can use the grip button to drop equipped objects.
* increased deadZone on grip to make inadvertent drops less likely to happen.
 2016-10-10 18:42:06 -07:00
David Kelly
b58c36cb12 Rolling my own 100hz timer 
Starting with the simplest possible thing - just sleep for 10000
microseconds.  Can make it adaptive if need be.
 2016-10-10 17:57:04 -07:00
Anthony J. Thibault
7ab76984ad Fix crash when switching to desktop mode from oculus HMD mode 
Removed internalPresent in oculus uncustomizeContext.  It had no ill effects.
 2016-10-10 16:54:08 -07:00
David Kelly
c664c7192e Merge pull request #8759 from howard-stearns/crowd-update 
update for sound
 2016-10-10 16:03:10 -07:00
Brad Hefta-Gaub
774d87a7a7 Merge pull request #8773 from howard-stearns/marketplace-button-state 
make marketplace button state match whether tablet is being shown
 2016-10-10 15:50:07 -07:00
Seth Alves
e9961110e9 if we have new ice-server information, retry right away, even if the previous attempt failed 2016-10-10 15:40:59 -07:00
Seth Alves
06db46e38a Merge branch 'master' of github.com:highfidelity/hifi into avoid-ds-ice-metaverse-race 2016-10-10 15:37:41 -07:00
Brad Hefta-Gaub
a877f182f7 Merge pull request #8771 from howard-stearns/kick-by-laser 
fix kick by laser
 2016-10-10 15:36:16 -07:00
Brad Hefta-Gaub
d661ae5638 Merge pull request #8766 from ZappoMan/depthReticleFixes 
fix reticle depth when not moving mouse, but moving head relative to HUD
 2016-10-10 15:15:20 -07:00
Brad Hefta-Gaub
798a5cfc9d Merge pull request #8768 from ZappoMan/nestedSkyboxes 
fix skybox changing when going between zones
 2016-10-10 15:13:33 -07:00
David Rowe
552f276a06 Load avatar browser dialog such that JavaScript EventBridge works 2016-10-11 11:12:57 +13:00
Brad Hefta-Gaub
6c63213c78 Merge pull request #8772 from hyperlogic/bug-fix/web-entity-crash 
Crash fix for RenderableWebEntityItem::buildWebSurface
 2016-10-10 14:38:05 -07:00
howard-stearns
333ec388a8 make marketplace button state match whether tablet being shown 2016-10-10 14:30:47 -07:00
David Rowe
d0900ec75e Add keyboard to avatar browser dialog 2016-10-11 10:11:36 +13:00
Anthony J. Thibault
e76a7fc577 Crash fix for RenderableWebEntityItem::buildWebSurface 
Gracefully handle the absence of a gl context.  We will continue to retry every render call.
 2016-10-10 13:57:54 -07:00
howard-stearns
1051c068e1 kick by hand controller 2016-10-10 13:47:08 -07:00
Seth Alves
9712301172 avoid a race that can cause metaverse to not have correct ice-server information about a domain 2016-10-10 11:54:33 -07:00
Chris Collins
2b8765b47e Merge pull request #8765 from ctrlaltdavid/fix-address-bar 
Fix address bar not being able to regain focus
 2016-10-10 10:11:34 -07:00
Chris Collins
8e9b9ddc6f Merge pull request #8764 from ctrlaltdavid/fix-login-keyboard 
Fix virtual keyboard in login dialog
 2016-10-10 09:50:05 -07:00
Brad Hefta-Gaub
735a6ca994 Merge pull request #8755 from hyperlogic/bug-fix/openvr-fixes 
openvr deadlock and crash on exit fixes
 2016-10-10 08:01:07 -07:00
Brad Hefta-Gaub
db5edb530a fix skybox changing when going between zones 2016-10-09 15:22:35 -07:00
Brad Hefta-Gaub
8da9fccb5d fix 'any endpoints' for axis style inputs 2016-10-08 20:24:52 -07:00
David Rowe
827c2b015b Update other dialogs to use single keyboard QML file 2016-10-09 11:52:30 +13:00
Brad Hefta-Gaub
4ec9299930 fix reticle depth when not moving mouse, but moving head relative to HUD 2016-10-08 14:31:30 -07:00
Brad Hefta-Gaub
20c522a9bc fix more bugs in away 2016-10-08 13:45:18 -07:00
Brad Hefta-Gaub
3aa1c36f53 Merge branch 'master' of https://github.com/highfidelity/hifi into betterAway 2016-10-08 11:50:10 -07:00
Brad Hefta-Gaub
87d66ffdf8 Merge pull request #8756 from jherico/i5_reprojection 
Turn on forced reprojection on i5 systems
 2016-10-08 10:51:27 -07:00
David Rowe
12f4b2854d Fix address bar not being able to regain focus 2016-10-08 19:38:57 +13:00
David Rowe
5a4665b02f Combine numeric keys into alpha keyboard QML file for scrolling windows 2016-10-08 16:27:51 +13:00
David Rowe
b954852ba9 Use temporary copy of keyboard QML file while refactoring 2016-10-08 15:23:11 +13:00
Anthony J. Thibault
ec801cb9d8 Addressed feedback from code review. 2016-10-07 17:46:46 -07:00
David Rowe
a934f59c2a Fix virtual keyboard in login dialog 2016-10-08 13:37:31 +13:00
Brad Davis
d8242f02a5 Merge pull request #8762 from jherico/stable_merge2 
Stable merge2
 2016-10-07 17:22:36 -07:00
Brad Davis
c6a890af40 Merge remote-tracking branch 'upstream/stable' into stable_merge2 2016-10-07 17:14:36 -07:00
Brad Hefta-Gaub
7e3d63c4e2 Merge pull request #8747 from jherico/buffer_page_fix 
Fix page size usage in gpu buffers
 2016-10-07 16:57:25 -07:00
Chris Collins
66924a7bb9 Merge pull request #8760 from huffman/fix/help-images 
Update help window images
 2016-10-07 16:07:41 -07:00
Ryan Huffman
6476dfecc6 Update help window images 2016-10-07 16:06:26 -07:00
Chris Collins
bde3a6d02a Merge pull request #8627 from huffman/feat/tutorialv3 
Tutorial
 2016-10-07 15:52:25 -07:00
howard-stearns
7c5dd89372 typo 2016-10-07 15:27:58 -07:00
howard-stearns
c5f889a34d update for sound 2016-10-07 15:13:37 -07:00
Anthony J. Thibault
7c7a9055d1 Allow grabbed objects to override the ignoreIK = true default. 
They can do this by adding the following to their userData.

    grabbableKey: {
        ignoreIK: false
    }

When this is present and false, the object will follow the hand joint, otherwise it will follow the hand controller.
 2016-10-07 14:50:00 -07:00
Anthony J. Thibault
0c2ebc27cb Fix for exception in handControllerGrab.js 
Specifically this:
    [UncaughtException] TypeError: Result of expression 'this.handToController' [undefined] is not a function. in file:///C:/msys64/home/anthony/code/hifi/build/interface/Release/scripts/defaultScripts.js:1388
 2016-10-07 14:48:55 -07:00
Ryan Huffman
abaa75245e Temporarily remov touch controller configuration 2016-10-07 13:41:23 -07:00
Ryan Huffman
0f0ea5f73f Remove dead code 2016-10-07 13:40:35 -07:00
Ryan Huffman
de14fdffb7 Remove commented log line 2016-10-07 13:38:18 -07:00