Sam Gateau
54c47fe3f9
merging
2015-05-07 11:35:58 -07:00
Seth Alves
d52a45b57e
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-07 11:30:46 -07:00
Andrew Meadows
f0618501dd
fix non-physical kinematic motion
...
also can set objects collisionless again
2015-05-07 11:29:42 -07:00
Sam Gateau
653d2e72b1
Skybox kind of working
2015-05-07 11:23:11 -07:00
samcake
12c26f9c3c
Merge pull request #4789 from Atlante45/display_zones
...
Display zones
2015-05-07 11:20:46 -07:00
Atlante45
7689837463
Merge branch 'display_zones' of github.com:Atlante45/hifi into display_zones
2015-05-07 20:17:07 +02:00
Atlante45
f761ba521a
Quiet compiler
2015-05-07 20:16:03 +02:00
Atlante45
591548dc38
Missing comma
2015-05-07 20:15:40 +02:00
Atlante45
faabf29e84
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 19:58:26 +02:00
Howard Stearns
9acdb3fb28
Proper defaults for material properties and a fail-safe for missing uv coordinates.
2015-05-07 10:47:50 -07:00
Clément Brisset
8997879b02
Merge https://github.com/highfidelity/hifi into display_zones
2015-05-07 18:39:51 +01:00
Clément Brisset
345875d0c4
Merge pull request #4775 from ZappoMan/skyboxPropertiesInZones
...
added skybox group properties to zones, wired up color to the actual skybox rendering
2015-05-07 19:35:33 +02:00
Andrew Meadows
47f978b86e
merge
2015-05-07 10:31:27 -07:00
Andrew Meadows
070140440d
fix crash bug when invalid entity ptr accessed
2015-05-07 10:30:22 -07:00
Andrew Meadows
fe5cfdf495
fix crash bug
...
when obj deleted but dangling pointer still on _pendingAdd
which would not be removed during getObjectsToDelete()
because backpointers had been disconnected
2015-05-07 10:28:38 -07:00
Seth Alves
867fe18472
put some code back now that entity-server is doing simple simulation again. don't draw blue physics-enabled dot unless debug menu-item is checked
2015-05-07 10:11:36 -07:00
Seth Alves
ddec6d5207
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-07 09:54:09 -07:00
Seth Alves
fe14202f51
add getName passthrough to ObjecdtMotionState, don't compute model shapes until the model has been simulated
2015-05-07 09:53:39 -07:00
David Rowe
0eeff526d5
Add shortcut key for face tracker muting
2015-05-07 08:51:59 -07:00
Atlante45
cafaeed822
Restore polygon mode after entities rendering
...
Default setting are causing issues so we just reset the polygon mode
since this won't matter once everything has moved to the new rendering
pipeline.
2015-05-07 13:34:22 +02:00
Atlante45
366964e424
Fix static initialisation fiasco
2015-05-07 13:00:56 +02:00
Atlante45
721eeccce2
Restaure GL to default after we render a batch
2015-05-07 12:01:22 +02:00
Atlante45
00571dad00
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 10:13:59 +02:00
Brad Hefta-Gaub
01f96f4e62
Merge pull request #4788 from samcake/orange
...
Try to fix the transform stack issue in 1st person
2015-05-06 23:47:52 -07:00
Sam Gateau
bba7dcfe5f
Try to fix the transform stack issue in 1st person
2015-05-06 23:32:02 -07:00
ZappoMan
496da6fcd5
wire up the skybox color property to the new skybox renderer
2015-05-06 20:36:06 -07:00
Seth Alves
fabff7fdf4
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-06 18:26:00 -07:00
ZappoMan
af2c3d91cf
Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones
2015-05-06 18:05:54 -07:00
Andrew Meadows
00c6944125
merge
2015-05-06 17:49:18 -07:00
Andrew Meadows
411bf1a35c
fix for entity-server kinematic simulation
2015-05-06 17:48:10 -07:00
Stephen Birarda
e3490838de
Merge pull request #4787 from jherico/flipped_icons
...
Fix inverted icons
2015-05-06 20:25:43 -04:00
Seth Alves
5ac8558168
flash yellow box when transmitting an edit packet
2015-05-06 17:03:27 -07:00
Stephen Birarda
b3f7ec1545
keep track of starves and skips on other avatars
2015-05-06 16:49:51 -07:00
David Rowe
afce981d83
Merge branch 'master' into 20530
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/DdeFaceTracker.cpp
interface/src/devices/DdeFaceTracker.h
2015-05-06 16:27:33 -07:00
Seth Alves
cc5f2ee451
in isMovingVsServer look at entity velocity only
2015-05-06 16:26:27 -07:00
Seth Alves
ba6f6d19cc
disable updateServerPhysicsVariables
2015-05-06 16:20:16 -07:00
Thijs Wenker
b76e22c952
spelling mistake
2015-05-07 01:14:16 +02:00
Seth Alves
630f1ce9d9
isMovingVsServer function
2015-05-06 16:13:07 -07:00
Bradley Austin Davis
3b8108e887
Fix inverted icons
2015-05-06 16:09:17 -07:00
Seth Alves
e73503a53d
Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1
2015-05-06 16:05:13 -07:00
Seth Alves
b0ccabe38e
update a motionstate's idea of what the entity-server thinks when an incoming update packet arrives
2015-05-06 16:05:05 -07:00
Andrew Meadows
452e84d43f
only update physics when proper flags are set
2015-05-06 16:02:03 -07:00
Andrew Meadows
7b1886a285
harvest outgoing changes for non-NULL entities
2015-05-06 16:01:25 -07:00
Andrew Meadows
584b643791
lock entitySimulation during physics simulation
2015-05-06 16:01:00 -07:00
Seth Alves
c63b8a93ec
oops fix endless loop
2015-05-06 15:48:45 -07:00
Seth Alves
4c3cbea261
don't auto-remove simulation owner unless the Node is gone. put back code that causes interfaces to give up ownership
2015-05-06 15:32:02 -07:00
Philip Rosedale
72da678bc2
Merge pull request #4785 from jherico/scale
...
Fix ensmallened overlay UI
2015-05-06 15:30:01 -07:00
Bradley Austin Davis
561d275dda
Fix ensmallened overlay UI
2015-05-06 15:18:17 -07:00
Philip Rosedale
cd4cc30a34
Merge pull request #4783 from thoys/20522
...
CR for Job #20522 - Make Jenga
2015-05-06 15:14:58 -07:00
Thijs Wenker
b3af1840c7
Added transparency and positioning updating of Planky button
2015-05-07 00:14:49 +02:00
