Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-06-04 14:30:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29358 commits 6 branches 1 tag 1.1 GiB
Commit graph

29358 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
1e44495f7c Initialize the GL widget with the 4.1 core profile 2015-07-31 16:21:47 -07:00
Brad Davis
d9d0f8dcfd Merge pull request #5473 from samcake/punk 
GLCORE : Merged upstream master into core
 2015-07-31 16:21:04 -07:00
Brad Davis
e8fafeb601 Fixing merge conflict 2015-07-31 16:17:32 -07:00
Sam Gateau
ca4dbdb996 Merging with upstream and compiling on windows 2015-07-31 16:14:53 -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
Brad Davis
aea07fe671 Merge branch 'master' into gl4_1 
Conflicts:
	libraries/gpu/src/gpu/Config.slh
	libraries/render-utils/src/deferred_light_limited.slv
	libraries/render-utils/src/simple.slf
	libraries/render-utils/src/simple_textured.slf
	tests/render-utils/src/main.cpp
	tools/scribe/src/main.cpp
 2015-07-31 15:08:37 -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
Andrew Meadows
661a916ebd merge rig into cleanup (removal of legacy shapes) 
Conflicts:
	interface/src/avatar/Avatar.h
	tests/physics/src/ShapeColliderTests.cpp
	tests/physics/src/ShapeColliderTests.h
 2015-07-31 13:40:51 -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
Brad Hefta-Gaub
b46a430fba Merge pull request #5468 from bwent/reset-position 
Add gettable naturalPosition property for model entities
 2015-07-31 11:03:27 -07:00
bwent
aab1f70800 Renaming vars 2015-07-31 10:47:05 -07:00
Stephen Birarda
1ad2f515de Merge pull request #5455 from thoys/assignment-agent-ping-fix 
Fixes Assignment-Agents to have no constantly reconnecting Avatar/AudioMixer
 2015-07-31 10:41:52 -07:00
bwent
67760fad79 Add gettable naturalPosition property for model entities 2015-07-31 10:15:35 -07:00
Howard Stearns
b685378ab0 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-31 10:08:30 -07:00
Seth Alves
5bae9843f5 code review 2015-07-31 09:34:50 -07:00
Brad Hefta-Gaub
569ed4bbf9 Merge pull request #5452 from samcake/yellow 
Migrate Linux to use GLEW and move to parity with windows for Opengl (compatibility 4.3)
 2015-07-31 09:33:52 -07:00
Seth Alves
c8f398024e replace a magic number with a constant 2015-07-30 21:16:07 -07:00
Seth Alves
0bc94158a8 make the height of the tetrahedrons in 'fatten' mode less tall. 2015-07-30 21:09:14 -07:00
Seth Alves
241e767ab6 move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shoulders 2015-07-30 18:44:09 -07:00
Sam Gateau
b08b2d29cc Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-30 18:40:21 -07:00
Seth Alves
c80516a051 Merge branch 'rig' of github.com:howard-stearns/hifi into rig 2015-07-30 18:39:09 -07:00
Seth Alves
c1f777e18f move setHandPosition from SkeletonModel to AvatarRig. Tell Rig::initJointStates joint-indexes for hands and elbows and shoulders 2015-07-30 18:39:01 -07:00
samcake
fbf21cb089 FIxed the problem on Mac, by removing all of the gpuConfig includesgit status 
q
:q
wq
 2015-07-30 18:27:47 -07:00
SamGondelman
25e75bcc79 WIP: trying to fix windows not finding framework 2015-07-30 18:11:24 -07:00
Howard Stearns
51ed912f5e Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig 2015-07-30 17:03:06 -07:00
Howard Stearns
78a900c866 Prototype blend. Just equal weighting for now. 2015-07-30 17:01:48 -07:00
Howard Stearns
40abd63b61 Merge pull request #14 from hyperlogic/ajt/cauterize-fix 
Fix for head cauterization.
 2015-07-30 15:55:42 -07:00
Anthony J. Thibault
e52bf2e12d Fix for head cauterization. 
When rendering rigidly bound mesh clusters were not properly using
the cauterization matrix set.
 2015-07-30 15:51:34 -07:00
Sam Gondelman
a01a4f929f removing unnecessary weak link 2015-07-30 15:14:51 -07:00
Howard Stearns
6ad3cdd402 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-30 15:14:09 -07:00
Howard Stearns
31574521c1 Merge pull request #13 from hyperlogic/ajt/model-offset-fix 
Clear translation on root joint.
 2015-07-30 15:13:09 -07:00