Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-04 23:41:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40461 commits 74 branches 59 tags 1.2 GiB
Commit graph

40461 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
a5e94ec087 Merge pull request #7307 from ctrlaltdavid/update-glyphs 
Update HiFi glyphs font file
 2016-03-10 12:55:32 -08:00
Anthony J. Thibault
9351d5edca Rig: warning fix & comments 2016-03-10 12:55:01 -08:00
Zach Pomerantz
d7d351fc63 Guard against unloaded env cubemaps 2016-03-10 12:50:52 -08:00
ericrius1
5ba96cb07c removed print statements 2016-03-10 12:47:31 -08:00
Zach Pomerantz
1e925d7bd8 Fetch unspecified textures on a delay 
This fixes an abort caused by the assertion
in ResourceCache::getResource: assert(delayLoad).
 2016-03-10 12:28:59 -08:00
Zach Pomerantz
d615e2e83b Avoid redundant zone updates 2016-03-10 12:27:45 -08:00
Brad Hefta-Gaub
6ed1ad10a1 remove hmdDefaults and hmdControls scripts, since they are borked 2016-03-10 12:12:24 -08:00
ericrius1
8fe926e535 added print statements 2016-03-10 11:41:12 -08:00
ericrius1
2af4dd90e1 updated shader links to be s3 2016-03-10 11:40:09 -08:00
Eric Levin
99f2c614c3 Merge pull request #10 from zzmp/uniformBugRepro 
Add tests for sphere, skybox
 2016-03-10 11:36:13 -08:00
Zach Pomerantz
64042327ec Use version tmp var 2016-03-10 11:08:15 -08:00
James B. Pollack
c05e996913 remove lifetime 2016-03-10 10:38:49 -08:00
Anthony J. Thibault
4a78300607 MyAvatar: Allow user to raise hands directly overhead. 
Previously we were using a infinitely tall vertical cylinder
to push hand IK targets out of the body, this had the
side-effect of preventing the hands from being raised over
the head.  Now, we collide against the same 3d capsule
used by the physics system for avatar collisions.
 2016-03-10 10:20:17 -08:00
Zach Pomerantz
f37049059e Finish name changes for rapidProceduralChange 2016-03-10 10:19:52 -08:00
Zach Pomerantz
9b89e46e65 Make procedural userData thread-safe 2016-03-10 10:12:55 -08:00
Zach Pomerantz
1640314076 Use one procedural for skybox (avoid copies) 2016-03-10 10:12:22 -08:00
Brad Hefta-Gaub
1547fc15aa Merge pull request #7305 from PhilipRosedale/editHandles 
Adjust edit handle sizes
 2016-03-10 09:46:43 -08:00
Anthony Thibault
153f7fc3aa OpenVR: adjusted translation of UI sphere overlay 2016-03-10 09:45:47 -08:00
samcake
f40d390cc9 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-10 09:40:43 -08:00
samcake
a26f522f33 Merge pull request #7308 from jherico/shaders 
Fix link problem with shaders that use transparency and normal maps
 2016-03-10 09:35:35 -08:00
samcake
0543bb22e2 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-10 09:31:30 -08:00
samcake
f6276615f7 Trying to fix the bound out of the octree volume problem 2016-03-10 09:31:05 -08:00
Brad Hefta-Gaub
99d26e0ef5 Merge pull request #7310 from jherico/crashes 
Addressing thread safety issues
 2016-03-10 09:26:49 -08:00
Brad Hefta-Gaub
ee727b0632 Merge pull request #7304 from Atlante45/master 
Fix messed up LogDialog multi-lines
 2016-03-10 09:23:35 -08:00
Philip Rosedale
ee1e4b898e Merge pull request #7278 from AndrewMeadows/simulation-priority 
adjust simulation priorities
 2016-03-10 08:52:18 -08:00
Brad Davis
ee017cf0a5 Make script cache thread safe 2016-03-10 08:47:11 -08:00
Brad Davis
f97e61e305 Make scripting interface members thread safe 2016-03-10 08:46:09 -08:00
Brad Hefta-Gaub
aaed1d333b Merge pull request #7309 from jherico/compositor_threading_fix 
Handle fake mouse events properly when triggered from a script
 2016-03-10 08:37:30 -08:00
Brad Hefta-Gaub
82ca78b37b Merge pull request #7300 from sethalves/fix-detach-crash 
fix removing attachments
 2016-03-10 08:23:52 -08:00
Brad Davis
f04d1b4998 Handle fake mouse events properly when triggered from a script 2016-03-09 22:11:40 -08:00
Brad Davis
aad2aaa764 Fix link problem with shaders that use transparency and normal maps 2016-03-09 20:01:18 -08:00
Zach Pomerantz
74e1d32221 Reuse procedural on skybox 2016-03-09 19:40:27 -08:00
Zach Pomerantz
4022474b48 Constrain procedural updates to render thread 2016-03-09 19:39:38 -08:00
Zach Pomerantz
3cd0f0d237 Drive skybox off of timer 2016-03-09 19:34:48 -08:00
Chris Collins
f98b6c3a28 Merge pull request #7303 from jherico/watchdog 
Update the watchdog heartbeat manually during startup
 2016-03-09 19:11:30 -08:00
Anthony Thibault
42d27557a1 OpenVR: remove 180 y rotation for UI bounds. 
Turns out the room I was using was misconfigured.
 2016-03-09 18:42:58 -08:00
Zach Pomerantz
d89d89fd08 Add all entities and skybox 2016-03-09 18:35:03 -08:00
David Rowe
4c3f374f02 Update HiFi glyphs font file 
Has some new, soon to be used characters, but no other changes.
 2016-03-10 15:10:44 +13:00
PhilipRosedale
c11487735f Adjust grab handle sizes 2016-03-09 17:46:38 -08:00
PhilipRosedale
6017db0f31 Adjust grab handle sizes 2016-03-09 17:43:44 -08:00
James B. Pollack
a8ac556103 merge 2016-03-09 17:41:14 -08:00
Anthony J. Thibault
5f1b8805cf Removed unnecessary include 2016-03-09 17:37:51 -08:00
James B. Pollack
f35ab59044 adjust bubbles and add a treasure chest 2016-03-09 17:36:45 -08:00
Zach Pomerantz
40fbe2d1e5 Reuse procedurals on entities 2016-03-09 17:34:03 -08:00
Atlante45
f6e01bbd36 Fix messed up LogDialog multi-lines 2016-03-09 17:31:04 -08:00
Brad Davis
9645ed9120 Update the watchdog heartbeat manually during startup 2016-03-09 17:00:45 -08:00
Anthony J. Thibault
886457939d Merge branch 'master' into tony/wrong-way-overlay 2016-03-09 16:50:18 -08:00
Howard Stearns
2b576e86f0 Merge pull request #7259 from jherico/crashes 
Crash fixes
 2016-03-09 16:42:36 -08:00
Chris Collins
ddb09ec222 Merge pull request #7285 from hyperlogic/tony/hand-controller-move-improvements 
Hand controller mouse improvements
 2016-03-09 16:34:35 -08:00
Chris Collins
690d877e93 Merge pull request #7292 from zzmp/fix/cache-loaded 
Mark Resource loaded after postprocessing
 2016-03-09 16:31:45 -08:00