Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 00:03:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26703 commits 76 branches 59 tags 1.2 GiB
Commit graph

9656 commits

Author SHA1 Message Date
Brad Davis
15d214f335 Initial pass at OpenVR 2015-06-12 17:29:05 -07:00
Brad Davis
7955eeda28 Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.h
 2015-06-12 15:49:35 -07:00
Philip Rosedale
b628df45bc Merge pull request #5121 from ZappoMan/attemptRevertOverlaysBork2 
REVERT recent changes to overlays that seem to be breaking stuff
 2015-06-12 13:50:53 -07:00
ZappoMan
1feceec0c7 Revert "Fix broken identity transforms on OSX" 
This reverts commit 9262839564.
 2015-06-12 12:57:37 -07:00
ZappoMan
0cdc2b53fe Revert "Merge pull request #5106 from jherico/render_cursor" 
This reverts commit 4d18bd7cec, reversing
changes made to 24fda9a733.
 2015-06-12 12:57:24 -07:00
ZappoMan
becd9646f2 Merge branch 'master' of https://github.com/highfidelity/hifi into cullingBugs 2015-06-12 11:43:08 -07:00
ZappoMan
7d7db65fd1 fix avatar mesh boxes not staying in sync with avatar position 2015-06-12 11:42:38 -07:00
Brad Hefta-Gaub
a5b28660ad Merge pull request #5113 from Atlante45/debug 
Fix text entities wrapping
 2015-06-12 11:23:31 -07:00
Brad Hefta-Gaub
b11b1d408b Merge pull request #5116 from jherico/osx_overlay_fix 
Fix broken identity transforms on OSX
 2015-06-12 10:59:37 -07:00
Atlante45
30ae78e3b6 Rename getRowHeight 2015-06-12 19:50:32 +02:00
Atlante45
26dd067982 Advance with _leading on y 2015-06-12 19:44:40 +02:00
Atlante45
f3d3bd7bec Remove _rowHeight 2015-06-12 19:44:15 +02:00
Bradley Austin Davis
9262839564 Fix broken identity transforms on OSX 2015-06-12 10:33:52 -07:00
Clément Brisset
e4511e37f5 Merge pull request #5111 from ZappoMan/cullingBugs 
hack to fix culling bugs for some subMesh parts in the windmill scene
 2015-06-12 18:53:46 +02:00
ZappoMan
c17ae593f0 CR feedback 2015-06-12 09:04:16 -07:00
Atlante45
228f8c2e61 Fix a few items rendering without pipeline 2015-06-12 17:34:16 +02:00
Atlante45
565bf8bcb2 Fix text entities wrapping 2015-06-12 15:41:37 +02:00
ZappoMan
2fc0233096 hack to fix culling bugs for some subMesh parts in the windmill scene 2015-06-11 20:50:31 -07:00
ZappoMan
feb3f68a00 hack to fix culling bugs for some subMesh parts in the windmill scene 2015-06-11 20:49:19 -07:00
Howard Stearns
27f40ea881 Signal Audio.disconnected, and use new hello/goodbye sounds in resources. 2015-06-11 20:33:30 -07:00
Brad Hefta-Gaub
c0deff9fdc Merge pull request #5097 from jherico/cursor_manager 
Cursor manager first pass
 2015-06-11 18:05:43 -07:00
Brad Hefta-Gaub
c27c20c142 Merge pull request #5109 from birarda/master 
fix for sticking windows audio-mixer
 2015-06-11 17:39:55 -07:00
Brad Davis
09cfe004a1 Combining with new cursor render code 2015-06-11 16:55:23 -07:00
Brad Davis
9148b866bb Merge branch 'render_cursor' into cursor_manager 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2015-06-11 16:19:57 -07:00
Stephen Birarda
f45c2a3e56 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-11 15:49:12 -07:00
Brad Davis
b7cd1ea72a Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 15:04:56 -07:00
Brad Hefta-Gaub
24fda9a733 Merge pull request #5085 from SamGondelman/master 
Exposing Input Key Binding To JavaScript
 2015-06-11 14:41:34 -07:00
Andrew Meadows
a3c5ea1b58 Merge pull request #5088 from sethalves/actions 
spring action with rotation and position target, rework grab script to use it
 2015-06-11 13:23:57 -07:00
Seth Alves
8ed9a3ca02 add handedness setting to avatar-hold action. update stick.js to allow use of hydra 2015-06-11 11:04:19 -07:00
Brad Hefta-Gaub
a1ee339765 Merge pull request #5103 from samcake/punk 
TEAM TEACHING : Repair the Overlay 3D rendering and introduce the concept of layer in the scene
 2015-06-11 10:17:38 -07:00
Brad Hefta-Gaub
684e93cf42 Merge pull request #5105 from Atlante45/debug 
Fix zones wireframe rendering
 2015-06-11 10:17:28 -07:00
ZappoMan
a878559e0c fix transforms for items with non-default registration point 2015-06-11 09:38:45 -07:00
ZappoMan
47888b4671 fix transforms for items with non-default registration point 2015-06-11 09:34:56 -07:00
Atlante45
f4f5f16758 Fix zones wireframe rendering 2015-06-11 18:34:39 +02:00
ZappoMan
55ede2b398 Merge branch 'master' of https://github.com/highfidelity/hifi into bugfix 2015-06-11 09:10:05 -07:00
Andrew Meadows
7d0000c537 fix warning about returning ref to temp variable 2015-06-11 08:38:03 -07:00
Sam Gateau
7685fe2229 Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool 2015-06-11 06:40:21 -07:00
Brad Davis
fa27550df4 Merge remote-tracking branch 'upstream/master' into render_cursor 2015-06-11 02:21:02 -07:00
Clément Brisset
d448a3be7f Merge pull request #5101 from ZappoMan/fix-attachments 
Get avatar attachments rendering again
 2015-06-11 10:35:49 +02:00
Seth Alves
ba4fd7adf6 windows didn't like EntityActionFactoryInterface::factory not returning an error 2015-06-10 19:23:01 -07:00
Seth Alves
4216308b9b Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 19:05:25 -07:00
ZappoMan
93c0bd63e9 fix debug rendering transforms 2015-06-10 18:54:07 -07:00
Seth Alves
45c7cd4929 respond to code review, add a simple hold-a-stick script 2015-06-10 18:48:51 -07:00
Seth Alves
eccf4eb8a8 hold action works 2015-06-10 17:05:49 -07:00
ZappoMan
e06422825a mostly getting attachments working again 2015-06-10 15:46:54 -07:00
Seth Alves
1c0c7f0fe3 Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-10 15:30:28 -07:00
Andrew Meadows
2f32d358c3 merge 2015-06-10 15:27:08 -07:00
Sam Gateau
1f62fb4b6f Adding standard vertex and pixel shaders for drawing texture in applicationOverlay 2015-06-10 15:24:29 -07:00
Andrew Meadows
6497ac6c82 renderBoundingBox() for sim-ownership debug 2015-06-10 14:24:00 -07:00
Brad Davis
7f6a49688a Merge branch 'master' into plugins 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Environment.cpp
	interface/src/Environment.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationOverlay.h
	interface/src/ui/overlays/LocalModelsOverlay.cpp
 2015-06-10 14:21:48 -07:00