Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 15:07:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25735 commits 25 branches 0 tags 1.1 GiB
Commit graph

12068 commits

Author SHA1 Message Date
ZappoMan
20ceb72d92 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-26 15:01:26 -07:00
Andrew Meadows
16e5710325 Merge pull request #4954 from ZappoMan/entitysmartpointers 
EnitityItem smart pointers
 2015-05-26 14:05:03 -07:00
Sam Gateau
e5755f52e5 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft 2015-05-26 13:57:10 -07:00
samcake
84525aabec Merge pull request #4959 from ZappoMan/team-teaching-entitysmartpointer 
TEAM TEACHING BRANCH - Entity Smart Pointers
 2015-05-26 13:56:47 -07:00
Sam Gateau
ad0b0cfade FIxing one more issue with compilation on ubuntu regarding the template functions specializationand the namespace 2015-05-26 11:40:35 -07:00
samcake
dd9d758da1 Fixing the compilation issue for real 2015-05-26 10:53:23 -07:00
ZappoMan
c92e7bed87 andrews CR feedback 2015-05-26 09:44:02 -07:00
ZappoMan
d1520c5502 andrews CR feedback 2015-05-26 09:23:27 -07:00
Sam Gateau
0083ba6f85 trying again 2015-05-25 17:39:31 -07:00
Sam Gateau
ad054a640e Fixing a problem with Mac/ubuntu build maybe 2015-05-25 17:21:03 -07:00
Sam Gateau
f0ab6d96f5 merge with upstream team-teaching 2015-05-24 19:45:37 -07:00
Sam Gateau
35b8d45bee Insert a first scene and the engine in the Application and render a first Item 2015-05-24 17:03:43 -07:00
ZappoMan
9988f2d1cd EnitityItem smart pointers 2015-05-22 22:38:02 -07:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -07:00
Ryan Huffman
47d9cf42c5 Remove unused lodManager 2015-05-22 16:04:05 -07:00
Ryan Huffman
05f8ba558f Update RenderArgs construction in paintGL 2015-05-22 16:02:24 -07:00
Ryan Huffman
1d12744781 Remove commented out code 2015-05-22 15:34:19 -07:00
Ryan Huffman
d1a5662ca7 Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
 2015-05-22 15:33:40 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
Brad Hefta-Gaub
ce613d4960 Merge pull request #4947 from samcake/punk 
Introducing the Engine and its Tasks
 2015-05-22 15:15:16 -07:00
ZappoMan
160898ce96 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-22 14:55:29 -07:00
Sam Gateau
a28c99bb40 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-22 14:40:00 -07:00
Brad Hefta-Gaub
dec1686228 Merge pull request #4943 from Atlante45/simple_program 
TEAM TEACHING - Simple program uses transform stack
 2015-05-22 14:39:13 -07:00
Sam Gateau
373ccd07ec Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-22 13:14:57 -07:00
Sam Gateau
e7e3eb2b7c FIrst version of the design for the Engine, the Tasks and a DrawTask. Introduced the ItemFilter 2015-05-22 12:58:18 -07:00
Andrew Meadows
461d08c0a9 merge upstream/master into andrew/bispinor 2015-05-22 11:35:02 -07:00
Atlante45
20ff43e29a Don't sync by default 2015-05-22 20:29:25 +02:00
Andrew Meadows
0431e8da36 put avatar body in right spot, and give it mass 2015-05-22 11:08:56 -07:00
Brad Hefta-Gaub
da8f99508c Merge pull request #4871 from huffman/console-error 
Add error handling to JSConsole
 2015-05-22 10:57:18 -07:00
Ryan Huffman
5ac02f66ca Remove const from ApplicationOverlay::renderOverlay 2015-05-22 09:58:20 -07:00
Ryan Huffman
6fd474a1a3 Fix comment 2015-05-22 09:56:21 -07:00
Atlante45
c6ce5e7680 PerformanceTimer deactivated when not in use 2015-05-22 18:54:40 +02:00
Ryan Huffman
4a4c9c75fc Add gpu::context to RenderArgs and start using RenderArgs in place of the flags 2015-05-22 09:50:51 -07:00
Andrew Meadows
01cc629224 fix crashes during init and shutdown 2015-05-22 09:20:08 -07:00
Atlante45
e5aa696dda syncInputStateCache 2015-05-22 17:39:08 +02:00
Atlante45
f089143cf1 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-22 17:16:51 +02:00
Atlante45
5d2187cedf Remove non batch call to bind/releaseSimpleProgram 2015-05-22 16:37:02 +02:00
David Rowe
a0c3c974a9 Throttle DDE face acquisition attempts in order to reduce CPU usage 2015-05-21 19:44:38 -07:00
Andrew Meadows
ac8cac9783 avatars use DYNAMIC motion 2015-05-21 16:37:10 -07:00
Andrew Meadows
2e3973dfdd impl AvatarMotionState::set/getWorldTransform() 2015-05-21 15:34:30 -07:00
Andrew Meadows
67f5d0773d some list management of AvatarMotionStates 2015-05-21 14:40:47 -07:00
ZappoMan
c7fb8fab85 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-21 10:36:22 -07:00
ZappoMan
e1c5c5b12e Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api 2015-05-20 18:42:54 -07:00
ZappoMan
8b95b538e6 Merge branch 'render' of https://github.com/samcake/hifi into team-teaching-scene-api 2015-05-20 18:34:53 -07:00
Seth Alves
38edc27cbb Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 18:24:40 -07:00
samcake
496898273c Merge pull request #4846 from jherico/dk1 
Second attempt at fixing the HMD eye projections, without breaking the camera this time.
 2015-05-20 17:02:28 -07:00
Sam Gateau
2ed7aae8d5 merging and updating 2015-05-20 16:50:43 -07:00
Seth Alves
782402b4c8 Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 14:53:05 -07:00
Brad Hefta-Gaub
79023763ef Merge pull request #4869 from ctrlaltdavid/20543 
CR for #20543 - Option to auto-mute mic if step away from PC when face tracking is enabled
 2015-05-20 14:47:31 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00