ZappoMan
763e6dd97b
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-27 19:58:11 -07:00
Brad Hefta-Gaub
bcc24c9762
Merge pull request #4975 from huffman/scene-avatar
...
Team Teaching - Move avatar rendering to Scene pipeline
2015-05-27 17:13:10 -07:00
Brad Hefta-Gaub
5da3a9440e
Merge pull request #4964 from howard-stearns/remove-global-collision-and-update-examples
...
[REQUIRES #4962 ] Remove global collision and update examples
2015-05-27 16:09:14 -07:00
Ryan Huffman
ea6b620d8a
Add declarations for avatar payload functions
2015-05-27 14:53:49 -07:00
Ryan Huffman
c5a3edee09
Fix error with duplicate variable names
2015-05-27 13:13:52 -07:00
Ryan Huffman
00db7fca70
Update avatar rendering to set displayLookAtVectors
2015-05-27 13:11:29 -07:00
Ryan Huffman
825e071ac0
Add overrides to MyAvatar::render*
2015-05-27 13:02:48 -07:00
Ryan Huffman
c13254a9c4
Merge branch 'team-teaching' of github.com:highfidelity/hifi into scene-avatar
...
Conflicts:
interface/src/Application.cpp
2015-05-27 12:44:52 -07:00
Ryan Huffman
f972e84d6c
Move avatar renedering to Scene
2015-05-27 12:40:26 -07:00
Ryan Huffman
389d5556f5
Update Avatar*Pointers to use std::*_ptr instead of Q*Pointer
2015-05-27 12:36:55 -07:00
David Rowe
a2272d3f42
Fix Windows C4351 build warning
...
VS2013 warns about default initialization of arrays because it behaved
differently in previous versions. Default initialization is what we expect
now that we're using VS2013 so we can disable this warning globally.
2015-05-27 11:49:00 -07:00
ZappoMan
4654ed95ac
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-27 10:40:24 -07:00
ZappoMan
2516066e1d
some hacking
2015-05-27 10:40:07 -07:00
Howard Stearns
4b4bf9fd90
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples
2015-05-27 09:29:06 -07:00
Sam Gateau
58e3fe695c
Refining once more for sir gcc on Ubuntu
2015-05-27 01:32:40 -07:00
Sam Gateau
a5c5cc9b70
First Item really rendering , for the WorldBox, desigining more of the RenderContext and task interface
2015-05-27 01:15:14 -07:00
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
Howard Stearns
3c718af43f
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples
2015-05-26 13:26:02 -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
Howard Stearns
cbf4e09a10
Remove global collision event.
2015-05-25 16:10:50 -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
