Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 16:54:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
33022 commits 71 branches 56 tags 1.2 GiB
Commit graph

33022 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
3db148f3dc fix obj model meshes 2015-10-08 11:13:52 -07:00
Brad Hefta-Gaub
9f0721c08b Merge pull request #6020 from ericrius1/grabFarNonColliding 
Added grab far events for non physical objects
 2015-10-08 09:56:22 -07:00
ericrius1
aac372cc8a Fixed styling errors 2015-10-08 09:53:06 -07:00
Brad Hefta-Gaub
e1b69a1704 Merge pull request #6022 from jherico/lisa 
Fix mouse events for entity scripts
 2015-10-07 20:43:41 -07:00
Brad Hefta-Gaub
7c286a41db Merge pull request #6019 from ericrius1/entityReset 
Adding a discreet entity to toybox that, when a user clicks on it, or near grabs it, will reset toybox
 2015-10-07 20:38:07 -07:00
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
50592a87a6 Fix mouse events for entity scripts 2015-10-07 19:44:08 -07:00
Brad Davis
99d1e17ae8 Support reload-on-change for local scripts 2015-10-07 19:18:59 -07:00
ericrius1
efc2dfb68f Added grab far events for non physical objects 2015-10-07 18:06:37 -07:00
ericrius1
3e822dbfc6 Adding far grab event to reset switch 2015-10-07 18:03:17 -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
ericrius1
f230dcd1c0 Fixed headers 2015-10-07 17:07:43 -07:00
ericrius1
3dd74a33d3 new attempt 2015-10-07 16:50:10 -07:00
ericrius1
18155f968b adding logging 2015-10-07 16:29:55 -07:00
ericrius1
032e503be6 change 2015-10-07 16:22:13 -07:00
ericrius1
54d82e6cc6 testing one 2015-10-07 16:10:21 -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
ericrius1
bfde77747a Not deleting reset switch unless client script runs 2015-10-07 16:03:11 -07:00
ericrius1
7e7c6bca8d deleting switch from client script 2015-10-07 16:01:08 -07:00
ericrius1
3c8b1b2a4e attempting duplicate script approach 2015-10-07 15:58:47 -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
ericrius1
3f3c91116b No calling within masterReset 2015-10-07 15:40:12 -07:00
ericrius1
39d0d82067 adding some logging 2015-10-07 15:39:32 -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
Brad Hefta-Gaub
c6d50af085 Merge pull request #5999 from AndrewMeadows/save-sixense-settings 
Save hydra calibration settings
 2015-10-07 15:27:06 -07:00
Andrew Meadows
7a918eb288 fix variable names in header 2015-10-07 15:25:07 -07:00
Atlante45
fb284448b5 Raise display name not to collide with heads 2015-10-07 15:21:35 -07:00
ericrius1
3465e3cc13 Adding hidden reset switch to room which, when grabbed or clicked on, will reset room 2015-10-07 15:21:24 -07:00
Atlante45
efeeaa7ea7 Make display names 25% smaller 2015-10-07 15:14:06 -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
Atlante45
fd6f0213ef CR 2015-10-07 14:55:18 -07:00
Atlante45
79b280f733 Update getDisplayNamePosition debug 2015-10-07 14:55:18 -07:00
Atlante45
91b46203f3 Don't take keyhole into account 2015-10-07 14:55:17 -07:00
Atlante45
946d289a99 Display name have a arc size instead of pixel size 2015-10-07 14:55:17 -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
039d9a6a98 Merge pull request #6010 from ZappoMan/disableHandMouseByDefault 
Disable hand mouse by default
 2015-10-07 14:15:58 -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