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

21600 commits

Author SHA1 Message Date
Andrew Meadows
5fc1e97166 fix windows build of render-utils-test 2017-03-27 16:49:43 -07:00
Andrew Meadows
92b41d7a38 fix link error for linux build 2017-03-27 15:50:40 -07:00
Andrew Meadows
ff2f4da4b2 final changes as per samcake 2017-03-27 15:19:28 -07:00
Andrew Meadows
fcf18cba91 render pipeline support for normalized intergers 2017-03-27 14:40:31 -07:00
Andrew Meadows
60bc76e1c4 store cluster indices and weights in uint16_t 2017-03-27 14:40:31 -07:00
Andrew Meadows
f6d6c62fab move variable closer to context where it is used 2017-03-27 14:40:31 -07:00
Andrew Meadows
18544581e6 remove warnings about implicit float cast 2017-03-27 14:40:31 -07:00
Andrew Meadows
60874e6041 remove unused cruft 2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub
c986077a4f Merge pull request #10007 from hyperlogic/feature/ik-debug-draw 
Added Developer > Avatar > Show IK Targets
 2017-03-27 14:29:02 -07:00
Brad Hefta-Gaub
3bdcfd8b78 Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick 
remove properties from RayToEntityIntersectionResult
 2017-03-27 14:26:51 -07:00
samcake
25d39d2430 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-03-27 09:50:44 -07:00
Seth Alves
c21b8b4eac raise max mesh count for static collision entities from 500 to 1000 2017-03-26 08:48:08 -07:00
Seth Alves
66f8e4063d Merge pull request #9984 from Atlante45/fix/warnings 
Fix warnings
 2017-03-26 07:03:33 -08:00
samcake
8b1a0be754 Merge pull request #9997 from jherico/ktx_cache_fix 
Correctly initialize a file cache with the proper key
 2017-03-25 09:58:32 -07:00
Sam Cake
ad5c78349a Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-03-25 09:57:28 -07:00
Anthony J. Thibault
5eddd232b0 Fix for change from std::string to QString 2017-03-24 17:03:01 -07:00
Anthony J. Thibault
49a95089d1 Remove hacks for debug rendering of IK targets 
A AnimContext class was introduced.  This context is passed into every node during evaluation/overlay.
It holds non-animVar "global" data passed from the application.

(cherry picked from commit a028d3ba58)
 2017-03-24 16:27:27 -07:00
Anthony J. Thibault
dd17b2e2f3 Added developer option to draw IK targets in world. 
(cherry picked from commit 7e7803c648)
 2017-03-24 16:20:52 -07:00
Brad Davis
82d502ae9f Correctly initialize a file cache with the proper key 2017-03-24 13:35:37 -07:00
Seth Alves
0d2e0eb9c3 Merge pull request #9994 from sethalves/avoid-deadlock-on-10k-mesh-fbx 
Avoid deadlock on 10k mesh fbx
 2017-03-24 12:34:37 -08:00
Seth Alves
aaa78d108b if a model has too many meshes, give up. 2017-03-24 11:17:24 -07:00
Seth Alves
e1e51614d9 don't hang loop if entity isDead 2017-03-24 11:16:54 -07:00
samcake
13b3809fe3 removing includes if possible 2017-03-24 11:04:52 -07:00
Clément Brisset
5ff7dbb254 Merge pull request #9991 from Atlante45/fix/entity-bad-url 
Show entity bounding box for bad URLs
 2017-03-24 10:56:06 -07:00
ZappoMan
ddd0645453 fix merge issue 2017-03-24 09:59:11 -07:00
samcake
a0488cfb91 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-03-24 09:41:09 -07:00
Brad Hefta-Gaub
1972b140b9 Merge pull request #9976 from mittens/21215 
Worklist #21215 - Removing Duplicate Status Icons for Submeshes
 2017-03-24 08:52:12 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223 
21223 - Quat functions have naming inconsistencies
 2017-03-24 08:12:11 -07:00
Brad Hefta-Gaub
aa1883ba85 Merge pull request #9979 from jherico/crash_fix 
Fix crash in render-perf-test
 2017-03-24 08:10:37 -07:00
Sam Cake
022e91b35d Clean comments and pixel format used 2017-03-24 00:26:14 -07:00
samcake
618344fe98 Fixing the bug regarding the numMIps allocated by GLBackend and breaking the HalfRezDepthTexture 2017-03-23 18:10:09 -07:00
Atlante45
4f8d9b190b Show green box when model entity has bad url 2017-03-23 17:56:33 -07:00
Atlante45
d4353e1d19 Fix warnings 2017-03-23 11:39:42 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00
Brad Davis
944255a37b Fix crash in render-perf-test 2017-03-22 22:44:05 -07:00
Brad Davis
3a40fd886f Fix comparison between GL stamps and GPU stamps 2017-03-22 18:11:20 -07:00
Brad Davis
4868a1618a Add initialization to sampler stamp 2017-03-22 18:10:54 -07:00
Brad Davis
893fcba283 Return the correct format and internal format combo for depth textures 2017-03-22 17:14:40 -07:00
Brad Davis
9a3686fc1a Fixing merge conflict 2017-03-22 14:55:11 -07:00
Brad Davis
85c80f3be8 Merge remote-tracking branch 'upstream/master' into smarter_textures 
Conflicts:
	libraries/gpu/src/gpu/Texture.cpp
 2017-03-22 14:25:23 -07:00
Andrew Meadows
a463013d90 Merge pull request #9960 from samcake/blue 
Fix Ambient Lighting equation
 2017-03-22 14:13:31 -07:00
Chris Collins
05c40d2930 Merge pull request #9933 from mittens/hotfix/obj-texture-fix 
Fixed the texture assignment for the OBJ loader
 2017-03-22 13:19:01 -07:00
trent
c71e57753b Removing changes (albeit benign ones) from another PR. 2017-03-22 15:23:40 -04:00
trent
36619cd2e4 Fixed issue with duplicate physics status icons per sub-object. 2017-03-22 15:07:29 -04:00
Triplelexx
31ec9b832f rename fronts to forwards 2017-03-22 18:43:30 +00:00
Triplelexx
c2cff55427 rename fronts to forwards 2017-03-22 18:41:06 +00:00
trent
83d69e65b3 Merge branch 'master' of https://github.com/highfidelity/hifi into 21215 2017-03-22 14:20:37 -04:00
Brad Davis
e60108cc8c PR comments 2017-03-21 17:26:24 -07:00
Triplelexx
6e740a5fbb change Mat4 getFront to getForward 2017-03-21 22:33:37 +00:00