Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 22:33:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29189 commits 71 branches 56 tags 1.2 GiB
Commit graph

29189 commits

This branch
This branch
All branches
Author SHA1 Message Date
bwent
fc385d9bc1 debugging 2015-08-05 10:29:30 -07:00
bwent
b9364a47a1 Debug null QUuid being stored in conenctionTokenHash 2015-08-04 15:31:26 -07:00
bwent
54dd5da64c To debug RSA padding error 2015-08-04 12:02:23 -07:00
bwent
af293ec6dd Fix DomainServerConnectionTOken packet writing/resetting 2015-08-04 12:02:23 -07:00
bwent
244cc016ab Generate session token UUIDs to be signed with username 2015-08-04 12:02:23 -07:00
Howard Stearns
597316b208 Merge pull request #5493 from thoys/fix-model-overlay-rig-crash 
Fix crash for ModelOverlays, caused by Rig changes
 2015-08-04 07:23:52 -07:00
Thijs Wenker
4bf6f8ed77 ModelOverlay causes a crash in the Model class. This is because ModelOverlay doesn't give a valid rig to the Model. 2015-08-04 14:47:13 +02:00
Eric Levin
3f5f75d6d2 Merge pull request #5430 from AlexanderOtavka/floating-ui 
Improvements to overlays.
 2015-08-03 14:35:52 -07:00
Brad Davis
f0ba0a4f47 Merge pull request #5485 from ctrlaltdavid/reduce-hmd-velocity 
Reduce the speed of movement when in HMD view
 2015-08-03 14:16:56 -07:00
David Rowe
5e7cb72843 Reduce the speed of movement when in HMD view 
When using hmdControls.js.
 2015-08-03 13:02:12 -07:00
Zander Otavka
1b4ba75b5a Fix click and drag logic for floatingUIExample.js. 2015-08-03 12:01:15 -07:00
Philip Rosedale
761f638ce3 Merge pull request #5466 from sethalves/vhacd-improvements 
vhacd tool -- make the height of the tetrahedrons in 'fatten' mode less tall.
 2015-08-03 11:18:37 -07:00
Zander Otavka
d24006e715 Improve logic around handling click and drag. 2015-08-03 11:14:55 -07:00
Andrew Meadows
acfc907704 Merge pull request #5438 from howard-stearns/rig 
Rig: Bottleneck animation management through a Rig class
 2015-08-03 11:14:21 -07:00
Zander Otavka
055c9dc59b Fix image URLs in controlPanel.js. 2015-08-03 10:41:35 -07:00
Stephen Birarda
7916ca91d5 Merge pull request #5479 from howard-stearns/fix-multiple-local-sounds 
All multiple local sounds
 2015-08-03 10:23:48 -07:00
Howard Stearns
8f616c04fb Fix https://app.asana.com/0/32622044445063/43589567731045 2015-08-02 21:46:39 -07:00
Brad Davis
95620b6385 Merge pull request #5475 from ZappoMan/removeQuads 
remove GL_QUADS from code base
 2015-08-01 19:57:22 -07:00
ZappoMan
493836e363 remove QUADS from GLBackendShared and Format 2015-08-01 17:26:38 -07:00
ZappoMan
771ce6dca3 remove QUAD_STRIP from Circle3DOverlay 2015-08-01 17:20:48 -07:00
ZappoMan
b02f751830 diff redux 2015-08-01 16:53:35 -07:00
ZappoMan
b138c16c7f use Austins QUAD to TRIANGLE_STRIP approach 2015-08-01 16:50:36 -07:00
ZappoMan
05a4a6aa9b implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents 2015-08-01 13:07:56 -07:00
ZappoMan
452225ddaf removed QUADS from Font::drawString() 2015-08-01 11:51:07 -07:00
ZappoMan
1dd6c1117d change GeometryCache::renderQuad() to use TRIANGLES as lower level render primitive 2015-08-01 11:29:28 -07:00
Howard Stearns
2713115336 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-31 18:05:47 -07:00
Howard Stearns
0dad1adf7d Speculative guard against crashing. 2015-07-31 18:05:14 -07:00
Philip Rosedale
04bea4dc98 Merge pull request #5471 from ctrlaltdavid/fix-inspect-pan 
Change the inspect.js pan direction and rate
 2015-07-31 17:34:24 -07:00
Seth Alves
bbee001366 Merge pull request #5470 from birarda/master 
fix for unique_ptr<char> allocations
 2015-07-31 15:09:18 -07:00
Stephen Birarda
12ad60a6b5 add a missed char[] in OctreePacketProcessor 2015-07-31 14:48:54 -07:00
David Rowe
c88e0360b3 Change the inspect.js pan direction and rate 
This makes camera zoom, orbit, and panning more similar to Second Life.
 2015-07-31 14:46:43 -07:00
Stephen Birarda
b0afdb21ad correct the unique_ptr char allocations 2015-07-31 14:29:05 -07:00
Zander Otavka
7973c2d469 Fix compile issue on Linux and Windows. 
Shoutout to Andrew for help finding the missing #include.
 2015-07-31 11:26:04 -07:00
Zander Otavka
9bd72e5769 Tweak PanelAttachable::setTransforms. 
Use reference instead of pointer, and make it virtual.
 2015-07-31 11:26:04 -07:00
Zander Otavka
c37c3ec2d2 Use images off the amazon bucket, not file://. 2015-07-31 11:26:04 -07:00
Zander Otavka
3983c31219 Add controlPanel.js script. 
Right click to open a control panel.  Control panel allows toggling of
face mute, mic mute, and address bar.
 2015-07-31 11:26:04 -07:00
Zander Otavka
37a1ad7626 Improve floatingUIExample.js. 
Demonstrates overlayManager.js functionality.
 2015-07-31 11:26:04 -07:00
Zander Otavka
ba190b4b34 Improve JavaScript abstraction layer for overlays. 
Also move it to it's own file.
 2015-07-31 11:26:04 -07:00
Zander Otavka
bc5ef8eb11 Clean up C++ relating to panels. 2015-07-31 11:26:04 -07:00
Zander Otavka
da2afca391 Expose overlay type checking to JavaScript. 2015-07-31 11:26:04 -07:00
Zander Otavka
1d37df4775 Improve and optimize panel transformations. 2015-07-31 11:26:04 -07:00
Zander Otavka
e5b8701215 Add toggle event for address bar. 2015-07-31 11:26:04 -07:00
Zander Otavka
1655dea2c3 Fix BillboardOverlay first person render bug. 2015-07-31 11:26:04 -07:00
Zander Otavka
0524155349 Expose face tracking to the script engine. 2015-07-31 11:26:04 -07:00
Zander Otavka
c77a91eb63 Expose address bar toggling to scripts. 2015-07-31 11:26:04 -07:00
Zander Otavka
c4cb6fba74 Improve BillboardOverlay::findRayIntersection. 2015-07-31 11:26:03 -07:00
Zander Otavka
377a1a54ae Add abstraction layer for Overlays.h. 
`examples/libraries/overlayUtils.js` allows you to manage overlays in an
object oriented manner.  Instead of:

    var billboard = Overlays.addOverlay("billboard", { visible: false });
    ...
    Overlays.editOverlay(billboard, { visible: true });
    ...
    Overlays.deleteOverlay(billboard);

You can now do:

    var billboard = new BillboardOverlay({ visible: false });
    ...
    billboard.visible = true;
    ...
    billboard.destroy();
 2015-07-31 11:26:03 -07:00
Zander Otavka
ed7fc07ab1 Fix cloning bug for BillboardOverlay. 2015-07-31 11:26:03 -07:00
Zander Otavka
173a79867c Extend Overlays API to allow for 3D UI panels. 
Currently, only BillboardOverlays can be added to a panel, but more
types of overlays will be supported in the future.
 2015-07-31 11:26:03 -07:00
Zander Otavka
dff6b0a456 Fix isFacingAvatar property on BillboardOverlay. 2015-07-31 11:26:03 -07:00