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
Brad Hefta-Gaub
3d898c39d6
Merge pull request #4986 from Atlante45/text-renderer
...
TEAM TEACHING - Text Entities render in Batch
2015-05-28 12:32:36 -07:00
ZappoMan
2fba5a0928
more work on simple renderable
2015-05-28 12:19:43 -07:00
ZappoMan
806ee88f1f
place burden of adding/removing to/from scene on entity
2015-05-28 09:43:36 -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
Atlante45
b0cbf5c51a
Adjust wraping with offset
2015-05-28 16:06:18 +02:00
Atlante45
ca529e4bb8
Remove debug/tweak sampler
2015-05-28 15:58:40 +02:00
Atlante45
12d75481e5
Introducing TextRenderer3D
2015-05-28 15:43:16 +02:00
Atlante45
c4ab18736d
Restore TextRenderer and sdf_text
2015-05-28 15:20:40 +02:00
Atlante45
10c2f3f561
More TextRenderer work
2015-05-28 14:51:57 +02:00
ZappoMan
3f14a7a262
allow entities to have multiple items
2015-05-27 21:00:20 -07:00
Brad Hefta-Gaub
75144b4489
Merge pull request #4984 from ZappoMan/team-teaching
...
TEAM TEACHING - merge from master
2015-05-27 20:55:17 -07:00
ZappoMan
5ad9efbee4
allow entities to tell us if they support proper scene rendering
2015-05-27 20:42:53 -07:00
ZappoMan
63c19f7c11
fix build buster from bad merge
2015-05-27 20:19:59 -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
6151a7cf1a
Merge pull request #4983 from AndrewMeadows/bispinor
...
fix for glitchy grabs and failure to take simulation ownership
2015-05-27 18:50:03 -07:00
Andrew Meadows
0a0eba8277
merge
2015-05-27 18:07:00 -07:00
Andrew Meadows
aba539928d
fix grab glitches and failure to own simulation
2015-05-27 18:05:59 -07:00
Brad Hefta-Gaub
0553f7ca4c
Merge pull request #4961 from hyperlogic/ajt/particle-net-anim-fix
...
Particle entities should avoid resetting simulation when setMaxParticles is called
2015-05-27 17:44:44 -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
samcake
be7b4f97e6
Merge pull request #4966 from ZappoMan/team-teaching-scene-api
...
TEAM TEACHING - primitive (non-model) entities rendering using new engine.
2015-05-27 17:07:14 -07:00
ZappoMan
b0cc536f53
debug cleanup
2015-05-27 16:55:02 -07:00
ZappoMan
37a291275d
more work on rendering in engine
2015-05-27 16:46:44 -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
Seth Alves
43dd8b3fb1
Merge pull request #4980 from ericrius1/pointer
...
Pointer
2015-05-27 15:37:24 -07:00
ZappoMan
a56e0d80b6
more work on renderable entities
2015-05-27 15:30:55 -07:00
ZappoMan
61712a6ac3
add some debugging streamers for some scene classes
2015-05-27 15:29:35 -07:00
Ryan Huffman
8002014dcd
Add <memory> to AvatarData for _ptr
2015-05-27 15:13:25 -07:00
Eric Levin
07c8fb6c02
turned pointer and draw funcitonality off be default
2015-05-27 15:11:16 -07:00
Eric Levin
ca85401b77
added button so user can toggle pointer on/off
2015-05-27 15:08:52 -07:00
Ryan Huffman
ea6b620d8a
Add declarations for avatar payload functions
2015-05-27 14:53:49 -07:00
Ryan Huffman
21b5e26dc9
Move AvatarData typedefs to AvatarData.h
2015-05-27 14:52:48 -07:00
Seth Alves
1cdb36f7fb
Merge pull request #4974 from ctrlaltdavid/fix-c4351
...
Fix Windows C4351 build warning
2015-05-27 14:46:03 -07:00
Seth Alves
968643a38c
Merge pull request #4977 from highfidelity/revert-4973-avatarInvokableFixes
...
Revert "removed const keyword from Q_INVOKABLE for avatar getter meth…
2015-05-27 14:21:24 -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
75a1d43bce
Merge pull request #4973 from ericrius1/avatarInvokableFixes
...
removed const keyword from Q_INVOKABLE for avatar getter methods such…
2015-05-27 13:58:58 -07:00
Seth Alves
29cb5ed126
Merge pull request #4967 from ericrius1/pointer
...
modified pointer script to allow users to draw on surfaces
2015-05-27 13:56:17 -07:00
Seth Alves
e016bc42a4
Merge pull request #4968 from ericrius1/blockWorld
...
added blockWorld script to generate floor of tiles and drop jenga blo…
2015-05-27 13:56:06 -07:00
ZappoMan
8c9cf480f3
more hacking
2015-05-27 13:23:59 -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
Eric Levin
eb0f35e041
removed const keyword from qinvokables for avatar getter methods such as getVelocity
2015-05-27 11:44:37 -07:00
ZappoMan
007aed7a0a
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-27 10:51:50 -07:00
Clément Brisset
7883ff9d36
Merge pull request #4972 from ZappoMan/team-teaching
...
TEAM TEACHING - merge from master
2015-05-27 19:45:21 +02:00
Howard Stearns
380723d1c5
Merge pull request #4970 from AndrewMeadows/thermonuclear
...
rewritten MassProperties with complete unit tests
2015-05-27 10:42:17 -07:00
