Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 15:13:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33038 commits 71 branches 56 tags 1.2 GiB
Commit graph

33038 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
aa2a8edc6f use _segmentStartIndex before changing its value 2015-10-08 15:44:18 -07:00
Stephen Birarda
0d9421a65e constantize the PacketList write error 2015-10-08 15:40:49 -07:00
Stephen Birarda
519df1565a fix comment format in PacketList 2015-10-08 15:38:41 -07:00
Stephen Birarda
dc4f987a2e fix segmented write logic in PacketList 2015-10-08 15:38:41 -07:00
Ryan Huffman
26c40adecb Merge pull request #6023 from ZappoMan/animationGroupSettings 
Fixes to isEmitting for ParticleEffects
 2015-10-08 12:24:36 -07:00
samcake
01d39bd614 Merge pull request #6025 from sethalves/fix-obj-model-meshes 2015-10-08 11:57:26 -07:00
Clément Brisset
8e2ce379e1 Merge pull request #6024 from ericrius1/entityResetTweaks 
Moved entity reset switch, fixed some style issues
 2015-10-08 11:56:01 -07:00
Brad Hefta-Gaub
f141026990 CR feedback 2015-10-08 11:48:48 -07:00
Brad Hefta-Gaub
a8d1622481 CR feedback 2015-10-08 11:47:54 -07:00
Seth Alves
3db148f3dc fix obj model meshes 2015-10-08 11:13:52 -07:00
ericrius1
b7f52ea542 Moved entity reset switch, fixed some style issues 2015-10-08 10:11:21 -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
39f2241eac fix coding standard issue 2015-10-08 09:46:43 -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 Hefta-Gaub
bb10d8a7d5 more work on rationalizing particle properties 2015-10-07 20:08:30 -07:00
Brad Hefta-Gaub
b479dd0a12 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-07 19:55:01 -07:00
Brad Hefta-Gaub
02a24712ca fix isEmitting property for particle effects, cleaned up some particle property editing in edit.js 2015-10-07 19:52:29 -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
Brad Hefta-Gaub
90049f6a5f Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-07 15:50:39 -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
Brad Hefta-Gaub
e93326e43f Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-07 15:49:46 -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