Andrzej Kapolka
a02656070f
Added some comments.
2014-09-03 14:43:11 -07:00
Andrzej Kapolka
686ad4f0ec
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-03 14:43:01 -07:00
Clément Brisset
72af7617fa
Merge pull request #3332 from AndrewMeadows/ragdoll
...
add AACubeShape to ShapeCollider
2014-09-03 14:34:32 -07:00
Stephen Birarda
4554a89754
Merge pull request #3340 from MarcelEdward/hifi-19916
...
Hifi 19916
2014-09-03 14:20:13 -07:00
Andrzej Kapolka
0bd800faf2
Starting on materials attributes, fixed bug with Hermite deltas.
2014-09-03 14:09:04 -07:00
MarcelEdward
9662dced09
This patch updates the MyAvatar.cpp file.
...
It adds a check MyAvatar::goToLocationFromResponse to see if the user is online, if the teleport to the avatar is done and if not a message is shown which said that the user is not online
2014-09-03 16:59:00 +02:00
MarcelEdward
e62834c197
This patch updates Application::updateLocationInServer() in Application.cpp
...
The online status is updated when the position is send to the data web, a avatar gets an offline status if the data web did not get an update in the last 30 seconds.
This function had an LastLocationObject in which only send in the location info to the data web in case the location changed.
Removed the last location so the position of the avatar is send to the data web every 5 seconds, so that the online status remains online if the avatar is still online and does not switch to offline when the avatar does not move.
2014-09-03 16:43:39 +02:00
MarcelEdward
95cab15864
the command:
...
cmake . -GXcode
creates a CMakeFiles direcory in the test directory, causing the creation of the xcode files to fail with an the source directory does not contain a CMakeList.txt file.
This patch updates the CMakeList.txt file in the test directory to ignore that created dir.
2014-09-03 16:34:23 +02:00
Andrzej Kapolka
33faffd9d4
Sphere tools for voxel editing.
2014-09-02 17:45:37 -07:00
Andrew Meadows
7c04a25095
fix whitespace formatting of curly braces
2014-09-02 16:29:20 -07:00
Andrzej Kapolka
926f0d099c
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-02 14:03:48 -07:00
Andrzej Kapolka
d9733be3e1
Merge pull request #3339 from ey6es/master
...
More shader fixes.
2014-09-02 13:57:31 -07:00
Andrzej Kapolka
34ba5cc31f
More shader fixes.
2014-09-02 13:54:47 -07:00
Clément Brisset
54315e26a8
Merge pull request #3334 from ctrlaltdavid/19992
...
Code Review for Job #19992
2014-09-02 13:11:53 -07:00
Andrzej Kapolka
4e561c69b9
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-02 12:32:57 -07:00
Andrzej Kapolka
d7a38e60b3
Merge pull request #3337 from ey6es/master
...
Quick fix for base colors underneath terrain.
2014-09-02 12:32:18 -07:00
Andrzej Kapolka
bf5e5fd72c
Quick fix for base colors underneath terrain.
2014-09-02 12:31:25 -07:00
Andrzej Kapolka
50a250ce01
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-09-02 12:03:47 -07:00
Clément Brisset
da96a4a458
Merge pull request #3333 from thoys/patch-1
...
Avatar.setLoop is now Avatar.setPlayerLoop
2014-09-01 21:18:08 -07:00
Thijs Wenker
1c41734569
Avatar.setLoop is now Avatar.setPlayerLoop
2014-08-30 15:50:20 +02:00
Andrzej Kapolka
fa06bef556
More dual contour bits.
2014-08-29 18:00:11 -07:00
Andrew Meadows
a71823353b
merge upstream/master into andrew/ragdoll
2014-08-29 16:46:33 -07:00
AndrewMeadows
431d69e9d9
Merge pull request #3330 from Atlante45/rec_file_format_tweaks
...
Rec file format tweaks
2014-08-29 16:10:03 -07:00
Andrew Meadows
aeb355e3da
re-enabling legacy avatar-vs-voxel collisions
...
so that I don't break anything when this merges with upstream
2014-08-29 15:53:20 -07:00
Andrew Meadows
ebcc960ec7
merge upstream/master into andrew/ragdoll
2014-08-29 15:48:40 -07:00
Atlante45
9b5b83117f
CR
2014-08-29 14:25:05 -07:00
Andrew Meadows
a0eb13f6db
collision logic for capsule-side-vs-cube-face
...
with unit tests
2014-08-29 14:23:00 -07:00
Andrzej Kapolka
120563951d
Fixed bug in edge vertex generation.
2014-08-29 12:10:25 -07:00
Andrzej Kapolka
78a03fb31a
More progress toward dual contour rendering.
2014-08-28 20:01:55 -07:00
David Rowe
518fa7936c
Increase model uploader menu width to accommodate large fonts
2014-08-28 17:25:35 -07:00
Andrew Meadows
00913d4422
fixes for capsuleVsAACube() with unit tests
2014-08-28 16:51:16 -07:00
Andrzej Kapolka
f02f95c460
Hermite data computation.
2014-08-28 14:53:48 -07:00
Stephen Birarda
29ed1b3fcd
Merge pull request #3331 from ctrlaltdavid/19961
...
Code Review for Job #19961
2014-08-28 14:30:01 -07:00
David Rowe
1d3a176f5f
Rename method
2014-08-28 13:53:47 -07:00
David Rowe
85e9f8064a
Simplify to use bool instead of storing domain name
2014-08-28 12:21:55 -07:00
Clément Brisset
1b5a6cf671
Merge pull request #3325 from chansensturm/audio-filter
...
left/right channels of head shadow filter now have independent gain calculations
2014-08-28 11:51:09 -07:00
Leonardo Murillo
ff2fe3fae4
Merge pull request #3329 from birarda/addresses
...
handle not found errors returned for addresses from data-web
2014-08-28 11:50:51 -07:00
Atlante45
1a131b0e29
Removed some debug + fixed some checks
2014-08-28 11:50:18 -07:00
Atlante45
a6bf9d7b90
Handle URL recordings + some safety checks
2014-08-28 11:42:39 -07:00
David Rowe
46c1a9d59a
Make login dialog automatically show only once per domain visit
2014-08-28 11:25:13 -07:00
Craig Hansen-Sturm
bef0232b35
Merge pull request #3327 from Atlante45/rec_file_format_tweaks
...
Looping option
2014-08-28 11:13:10 -07:00
Craig Hansen-Sturm
3e3090f1ea
coding standard
2014-08-28 11:12:17 -07:00
Atlante45
9df68dc2f1
CR
2014-08-28 10:58:07 -07:00
Stephen Birarda
cc2a35c2a8
handle not found errors returned for addresses from data-web
2014-08-28 10:54:05 -07:00
Clément Brisset
aae10e8431
Merge pull request #3326 from JeroMiya/vs2010expressInstallOrderBuildDocFix
...
Added the correct install order for VS2010 C++ Express and Win 7.1 SDK
2014-08-28 10:08:08 -07:00
Sleepy Daddy Software™
e7fe7bd021
Added the correct install order for VS2010 C++ Express and Windows 7.1 SDK.
2014-08-28 01:23:19 -04:00
Andrzej Kapolka
2b2bc9179a
More progress towards computing Hermite data.
2014-08-27 19:09:10 -07:00
Atlante45
691ace7cc6
Looping option
2014-08-27 19:05:39 -07:00
Andrzej Kapolka
96b4a1080c
More voxel editing bits.
2014-08-27 18:15:29 -07:00
Craig Hansen-Sturm
0881959750
left/right channels of head shadow filter now have independent gain + implemented all-pass filter
2014-08-27 17:30:11 -07:00
