Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 17:25:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
27601 commits 25 branches 28 tags 1.2 GiB
Commit graph

27601 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenkins Slave Access
981ff2d5fa Enhancing PR installer titles 2015-07-01 14:13:37 -04:00
Seth Alves
e8a6acd65b responses to code review 2015-07-01 10:42:04 -07:00
Brad Hefta-Gaub
e25483cdde Merge pull request #5241 from jherico/stats_fix 
Fix inverted in/out mbps display on stats
 2015-07-01 10:30:04 -07:00
Seth Alves
5e2f7204b4 responses to code review 2015-07-01 10:29:42 -07:00
Brad Davis
cd63b8a49d Fix inverted in/out mbps display on stats 2015-07-01 10:10:53 -07:00
Brad Davis
d4d6f8f5d5 Eliminate per-packet locking for processing 2015-07-01 10:06:04 -07:00
Sam Gateau
63e3d0e741 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-01 07:48:37 -07:00
Sam Gateau
2f04a9d3da refining the shader pipeline and trying to pass a Status Getter from the model and fails 2015-07-01 07:47:46 -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
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
samcake
49abbe276f Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-29 10:07:40 -07:00
Seth Alves
3e88e1f400 unbungle merge 2015-06-29 10:04:27 -07:00