Seth Alves
a300dec1f7
update entity data bytes whenever it's asked for
2015-06-30 10:42:34 -07:00
Sam Gondelman
aaf84b47f3
Merge remote-tracking branch 'upstream/plugins' into sam/vive-hand-controllers
2015-06-30 10:37:06 -07:00
Seth Alves
505332c367
include action data among physics initiated network updates from interface to entity-server
2015-06-30 10:19:03 -07:00
Sam Gondelman
6c40b48204
reset works if you're looking straight down
2015-06-30 10:13:02 -07:00
Seth Alves
7d7e3769f6
suppress a log message
2015-06-30 09:56:15 -07:00
Brad Davis
e421141ec5
experimenting with input plugins
2015-06-30 09:52:54 -07:00
Ryan Huffman
abab284f38
Merge pull request #5235 from ericrius1/lineTransform
...
line entities can now be properly rotated using rotation property
2015-06-30 09:30:01 -07:00
Sam Gateau
20cb519c14
first draft at using the status of the item for representing stats and current data about it in the DrawStatus phase
2015-06-30 08:19:00 -07:00
Sam Gondelman
be7053d208
workaround for resetSensors in OpenVRDisplayPlugin
...
For some reason ResetSeatedZeroPose doesn't work.
So we do it the hardway.
2015-06-29 20:27:32 -07:00
Seth Alves
c3747ab8aa
initialize some variables
2015-06-29 19:40:57 -07:00
Seth Alves
88fc74374b
if a hold action is edited by a local script, mark it as 'mine'. if it's not 'mine', let the spring action handle the wire protocol
2015-06-29 19:27:10 -07:00
Sam Gondelman
1dd62b2726
general improvements, need to resolve dependency issues
2015-06-29 18:22:31 -07:00
Sam Gondelman
a27196dfee
initial testing of hand controller tracking
2015-06-29 17:13:33 -07:00
Seth Alves
0a734c9d3d
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership
2015-06-29 16:56:04 -07:00
Seth Alves
fbede0a23f
guard against feeding bullet a NaN
2015-06-29 15:54:24 -07:00
Niraj Venkat
d7791982ac
Starting stats branch
2015-06-29 15:19:50 -07:00
Seth Alves
9b7ea19087
include action type in arguments delivered to scrips
2015-06-29 14:33:58 -07:00
Seth Alves
c539d9f233
allow for removal and readdition of an action in one time-slice without asserting
2015-06-29 12:22:06 -07:00
Seiji Emery
374150a39f
Merge https://github.com/highfidelity/hifi
2015-06-29 11:56:50 -07:00
ericrius1
843ab6d5e3
line entities can now be properly rotated using rotation property
2015-06-29 11:08:09 -07:00
Brad Davis
cdb6620703
Merge remote-tracking branch 'upstream/master' into plugins
2015-06-29 10:55:39 -07:00
Brad Davis
196a92c1b4
A little bit of display plugin API cleanup
2015-06-29 10:55:13 -07:00
Brad Davis
5cfa22396c
Merge pull request #5219 from venkatn93/master
...
Changing tooltip reticle
2015-06-29 10:51:16 -07:00
Seth Alves
3e88e1f400
unbungle merge
2015-06-29 10:04:27 -07:00
Seth Alves
1d122060a6
merge andrew's sim-ownership branch
2015-06-29 09:50:38 -07:00
Andrew Meadows
513285a00e
use macros for packing/unpacking QByteArray
2015-06-29 07:27:34 -07:00
Andrew Meadows
769755e30a
recycle PROP_SIMULATOR_ID
2015-06-29 06:20:14 -07:00
Brad Davis
a923c044a3
Merge remote-tracking branch 'upstream/master' into plugins
2015-06-28 22:51:46 -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
Seth Alves
c0c1116c69
attempt some clean-ups in edge/unexpected situations
2015-06-27 11:09:28 -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
Brad Davis
a8f8c45755
Use correct size for the offscreen framebuffer for vive
2015-06-27 00:30:33 -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
Seth Alves
9f6ec4120d
undo previous experiment
2015-06-26 18:43:56 -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 Hefta-Gaub
fbf2f51ded
Merge pull request #5224 from sethalves/fix-nan-in-vec3
...
don't try to convert a vec3 containing NaN to a script value
2015-06-26 17:55:38 -07:00
Seth Alves
0f3ac976c3
don't try to convert a vec3 containing NaN to a script value
2015-06-26 17:53:28 -07:00
Stephen Birarda
8fd309027f
add a forced failover for hanging STUN dns lookup
2015-06-26 17:35:14 -07:00
Brad Davis
5ce79d6800
Merge remote-tracking branch 'upstream/master' into plugins
2015-06-26 17:14:45 -07:00
Brad Davis
84505c49c4
Merge pull request #5213 from birarda/hyperlink-photo
...
add photo replacement for hyperlinked places
2015-06-26 17:05:33 -07:00
Brad Davis
4417c00ae4
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.h
interface/src/Menu.h
2015-06-26 17:02:16 -07:00
Atlante45
d02c69111b
Fix compile error in text shader
2015-06-26 16:56:47 -07:00
Seth Alves
5e65972265
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 16:55:34 -07:00
Seth Alves
1326791502
add sanity check to PhysicalEntitySimulation::addAction
2015-06-26 16:55:16 -07:00
Seth Alves
31a3ca641d
clean up left-over action if it's re-added
2015-06-26 16:54:46 -07:00
Seth Alves
300d35219d
move functions our of header to cpp file
2015-06-26 16:54:01 -07:00
Niraj Venkat
9101b4ad70
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-26 16:28:01 -07:00
Niraj Venkat
fe8d539cf5
changing link icon
2015-06-26 16:27:04 -07:00
Atlante45
27a1a55275
Don't cull text background/Text is emissive
2015-06-26 16:17:41 -07:00
Atlante45
efd805bea7
Introduce new emissive simple program
...
Also fixes the shading on web entities using that program
2015-06-26 16:17:41 -07:00
Atlante45
017b4045e5
Fix web entity texture not displayed
2015-06-26 16:17:41 -07:00
Atlante45
078a5a8439
Formatting
2015-06-26 16:17:40 -07:00
Atlante45
3c49e6231e
Sam's fix for pipeline edge case
...
Basically if we bind a uniform texture and the pipeline is not setup
correctly on mac
2015-06-26 16:17:40 -07:00
Atlante45
e6cdd4a9ff
Fix web entities back culled
2015-06-26 16:17:40 -07:00
Atlante45
f753a54494
Fix web entities incorrect dimensions
2015-06-26 16:17:39 -07:00
Seth Alves
b4537b081f
fix clearActions
2015-06-26 16:02:47 -07:00
ZappoMan
f61581d29d
possible fix for deadlock
2015-06-26 15:42:04 -07:00
David Rowe
8d83e23bab
Improve entity properties list code comment
2015-06-26 15:37:16 -07:00
Seth Alves
70aa762f61
merge from upstream
2015-06-26 15:34:10 -07:00
Stephen Birarda
ff33922716
handle conflicts on merge with upstream master
2015-06-26 15:33:35 -07:00
ZappoMan
ccbc048f64
repair bad ordering of PROP_SCRIPT_TIMESTAMP
2015-06-26 14:59:40 -07:00
Stephen Birarda
9b84eabd18
Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo
2015-06-26 14:40:01 -07:00
Seth Alves
bc7271769c
merge from master
2015-06-26 14:29:40 -07:00
Stephen Birarda
a0df52e860
add note for UI link
2015-06-26 14:17:54 -07:00
Stephen Birarda
7e19a540fd
add the new placeholder image
2015-06-26 14:13:23 -07:00
Stephen Birarda
18e2b62ecc
initial image replacement for hyperlink preview
2015-06-26 14:12:26 -07:00
David Rowe
1898c6bd55
Merge branch 'master' into 20547
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-06-26 13:05:51 -07:00
Seth Alves
9e8113a63c
bump protocol version
2015-06-26 12:36:10 -07:00
Seth Alves
005bd8bda5
merge from upstream
2015-06-26 12:33:35 -07:00
Brad Hefta-Gaub
2c30711229
Merge pull request #5210 from bwent/faceCameraProp
...
Added faceCamera property for text entities
2015-06-26 12:29:25 -07:00
Seth Alves
d09588b7fa
put upper bound on size of serilized action parameters so they'll fit in MTU
2015-06-26 12:11:34 -07:00
Seth Alves
6a39aecdd4
back out mistaken commit
2015-06-26 12:11:03 -07:00
Seth Alves
798c9492d3
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 11:47:21 -07:00
Stephen Birarda
522b715628
remove comment, styling cleanup
2015-06-26 11:41:34 -07:00
Stephen Birarda
c6df573933
fix some OS X warnings, add description to tooltip
2015-06-26 10:50:31 -07:00
Brad Davis
8dcd91fdab
Merge pull request #5192 from venkatn93/master
...
Hyperlink tooltip and address bar remodel
2015-06-26 10:28:52 -07:00
Seth Alves
c95db5672a
include argument-packing version in serialized argument data
2015-06-26 10:01:45 -07:00
Seth Alves
f5f1d0829c
Merge branch 'physics-lock-entity-tree' of github.com:sethalves/hifi into actions-over-wire
2015-06-26 07:20:51 -07:00
Seth Alves
015498a6e0
move function up so this builds in non-debug mode
2015-06-26 07:20:22 -07:00
Seth Alves
2682c4720d
fix alt-branch of ifdef
2015-06-26 07:04:10 -07:00
Seth Alves
a0d77c061c
lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does
2015-06-26 07:00:28 -07:00
Seth Alves
7c26641560
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-25 17:40:27 -07:00
bwent
aa865680ab
Added faceCamera property to Text Entities
...
…and removed from base
2015-06-25 15:38:38 -07:00
Niraj Venkat
6b14a64c8c
Formatting changes and teleport on click
2015-06-25 15:15:44 -07:00
Brad Hefta-Gaub
6c4a4866d3
Merge pull request #5202 from Atlante45/overlay
...
Overlay have correct bounds
2015-06-24 19:00:55 -07:00
Brad Hefta-Gaub
77bbb23a1e
Merge pull request #5175 from hyperlogic/ajt/first-person-avatar
...
Render a different model when in first person view.
2015-06-24 18:54:47 -07:00
Clément Brisset
e05b4e3115
Merge pull request #5203 from howard-stearns/set-injector-options-from-script
...
Set injector options from script
2015-06-24 16:54:11 -07:00
Anthony J. Thibault
3853395298
Bug fixes for switching between head/body and full body avatars
...
The head model visibility is now updated in preRender()
Moved the near clip plane in a bit more
Invalidate head bone vector on LOD switching.
Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Atlante45
85b2771c4a
Extend Extents
2015-06-24 15:44:48 -07:00
Clément Brisset
6db4184748
Merge pull request #5171 from huffman/fix-edit-rotate
...
Fix edit.js rotation display
2015-06-24 15:35:15 -07:00
Seiji Emery
6e87f44ec7
Merge remote-tracking branch 'upstream/master'
2015-06-24 15:12:57 -07:00
bwent
0516caaa32
Added CHECK_PROPERTY_CHANGE macro
2015-06-24 14:58:33 -07:00
Ryan Huffman
4df1bea4ec
Merge pull request #5167 from SamGondelman/hmdControls
...
hmdControls.js for movement when wearing an HMD
2015-06-24 14:40:31 -07:00
Howard Stearns
3b8a46b87d
Allow scripted audio injectors to have options set.
2015-06-23 21:01:34 -07:00
Seth Alves
28582ed14d
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-23 19:50:35 -07:00
David Rowe
33b48947a5
Delete Interface.ini.lock file at start-up if it exists
...
Otherwise Interface freezes.
2015-06-23 17:36:19 -07:00
Brad Davis
8f8bda327c
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/OculusManager.h
2015-06-23 16:54:32 -07:00
bwent
99cd9bada1
Added Billboard entity property and enabled billboarding for text entities
2015-06-23 16:22:34 -07:00
Seth Alves
a46e8ed14c
quiet compiler
2015-06-23 15:27:35 -07:00
Seth Alves
0af137af36
save encoded action data rather than generating it on demand
2015-06-23 15:27:25 -07:00
ericrius1
b1190bee6e
deleted empty files I accidently committed.
2015-06-23 14:13:13 -07:00
David Rowe
93509f4c6e
Code review
2015-06-23 11:25:02 -07:00
Seth Alves
6e34678a59
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-23 10:48:21 -07:00
Seth Alves
4bf4e9f5da
Merge pull request #5164 from ericrius1/lineBounds
...
Line bounds
2015-06-23 10:47:38 -07:00
Seth Alves
20f173a474
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 19:36:09 -07:00
Brad Hefta-Gaub
a3e1987078
Merge pull request #5176 from huffman/fix-raypicking-crash
...
DO NOT MERGE - Fix recalculateMeshBoxes being called outside of mutex
2015-06-22 19:03:31 -07:00
Seiji Emery
dfe58a5ed4
Disabled Model (entity) Tests, as they are waaay out of date and will not run with the current codebase. These should get reimplemented at some point.
2015-06-22 17:42:07 -07:00
Brad Hefta-Gaub
e0f9f8b613
Merge pull request #5183 from birarda/ac-scripts
...
fix AC crash with no controller scripting interface
2015-06-22 17:22:56 -07:00
Philip Rosedale
6ef7e486b1
Merge pull request #5165 from ctrlaltdavid/20582
...
CR for #20582 - Fix the issue with Domain backups
2015-06-22 17:02:38 -07:00
Seth Alves
f75506bf1b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 15:37:10 -07:00
Seth Alves
4849e2922e
quiet valgrind
2015-06-22 14:21:25 -07:00
Brad Davis
98f7b0a689
Merge pull request #5181 from birarda/master
...
fix for double store on index path lookup
2015-06-22 13:58:36 -07:00
Brad Davis
9f98547390
Merge branch 'master' into plugins
2015-06-22 13:35:40 -07:00
Seth Alves
7f4e3f8216
when deserializing action, remove any existing actions that weren't part of the serialized data
2015-06-22 13:12:34 -07:00
Seth Alves
55975fd611
don't add an action of we're about to remove it
2015-06-22 13:11:42 -07:00
Howard Stearns
240272be11
Merge pull request #5161 from PhilipRosedale/master
...
Always test and remove DC Offset
2015-06-22 12:09:08 -07:00
Philip Rosedale
111b0f286d
Merge pull request #5160 from ctrlaltdavid/addressbar-tidy
...
Tidy address bar code
2015-06-22 12:08:33 -07:00
Philip Rosedale
e5c1e0ca67
Merge pull request #5159 from howard-stearns/refactor-playSound
...
Refactor playSound
2015-06-22 12:07:08 -07:00
Stephen Birarda
ff21c22245
fix AC crash with no controller scripting interface
2015-06-22 11:56:07 -07:00
Stephen Birarda
a9eccb687a
fix for double store on index path lookup
2015-06-22 11:26:17 -07:00
ericrius1
362d9a2481
syncing brush sphere with line color
2015-06-22 10:35:00 -07:00
Brad Davis
3231bbba5a
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
2015-06-22 09:44:16 -07:00
Brad Davis
1b44c220a7
Prep work for procedural stars & stuff
2015-06-22 09:43:12 -07:00
Seth Alves
bce8b0cc1b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 07:19:55 -07:00
Seth Alves
c14276145d
lock when reading or writing _actionsToAdd or _actionsToRemove
2015-06-22 07:19:40 -07:00
