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

25037 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
06e1330e42 Clean up the includes in gpu, make the skybox shader works 2015-05-06 12:12:54 -07:00
Brad Hefta-Gaub
4de6d645e5 Merge pull request #4701 from jherico/infoview 
Infoviews & Browser in QML
 2015-05-06 12:12:21 -07:00
Brad Davis
a9de502e76 removing commented out old implementation. 2015-05-06 12:03:47 -07:00
Brad Hefta-Gaub
e1db23887a Merge pull request #4781 from jherico/off_axis 
Removing off-axis projection from menu
 2015-05-06 11:59:59 -07:00
Howard Stearns
d2dbb2c116 Missing the code! 2015-05-06 11:57:34 -07:00
Andrew Meadows
326d17072e merge seth/dice-on-table-1 into andrew/nova 2015-05-06 11:50:12 -07:00
Andrew Meadows
c97b11a6e9 no ownership of kinematic objects on collision 2015-05-06 11:48:31 -07:00
Andrew Meadows
6e6fec158d split ignore/activation thresholds for updates 2015-05-06 11:47:33 -07:00
Andrew Meadows
f0c778a802 fix bug preventing taking of simulation ownership 2015-05-06 11:46:42 -07:00
Andrew Meadows
646661d037 update body gravity when proper dirty bits are set 2015-05-06 11:46:25 -07:00
Bradley Austin Davis
fc73676b4d Merge branch 'master' into plugins_pt1 2015-05-06 11:43:25 -07:00
ZappoMan
f2ebb6e821 fix output of group names to be lowercase 2015-05-06 11:30:41 -07:00
Bradley Austin Davis
4c22e637d7 Merge remote-tracking branch 'upstream/master' into off_axis 2015-05-06 11:28:03 -07:00
Bradley Austin Davis
c832fd969a Removing off-axis projection from menu 2015-05-06 11:26:46 -07:00
Seth Alves
238a41f2b9 pull from upstream 2015-05-06 11:22:18 -07:00
Seth Alves
f75eef4295 Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1 2015-05-06 11:20:45 -07:00
Seth Alves
129a3a82da clear incoming flags after adding an entity to simulation. If an entity has a shape-type of none, don't keep asking it for a shape 2015-05-06 11:20:39 -07:00
Clément Brisset
9f8e52652b Merge pull request #4771 from ctrlaltdavid/20526 
CR for #20526 - Fix Mixamo avatar clipping in HMD view
 2015-05-06 20:17:07 +02:00
Andrew Meadows
e61470517c track all entities added to simulation 2015-05-06 11:01:16 -07:00
samcake
50012ee9de fixing build issues on MAc 2015-05-06 11:00:37 -07:00
ZappoMan
edb84a1a14 Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones 2015-05-06 10:52:04 -07:00
Brad Hefta-Gaub
b27154186b Merge pull request #4779 from jherico/hmd_tools 
Fix for HMDTools targeting wrong screen on OSX
 2015-05-06 10:46:55 -07:00
Bradley Austin Davis
de49057f17 Fix for HMDTools targeting wrong screen on OSX 2015-05-06 10:32:45 -07:00
Howard Stearns
e9c76da8d4 Merge branch 'master' of https://github.com/highfidelity/hifi into objReader 2015-05-06 10:30:10 -07:00
Sam Gateau
fe3b5d1867 preparing for PR, back to the default background mode SKy_DOME 2015-05-06 10:27:31 -07:00
David Rowe
eb438e9ccb Can use same clipping calc for non-Oculus 2015-05-06 09:58:14 -07:00
Philip Rosedale
e2541c4243 Merge pull request #4740 from ctrlaltdavid/20518 
CR for #20518 - Mute camera button next to mute audio button
 2015-05-06 09:54:42 -07:00
Sam Gateau
c86a8b3944 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-06 09:54:08 -07:00
Sam Gateau
dc81a3ecc2 Cube texture are working with the GL backend, useing it in SKybox successfullly 2015-05-06 09:53:36 -07:00
Seth Alves
7a5fe8a34e quiet compiler 2015-05-06 09:05:13 -07:00
Seth Alves
ff104bb915 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-06 08:55:06 -07:00
Atlante45
8de5e636bb Bit of cleanup 2015-05-06 17:39:18 +02:00
Brad Hefta-Gaub
410baa6ac0 Merge pull request #4778 from ctrlaltdavid/20525 
CR for 20525 - Fix lobby not displaying in HMD mode
 2015-05-06 08:34:32 -07:00
David Rowe
9c1d73747f Merge branch 'master' into 20526 2015-05-06 08:24:57 -07:00
Atlante45
50ba154615 Correctly wire setDrawZones 2015-05-06 17:04:01 +02:00
Atlante45
52191f922c Render Sphere/Box zones 2015-05-06 16:57:53 +02:00
Clément Brisset
0470e72459 Merge pull request #4777 from cozza13/20529 
CR for Job #20529 - Change defaulscripts.js
 2015-05-06 16:12:22 +02:00
Atlante45
6d2fe945af Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-06 09:53:57 +02:00
David Rowe
333da93642 Updated face tracker mute icons 2015-05-05 23:20:23 -07:00
David Rowe
b519884609 Fix lobby not displaying in HMD mode 
This usage of Glower is similar to that in renderAvatarBillboard(). Both
may indicate that something needs changing in the graphics pipeline.
 2015-05-05 20:54:12 -07:00
Seth Alves
74743c9677 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-05 20:15:17 -07:00
Andrew Meadows
14f925b48e merge seth/dice-on-table-1 into andrew/nova 
Conflicts:
	libraries/physics/src/EntityMotionState.cpp
	libraries/physics/src/ObjectMotionState.h
 2015-05-05 16:54:53 -07:00
Chris Collins
7396bb138d Removed headmove 
removed head move, it is not being used by Oculus users at the moment
 2015-05-05 16:52:38 -07:00
Seth Alves
e637a9b5ae Merge pull request #4776 from PhilipRosedale/master 
dice don't go away unless 'X' key is clicked, harmonicOscillator.js
 2015-05-05 16:52:35 -07:00
David Rowe
1c21874f00 Make face tracker mute action start / stop face tracker 2015-05-05 16:51:31 -07:00
Andrew Meadows
50f73602f6 cleanup PhysicalEntitySimulation::_outgoingChanges 2015-05-05 16:51:07 -07:00
Andrew Meadows
d4701b4310 namechange getIncomingDF --> getAndClearIncomingDF 2015-05-05 16:49:41 -07:00
Andrew Meadows
550820ee45 set EntityItem::_simulated in the correct location 2015-05-05 16:48:56 -07:00
Seth Alves
4a7fe50084 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-05 16:43:43 -07:00
Seth Alves
c35edd8eb4 some debugging on Andrew's refactor 2015-05-05 16:40:10 -07:00