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

45478 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gondelman
84b7f9b186 Merge pull request #8375 from SamGondelman/loadingFade 
remove polyvox fade, fix web fade, add light fade
 2016-08-05 11:53:15 -07:00
SamGondelman
8494400047 don't use web entity texel color alpha as per tony's suggestion 2016-08-05 11:27:56 -07:00
SamGondelman
f2ee57f2de light fade 2016-08-05 11:17:02 -07:00
SamGondelman
b13edc7b6a fixed web fade fo' real 2016-08-05 10:48:09 -07:00
SamGondelman
130e64aaba remove polyvox fade, possibly fix web fade 2016-08-05 10:36:48 -07:00
Sam Gondelman
ffa540c0e5 Merge pull request #8374 from ZappoMan/fadeFinalizeModels 
implement support for updating the render items of models when they finish their fade
 2016-08-05 10:34:48 -07:00
Brad Hefta-Gaub
83280aa3f2 implement support for updating the render items of models when they finish their fade 2016-08-05 10:11:07 -07:00
Brad Hefta-Gaub
67cf105720 Merge pull request #8369 from SamGondelman/loadingFade 
Loading fade progress
 2016-08-04 15:24:37 -07:00
SamGondelman
3107d63ad8 one more warning 2016-08-04 14:31:44 -07:00
SamGondelman
b6e73e06a2 merge from master 2016-08-04 13:34:38 -07:00
SamGondelman
004b0158a4 fix warnings on osx 2016-08-04 13:09:09 -07:00
SamGondelman
ac9a80131a refactoring _fadeStartTime and isTransparent, make simple renderables switch to transparent when fade finishes 2016-08-04 12:34:46 -07:00
Chris Collins
be87f294d8 Merge pull request #8351 from thoys/fix-handcontrollergrab-grab-message 
fix remote triggering handControllerGrab
 2016-08-04 11:55:48 -07:00
SamGondelman
6604c27f23 polyvox fade WIP 2016-08-04 10:55:37 -07:00
Brad Hefta-Gaub
a1dc9beddb Merge pull request #8348 from ZappoMan/beltAndSuspenders 
implement codec renegotiation in client
 2016-08-03 21:22:28 -07:00
SamGondelman
d521315475 fade polylines (needs testing) 2016-08-03 17:03:52 -07:00
Chris Collins
2473bbf1db Merge pull request #8313 from imgntn/tweak_lazers 
Tweak Teleport + Hand Lasers
 2016-08-03 16:40:28 -07:00
SamGondelman
d7052f6250 try to make text entities fade 2016-08-03 16:27:51 -07:00
Seth Alves
7740420b96 Merge pull request #8361 from hyperlogic/bug-fix/avatar-debug-draw 
Bug fix for avatar debug marker rendering.
 2016-08-03 16:07:49 -07:00
SamGondelman
7713c1f4bf try to fade in web entities 2016-08-03 15:56:41 -07:00
Anthony J. Thibault
f24c92f3a1 Bug fix for avatar debug marker rendering. 
"Developer > Hands > Show Hand Targets" works again
"Developer > Avatar > Draw Position" works again
 2016-08-03 15:43:31 -07:00
Philip Rosedale
f0c944b0c3 Merge pull request #8350 from sethalves/ignore-touch 
if the oculus HMD isn't on someone's head, don't take input from the controllers
 2016-08-03 15:21:43 -07:00
Philip Rosedale
98e40d54e1 Merge pull request #8355 from SamGondelman/touchDeadZone 
Added dead zones to Hydra and Oculus Touch joysticks
 2016-08-03 15:17:15 -07:00
James B. Pollack
e012d3cebb Merge branch 'tweak_lazers' of github.com:imgntn/hifi into tweak_lazers 2016-08-03 15:00:05 -07:00
James B. Pollack
7a41ed25db Merge remote-tracking branch 'upstream/master' into tweak_lazers 2016-08-03 14:59:51 -07:00
Seth Alves
707fa2cafe Merge branch 'master' of github.com:highfidelity/hifi into ignore-touch 2016-08-03 14:51:28 -07:00
SamGondelman
27bacc9165 try to fade in procedural shapes 2016-08-03 14:33:05 -07:00
SamGondelman
2eb0c7735f working on fading shape entities 2016-08-03 13:30:05 -07:00
Brad Hefta-Gaub
eb230071a0 Merge branch 'master' of https://github.com/highfidelity/hifi into beltAndSuspenders 2016-08-03 11:53:28 -07:00
SamGondelman
458e43fadc added dead zones to hydras, style fixes 2016-08-03 10:18:57 -07:00
Seth Alves
9962d47173 Merge pull request #8326 from birarda/kick 
kick
 2016-08-03 09:21:09 -07:00
Brad Hefta-Gaub
754eae98c2 Merge pull request #8353 from birarda/fake-atp-url 
fix for disabled physics with unloadable entity
 2016-08-03 09:10:41 -07:00
Brad Hefta-Gaub
70cb3d3393 Merge pull request #8354 from AlexanderOtavka/remove-web-debug 
Remove url change debug info for WebView
 2016-08-03 09:10:10 -07:00
Seth Alves
cc7322a0de Merge pull request #8334 from ctrlaltdavid/21015 
refresh file dialog when directory content changes
 2016-08-03 08:11:40 -07:00
James B. Pollack
5ad5899140 revert pointer changes 2016-08-02 21:26:48 -07:00
James B. Pollack
fed39d9056 cleanup dead code 2016-08-02 21:26:04 -07:00
Chris Collins
b2a354ddb9 Merge pull request #8331 from huffman/feat/progress-updates 
progress.js updates
 2016-08-02 21:10:54 -07:00
Seth Alves
8f76c43bc1 if call to ovr_GetSessionStatus fails, also don't take input from controllers 2016-08-02 19:49:58 -07:00
Seth Alves
ed4b3cde6b Merge branch 'master' of github.com:highfidelity/hifi into ignore-touch 2016-08-02 19:44:28 -07:00
James B. Pollack
9d56c697e7 no delay! 2016-08-02 19:02:20 -07:00
James B. Pollack
364eb992fb no teleport while moving 2016-08-02 18:53:36 -07:00
James B. Pollack
88ebeaa4cb start no movement mode. using actual keys since avatar speed doesnt work with gtting stuck 2016-08-02 18:46:47 -07:00
Brad Hefta-Gaub
193f0bbb99 Merge pull request #8345 from ctrlaltdavid/web-window-signals 
add OverlayWebWindow resized, moved, and closed signals
 2016-08-02 18:41:49 -07:00
Brad Hefta-Gaub
0d1034914d Merge pull request #8352 from AlexanderOtavka/fix-confirm 
Fix confirm dialog
 2016-08-02 18:41:08 -07:00
SamGondelman
1ce7623f41 added deadzones to oculus touch movements 2016-08-02 18:19:58 -07:00
SamGondelman
d63a0ef08f working on making other entities transparent 2016-08-02 18:09:42 -07:00
Seth Alves
8c43c12249 clear pose before short-circuiting update 2016-08-02 16:49:24 -07:00
Zander Otavka
3c30743d0d Remove url change debug info for WebView 2016-08-02 16:48:39 -07:00
Ryan Huffman
adbd9ff854 Add constants for progress bar offset 2016-08-02 16:34:57 -07:00
Stephen Birarda
5d3e125a06 make failed geomtetry request not hold physics 2016-08-02 16:32:41 -07:00