Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 03:53:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27311 commits 71 branches 56 tags 1.2 GiB
Commit graph

27311 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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