Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
Andrew Meadows
1759f0553d
Merge pull request #5290 from BingShearer/CrashFixes
...
Crash fixes
2015-07-10 10:42:47 -07:00
Brad Hefta-Gaub
33016e2797
Merge pull request #5293 from jherico/bart
...
More profiling ranges and updated performance testing scripts
2015-07-09 19:10:45 -07:00
Brad Davis
a92a7980d7
Restore audio scope
2015-07-09 17:49:25 -07:00
Brad Davis
446f800aee
More profiling ranges and updated performance testing scripts
2015-07-09 15:43:30 -07:00
Bing Shearer
99c563602f
Fixed Else case where _renderImage is true but the texture has 0 size, else case did not previously exist.
2015-07-09 15:25:37 -07:00
Bing Shearer
85f6fdb8cf
Fixed bug which would cause program to crash if there was no image associated with an overlay in windows build (see checkbox in sunLightExample)
2015-07-09 14:20:10 -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
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
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
Atlante45
85df510b4b
Use depth bias to avoid z-fighting on text3d overlays
2015-07-04 18:40:37 -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
Eric Levin
3d06b011aa
adding batch to renderHUD
2015-07-03 13:27:00 -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
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
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
ericrius1
8be1fd28e5
stripping naked gl calls from overlays to allow vive and oculus plugins to work
2015-07-02 13:57:00 -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
ZappoMan
b13a4b2a71
add edit update stats
2015-07-02 11:07:47 -07:00
Clément Brisset
b616fff222
Merge pull request #5220 from howard-stearns/avatar-collision-sounds
...
Avatar collision sounds
2015-07-02 10:27:24 -07:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07:00
Atlante45
ee13407066
Fix smart pointer casts
2015-07-01 19:22:40 -07:00
Clément Brisset
eb3bddfe4c
Merge pull request #5209 from ctrlaltdavid/20589
...
QA for #20589 - Vertical field of view preference change should be applied immediately
2015-07-01 13:53:25 -07:00
Clément Brisset
ede2eec283
Merge pull request #5240 from ctrlaltdavid/fix-textoverlay-size
...
Fix TextOverlay font size setting
2015-07-01 13:52:51 -07:00
David Rowe
e85eb246d2
Delete old TextRenderer after new one is in place
2015-07-01 13:19:46 -07:00
Philip Rosedale
8ed4000560
Merge pull request #5239 from SamGondelman/zooming
...
DO NOT MERGE - quadratic zooming response
2015-07-01 12:22:23 -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
David Rowe
215c260c9e
Fix TextOverlay font size setting
2015-06-30 17:08:43 -07:00
Sam Gondelman
c9d205de3e
quadratic zooming response
2015-06-30 14:04:43 -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
Howard Stearns
51782bd17d
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-29 09:30:44 -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
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
567d98dfab
Merge branch 'cursor_fix' of github.com:jherico/hifi into actions-over-wire
2015-06-27 10:45:34 -07:00
Howard Stearns
dc7360cdc2
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-27 08:37:30 -07:00
Seth Alves
5ecc39b811
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 20:06:10 -07:00
Brad Davis
e6fade8c13
Prevent tooltips from appearing with stale data
2015-06-26 18:16:56 -07:00
Brad Davis
3b987c1e73
Fixing always-on link cursor
2015-06-26 18:14:31 -07:00
Howard Stearns
9a04fdf10a
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-26 16:24:27 -07:00
Howard Stearns
98f165f2ae
Avatar collision sounds.
...
collisionsSoundURL can be set in preferences:
Currently defaults to https://s3.amazonaws.com/hifi-public/sounds/Collisions-hitsandslaps/airhockey_hit1.wav .
Can be empty, which means no sound, rather than restoring default.
MyAvatar.collisionSoundURL can read/written in scripts.
Preloads when set, so that it won't have to fetch on first collision.
Plays at start of collision only, with volume proportional to "velocity change"^2.
2015-06-26 16:23:16 -07:00
Stephen Birarda
9b84eabd18
Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo
2015-06-26 14:40:01 -07:00
Seth Alves
bc7271769c
merge from master
2015-06-26 14:29:40 -07:00
