Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 00:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
25213 commits 75 branches 59 tags 1.2 GiB
Commit graph

25213 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
1fdf2c7803 Don't flash whole screen when audio clips 2015-05-06 13:35:53 -07:00
Seth Alves
96a44314c9 don't have interface give up ownership 2015-05-06 13:29:54 -07:00
Bradley Austin Davis
351246fac1 Fixing new image texture use from last upstream merge 2015-05-06 12:50:20 -07:00
Sam Gateau
00c45dbb43 missing includes 2015-05-06 12:38:12 -07:00
Howard Stearns
35337ef2c2 Spell out order-of-evaluation for the compiler. 2015-05-06 12:28:45 -07:00
David Rowe
4cd4dee84d Use average coefficient values to zero out bias 
Adjust control thresholds to suit.
 2015-05-06 12:26:44 -07:00
Sam Gateau
0fbccf1d33 get ready for PR, SKY_DOME by default 2015-05-06 12:22:19 -07:00
Sam Gateau
1b5185abeb fix the conditional on the texture pointer which was wrong and bring back atmosphere sky dome 2015-05-06 12:19:19 -07:00
Seth Alves
a72ac3ead2 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-06 12:19:04 -07:00
Bradley Austin Davis
ea6f840fdb Merge remote-tracking branch 'upstream/master' into plugins_pt1 2015-05-06 12:18:04 -07:00
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
Stephen Birarda
c5e189bbf2 use new PacketHeaders calls from LimitedNodeList 2015-05-06 11:52:03 -07:00
Stephen Birarda
0d1c1bf8dd lock NodeData when attempting to read stats 2015-05-06 11:51:46 -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
David Rowe
a6dd08fea8 Calculate average coefficient values 2015-05-06 11:38:14 -07:00
Stephen Birarda
460abd85b9 don't double send data to a receiver 2015-05-06 11:35:45 -07:00
Stephen Birarda
ba9ed12415 store last sequence number sent with data 2015-05-06 11:35:34 -07:00
Stephen Birarda
e2986f5702 add get seq num, cleanup PacketHeaders methods 2015-05-06 11:34:58 -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
David Rowe
e1b5e7caf6 Add DDE calibration count-down 2015-05-06 11:13:19 -07: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
Stephen Birarda
b0c7af1714 store last seq for node/packet type combo 2015-05-06 10:41:41 -07:00
Stephen Birarda
3887467048 store last broadcasted sequence number 2015-05-06 10:41:24 -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
Stephen Birarda
5b1514a390 Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers 2015-05-06 10:12:17 -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