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

73127 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
fa0c58fa0e Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend 2018-11-02 00:08:47 -07:00
Cristian Luis Duarte
bc7e49482a Add Android for the condition of _meshBlendshapeBuffer usage 2018-10-30 19:44:39 -03:00
Cristian Luis Duarte
a09b1adb6c Android temporal change - Bring back GLESBackend TEX_UNIT constants 2018-10-30 16:45:25 -03:00
Cristian Luis Duarte
f00f1931f3 Merge branch 'master' into gles_use_tbo_no_ssbo 2018-10-29 20:06:32 -03:00
John Conklin II
db87fe9696
Merge pull request #14288 from luiscuenca/avatarTransitFreezeFix 
Fix avatars remain stuck in place for other users intermittently
 2018-10-29 15:03:43 -07:00
John Conklin II
e01401294f
Merge pull request #14286 from ctrlaltdavid/M17988 
Fix Interface eating memory when minimized
 2018-10-29 12:52:10 -07:00
luiscuenca
e49e9cdc56 Set avatar client sooner 2018-10-29 07:25:22 -07:00
luiscuenca
056fe338e1 Apply transit logic if avatar instance is client side 2018-10-27 07:15:31 -07:00
luiscuenca
767f4e9d6d Return server position 2018-10-26 17:16:43 -07:00
luiscuenca
62e4b3fead Avatar mixer gets the updated position 2018-10-26 16:02:17 -07:00
David Rowe
1cca975b37 Fix Interface eating memory when minimized 2018-10-27 11:40:02 +13:00
Sam Gateau
439452f9ee
Merge pull request #14123 from jherico/fix/mac_gl2 
Additional Mac OpenGL work
 2018-10-26 15:38:23 -07:00
Ryan Huffman
c6403a44cb
Merge pull request #14281 from dback2/collidesPropertyFix 
Fix Collides With subproperties
 2018-10-26 13:46:52 -07:00
John Conklin II
fa2fb3a87a
Merge pull request #14246 from sethalves/sync-grab-props 
keep userData and new grab properties in sync
 2018-10-26 11:52:47 -07:00
Brad Davis
a3a952265a Fix android crash 2018-10-26 11:23:30 -07:00
Brad Davis
36edb939c3 Try to fix android crash 2018-10-26 11:23:30 -07:00
Brad Davis
7ca8b54039 Fix crash on startup on windows / android 2018-10-26 11:23:30 -07:00
Brad Davis
9a30073f27 Only enable debug GL context on demand 2018-10-26 11:23:29 -07:00
Brad Davis
405ec228b8 Fix mac warning 2018-10-26 11:23:29 -07:00
Bradley Austin Davis
28b45ce1d9 Resolve compositing glitches 2018-10-26 11:23:29 -07:00
Bradley Austin Davis
95d160a170 Working on mac GL issues 2018-10-26 11:23:29 -07:00
Sam Gondelman
7339a43536
Merge pull request #14278 from SamGondelman/macbs 
Mac: Possibly fix a completely different blendshapes bug
 2018-10-26 09:26:30 -07:00
David Back
13acfb325a fix collides with properties, fix ordering for start/finish/spread properties 2018-10-25 15:06:15 -07:00
John Conklin II
2dfd63f4e7
Merge pull request #14229 from thoys/feat/create/tooltips 
MS19052 [CreateApp]: Tooltips
 2018-10-25 14:52:16 -07:00
SamGondelman
7dff015585 maybe? 2018-10-25 14:40:58 -07:00
John Conklin II
7227547b6a
Merge pull request #14279 from dback2/removeParticleExplorer 
Remove particle explorer
 2018-10-25 13:37:22 -07:00
Jeff Clinton
946d68af6a
Merge pull request #14262 from SamGondelman/particleLoad 
Fix and expose Particle Entity emitRadiusStart
 2018-10-25 12:41:02 -07:00
John Conklin II
2eb801bdc6
Merge pull request #14035 from SimonWalton-HiFi/avatar-mixer-improvements 
Further avatar-mixer improvements
 2018-10-25 12:25:32 -07:00
David Back
eb347c5596 remove particle explorer 2018-10-25 11:30:18 -07:00
SamGondelman
faff5f11e8 Merge remote-tracking branch 'upstream/master' into particleLoad 2018-10-25 10:56:11 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter 
Quality Improvements to Avatars driven by Vive Trackers
 2018-10-25 08:51:59 -07:00
Jeff Clinton
736dc47934
Merge pull request #14274 from huffman/feat/silence-defaults-in-script-log 
Add optional default scripts log suppression to the script debug window
 2018-10-25 08:50:25 -07:00
Seth Alves
b8f1c96685 rats 2018-10-25 07:47:16 -07:00
Seth Alves
b93807b1a7 remove conversion code from equipEntity.js 2018-10-25 07:47:16 -07:00
Seth Alves
c5aafd4644 fix spatialKey conversion 2018-10-25 07:47:16 -07:00
Seth Alves
387a8ce933 fix QJsonArray handling 2018-10-25 07:47:15 -07:00
Seth Alves
252e504ab9 attempt to keep userData and new grab properties in sync 2018-10-25 07:47:15 -07:00
Seth Alves
b9f8c59f61
Merge pull request #13904 from alexiamandeville/menu-updates 
Resorting Developer menu organization
 2018-10-24 19:41:22 -07:00
Sam Gateau
6afd9a1dca
Merge pull request #14269 from SamGondelman/bs 
Possible fix for yet another blendshape crash
 2018-10-24 17:51:23 -07:00
Thijs Wenker
13cad17793 better style js attributes 2018-10-25 02:46:16 +02:00
Thijs Wenker
bb7d1f8afb fix broken and missing tooltips 2018-10-25 02:46:16 +02:00
Thijs Wenker
83051940a8 Fix QA feedback 2018-10-25 02:46:15 +02:00
Thijs Wenker
358b0b76d1 tooltip delay of 500ms 2018-10-25 02:46:15 +02:00
Thijs Wenker
a3b874f9aa property tooltips 2018-10-25 02:46:14 +02:00
John Conklin II
7db7131ef4
Merge pull request #14172 from dback2/entityPropertiesRefactor 
Entity properties refactor / reorder and merge particle explorer into properties
 2018-10-24 17:39:17 -07:00
Jeff Clinton
67fe43ebb1
Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars 
Small avatars now have a minimum jump height of 0.25 meters
 2018-10-24 17:08:28 -07:00
Ryan Huffman
5c5a5c9cd2 Add optional default scripts log suppression 2018-10-24 16:23:10 -07:00
David Back
a88678fb70 fix bad css merge, add particle property debounce 2018-10-24 15:07:47 -07:00
Simon Walton
b6f259fc42 Fix incorrect merge-resolution 2018-10-24 13:17:45 -07:00
SamGondelman
a3c42363cc please for the love of god 2018-10-24 12:43:01 -07:00