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

25210 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
ddec6d5207 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-07 09:54:09 -07:00
Seth Alves
fe14202f51 add getName passthrough to ObjecdtMotionState, don't compute model shapes until the model has been simulated 2015-05-07 09:53:39 -07:00
David Rowe
0eeff526d5 Add shortcut key for face tracker muting 2015-05-07 08:51:59 -07:00
Atlante45
cafaeed822 Restore polygon mode after entities rendering 
Default setting are causing issues so we just reset the polygon mode
since this won't matter once everything has moved to the new rendering
pipeline.
 2015-05-07 13:34:22 +02:00
Atlante45
366964e424 Fix static initialisation fiasco 2015-05-07 13:00:56 +02:00
Atlante45
721eeccce2 Restaure GL to default after we render a batch 2015-05-07 12:01:22 +02:00
Atlante45
00571dad00 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 10:13:59 +02:00
Brad Hefta-Gaub
01f96f4e62 Merge pull request #4788 from samcake/orange 
Try to fix the transform stack issue in 1st person
 2015-05-06 23:47:52 -07:00
Sam Gateau
bba7dcfe5f Try to fix the transform stack issue in 1st person 2015-05-06 23:32:02 -07:00
ZappoMan
496da6fcd5 wire up the skybox color property to the new skybox renderer 2015-05-06 20:36:06 -07:00
Seth Alves
fabff7fdf4 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-06 18:26:00 -07:00
ZappoMan
af2c3d91cf Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones 2015-05-06 18:05:54 -07:00
Andrew Meadows
00c6944125 merge 2015-05-06 17:49:18 -07:00
Andrew Meadows
411bf1a35c fix for entity-server kinematic simulation 2015-05-06 17:48:10 -07:00
Stephen Birarda
e3490838de Merge pull request #4787 from jherico/flipped_icons 
Fix inverted icons
 2015-05-06 20:25:43 -04:00
Seth Alves
5ac8558168 flash yellow box when transmitting an edit packet 2015-05-06 17:03:27 -07:00
Stephen Birarda
b3f7ec1545 keep track of starves and skips on other avatars 2015-05-06 16:49:51 -07:00
David Rowe
afce981d83 Merge branch 'master' into 20530 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/DdeFaceTracker.cpp
	interface/src/devices/DdeFaceTracker.h
 2015-05-06 16:27:33 -07:00
Seth Alves
cc5f2ee451 in isMovingVsServer look at entity velocity only 2015-05-06 16:26:27 -07:00
Seth Alves
ba6f6d19cc disable updateServerPhysicsVariables 2015-05-06 16:20:16 -07:00
Thijs Wenker
b76e22c952 spelling mistake 2015-05-07 01:14:16 +02:00
Seth Alves
630f1ce9d9 isMovingVsServer function 2015-05-06 16:13:07 -07:00
Bradley Austin Davis
3b8108e887 Fix inverted icons 2015-05-06 16:09:17 -07:00
Seth Alves
e73503a53d Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1 2015-05-06 16:05:13 -07:00
Seth Alves
b0ccabe38e update a motionstate's idea of what the entity-server thinks when an incoming update packet arrives 2015-05-06 16:05:05 -07:00
Andrew Meadows
452e84d43f only update physics when proper flags are set 2015-05-06 16:02:03 -07:00
Andrew Meadows
7b1886a285 harvest outgoing changes for non-NULL entities 2015-05-06 16:01:25 -07:00
Andrew Meadows
584b643791 lock entitySimulation during physics simulation 2015-05-06 16:01:00 -07:00
Seth Alves
c63b8a93ec oops fix endless loop 2015-05-06 15:48:45 -07:00
Seth Alves
4c3cbea261 don't auto-remove simulation owner unless the Node is gone. put back code that causes interfaces to give up ownership 2015-05-06 15:32:02 -07:00
Philip Rosedale
72da678bc2 Merge pull request #4785 from jherico/scale 
Fix ensmallened overlay UI
 2015-05-06 15:30:01 -07:00
Bradley Austin Davis
561d275dda Fix ensmallened overlay UI 2015-05-06 15:18:17 -07:00
Philip Rosedale
cd4cc30a34 Merge pull request #4783 from thoys/20522 
CR for Job #20522 - Make Jenga
 2015-05-06 15:14:58 -07:00
Thijs Wenker
b3af1840c7 Added transparency and positioning updating of Planky button 2015-05-07 00:14:49 +02:00
Stephen Birarda
e540a6dbb3 fix packet sequence number unmarshal 2015-05-06 14:48:10 -07:00
Seth Alves
a057d7dfa3 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-06 14:41:54 -07:00
ZappoMan
b7dfbd103a Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones 2015-05-06 14:41:53 -07:00
Brad Hefta-Gaub
5551997cdc Merge pull request #4780 from samcake/blue 
Add support for Skybox and rendering path of background according to Zones
 2015-05-06 14:41:06 -07:00
Thijs Wenker
477447b95f Planky game script 2015-05-06 23:36:44 +02:00
Seth Alves
fe06ce2931 pull from upstream 2015-05-06 14:31:22 -07:00
Seth Alves
86ec12b22c don't increase moving-without-simulator counter unless the thing is moving enough 2015-05-06 14:30:45 -07:00
Seth Alves
719747ee2d Merge pull request #4725 from howard-stearns/objReader 
Textures for .obj reader:
 2015-05-06 14:30:29 -07:00
Brad Hefta-Gaub
cb4a76a5cd Merge pull request #4758 from jherico/plugins_pt1 
Display Plugins Prep - Part 1
 2015-05-06 14:27:09 -07:00
Stephen Birarda
ff676958e8 fix hash replacement in PacketHeaders 2015-05-06 14:24:11 -07:00
Sam Gateau
8fd77f964c Fix include filke case for ubuntu... 2015-05-06 14:23:42 -07:00
Bradley Austin Davis
3c10d29d53 Removing another reference to oculus manager 2015-05-06 14:09:43 -07:00
Seth Alves
fe308c0189 only do infection during collisions if one of the objects is being simulated by this interface 2015-05-06 13:50:14 -07:00
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