Seth Alves
|
b19d505fc1
|
remove stray debug print
|
2015-07-01 20:32:45 -07:00 |
|
Seth Alves
|
246861221c
|
rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready.
|
2015-07-01 20:17:21 -07:00 |
|
Seth Alves
|
6e3cab9f4d
|
fix logic problem with previous fix
|
2015-07-01 12:37:15 -07:00 |
|
Seth Alves
|
593ed9f998
|
work around problem where EntityItem::setActionData is called before the entity tree is set up
|
2015-07-01 12:26:51 -07:00 |
|
Seth Alves
|
5ab2c8d724
|
rename variable to be more descriptive
|
2015-07-01 12:24:50 -07:00 |
|
Seth Alves
|
e8a6acd65b
|
responses to code review
|
2015-07-01 10:42:04 -07:00 |
|
Seth Alves
|
5e2f7204b4
|
responses to code review
|
2015-07-01 10:29:42 -07:00 |
|
Seth Alves
|
a356cbf620
|
remove commented code
|
2015-07-01 07:33:46 -07:00 |
|
Seth Alves
|
b7e9056c04
|
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership
|
2015-07-01 07:33:29 -07:00 |
|
Seth Alves
|
6e7973f5b9
|
coding-standard / code-review
|
2015-06-30 19:28:22 -07:00 |
|
Seth Alves
|
f4bbbcbec7
|
try to explain action class hierarchy in a comment
|
2015-06-30 19:05:34 -07:00 |
|
Seth Alves
|
a300dec1f7
|
update entity data bytes whenever it's asked for
|
2015-06-30 10:42:34 -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 |
|
Seth Alves
|
7d7e3769f6
|
suppress a log message
|
2015-06-30 09:56:15 -07:00 |
|
Brad Hefta-Gaub
|
448a0f01b6
|
Merge pull request #5236 from howard-stearns/wantEditLogging-off-by-default
Want edit logging off by default
|
2015-06-30 09:30:33 -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 |
|
Seth Alves
|
0caa8be66e
|
ignore incoming changes for a hold action that's flagged as 'mine'
|
2015-06-29 19:50:19 -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 |
|
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
|
33d9dc40f5
|
name stick
|
2015-06-29 16:08:50 -07:00 |
|
Seth Alves
|
a0fd75c54f
|
don't enable hold actions from remote nodes
|
2015-06-29 16:08:37 -07:00 |
|
Seth Alves
|
fbede0a23f
|
guard against feeding bullet a NaN
|
2015-06-29 15:54:24 -07:00 |
|
Seth Alves
|
2e5b25b5d8
|
include timescale in wire protocol ../../interface/src/avatar/AvatarActionHold.cpp
|
2015-06-29 14:34:26 -07:00 |
|
Seth Alves
|
9b7ea19087
|
include action type in arguments delivered to scrips
|
2015-06-29 14:33:58 -07:00 |
|
Brad Davis
|
09f32f6839
|
Merge pull request #5234 from birarda/hyperlink-photo
styling changes in hyperlink tooltip
|
2015-06-29 12:38:46 -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 |
|
Howard Stearns
|
a736d0d901
|
Initial value false for domain-server wantEditLogging (used by assignment clients).
|
2015-06-29 11:33:55 -07:00 |
|
Howard Stearns
|
ebf9c3224a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into toolbar-auto-persist-as-percentage-of-screen
|
2015-06-29 11:32:16 -07:00 |
|
ericrius1
|
843ab6d5e3
|
line entities can now be properly rotated using rotation property
|
2015-06-29 11:08:09 -07:00 |
|
Stephen Birarda
|
3dc3d8b4c1
|
make the tooltip background darker
|
2015-06-29 11:05:59 -07:00 |
|
Stephen Birarda
|
133247ec6d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo
|
2015-06-29 10:57:16 -07:00 |
|
Stephen Birarda
|
f93ad34282
|
add spacing above and below tooltipPic
|
2015-06-29 10:57:09 -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 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 |
|
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 |
|