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
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
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
Atlante45
20ff43e29a
Don't sync by default
2015-05-22 20:29:25 +02: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
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
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
Howard Stearns
c5b8dd51d8
Fix https://app.asana.com/0/32622044445063/34195351184789
...
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
2015-05-20 11:07:03 -07:00
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -07:00
Brad Davis
827d7f6221
Merge branch 'master' into dk1
2015-05-20 09:41:20 -07:00
Atlante45
9b49936d29
TextRenderer memory leak
2015-05-20 16:41:47 +02:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Atlante45
a9a0c9f387
Render 3D overlays before entities
...
This gets rid of some issues due to entities moving to render pipeline
2015-05-18 17:13:32 +02:00
Atlante45
a7ee10001a
Remove used deprecated methods
...
Also added a warning on the single one in use right now,
so that it gets deleted once it is moved to the rendering pipeline
2015-05-18 16:37:28 +02:00
Sam Cake
580339e99f
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-15 17:24:59 -07:00
Sam Cake
e9ff06df24
FIx the issue where the view frustum used in the skybox wasn;t in sync with the true camera, except if shadows is on, THe one call missing is now always executed
2015-05-15 17:22:29 -07:00
Philip Rosedale
36b396b9ef
Merge pull request #4881 from ctrlaltdavid/fix-binary-eyelid
...
Fix visibility of binary eyelid control menu item
2015-05-15 17:19:15 -07:00
Philip Rosedale
0d00393eff
Merge pull request #4854 from ctrlaltdavid/fix-facetracker-rotation
...
Fix facetracker rotation
2015-05-15 17:17:30 -07:00
David Rowe
d3cb6a9334
Fix visibility of binary eyelid control menu item
2015-05-15 09:40:32 -07:00
Brad Davis
6797174b97
Fix picking in the HMD
2015-05-14 19:15:47 -07:00
Seth Alves
41d77e6146
Merge pull request #4852 from AndrewMeadows/nova
...
improved distributed simulation ownership negotiation
2015-05-14 11:40:49 -07:00
