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

29875 commits

Author SHA1 Message Date
Zach Fox
1eca1bfd55 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-22 11:18:10 -07:00
Stephen Birarda
3c79a79487
Merge pull request #14163 from Atlante45/fix/bw-recorder 
Fix crash with BandwidthRecorder
 2018-10-22 10:11:26 -07:00
Seth Alves
a2d4c236c1
Merge pull request #14220 from SamGondelman/pickFree 
Fix PickManager::removePick heap use after free
 2018-10-22 09:48:22 -07:00
Stephen Birarda
ea3bdeb26e
Merge pull request #14181 from Atlante45/feat/timebox-packet-processing 
Timebox packet processing
 2018-10-22 09:43:30 -07:00
Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings 
Fix new Mac warnings
 2018-10-20 13:40:53 -07:00
Brad Hefta-Gaub
23ddb7dea6
Merge pull request #14207 from Atlante45/fix/white-spheres 
Remove pending avatars data structure
 2018-10-20 12:09:51 -07:00
Sam Gateau
6005b934ad
Merge pull request #13979 from AndrewMeadows/game-loop-optimizations-001 
minor bug fix and optimization in ModelEntity animation
 2018-10-19 17:02:48 -07:00
Brad Hefta-Gaub
e6ec32e515
Merge pull request #14222 from SamGondelman/material 
Fix material entity opacity maps
 2018-10-19 16:45:31 -07:00
Brad Hefta-Gaub
219302a9b6
Merge pull request #14157 from SimonWalton-HiFi/domain-checkin-limit 
Cap the number of domain-server duplicate check-ins sent upon retransmission
 2018-10-19 16:41:09 -07:00
Brad Hefta-Gaub
881f7f0142
Merge pull request #14242 from jherico/fix/light_channels 
Fix light color serialization
 2018-10-19 16:17:21 -07:00
Brad Hefta-Gaub
c6fff83805
Merge pull request #14145 from ctrlaltdavid/M17223 
JSDoc fixes
 2018-10-19 16:16:19 -07:00
Brad Davis
2687c024eb Fix light color / serialization 2018-10-19 14:47:02 -07:00
Anthony Thibault
6cc7c861d1
Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest 
Disable user hand controllers if they are too far away or not moving.
 2018-10-19 14:02:32 -07:00
Sam Gateau
388b31acf7
Merge pull request #14169 from SamGondelman/highlight 
Fix highlight not working after HMD switch
 2018-10-19 11:58:25 -07:00
John Conklin II
9c841db9fb
Merge pull request #14184 from SamGondelman/blendshape 
Move blendshape buffers to render thread
 2018-10-19 11:55:44 -07:00
John Conklin II
9750cc2416
Merge pull request #14173 from sethalves/fix-linux-build 
fix build on clang 7
 2018-10-19 11:13:43 -07:00
John Conklin II
81fbb5a332
Merge pull request #14140 from AndrewMeadows/dps-setPos-vs-grab 
Make EntityScriptingInterface aware of distributed physics simulation (DPS) rules
 2018-10-19 10:33:14 -07:00
Zach Fox
2df9d28c5b Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-19 09:42:06 -07:00
John Conklin II
4dec304d66
Merge pull request #14162 from luiscuenca/cleanElbowPoleVectorSmooth 
Clean up elbow smoothing code
 2018-10-18 19:16:32 -07:00
John Conklin II
5095a4e0eb
Merge pull request #14196 from sethalves/interstitial-domain-full 
go to error-room when failing to connect to a full domain
 2018-10-18 17:49:35 -07:00
Zach Fox
41742aaf9e Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-18 16:22:41 -07:00
John Conklin II
1f06c87580
Merge pull request #14096 from Zvork/mipgen 
Added generateTextureMipsWithPipeline function in gpu::Batch
 2018-10-18 16:06:28 -07:00
SamGondelman
47c6825aea CR 2018-10-18 11:08:53 -07:00
Andrew Meadows
6558d539e4 adjust simulation bid priority by props changed 2018-10-18 10:33:02 -07:00
Andrew Meadows
9bfa4a5267 remove unhelpful/wrong TODO comment 2018-10-18 10:33:02 -07:00
Andrew Meadows
1a685d2409 set script-triggerd sim ownership priority correctly 2018-10-18 10:33:02 -07:00
Andrew Meadows
ce81ab1f9d don't edit restricted properties unless sim ownership possible 2018-10-18 10:33:02 -07:00
Andrew Meadows
bb51079284 move some bid-prep logic from EntityMotionState to EntityItem 2018-10-18 10:33:02 -07:00
Andrew Meadows
0b34524ba0 minimimze time holding locks on tree in editEntity() 2018-10-18 10:31:27 -07:00
Andrew Meadows
21654ba77c cleanup access to sessionID 2018-10-18 10:31:27 -07:00
Andrew Meadows
f63610af2b namechange: TerseUpdate --> TransformAndVelocities 2018-10-18 10:31:27 -07:00
Zach Fox
2a9e0041b2 Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-10-18 10:16:07 -07:00
John Conklin II
1cc2569bd8
Merge pull request #13596 from SamGondelman/scriptvec3 
Replace vec2, vec3, and xColor properties with JS prototypes
 2018-10-18 09:47:56 -07:00
SamGondelman
de4dff5202 fix highlight weirdness 2018-10-17 16:18:55 -07:00
John Conklin II
8e5bc1678f
Merge pull request #14219 from SamGondelman/materialCull 
QueryAACube fixes and materials expand to include their parent
 2018-10-17 15:15:23 -07:00
Sam Gondelman
3f117cd3e0
Merge branch 'master' into scriptvec3 2018-10-17 13:57:21 -07:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1 
move grab pseudo-properties (userData) into first-class EntityItemProperties
 2018-10-17 13:29:20 -07:00
Sam Gondelman
e3543cf098
Merge branch 'master' into scriptvec3 2018-10-17 13:10:29 -07:00
Andrew Meadows
3b1b64b057 fix logic in readyToAnimate() 2018-10-17 11:45:39 -07:00
Andrew Meadows
da0d70af3f don't use string comparison when polling for changed animation URL 2018-10-17 11:45:39 -07:00
Andrew Meadows
0c61779331 remove deprecated cruft; stub setAnimationURL() override 2018-10-17 11:45:39 -07:00
Andrew Meadows
148944814b consolidate two bad string checks into one 2018-10-17 11:45:39 -07:00
John Conklin II
7b226aa559
Merge pull request #14124 from SamGondelman/particle 
Don't render particles without textures
 2018-10-17 11:17:23 -07:00
John Conklin II
72c9f697ab
Merge pull request #14119 from SamGondelman/varying 
Move stage frames to Varyings
 2018-10-17 11:16:28 -07:00
John Conklin II
e59e3720fe
Merge pull request #14139 from SamGondelman/animation 
Fix various ResourceCache bugs
 2018-10-17 11:13:35 -07:00
John Conklin II
eb088772d0
Merge pull request #14156 from sabrina-shanman/bug_dynamic-hulls 
Fix "Good" collision not honoring mesh groups in OBJ files
 2018-10-17 11:12:21 -07:00
SamGondelman
c5a94a415d fix material entity opacity maps 2018-10-17 09:59:43 -07:00
John Conklin II
9f0b4fb437
Merge pull request #14122 from SamGondelman/skybox 
Rebake default skybox for all platforms
 2018-10-17 09:50:00 -07:00
Sam Gondelman
cba4a4139a
fix compile error 2018-10-16 18:25:17 -07:00
Sam Gondelman
19fd7b5ac7
cr 2018-10-16 18:24:14 -07:00