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

70676 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
83ed572a33 Render Touch controllers at physical hands's locations 2018-08-04 19:27:44 +12:00
Brad Davis
e6fb2a9e15 Add scribe source files to project 2018-08-03 21:57:53 -07:00
John Conklin II
00a8b73814
Merge pull request #13751 from danteruiz/fix-flying 
fix flying
 2018-08-03 19:27:47 -07:00
sabrina-shanman
870940b3a0 Merge branch 'master' into safe-teleport-target 2018-08-03 18:14:43 -07:00
Dante Ruiz
9bebd1e623 making changes 2018-08-03 18:11:55 -07:00
amantley
bac9d195be working on the hand blend alphas, something is wrong with the print out 2018-08-03 17:56:49 -07:00
sabrina-shanman
a460cfac29 Do not store physics engine pointer in PickScriptingInterface 2018-08-03 17:55:54 -07:00
sabrina-shanman
c6b24496c8 Add 'loaded' parameter to CollisionPickResult to indicate if the collision region is loaded 2018-08-03 17:56:01 -07:00
sabrina-shanman
e7766039b9 Pass pick variant map into unsuccessful/default collision results 2018-08-03 17:55:54 -07:00
sabrina-shanman
cf34a2cffd Do not const cast CollisionRegion 2018-08-03 17:55:54 -07:00
John Conklin II
3a6a72a079
Merge pull request #13643 from SimonWalton-HiFi/user-setting-hmac 
Add DS option to disable HMAC packet authentication
 2018-08-03 17:45:32 -07:00
amantley
375d726535 added the new animations for strafe and walk to the resource file and updated the avatar-animation.json file 2018-08-03 16:48:43 -07:00
MiladNazeri
a7a8214983
Merge pull request #13637 from ctrlaltdavid/M08513-a 
Audio API JSDoc
 2018-08-03 16:38:03 -07:00
Bradley Austin Davis
fc51b93691 Fix OSX build 2018-08-03 16:15:58 -07:00
David Rowe
f9d9324a14 Improve text in Avatar app's pop-ups 2018-08-04 10:55:57 +12:00
Dante Ruiz
f30b552e19 fix-flying 2018-08-03 15:50:11 -07:00
Sam Gateau
aac4ff0b7e
Merge pull request #13749 from samcake/punk 
Fix the other avatars not being removed when Avatar mixer reset
 2018-08-03 15:37:13 -07:00
Sam Gateau
c1951da2bb
Merge pull request #13737 from jherico/fix/fb16633_a 
Don't allow Web surfaces created by non-client scripts to access files
 2018-08-03 15:25:41 -07:00
Brad Davis
a1cd39f4c2 Fix some explicit bindings that should be binding, not location 2018-08-03 14:58:12 -07:00
Brad Davis
6ed7512112 Fix build failures after parabola merge 2018-08-03 14:58:12 -07:00
Brad Davis
df031b5d93 Fix procedural rendering with custom uniforms 2018-08-03 14:58:12 -07:00
Brad Davis
eca803503c Fix resolution scaling 2018-08-03 14:58:12 -07:00
Brad Davis
8eb97dc79c PR feedback 2018-08-03 14:58:12 -07:00
Brad Davis
a1a1a03bbc Fixing crash on exit, deferred debugging tool 2018-08-03 14:58:11 -07:00
Brad Davis
ae8f841912 Shader refactoring for explicit bindings 2018-08-03 14:58:11 -07:00
Brad Davis
04e84f1d23 Moving to cmake time shader compiling 2018-08-03 14:58:11 -07:00
Brad Davis
d6bcdcde3f Fix DISABLE_QML behavior 2018-08-03 14:58:11 -07:00
NissimHadar
5795e2492f Merge branch 'master' of https://github.com/highfidelity/hifi into exportToTestRail1 2018-08-03 14:51:23 -07:00
NissimHadar
9e8619f7be WIP - updating test results. 2018-08-03 14:50:20 -07:00
NissimHadar
37f761beeb Builds Python script that creates list of failure names 2018-08-03 14:21:10 -07:00
John Conklin II
243bd5ea69
Merge pull request #13536 from SimonWalton-HiFi/script-engine-thread-agent 
ScriptsModel instances should be created & destroyed on the same thread (for Agent)
 2018-08-03 13:32:11 -07:00
NissimHadar
dfa461b4f6 Ready to update the run with the test results. 2018-08-03 12:57:54 -07:00
sabrina-shanman
b7d5804edb Format if..else statements 2018-08-03 12:55:11 -07:00
David Rowe
fdd6b7e07b Delete erroneous merge file 2018-08-04 07:29:57 +12:00
David Rowe
2270255d88 JSDoc review 2018-08-04 07:22:12 +12:00
amantley
76b182f03b added the hmd strafe to the rig code 2018-08-03 12:12:01 -07:00
sabrina-shanman
0b40608650 Fix collision picks not working with MyAvatar 2018-08-03 12:05:58 -07:00
Bradley Austin Davis
8e9c1e5c0a Fix out of date comment 2018-08-03 11:38:39 -07:00
NissimHadar
7ef3b27490 WIP - updating test results. 2018-08-03 11:12:18 -07:00
David Back
0565e0400c fix edit log spam with -1 hand 2018-08-03 11:08:56 -07:00
Olivier Prat
cb24046eea Reorder some functions 2018-08-03 18:51:31 +02:00
Sam Gateau
2013f1bd33
Merge pull request #13732 from AndrewMeadows/other-avatar-physics 
reduce physics simulation cost of other-avatars
 2018-08-03 09:33:59 -07:00
Sam Gateau
da252a70c1 Same as https://github.com/highfidelity/hifi/pull/13747 2018-08-03 09:22:29 -07:00
Olivier Prat
f2a01021f3 Improvement of debug shadow script 2018-08-03 18:01:22 +02:00
Alexander Ivash
5a2506e94f FB16831 qml-related warnings in log 
fix is based on exposing C++ objects to QML before root object is created (as root object might already require C++ objects)
 2018-08-03 17:10:41 +03:00
NissimHadar
2a6bc8bd3e WIP - add results to runs. 2018-08-02 20:10:25 -07:00
NissimHadar
66391c2d64 WIP - add results to runs. 2018-08-02 19:07:16 -07:00
NissimHadar
c8eca5e308 Merge branch 'master' of github.com:highfidelity/hifi into exportToTestRail1 2018-08-02 16:42:06 -07:00
NissimHadar
11b4beda5e Can create a test run. 2018-08-02 15:37:44 -07:00
David Rowe
32e3bb0e1d Merge branch 'master' into M08513-a 
# Conflicts:
#	libraries/audio/src/SoundCache.h
 2018-08-03 10:29:32 +12:00