Atlante45
2ba6bd3afc
Double display name offset
2015-07-06 18:39:43 -07:00
Anthony J. Thibault
834b75f4c4
work in progress room scale tracking work.
...
sensor to world matrix stored in MyAvatar
override setPosition and setOrientation to move sensor to world matrix.
2015-07-06 18:25:42 -07:00
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
Sam Gondelman
f69b755166
merge with hifi/plugins
2015-07-06 17:41:45 -07:00
Brad Davis
bd938d5f4c
Merge pull request #5263 from ZappoMan/inBoundStats
...
Additional inbound entity stats
2015-07-06 17:12:19 -07:00
Sam Gondelman
8fbbb26b15
vertical hand offset (temporary)
2015-07-06 17:04:28 -07:00
Sam Gondelman
33e4893c17
correct hand rotation, buttons and axes work
2015-07-06 16:30:56 -07:00
Brad Davis
95000eec3c
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/ui/overlays/LocalModelsOverlay.cpp
2015-07-06 16:22:03 -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
samcake
c090bd0bd7
Merge branch 'yellow' of https://github.com/samcake/hifi into daft
2015-07-06 15:46:21 -07:00
samcake
9649fe45e4
fix a bad paintRainbow function in the shader...
2015-07-06 15:45:26 -07:00
Brad Hefta-Gaub
96fecd093d
Merge pull request #5237 from samcake/yellow
...
Introducing the Status to the render::Scene & Engine, a per item information that can be displayed in 3D for debug
2015-07-06 15:41:58 -07:00
samcake
a8ddc71946
Merge pull request #5262 from bwent/cookies
...
Added checkbox functionality, double-click to reset panel
2015-07-06 15:09:16 -07:00
Sam Gateau
fe633cd545
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-06 15:04:02 -07:00
bwent
8b4398cd5a
Update cookies.js
2015-07-06 15:03:21 -07:00
bwent
2bdd2b8c2c
Update cookies.js
2015-07-06 15:02:51 -07:00
samcake
a2f6693bd7
getting the deferred lighting to work
2015-07-06 14:40:10 -07:00
Sam Gateau
4d48b98364
For a fistfull of magic numbers
2015-07-06 14:22:09 -07:00
bwent
5d91f1be83
Removed header comments
2015-07-06 13:26:16 -07:00
David Rowe
5046f4c1ac
Update upgrade dialog
...
- Strip out "<br />"s
- Show information for all new versions since current, not just latest
- Display scrollbar if content too long to show all at once
- "version" / "versions" behind depending on if one or more
- Align buttons with heading and text
- Darken text so that is more readable
2015-07-06 13:19:42 -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
bwent
93fbfcbff7
Added checkbox functionality, double-click to reset panel
2015-07-06 12:09:08 -07:00
Brad Davis
21562c0766
Merge pull request #5258 from ericrius1/nakedGLStripping
...
Removing naked GL calls from overlay code
2015-07-06 10:25:50 -07:00
Sam Gateau
2bbffff22f
Fixing typos
2015-07-06 10:22:25 -07:00
samcake
76e661f88d
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-05 12:08:56 -07:00
Clément Brisset
c5a043f2e1
Merge pull request #5253 from ZappoMan/inBoundStats
...
add edit update stats
2015-07-04 21:11:48 -07:00
ZappoMan
c4a5160b89
CR feedback
2015-07-04 19:13:35 -07:00
Atlante45
85df510b4b
Use depth bias to avoid z-fighting on text3d overlays
2015-07-04 18:40:37 -07:00
Atlante45
c61bf34200
Use depth bias to avoid z-fighting on text entities
2015-07-04 18:35:00 -07:00
Atlante45
9bf6c439aa
Use depth bias to avoid z-fighting on display name
2015-07-04 18:34:19 -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
32cf4dac78
Fix displayname z-fighting
2015-07-04 16:06:38 -07:00
Atlante45
0eb89efb34
Fix text entity billboarding
2015-07-04 16:06:38 -07:00
ZappoMan
74733452da
some tweaks to make stats dialog more readable
2015-07-04 11:25:27 -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
David Rowe
3f38a835d8
Fix look-at vectors not rendering if not looking at me
2015-07-03 13:49:10 -07:00
Eric Levin
3d06b011aa
adding batch to renderHUD
2015-07-03 13:27:00 -07:00
samcake
4019a216d4
Fixed the viewport expressed in int not getting to the shader, needed to be convert to float
2015-07-03 12:12:54 -07:00
samcake
c6a613eaa9
Merge pull request #5260 from ZappoMan/deadCodeRemovalMachine
...
remove dead code
2015-07-03 11:53:21 -07:00
samcake
84b70fbaca
Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass
2015-07-03 11:36:19 -07:00
ZappoMan
29a7584ee6
remove dead code
2015-07-03 11:29:59 -07:00
Eric Levin
9d3995ae25
Merge branch 'nakedGLStripping' of https://github.com/ericrius1/hifi into nakedGLStripping
2015-07-03 09:42:19 -07:00
Brad Davis
ba7c3a2c27
Attempting to get UI and navigation keys/mouse working
2015-07-03 07:10:33 -07:00
Brad Davis
b529901b1a
Attempting to protect against infinite recursion
2015-07-03 07:09:57 -07:00
Brad Davis
e459d0cb83
Fixing the 0.6 Oculus plugin
2015-07-03 07:08:48 -07:00
Brad Davis
2a1776303d
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/avatar/SkeletonModel.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
2015-07-03 06:17:35 -07:00
