Brad Davis
a923c044a3
Merge remote-tracking branch 'upstream/master' into plugins
2015-06-28 22:51:46 -07:00
Brad Davis
dcdf47dd66
Fix mouse interaction with overlays in HMDs
2015-06-28 22:51:26 -07:00
Brad Hefta-Gaub
62b3ca936f
Merge pull request #5231 from ctrlaltdavid/fix-textoverlay-font
...
Fix text overlay font rendering
2015-06-28 09:06:12 -07:00
David Rowe
386b3d8ae3
Fix text overlay font rendering
...
Use the same font size as used in TextRenderer to avoid scaling issues.
2015-06-27 14:02:49 -07:00
Seth Alves
0970f010a4
provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are
2015-06-27 13:31:00 -07:00
Howard Stearns
af4b804d37
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-27 12:50:13 -07:00
Seth Alves
c0c1116c69
attempt some clean-ups in edge/unexpected situations
2015-06-27 11:09:28 -07:00
Seth Alves
4ce3465bf7
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-27 10:56:46 -07:00
Seth Alves
97cd5b8b99
Merge pull request #5223 from SamGondelman/cameraMode
...
misc. key binding/camera fixes
2015-06-27 10:55:34 -07:00
Seth Alves
7f609dca26
Merge branch 'cameraMode' of github.com:SamGondelman/hifi into actions-over-wire
2015-06-27 10:49:12 -07:00
Seth Alves
35adf0c82d
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-27 10:48:48 -07:00
Seth Alves
b7da7374ba
Merge pull request #5227 from jherico/cursor_fix
...
Fixing always-on link cursor
2015-06-27 10:47:51 -07:00
Seth Alves
567d98dfab
Merge branch 'cursor_fix' of github.com:jherico/hifi into actions-over-wire
2015-06-27 10:45:34 -07:00
Seth Alves
aa3c7eac9b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-27 10:12:59 -07:00
Seth Alves
30be515a94
remove unneeded lock around action-data in entity item. Actions now use a weak pointer to keep track of owner entity
2015-06-27 08:53:27 -07:00
Howard Stearns
dc7360cdc2
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-27 08:37:30 -07:00
Brad Davis
7ca63a4ace
Fixing overlay rendering in plugins
2015-06-27 00:43:38 -07:00
Brad Davis
267d339ecc
Put the 2D plugin first for default usage, enable oculus, disable interleaved
2015-06-27 00:31:29 -07:00
Brad Davis
a8f8c45755
Use correct size for the offscreen framebuffer for vive
2015-06-27 00:30:33 -07:00
Brad Davis
e7f31ec811
Move to latest Oculus SDK
2015-06-27 00:27:22 -07:00
Andrew Meadows
426b343e2c
remove cruft canAppendBytes() method
2015-06-26 23:12:48 -07:00
Andrew Meadows
4d4b97fe59
add priority promotion to reduce volunteer races
...
also fix priority inheritance from chained collisions
2015-06-26 22:30:06 -07:00
Brad Hefta-Gaub
9b42221123
Merge pull request #5216 from ctrlaltdavid/comment-update
...
Improve entity properties list code comment
2015-06-26 22:21:39 -07:00
Andrew Meadows
f274958beb
fix bad merge during rebase
2015-06-26 22:13:06 -07:00
Andrew Meadows
e18506c77f
promote volunteer priority
...
also remove some cruft
change uint8_t to be quint8
2015-06-26 22:00:43 -07:00
Andrew Meadows
d6c69e8fe6
pack terse update parameters near each other
...
also don't constantly resend ownership data
2015-06-26 22:00:43 -07:00
Andrew Meadows
ff67b54f87
don't read terse update data for objs we own
2015-06-26 21:58:40 -07:00
Andrew Meadows
1ba937eab9
fix bug in streaming of SimulationOwner class
2015-06-26 21:58:40 -07:00
Andrew Meadows
40f6ecd936
fix crash for dereference null pointer
2015-06-26 21:58:40 -07:00
Andrew Meadows
44d3074561
remove debug code
2015-06-26 21:58:03 -07:00
Andrew Meadows
12fc18092b
SimulationOwner as one property
2015-06-26 21:58:03 -07:00
Andrew Meadows
b6d5adaef8
move global into function that uses it
2015-06-26 21:57:04 -07:00
Andrew Meadows
cf74dbe1dc
partial progress toward sim ownership negotiations
...
works well for just a few objects but fails for piles
committing some debug stuff that will have to be torn out later
2015-06-26 21:57:04 -07:00
Andrew Meadows
c87e7c99ce
bid for ownership on script-change phys properties
2015-06-26 21:57:04 -07:00
Andrew Meadows
4b29907216
trigger bid for ownership on action manipulations
2015-06-26 21:57:04 -07:00
Andrew Meadows
a33c350385
improved forcing of simulator ownership bid
2015-06-26 21:57:04 -07:00
Andrew Meadows
8510110324
increase sim priority when flagged for ownership
2015-06-26 21:57:04 -07:00
Andrew Meadows
2579247c34
claim ownership faster for scripted manipulations
2015-06-26 21:57:04 -07:00
Andrew Meadows
7c793c6397
accept simulation release from entity-server
2015-06-26 21:57:04 -07:00
Andrew Meadows
d0ac3e4514
more work on simulator priority
...
scripts that edit terse update data try to assert priority
physics simulation tries to assert "volunteer" priority
max priority rules are applied in entity server
2015-06-26 21:57:04 -07:00
Andrew Meadows
82ba5cd4b6
sim ownership uses expiry, apply priority rules
2015-06-26 21:57:04 -07:00
Andrew Meadows
443c7d9c70
allow equal priority to take simulation ownership
2015-06-26 21:57:04 -07:00
Andrew Meadows
8afd9a5e1d
add EntityItem::_simulatorPriority as uint8_t
2015-06-26 21:57:04 -07:00
Seth Alves
5ecc39b811
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 20:06:10 -07:00
DaveDubUK
bb2c640a6d
walk.js disable audio by default
2015-06-27 09:23:18 +07:00
Seth Alves
9f6ec4120d
undo previous experiment
2015-06-26 18:43:56 -07:00
Brad Davis
e6fade8c13
Prevent tooltips from appearing with stale data
2015-06-26 18:16:56 -07:00
Brad Davis
3b987c1e73
Fixing always-on link cursor
2015-06-26 18:14:31 -07:00
Seth Alves
0739c46249
if new action data is the same as the old action data, don't re-unpack it
2015-06-26 18:13:53 -07:00
Brad Davis
69fa18c6c0
Working on overlay in plugins
2015-06-26 18:08:10 -07:00
