Sam Gateau
ddec8fd26f
Trying to find a good solution for update message & data
2015-05-30 13:57:05 -07:00
Sam Gateau
7bde81e95f
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft
2015-05-29 15:50:31 -07:00
Sam Gateau
f04f3bda72
Introducing the RenderDeferredTask class which moves the current rendering pipeline into the render::ENgine scheme
2015-05-29 15:44:14 -07:00
samcake
f8a90684ce
Merge pull request #5000 from huffman/scene-overlay
...
Team Teaching - Move overlay rendering to Scene pipeline
2015-05-29 15:31:46 -07:00
Ryan Huffman
b37a023041
Remove all overlays from Scene on desctruction
2015-05-29 14:55:53 -07:00
Ryan Huffman
3f5b115c67
Move _overlays after scene in Application so it destructs first
2015-05-29 14:55:32 -07:00
Ryan Huffman
667dccbb87
Add Item::INVALID_ITEM_ID and use in overlays
2015-05-29 13:43:49 -07:00
Sam Gateau
eef8077417
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-29 13:20:43 -07:00
Atlante45
d8168811b3
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 19:58:22 +02:00
Seth Alves
b0f6826d17
Merge pull request #4995 from birarda/domain-dtls
...
speed up initial connection to domains
2015-05-29 10:50:01 -07:00
Howard Stearns
8e245ec4c2
getCollisionEvents has a side-effect on state (removing END events from further consideration), so it must be called once per step.
...
Otherwise entities never get to see end events.
Also, entity collision processing should only be done when there are outgoing changes (just like for avatar).
2015-05-29 09:59:21 -07:00
Ryan Huffman
b4806f5aac
Fix render::PendingChanges using render::Scene::PendingChanges
2015-05-29 09:40:52 -07:00
Ryan Huffman
0e5cf273ab
Fix AABox bounds handling in Overlays
2015-05-29 09:40:23 -07:00
Ryan Huffman
b21d0a3a53
Remove Overlays::renderWorld from Application
2015-05-29 09:40:03 -07:00
Ryan Huffman
2222468e89
Remove Overlays::renderWorld
2015-05-29 08:53:40 -07:00
Ryan Huffman
874f722504
Remove unused Avatar::Pointer typedef
2015-05-29 08:51:37 -07:00
Ryan Huffman
1089490658
Move overlay rendering to Scene
2015-05-29 08:51:25 -07:00
Sam Gateau
dd9cafcd09
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-28 18:14:41 -07:00
Sam Gateau
3f8bdc14c4
reinserting culling, lod and depth sort to the rendering
2015-05-28 18:01:31 -07:00
Stephen Birarda
5749fefcd5
have show DS connect refresh existing dialog
2015-05-28 17:07:57 -07:00
Stephen Birarda
7f86ca3f10
refresh the network dialog if it is already up
2015-05-28 17:07:20 -07:00
Brad Hefta-Gaub
1c3398f27e
Merge pull request #4991 from ZappoMan/team-teaching
...
TEAM TEACHING - merge from master
2015-05-28 13:52:18 -07:00
Howard Stearns
0f30ec2ccc
Undo the merge with the broken master checking. What could go wrong?
2015-05-28 13:48:27 -07:00
Howard Stearns
810c766f77
When an entity is added or changed with a collisionSoundURL, cache it so that it is ready to play on the first hit.
2015-05-28 12:50:02 -07:00
ZappoMan
1029a8af7c
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-28 12:38:16 -07:00
ZappoMan
a0e51469d3
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-28 12:36:34 -07:00
ZappoMan
2fba5a0928
more work on simple renderable
2015-05-28 12:19:43 -07:00
Andrew Meadows
2a4cd468e4
Merge pull request #4979 from sethalves/polyvox
...
initial pass at Polyvox Entity Type
2015-05-28 10:43:50 -07:00
Atlante45
bca80addef
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer
2015-05-28 16:13:24 +02:00
Seth Alves
a91a7942a4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-28 06:59:39 -07:00
Atlante45
10c2f3f561
More TextRenderer work
2015-05-28 14:51:57 +02:00
Brad Davis
e5bec42512
Fix mouse emulation picking and pointer positioning for the hydra
2015-05-27 23:36:00 -07:00
Andrew Meadows
4e073c77b3
Merge pull request #4978 from sethalves/fix-4973
...
recreate PR #4973 with some additional changes -- removed const keywo…
2015-05-27 21:11:28 -07:00
ZappoMan
763e6dd97b
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-27 19:58:11 -07:00
Seth Alves
4fa6f388b9
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 18:20:59 -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
Stephen Birarda
734798a365
fix move of connection steps to LNL
2015-05-27 15:50:31 -07:00
Ryan Huffman
ea6b620d8a
Add declarations for avatar payload functions
2015-05-27 14:53:49 -07:00
Seth Alves
386b3301f4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 14:46:37 -07:00
Seth Alves
bfa0e9c234
recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity
2015-05-27 14:44:23 -07:00
Seth Alves
ba0467aafe
Revert "removed const keyword from Q_INVOKABLE for avatar getter methods such…"
2015-05-27 14:10:45 -07:00
Seth Alves
7f99f261c2
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 13:59:13 -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
