Atlante45
d8168811b3
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 19:58:22 +02: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
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
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
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
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
Seth Alves
c80f2970fd
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-05-27 07:37:51 -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
Seth Alves
55028f6cb0
voxel data sent over wire and saved to json
2015-05-26 16:34:35 -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
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
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
Sam Gateau
a28c99bb40
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk
2015-05-22 14:40:00 -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
Ryan Huffman
6fd474a1a3
Fix comment
2015-05-22 09:56:21 -07: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
Andrew Meadows
67f5d0773d
some list management of AvatarMotionStates
2015-05-21 14:40:47 -07:00
ZappoMan
946878006d
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching
2015-05-20 18:46:32 -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
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
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
Brad Davis
827d7f6221
Merge branch 'master' into dk1
2015-05-20 09:41:20 -07:00
