Commit graph

10059 commits

Author SHA1 Message Date
Atlante45
687f9dda4a Restore old offset behaviors 2015-07-06 18:21:17 -07:00
Atlante45
541d9ae431 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard 2015-07-06 18:05:43 -07:00
Brad Davis
bd938d5f4c Merge pull request #5263 from ZappoMan/inBoundStats
Additional inbound entity stats
2015-07-06 17:12:19 -07:00
ZappoMan
05f28064bf add stats for PPS for inbound from network into OctreePacketProcessor and processing out of OctreePacketProcessor 2015-07-06 16:03:42 -07:00
Sam Gateau
fe633cd545 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-06 15:04:02 -07:00
Sam Gateau
4d48b98364 For a fistfull of magic numbers 2015-07-06 14:22:09 -07:00
Sam Gateau
95f5b14d45 CLenaing the interface of Item::Status to be more explicit and removing magic numbers 2015-07-06 12:47:35 -07:00
Sam Gateau
e63be58251 CLenaing the interface of Item::Status to be more explicit 2015-07-06 12:23:57 -07:00
Sam Gateau
2bbffff22f Fixing typos 2015-07-06 10:22:25 -07:00
ZappoMan
c4a5160b89 CR feedback 2015-07-04 19:13:35 -07:00
Atlante45
c61bf34200 Use depth bias to avoid z-fighting on text entities 2015-07-04 18:35:00 -07:00
Atlante45
0093403bba Add depth bias option to simple programs
Simple programs are now lazily generated and stored in a hash
2015-07-04 18:33:03 -07:00
Atlante45
d243190caf Coding standard 2015-07-04 16:06:39 -07:00
Atlante45
0eb89efb34 Fix text entity billboarding 2015-07-04 16:06:38 -07:00
ZappoMan
40cdd8646e add packets per second to octree processing stats 2015-07-03 15:53:53 -07:00
ZappoMan
2aa345dfc6 Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats 2015-07-03 15:04:59 -07:00
ZappoMan
29a7584ee6 remove dead code 2015-07-03 11:29:59 -07:00
Sam Gateau
e3c06a30a1 removing dead code 2015-07-02 19:29:09 -07:00
ZappoMan
e1530b3ce9 added a FIXME STUTTER note 2015-07-02 18:15:24 -07:00
samcake
f9562bedd9 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 18:14:45 -07:00
Sam Gateau
76ca093e05 something working ? 2015-07-02 18:12:03 -07:00
Stephen Birarda
812b18c74e Merge pull request #5205 from SeijiEmery/unit-tests
Unit tests
2015-07-02 20:58:09 -04:00
samcake
0c55130548 maybe i have solved the passing of the status 2015-07-02 17:31:29 -07:00
ZappoMan
a54cf67064 add stats for processing time per packet 2015-07-02 17:28:53 -07:00
ZappoMan
8916dd2056 add stats for elements and entities per second 2015-07-02 17:00:35 -07:00
ZappoMan
0c0b8dbbc1 add stats for elements and entities per incoming packet 2015-07-02 16:19:13 -07:00
Sam Gateau
dcd61fd417 improvment ? 2015-07-02 16:13:54 -07:00
Sam Gateau
79be37f78f improvment ? 2015-07-02 16:00:56 -07:00
Sam Gateau
bf052162bb improvment ? 2015-07-02 15:53:02 -07:00
Sam Gateau
8d8a902328 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 15:06:32 -07:00
Sam Gateau
be8fe25338 Trying to finalize the look and behavior of th estatus indicators 2015-07-02 15:06:07 -07:00
ZappoMan
b568e895ec Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats 2015-07-02 15:00:09 -07:00
Brad Hefta-Gaub
2a03f62bf2 Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership
Actions over wire and improved simulation ownership
2015-07-02 14:57:27 -07:00
ZappoMan
5c4d4893de added bytes per edit stats 2015-07-02 13:44:28 -07:00
ZappoMan
63b585da0f added updates per second stat 2015-07-02 13:28:12 -07:00
Leonardo Murillo
9440546619 Don't display update dialog if this is a PR build 2015-07-02 14:17:36 -06:00
ZappoMan
b13a4b2a71 add edit update stats 2015-07-02 11:07:47 -07:00
samcake
faea97d3c7 Merge pull request #5221 from Atlante45/web
Fix Web entities
2015-07-02 10:45:20 -07:00
Brad Hefta-Gaub
f16b8d5083 Merge pull request #5246 from jherico/inter_idle_timing
Instrument the inter-idle time and tweaking the timeout setting
2015-07-02 09:01:44 -07:00
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
Sam Gateau
d019ef4373 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-01 18:12:11 -07:00
samcake
3564499824 Merge pull request #5249 from ZappoMan/entityServerEditStats
add more detailed edit timing to entity server
2015-07-01 18:11:19 -07:00
Niraj Venkat
23979cce8f Merge branch 'yellow' of https://github.com/samcake/hifi into stats 2015-07-01 17:31:15 -07:00
Niraj Venkat
ee998d0c74 Icon size is a pixel if the inStatus is -1 2015-07-01 17:30:50 -07:00
Sam Gateau
e8b11f1198 Exposing the display Item Status to js to turn it on/off 2015-07-01 17:27:41 -07:00
Niraj Venkat
219bcd19ed Status bar update 2015-07-01 16:40:42 -07:00
Brad Davis
59027959b8 CR comments and fixing the average calculation 2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub
b4f04af66f Merge pull request #5242 from jherico/packet_processing
Eliminate per-packet locking for processing
2015-07-01 16:11:27 -07:00
ZappoMan
24b4614703 add more detailed edit timing to entity server 2015-07-01 16:11:08 -07:00