Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:33:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29008 commits 71 branches 56 tags 1.2 GiB
Commit graph

29008 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
b08b2d29cc Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-30 18:40:21 -07:00
samcake
fbf21cb089 FIxed the problem on Mac, by removing all of the gpuConfig includesgit status 
q
:q
wq
 2015-07-30 18:27:47 -07:00
Sam Gateau
14f4c9c6c0 REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend 2015-07-30 15:07:36 -07:00
Sam Gateau
d84e2d31ea Merge with master 2015-07-30 11:20:00 -07:00
Stephen Birarda
fc80e427b9 remove names from audio-mixer jitter calc comments 2015-07-30 11:08:45 -07:00
samcake
b84302a44a Merge pull request #4 from sethalves/test-5452 
fix linux build
 2015-07-30 10:16:58 -07:00
Brad Hefta-Gaub
96fdb32edc Merge pull request #5461 from venkatn93/avatar 
HBAO implementation
 2015-07-30 08:46:55 -07:00
Brad Hefta-Gaub
b95e4e1e93 Merge pull request #5323 from MarcelEdward/20605 
Removed the  line where the directory is stripped off the RelativeFile
 2015-07-30 07:30:01 -07:00
Marcel Verhagen
fa6d6a5123 Added the & references to the const variables 2015-07-30 15:08:02 +02:00
Seth Alves
a9556660c4 fix linux build 2015-07-29 20:53:24 -07:00
Brad Hefta-Gaub
398bace83c Merge pull request #5439 from samcake/punk 
Remove alias gl calls from Batch and Introduce a ResetStage Batch command
 2015-07-29 20:05:06 -07:00
Niraj Venkat
291e0e21ae HBAO final implementation 2015-07-29 18:47:27 -07:00
Brad Hefta-Gaub
5a777b17a2 Merge pull request #5444 from huffman/fix-import-large-svo 
Fix issue with skyboxes not being importable from marketplace
 2015-07-29 18:34:55 -07:00
samcake
70d64a7777 Really fixing the depth write mask issue on clear... 2015-07-29 18:27:10 -07:00
Howard Stearns
84fd67ca7a Merge pull request #5460 from sethalves/obj-o-means-meshpart 
treat a "o" in an obj file as if it were a "g"
 2015-07-29 18:11:41 -07:00
samcake
e32e45ed2b make sure the writting mask is on for depth buffer 2015-07-29 18:06:46 -07:00
Seth Alves
b7ecffa0be treat a "g" in an obj file the same as a "o" 2015-07-29 17:55:56 -07:00
Eric Levin
0b1a36148e Merge pull request #5457 from howard-stearns/no-idle-hip-shifting 
Remove avatar->shift hips for idle animations.
 2015-07-29 17:50:08 -07:00
samcake
ac46b2bd17 Keep the resetstage in 2015-07-29 17:38:23 -07:00
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
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
Niraj Venkat
d76cda396f HBAO implementation ported from NVidia HLSL 2015-07-29 11:05:19 -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
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
bwent
7805cf4e48 Format fixes, UI logos for collapse/expand toggle 2015-07-29 09:19:33 -07: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
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