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

13193 commits

Author SHA1 Message Date
Brad Hefta-Gaub
65473cadcb Merge pull request #6021 from jherico/homer 
Support reload-on-change for local scripts
 2015-10-07 20:34:15 -07:00
Brad Davis
99d1e17ae8 Support reload-on-change for local scripts 2015-10-07 19:18:59 -07:00
Eric Levin
a6e1fbd50f Merge pull request #6014 from ctrlaltdavid/20699 
Sanitize particle properties, fix crashes
 2015-10-07 17:19:29 -07:00
Brad Hefta-Gaub
a86e34f9f9 Merge pull request #6018 from hyperlogic/tony/avatar-mixer-stats-improvements 
Separated AvatarMixer inbound and outbound bandwidth on stats overlay
 2015-10-07 16:04:13 -07:00
Anthony Thibault
a363493a99 Merge pull request #6016 from samcake/calvin 
Fix the cauterized Cluster Matrices issue when rear view mirror is enabled
 2015-10-07 15:52:11 -07:00
Andrew Meadows
ef58238c66 Merge pull request #6017 from ZappoMan/animationGroupSettings 
fix a bunch of warnings
 2015-10-07 15:50:20 -07:00
Anthony J. Thibault
00f3b7b1b5 Renamed delt to averageTimeBetweenPackets 2015-10-07 15:46:42 -07:00
Brad Hefta-Gaub
ae93c020be Merge pull request #5994 from Atlante45/display_name 
Display name in terms of arc size not pixels
 2015-10-07 15:40:30 -07:00
Anthony J. Thibault
0cebeb7fe9 Separated AvatarMixer inbound and outbound bandwidth on stats overlay 
Also, small bug fix to BandwidthRecorder. It would incorrectly
calculate outbound pps if the input pps was 0.
 2015-10-07 15:32:10 -07:00
Andrew Meadows
7a918eb288 fix variable names in header 2015-10-07 15:25:07 -07:00
David Rowe
131b4ed004 Merge branch 'master' into 20699 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
	libraries/entities/src/ParticleEffectEntityItem.cpp
 2015-10-07 15:08:07 -07:00
Atlante45
14a1860670 Do not change keyhole radius 2015-10-07 14:55:18 -07:00
Brad Hefta-Gaub
bfd014203e fix a bunch of warnings 2015-10-07 14:48:42 -07:00
samcake
f0b7622ef0 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-10-07 14:27:01 -07:00
samcake
0a351a8a0c FIx the problem with cauterizedClusterMatrices in the case rear view mirror is used. Clean the way to define the depth stencil format for texture 2015-10-07 14:26:33 -07:00
Andrew Meadows
464ef2293d more descriptive variable names 2015-10-07 14:19:15 -07:00
Andrew Meadows
0680be0422 save sixense settings and some UI cleanup 2015-10-07 14:19:15 -07:00
Andrew Meadows
76264ae704 fix formatting 2015-10-07 14:17:21 -07:00
Andrew Meadows
6c2a94fddb remove unused method declarations 2015-10-07 14:17:21 -07:00
Andrew Meadows
0061426ded Merge pull request #6006 from ZappoMan/animationGroupSettings 
Animation group settings
 2015-10-07 14:09:20 -07:00
Brad Hefta-Gaub
b09ae1755e fix formatting of macros 2015-10-07 13:59:00 -07:00
Brad Hefta-Gaub
6f9b5d8125 Merge pull request #5988 from thoys/js-hmd-position-orientation 
expose position and orientation of HMD to Javascript.
 2015-10-07 13:27:15 -07:00
Brad Hefta-Gaub
7a85e5b7a7 rename frameIndex to currentFrame 2015-10-07 13:02:58 -07:00
Brad Hefta-Gaub
57cc7adbfe standardize somethingChanged - CR feedback 2015-10-07 12:27:12 -07:00
samcake
6c75daa027 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-10-07 11:39:07 -07:00
Brad Hefta-Gaub
ef054ffc6d Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-10-07 11:27:50 -07:00
Brad Hefta-Gaub
6eeb64b032 CR feedback 2015-10-07 11:23:24 -07:00
samcake
05da9d94cd fixing the depth stencil texture case 2015-10-07 11:20:11 -07:00
Stephen Birarda
022c4276b9 Merge pull request #5892 from Atlante45/protocol 
Add channels to UDT
 2015-10-07 11:06:22 -07:00
David Rowe
4624649b1b Sanitize particle properties, fix crashes 2015-10-07 08:57:55 -07:00
Thijs Wenker
4ab5e0af84 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-07 14:48:06 +02:00
Brad Hefta-Gaub
05fd62ac51 Merge pull request #6009 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-07 01:43:10 -07:00
Brad Hefta-Gaub
b06d17d45a Merge pull request #6000 from samcake/hobbes 
Migrate FBXReader to use model::Mesh and clean Model Part rendering
 2015-10-07 01:31:21 -07:00
samcake
dd2aa36a11 FIx the shiny objects by actually using the specular map as it should be... 2015-10-06 23:10:03 -07:00
Brad Davis
eff5a4c395 Picking fixes in the HMD 2015-10-06 22:56:48 -07:00
samcake
83a0091e47 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-06 22:03:07 -07:00
Brad Davis
19fb4e92a6 Enabling programmatic access to the IPD scale 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/scripting/HMDScriptingInterface.cpp
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:08:17 -07:00
Thijs Wenker
6e52fcb857 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-07 03:11:24 +02:00
samcake
c75c31ddc8 Fixing the index Offset issue with instanced shapes from Geometry cache 2015-10-06 18:04:08 -07:00
Brad Hefta-Gaub
02bb372c27 Merge pull request #6008 from AndrewMeadows/ik-targets-use-model-frame 
IK targets specified in the skeleton's model-frame
 2015-10-06 17:34:42 -07:00
Clément Brisset
8a24d1eb9c Merge pull request #6007 from ZappoMan/fixWarning 
clean up warnings and coding standard issues
 2015-10-06 17:02:11 -07:00
Ryan Huffman
74c89ad099 Merge pull request #5984 from Atlante45/cleanup_app 
Application cleanup
 2015-10-06 16:58:05 -07:00
Andrew Meadows
224fc55033 put IK targets in skeleton's model-frame 2015-10-06 16:49:29 -07:00
Atlante45
3a8deff53e Return if innactive 2015-10-06 16:38:16 -07:00
Brad Hefta-Gaub
867d34b617 clean up warnings and coding standard issues 2015-10-06 16:33:24 -07:00
Atlante45
ca575bee89 Remove unecessary move 2015-10-06 16:15:51 -07:00
Atlante45
5ee966261d Start thread right away 2015-10-06 16:12:50 -07:00
Atlante45
81b88cb096 Renamed MessagePart > MessagePartNumber 2015-10-06 16:12:04 -07:00
Brad Hefta-Gaub
016bf4011d cleanup 2015-10-06 16:07:36 -07:00
Brad Hefta-Gaub
1319642a59 fix frame jumping behavior on restart 2015-10-06 15:59:35 -07:00