Sam Gateau
8b7ad9cfcb
merge with upstream
2015-07-29 17:13:48 -07:00
Sam Gateau
ab4b940d83
merge with upstream
2015-07-29 17:11:13 -07:00
Niraj Venkat
4f2630c561
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-29 16:54:37 -07:00
Sam Gateau
4972cb024f
Try to make the inlucde sequence simpler in gpu for GLBackend
2015-07-29 16:48:23 -07:00
Sam Gateau
5baf993c24
fixing the stars again
2015-07-29 16:27:45 -07:00
Sam Gateau
269db0ff6f
fixing the stars rendering that was vilently broken durign the hunt for GPUCOnfig.h includes
2015-07-29 16:08:16 -07:00
Howard Stearns
d73f133daa
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 15:45:00 -07:00
Howard Stearns
838711e526
Remove avatar->shift hips for idle animations.
...
See https://app.asana.com/0/32622044445063/43127903156601
2015-07-29 15:27:50 -07:00
Sam Gateau
3c934af297
clean the gpuCOnfig.h for linux
2015-07-29 14:45:48 -07:00
Sam Gateau
9601e09ba9
A simpler way to add the NSIGHT_FOUND define to all the projects depending on GPU
2015-07-29 14:42:24 -07:00
Sam Gateau
8c96096a67
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-29 14:04:20 -07:00
Sam Gateau
661f29924f
Clean up the cmakelist to normally onlly do th eminimal linking and include for gl
2015-07-29 13:55:26 -07:00
Sam Gateau
17650dde74
Solving the coimpiling issue with Render-utils test
2015-07-29 11:49:22 -07:00
samcake
4ebc75da1f
Merge pull request #5369 from ericrius1/hitEffect
...
Added functionality for displaying a screen-space hit effect
2015-07-29 11:28:08 -07:00
Niraj Venkat
8a833d8a00
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar
2015-07-29 11:15:21 -07:00
ericrius1
65e04337bf
removed synccache line
2015-07-29 11:15:20 -07:00
Andrew Meadows
a1e6fdc4b2
Merge pull request #5435 from MarcelEdward/hifi-2-20069
...
Hifi 2 20069
2015-07-29 11:13:30 -07:00
Howard Stearns
806714b20a
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 11:10:59 -07:00
Niraj Venkat
d76cda396f
HBAO implementation ported from NVidia HLSL
2015-07-29 11:05:19 -07:00
Howard Stearns
6c68dbeee2
Merge branch 'sethalves-rig2' into rig
2015-07-29 10:50:10 -07:00
Howard Stearns
a9f76324b5
Merge branch 'rig' of https://github.com/sethalves/hifi into sethalves-rig2
2015-07-29 10:49:27 -07:00
ericrius1
697cb4c9d0
fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine
2015-07-29 10:02:06 -07:00
Howard Stearns
12d449f69d
Update test case initialization post cauterization changes.
2015-07-29 09:55:46 -07:00
Howard Stearns
7fdba9132e
Revert Camera.h changes.
2015-07-29 09:55:19 -07:00
Sam Gateau
76acbde595
Removing the opengl and glew links from Interface since now coming from gpu lib
2015-07-29 09:54:10 -07:00
samcake
bc941147f4
Merge pull request #5446 from bwent/cookies
...
Add cookies.js functionality for collapsable subpanels, key navigation
2015-07-29 09:53:07 -07:00
Howard Stearns
66621d31e8
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 09:26:36 -07:00
bwent
7805cf4e48
Format fixes, UI logos for collapse/expand toggle
2015-07-29 09:19:33 -07:00
Howard Stearns
68aec1fd36
Merge branch 'rig' of https://github.com/howard-stearns/hifi into rig
2015-07-29 09:12:44 -07:00
Howard Stearns
327ecfe62c
Be less noisy.
2015-07-29 09:11:58 -07:00
Howard Stearns
711dce4edc
Merge pull request #9 from hyperlogic/ajt/cauterize-head-fix
...
Remove cauterize code from Rig and move it back into Model.
2015-07-29 09:09:28 -07:00
Thijs Wenker
7325e6a7b7
Send ping requests to the nodes (AvatarMixer, AudioMixer, EntityServer) that the Assignment agent connected with to keep the connections alive.
2015-07-29 14:57:06 +02:00
Marcel Verhagen
1d29fb9d7f
replace tabs with whitespaces.
2015-07-29 14:56:24 +02:00
Brad Davis
6a5c2982ac
Merge pull request #5453 from hyperlogic/ajt/mirror-anchor-fix
...
Changed mirror position to not be achored to the head.
2015-07-28 20:26:19 -07:00
Anthony J. Thibault
044ea2ace5
Changed mirror position to not be achored to the head.
...
But instead it's anchored to the "default" eye position, which
is where the eyes are in the model, before IK or animations occur.
2015-07-28 19:31:43 -07:00
samcake
8dd85aab14
Merge pull request #2 from AndrewMeadows/californium
...
fix rendering on linux
2015-07-28 18:14:06 -07:00
Andrew Meadows
475d069185
fix rendering on linux
2015-07-28 18:12:10 -07:00
samcake
8e73df119b
Merge pull request #1 from AndrewMeadows/californium
...
compile on linux with GLEW
2015-07-28 17:58:55 -07:00
Andrew Meadows
77a12eb50e
compile on linux with GLEW
2015-07-28 17:53:01 -07:00
Anthony J. Thibault
b06485c266
Remove cauterize code from Rig and move it back into Model.
...
* cauterize code is used as at render time and is not dependent on
the jointStates.
* MyAvatar now initialize the bone set used for cauterization and
makes the decision to perform cauterization or not in preRender.
2015-07-28 17:45:33 -07:00
samcake
27d3d3f450
fix w to x
2015-07-28 15:51:15 -07:00
samcake
9cf3dfd3f7
test this on windows ?
2015-07-28 15:49:39 -07:00
Sam Gateau
8b20f9d3a6
do the minimum include to use glew on linux
2015-07-28 15:48:01 -07:00
ericrius1
469bace7ca
removed unnessary computations from hit effect fragment shader
2015-07-28 15:15:34 -07:00
Sam Gateau
df9b66d267
Implement the uniform buffer and resource texture cache and their reset
2015-07-28 15:08:52 -07:00
Andrew Meadows
fa49342f00
Merge pull request #5420 from bwent/solar-system
...
Example script solarsystem.js with orbiting satellite game
2015-07-28 15:06:23 -07:00
Howard Stearns
a383f43f75
Merge pull request #5447 from AndrewMeadows/calcium
...
fix broken unit test builds
2015-07-28 14:34:20 -07:00
Philip Rosedale
cce6f15de2
Merge pull request #5443 from huffman/edit-camera-up
...
Update edit.js to swing up on activate so that it doesn't intersect with the avatar's head
2015-07-28 13:32:34 -07:00
Ryan Huffman
0b25fc335e
Cleanup edit.js entity creation
2015-07-28 13:21:29 -07:00
Marcel Verhagen
34d63cdb43
Removed double ""
2015-07-28 22:02:36 +02:00
