Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-06-04 18:30:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
39313 commits 6 branches 1 tag 1.1 GiB
Commit graph

39313 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
d6a716a1aa only head and torso for bounding capsule radius 2016-02-15 10:29:29 -08:00
ericrius1
e4d4044a2b particleExplorer works in edit tab 2016-02-15 09:41:47 -08:00
samcake
545f276fdf Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-15 09:29:00 -08:00
ericrius1
b92c5555fe Merge branch 'master' into particlesInEdit2 2016-02-15 09:14:37 -08:00
samcake
bb38f44abf Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-02-14 11:09:52 -08:00
Brad Hefta-Gaub
376c23f1a3 Merge pull request #7100 from imgntn/edit_props 
Hide hyperlink property for web entities
 2016-02-12 18:29:35 -08:00
samcake
e6d15c3d56 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-02-12 18:22:30 -08:00
samcake
4559e75f90 Trying to solve the ambient issue 2016-02-12 18:22:01 -08:00
Brad Davis
b5cba79f0c Merge pull request #7095 from ZappoMan/hmdHacking 
Various bug fixes in related to HMD overlay support
 2016-02-12 17:50:42 -08:00
Brad Hefta-Gaub
48fe638312 Merge pull request #7104 from howard-stearns/update-orbitingSound 
update-orbitingSound.js
 2016-02-12 17:44:47 -08:00
Brad Hefta-Gaub
c699c828cd Merge pull request #7092 from birarda/assets-abs-path 
add setting to DS for asset path, handle absolute paths
 2016-02-12 17:43:23 -08:00
Howard Stearns
9a3972c43f wait for sound to download 2016-02-12 17:42:44 -08:00
Brad Hefta-Gaub
e003fe5f4b Merge pull request #7081 from zzmp/fix/mini-mirror-ao 
Disable AO in mini mirror
 2016-02-12 17:37:45 -08:00
Andrew Meadows
6baf181453 Merge pull request #7093 from hyperlogic/tony/input-poses-in-avatar-space 
Controller Pose values are relative to Avatar.
 2016-02-12 17:13:36 -08:00
Brad Hefta-Gaub
d85a8a4fb9 Merge pull request #7103 from jherico/render-rate 
Don't drop to half the vsync rate when we can't keep up
 2016-02-12 17:11:03 -08:00
samcake
21c9b74a68 Cleaning up performance timers which are taking too much time... 2016-02-12 17:07:53 -08:00
samcake
bcd7876f6c adding better performance stats 2016-02-12 16:53:24 -08:00
Andrew Meadows
33d49fecaf Merge pull request #7085 from kencooke/master 
Added AVX detection for Mac/Linux
 2016-02-12 16:50:36 -08:00
Brad Davis
df225afd05 PR feedback 2016-02-12 16:25:46 -08:00
Brad Hefta-Gaub
df6437236e some CR feedback 2016-02-12 16:13:12 -08:00
Chris Collins
8317914070 Merge pull request #7097 from jherico/menuCleanup 
Don't leave user data pointers around in objects after deletion
 2016-02-12 16:12:20 -08:00
Brad Hefta-Gaub
1c2096bc30 remove some unrelated whitespace changes 2016-02-12 16:09:51 -08:00
Howard Stearns
25671fbefe Update orbitingSound.js to use a sample file that exists and setOptions function. 2016-02-12 16:01:23 -08:00
Brad Davis
908e153c36 Don't drop to half the vsync rate when we can't keep up 2016-02-12 15:57:27 -08:00
Zach Pomerantz
0903e14b06 Revert model texs when unset 2016-02-12 15:57:24 -08:00
Eric Levin
921674b952 Merge pull request #7101 from ZappoMan/fixDoublePreload 
fix error in preload logic
 2016-02-12 15:35:59 -08:00
Brad Hefta-Gaub
98aaf02030 Merge pull request #7098 from zzmp/fix/model-texture-delta 
Update NetworkMaterial maps when changing textures
 2016-02-12 15:16:17 -08:00
Andrew Meadows
2f2d1b5d22 Merge pull request #7076 from birarda/integrate-new-hrtf 
use injector not mixed count for inactivity
 2016-02-12 15:14:53 -08:00
Brad Hefta-Gaub
9160758af7 make sure forced reload still works 2016-02-12 15:09:50 -08:00
samcake
e3307d91ad Fix the debugging tool to be able to freeze the frustum for scene fetch and culling 2016-02-12 14:59:43 -08:00
Brad Hefta-Gaub
550b9a98b1 fix error in preload logic 2016-02-12 14:45:55 -08:00
James B. Pollack
c469fc6a29 hide hyperlink property for web entities 2016-02-12 14:30:21 -08:00
Chris Collins
3321265ae7 Merge pull request #7086 from howard-stearns/clear-away-on-buttons 
Clear pause/away on controller button press
 2016-02-12 12:56:42 -08:00
Zach Pomerantz
d21f9d555a Update NetworkMaterial maps when changing textures 2016-02-12 12:37:07 -08:00
Brad Davis
28f3e8ba9c Don't leave user data pointers around in objects after deletion 2016-02-12 12:07:23 -08:00
Anthony Thibault
7d400623be Merge pull request #7096 from howard-stearns/fix-lookAt 
Fix Quat.lookAt
 2016-02-12 12:01:19 -08:00
samcake
9bfeb4a1d5 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 11:31:47 -08:00
samcake
c4faa091a1 Fixing initialization syntax 2016-02-12 11:31:21 -08:00
Andrew Meadows
1e29faf365 Merge pull request #7090 from ZappoMan/fixOctreeBag 
move back to unordered_set so that OctreeElementBag will handle uniqueness
 2016-02-12 11:22:46 -08:00
Brad Hefta-Gaub
1160ecb335 improvements in HMD UI behavior 2016-02-12 10:51:33 -08:00
samcake
ef92a52777 Merge pull request #7051 from zzmp/feat/graphics-dialog 
Move graphics settings to a new dialog
 2016-02-12 10:46:00 -08:00
Howard Stearns
80baa5ce18 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-lookAt 2016-02-12 10:39:31 -08:00
Howard Stearns
874f74de04 Fix Quat.lookAt 2016-02-12 10:38:50 -08:00
samcake
2d33bb83e1 Remove a dead comment 2016-02-12 10:30:44 -08:00
samcake
c248732bc7 Getting the array initialization right ? 2016-02-12 10:27:08 -08:00
samcake
40c283cba2 Fixing some warnings 2016-02-12 10:21:28 -08:00
samcake
40455af7fc LEss warning 2016-02-12 10:16:20 -08:00
samcake
5acfd5ff53 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-12 09:59:48 -08:00
samcake
171acb883f Fixing compilation issue on mac and linux 2016-02-12 09:59:33 -08:00
Andrew Meadows
31f9da2dcb Merge pull request #7094 from sethalves/fix-attachment-manager 
fix some things I broke yesterday
 2016-02-12 09:40:52 -08:00