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

70364 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon Walton
a8b9568c92 Add some locking 2018-08-10 10:11:46 -07:00
Simon Walton
875407b3fe New approach to physics readiness - now (mostly) working 2018-08-09 16:24:04 -07:00
Simon Walton
4395e1fa26 Safe Landing checkpoint 2018-08-09 11:11:58 -07:00
Simon Walton
88bd4e3d9a WIP - safe landing infrastructure 2018-08-08 12:32:45 -07:00
Simon Walton
790fb43b42 Start of safe landing client work 2018-08-07 11:34:05 -07:00
Anthony Thibault
079b276c2b
Merge pull request #13733 from luiscuenca/fixElbowPoleVector3 
Elbow pole vectors improvements
 2018-08-06 17:33:03 -07:00
Sam Gateau
00c5b6f5f4
Merge pull request #13743 from SamGondelman/transparent 
Fix primitives always drawing as transparents
 2018-08-06 16:28:30 -07:00
Sam Gondelman
7dd80d0180
Merge pull request #13240 from jherico/feature/glsl_layouts 
Update shader pipeline, improve mac startup time
 2018-08-06 15:30:46 -07:00
Brad Davis
dcdc3a323c Use defines for packed textures to satisfy both GLES and GL 4.1 2018-08-06 14:35:36 -07:00
Brad Davis
993e1e1c4d Use GLES compatible context for shader tests 2018-08-06 14:35:11 -07:00
David Back
112327a3c1
Merge pull request #13735 from dback2/entityCameraKeyFix 
Use key codes for entity camera keys
 2018-08-06 14:07:48 -07:00
Clément Brisset
9de0c25eb5
Merge pull request #13763 from hyperlogic/feature/avatar-data-packet-size-addition 
Added readme and size field to avatar data packet dissector
 2018-08-06 13:59:12 -07:00
Clément Brisset
5c3ab2c354
Merge pull request #13762 from kencooke/audio-hrtf-bugfix 
Fix possible assert in HRTF
 2018-08-06 13:58:45 -07:00
Anthony J. Thibault
2cd01ad189 Added readme and size field to avatar data packet dissector 2018-08-06 11:15:43 -07:00
Brad Davis
a0ef0c0b13 Fix procedurals 2018-08-06 10:31:14 -07:00
Ken Cooke
496724f0db formatting cleanup 2018-08-04 20:15:04 -07:00
Ken Cooke
2121e201d5 fix assert when azimuth is negative subnormal 2018-08-04 20:09:27 -07: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
Dante Ruiz
9bebd1e623 making changes 2018-08-03 18:11:55 -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
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
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
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
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
Bradley Austin Davis
8e9c1e5c0a Fix out of date comment 2018-08-03 11:38:39 -07: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
David Rowe
32e3bb0e1d Merge branch 'master' into M08513-a 
# Conflicts:
#	libraries/audio/src/SoundCache.h
 2018-08-03 10:29:32 +12:00
SamGondelman
2f358f3380 fix shapes always drawing as transparents 2018-08-02 12:16:01 -07:00
Zach Fox
41b804a5dd
Merge pull request #13738 from zfox23/MS17215_newEarlyFetchLogic 
Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present
 2018-08-02 09:39:37 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics 
Enable physics after ES indicates all nearby entities received
 2018-08-01 18:15:00 -07:00
Andrew Meadows
e336c9276d first set shape THEN use it 2018-08-01 17:39:57 -07:00
Simon Walton
6f1487bbf8 Don't explicitly use data method of shared node pointer 2018-08-01 17:11:26 -07:00
Simon Walton
d7a49ee594
Merge pull request #13622 from SimonWalton-HiFi/ac-monitor-resources 
Raise POSIX descriptor-limit in AC Monitor if necessary
 2018-08-01 17:07:33 -07:00
Zach Fox
67528cb646 Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present 2018-08-01 15:49:53 -07:00
Brad Davis
4b317a84d8 Don't allow Web surfaces created by non-client scripts to access files 2018-08-01 15:12:45 -07:00