Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-18 07:50:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27529 commits 25 branches 0 tags 1.1 GiB
Commit graph

27529 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Rowe
215c260c9e Fix TextOverlay font size setting 2015-06-30 17:08:43 -07:00
Niraj Venkat
a33a76ac27 Merge branch 'yellow' of https://github.com/samcake/hifi into stats 2015-06-30 16:12:56 -07:00
Niraj Venkat
aa55de46c2 Drawing full bounding box 2015-06-30 16:09:45 -07:00
Sam Gateau
8bd5e15f73 Exposing the viewport to the shader and have a first draft of the draw status pipeline 2015-06-30 14:43:57 -07:00
Niraj Venkat
2f2d5815db Merge branch 'master' of https://github.com/highfidelity/hifi into stats 2015-06-30 14:13:03 -07:00
Seiji Emery
a48adf5ce5 Cleanup + formatting 2015-06-30 14:12:58 -07:00
Sam Gondelman
c9d205de3e quadratic zooming response 2015-06-30 14:04:43 -07:00
Niraj Venkat
0ea2774d6e Merge branch 'yellow' of https://github.com/samcake/hifi into stats 2015-06-30 10:46:07 -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
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
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
Niraj Venkat
d7791982ac Starting stats branch 2015-06-29 15:19:50 -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
Seiji Emery
bfe33f64eb Merge branch 'master' of https://github.com/SeijiEmery/hifi into unit-tests 2015-06-29 12:09:37 -07:00
Seiji Emery
374150a39f Merge https://github.com/highfidelity/hifi 2015-06-29 11:56:50 -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
Seiji Emery
8e324f5de2 Fixes 2015-06-29 11:29:10 -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
Sam Gondelman
0bf4c9dda2 correct menu shortcut for mouselook 2015-06-29 09:58:35 -07:00
Seth Alves
1d122060a6 merge andrew's sim-ownership branch 2015-06-29 09:50:38 -07:00
Howard Stearns
51782bd17d Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds 2015-06-29 09:30:44 -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
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