ZappoMan
c4a5160b89
CR feedback
2015-07-04 19:13:35 -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
ZappoMan
e1530b3ce9
added a FIXME STUTTER note
2015-07-02 18:15:24 -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
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
24b4614703
add more detailed edit timing to entity server
2015-07-01 16:11:08 -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
Andrew Meadows
12fc18092b
SimulationOwner as one property
2015-06-26 21:58:03 -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
Anthony J. Thibault
3853395298
Bug fixes for switching between head/body and full body avatars
...
The head model visibility is now updated in preRender()
Moved the near clip plane in a bit more
Invalidate head bone vector on LOD switching.
Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Philip Rosedale
6ef7e486b1
Merge pull request #5165 from ctrlaltdavid/20582
...
CR for #20582 - Fix the issue with Domain backups
2015-06-22 17:02:38 -07:00
Brad Davis
1b44c220a7
Prep work for procedural stars & stuff
2015-06-22 09:43:12 -07:00
Bradley Austin Davis
4ccdc78866
Fixing frustum perspective bug
2015-06-21 15:53:24 -07:00
David Rowe
709508857c
Delete maximum rolling backup file if it exists before rolling backup
2015-06-18 17:39:31 -07:00
Seth Alves
021dc64789
merge from upstream
2015-06-18 15:03:09 -07:00
Seth Alves
b258aeaa3d
merge from master
2015-06-18 10:04:14 -07:00
Atlante45
a9d2bb1e1c
Coding standard
2015-06-18 15:23:50 +02:00
Seth Alves
610bfc63e8
check success in OctreePacketData::appendValue for qvectors of vec3s before proceeding with further data appends
2015-06-17 18:34:46 -07:00
Seth Alves
508ae276c6
enable -Wdouble-promotion
2015-06-16 18:23:10 -07:00
Atlante45
7654533888
Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod
2015-06-03 19:47:51 +02:00
ZappoMan
7c40b666e8
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api
2015-06-03 09:52:40 -07:00
Atlante45
bbf1837796
Introduced RenderDetails/Stats don't pull details
...
- Regrouped everything stat in a struct
- Details are set into the stats
2015-06-03 16:14:23 +02:00
Andrew Meadows
2702e07863
Merge pull request #5015 from sethalves/polyvox
...
PolyVox improvements -- depends on #5008
2015-06-02 14:34:49 -07:00
Eric Levin
55ffb7f1c0
code style changes
2015-06-02 12:51:45 -07:00
Eric Levin
785144404c
changed entity packet type version number
2015-06-01 15:37:29 -07:00
Eric Levin
83bf4241e4
resolved merge conflicts... but now lines not flying across clients
2015-06-01 15:16:08 -07:00
ZappoMan
d4af454834
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-06-01 14:42:35 -07:00
Eric Levin
5cce4edec8
fix merge conflicts attemp 1
2015-06-01 11:18:33 -07:00
Eric Levin
b6b5078048
removed unneeded append methods from OctreePacketData
2015-06-01 11:11:08 -07:00
Eric Levin
93c3f90c95
clened up read and write of qVec- no longer converting between qVector and qByteArray
2015-06-01 11:08:48 -07:00
Eric Levin
115bf3dd25
cleaned up logging and testing code.
2015-05-31 14:52:44 -07:00
Eric Levin
27b59b5f72
fixed bug in qvec unpacking code
2015-05-31 14:46:20 -07:00
Eric Levin
5e22af8643
points and line width persistent accross clients
2015-05-31 14:21:28 -07:00
Eric Levin
cb72b620cf
printing bytes out correctly
2015-05-29 19:42:07 -07:00
Eric Levin
7d5dd278a1
adding unpacking
2015-05-29 16:54:40 -07:00
Seth Alves
a96520ca74
set up EntityItemPropertiesFromScript to either ignore or honor read-only properties
2015-05-29 13:43:18 -07:00
Brad Davis
f98305dd55
CR comments
2015-05-29 12:45:03 -07:00
Brad Davis
8bad80324f
Merge branch 'master' into plugins_pt3
2015-05-29 09:05:01 -07:00
ZappoMan
a0e51469d3
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-28 12:36:34 -07:00
Eric Levin
72af4e4e67
latest pointer
2015-05-28 10:44:44 -07:00
Eric Levin
8edc883e4d
adding serialization for Qvector
2015-05-27 13:47:47 -07:00
Seth Alves
0f81445cee
flag for polyvox to select minecraft vs walking-cubes. uppack to unpack
2015-05-27 07:04:44 -07:00
Seth Alves
6930008f74
remove debugging spew
2015-05-26 21:40:50 -07:00
Seth Alves
ebae87136f
debugging
2015-05-26 20:57:58 -07:00