Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-03 22:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29254 commits 25 branches 0 tags 1.1 GiB
Commit graph

29254 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/MyAvatar.h
	tests/ui/src/main.cpp
 2015-07-30 12:55:22 -07:00
Bradley Austin Davis
fccb07dc93 Tweaking timing of geometry restoration 2015-07-30 12:44:47 -07:00
Bradley Austin Davis
a260be9a4d HMDTools dialog restoration phase 2, electric boogaloo 2015-07-30 12:25:21 -07:00
Brad Davis
5878a4661c Restoring HMD tools dialog, phase 1 2015-07-30 11:35:55 -07:00
Stephen Birarda
fc80e427b9 remove names from audio-mixer jitter calc comments 2015-07-30 11:08:45 -07:00
Brad Davis
382ef057b0 Revert to using QGLWidget 2015-07-30 10:59:05 -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
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
Brad Hefta-Gaub
6364072c10 Merge pull request #5459 from SamGondelman/sam/input-plugins 
Plugins branch - small fixes
 2015-07-29 18:23:34 -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 Gondelman
9025bc3ead press o to toggle overlays in case you don't have a middle mouse click 2015-07-29 16:43:25 -07:00
SamGondelman
42e7c5278c attempt to fix ray picking in standing mode 2015-07-29 16:04:57 -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
Brad Davis
d16e00c17b Merge pull request #5456 from SamGondelman/sam/input-plugins 
Plugins branch - fixed comfort mode, other scripts
 2015-07-29 12:15:42 -07:00
Sam Gondelman
c9ef6d5b26 fixed some scripts to work with plugins branch 2015-07-29 12:09:28 -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
Bradley Austin Davis
80ee31edd9 Address crashes on exit 2015-07-29 11:00:00 -07:00
Brad Davis
900c2c11df Another whack at touch events 2015-07-29 10:29: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
Brad Davis
07553e7a7c Accept touch events in the GL window 2015-07-29 10:00:41 -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
Brad Davis
f0d0979ade Fix UI element placement 2015-07-29 09:19:09 -07:00
Marcel Verhagen
1d29fb9d7f replace tabs with whitespaces. 2015-07-29 14:56:24 +02:00
Brad Davis
3fa7c7b516 Fixing GL window header 2015-07-28 23:22:28 -07:00
Brad Davis
bb29127eff Merge remote-tracking branch 'upstream/master' into plugins 2015-07-28 23:14:41 -07:00
Brad Davis
87bd930854 Renaming mode menu 2015-07-28 23:14:34 -07:00
Brad Davis
e109bd42d2 Fixing cleanup of glwindow 2015-07-28 23:14:33 -07: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
Brad Davis
3ecc292e16 Merge pull request #5454 from hyperlogic/ajt/camera-binding-fix 
Fix for edit.js Camera.getPosition(), getOrientation() and getRotation()
 2015-07-28 20:04:20 -07:00
Anthony J. Thibault
608898848f Fix for edit.js Camera.getPosition(), getOrientation() and getRotation() 
JavaScript has problems with const refs, apparently.
Camera.getPosition() was returning undefined.
 2015-07-28 19:49:06 -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
Anthony J. Thibault
22d63b7697 Compilation fix for GLWindow 2015-07-28 18:10:59 -07:00
Anthony J. Thibault
ce7e385900 Updated comment 2015-07-28 18:03:03 -07:00