Sam Gondelman
4c83c6918d
fixed avatar billboards not displaying
2015-05-29 16:44:16 -07:00
Howard Stearns
9c56f6270e
Remove debug print.
2015-05-29 16:21:57 -07:00
Howard Stearns
6e2378e676
Sound parameter tweaks.
2015-05-29 16:19:41 -07:00
Philip Rosedale
11844463d1
Merge pull request #4915 from AndrewMeadows/isothermal
...
DO NOT MERGE grabHockey.js script can safely manipulate misc objects again
2015-05-29 16:07:32 -07:00
Philip Rosedale
6b9f6ff7bb
Merge pull request #4994 from AndrewMeadows/isentropic
...
compute correct deltaTime for extrapolation of moving entity and other fixes
2015-05-29 16:07:10 -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
Brad Hefta-Gaub
c71519bfb1
Merge pull request #4996 from samcake/punk
...
TEAM TEACHING: Culling, LOD and Depth sort added to DrawSceneTask
2015-05-29 15:06:17 -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
Sam Gateau
1bdd6139bd
Merge branch 'punk' of https://github.com/samcake/hifi into daft
2015-05-29 14:03:04 -07:00
Sam Gateau
81396ae5aa
TRying again a better compare function signature for ubunutu
2015-05-29 13:48:19 -07:00
Ryan Huffman
667dccbb87
Add Item::INVALID_ITEM_ID and use in overlays
2015-05-29 13:43:49 -07:00
Seth Alves
a96520ca74
set up EntityItemPropertiesFromScript to either ignore or honor read-only properties
2015-05-29 13:43:18 -07:00
Seth Alves
6913c62b84
Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property
2015-05-29 13:42:25 -07:00
Sam Gateau
98160c8d60
Reorganize the sorting classes for maybe compiling on linux gcc 4.8 ?
2015-05-29 13:31:17 -07:00
Stephen Birarda
e7ce8706a3
Merge pull request #5004 from birarda/domain-dtls
...
fix debug for failed ping to DS
2015-05-29 16:21:41 -04:00
Stephen Birarda
33fde7c66d
remove extra debug
2015-05-29 13:21:24 -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
Brad Hefta-Gaub
7d1cd70e89
Merge pull request #4969 from jherico/plugins_pt3
...
Working towards display plugins
2015-05-29 13:19:18 -07:00
Seth Alves
1a26421414
Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property
2015-05-29 13:04:45 -07:00
Brad Davis
77b45e2b4a
Adding missing files
2015-05-29 12:59:55 -07:00
Brad Davis
f98305dd55
CR comments
2015-05-29 12:45:03 -07:00
Brad Hefta-Gaub
fe9c2858e0
Merge pull request #5002 from Atlante45/entities
...
TEAM TEACHING - PolyVox entities render in entities Batch
2015-05-29 12:29:01 -07:00
Brad Hefta-Gaub
b2b5d0eaf7
Merge pull request #5003 from Atlante45/team-teaching
...
Update team teaching
2015-05-29 12:28:09 -07:00
Stephen Birarda
2207bfaf40
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-dtls
2015-05-29 12:06:12 -07:00
Stephen Birarda
e253687dcd
fix fail case for DS pings
2015-05-29 12:06:07 -07:00
Andrew Meadows
8177512432
send all TerseUpdate properties when one changes
2015-05-29 11:35:50 -07:00
ZappoMan
7ec44dfc88
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-29 11:23:31 -07:00
ZappoMan
94f6e8cebd
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-05-29 11:23:22 -07:00
ZappoMan
7de1fd878e
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 11:10:27 -07:00
ZappoMan
dc62052a3c
more hacking on models
2015-05-29 11:07:25 -07:00
Atlante45
e9edc3e789
PolyVox entities use simple program
2015-05-29 20:05:38 +02:00
Atlante45
f70fb0801b
Merge branch 'team-teaching' into entities
2015-05-29 19:58:59 +02:00
Atlante45
abc261f289
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching
2015-05-29 19:58:35 +02: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
Andrew Meadows
64eba660ad
Merge pull request #5001 from howard-stearns/entity-collision-end
...
get end collision events in entity collision handler
2015-05-29 10:40:50 -07:00
Sam Gateau
0a0c0482ae
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft
2015-05-29 10:09:20 -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
Andrew Meadows
f049dc37fc
Merge pull request #4992 from howard-stearns/preload-collision-sounds
...
Preload collision sounds
2015-05-29 09:51:41 -07:00
Stephen Birarda
e91ee7e7e3
only send add packet for nodes in interest set
2015-05-29 09:49:54 -07:00
Ryan Huffman
b4db787837
Merge branch 'team-teaching' of github.com:highfidelity/hifi into scene-overlay
2015-05-29 09:42:46 -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
Seth Alves
9f4fff3588
don't need convertScriptValue(QScriptEngine* e, QDateTime v)
2015-05-29 09:33:29 -07:00
Eric Levin
f573645291
line entity width translating
2015-05-29 09:24:00 -07:00
Brad Hefta-Gaub
ae6b13b77c
Merge pull request #4999 from Atlante45/team-teaching
...
Update team-teaching
2015-05-29 09:21:25 -07:00
