Seth Alves
|
4377105410
|
formatting and cleanups
|
2015-02-02 12:13:54 -08:00 |
|
Brad Davis
|
e71b61a256
|
remove oglplus references
|
2015-02-02 12:01:21 -08:00 |
|
Seth Alves
|
779a0086c4
|
BandwidthRecorder no longer knows about channel displays. cause overlay pps and Mbps to only update once per second
|
2015-02-02 11:56:50 -08:00 |
|
David Rowe
|
6e82679997
|
Permanently re-enable audio selection on Windows
|
2015-02-02 11:19:11 -08:00 |
|
Stephen Birarda
|
30a9f6159b
|
add required files for ndk-gdb
|
2015-02-02 11:01:35 -08:00 |
|
Stephen Birarda
|
884d8713ee
|
actually enter and leave vr mode
|
2015-02-02 10:04:04 -08:00 |
|
Seth Alves
|
f1cca2ac92
|
move bandwidth stats display details out of recorder class into dialog class
|
2015-02-02 09:26:09 -08:00 |
|
Seth Alves
|
c0a219678c
|
use DependencyManager to keep track of BandwidthRecorder
|
2015-02-02 08:55:55 -08:00 |
|
Philip Rosedale
|
aa86db202c
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2015-02-02 07:05:04 -08:00 |
|
Seth Alves
|
b85456b1e9
|
refactoring, cause BandwidthDialog to only update numbers once per second
|
2015-02-02 05:28:28 -08:00 |
|
Brad Davis
|
0726f7cd21
|
Example images from text rendering test
|
2015-02-01 19:49:01 -08:00 |
|
Brad Davis
|
8bac67abf9
|
Merge branch 'develop' into text-renderer
|
2015-02-01 19:47:05 -08:00 |
|
Brad Davis
|
a096c79747
|
Working on text rendering test
|
2015-02-01 19:46:49 -08:00 |
|
Brad Davis
|
96a5a02e18
|
Merge branch 'develop' into text-renderer
|
2015-02-01 16:25:34 -08:00 |
|
Brad Davis
|
ab1624b0a8
|
Adding matrix stack (currently not used
|
2015-02-01 16:25:17 -08:00 |
|
Brad Davis
|
6835068496
|
Adding text rendering test tool
|
2015-02-01 16:24:43 -08:00 |
|
Brad Davis
|
711506e055
|
Moving implementation details out of header
|
2015-02-01 14:15:34 -08:00 |
|
Brad Davis
|
0ca928ca3d
|
Merge branch 'oglplus' into text-renderer
|
2015-02-01 11:48:28 -08:00 |
|
Brad Davis
|
95a4e1626e
|
Merge branch 'oglplus' into develop
|
2015-02-01 11:48:10 -08:00 |
|
Brad Davis
|
acf0b292e9
|
Adding example images
|
2015-01-31 21:53:34 -08:00 |
|
Brad Davis
|
60317b3526
|
Working on signed distance fields text rendering
|
2015-01-31 21:42:54 -08:00 |
|
Seth Alves
|
fc07ecf83d
|
use BandwidthRecorder rather than recompute Mbps and pps in Application
|
2015-01-31 20:40:18 -08:00 |
|
Seth Alves
|
bee895ba0a
|
capture network bandwidth stats from NodeList rather than various places
|
2015-01-31 20:02:04 -08:00 |
|
Brad Davis
|
71b677ef5c
|
Removing nsight dependency as it breaks on my machine
|
2015-01-31 19:43:55 -08:00 |
|
Brad Davis
|
11f0d149f7
|
Adding cmake support for finding and using oglplus / boostconfig
|
2015-01-31 19:41:04 -08:00 |
|
Seth Alves
|
105b2c5fd7
|
shell script to regenerate emacs TAGS file for project
|
2015-01-31 10:54:01 -08:00 |
|
Seth Alves
|
77582f50df
|
Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter
|
2015-01-31 10:53:33 -08:00 |
|
Seth Alves
|
97035b6cd9
|
move some magic numbers to constants
|
2015-01-31 07:42:01 -08:00 |
|
Atlante45
|
1cfd98b2d7
|
Name threads
|
2015-01-31 00:50:12 -08:00 |
|
David Rowe
|
3c7cdc16ce
|
Merge branch 'master' into 20280
Conflicts:
interface/src/Application.h
|
2015-01-30 18:44:14 -08:00 |
|
Brad Hefta-Gaub
|
2eeb2a5ec5
|
Merge pull request #4205 from AndrewMeadows/isentropic
small models get box collision shape
|
2015-01-30 18:30:55 -08:00 |
|
Andrew Meadows
|
a723c748f5
|
check initialization of _needsInitialSimulation
|
2015-01-30 18:08:00 -08:00 |
|
Ryan Huffman
|
42bab84990
|
Merge branch 'master' of github.com:highfidelity/hifi into billboard-update
Conflicts:
interface/src/ui/overlays/BillboardOverlay.cpp
|
2015-01-30 16:58:05 -08:00 |
|
Brad Hefta-Gaub
|
e73a000bb8
|
Merge pull request #4208 from birarda/master
update to @problem's new interface icon
|
2015-01-30 16:53:32 -08:00 |
|
Brad Hefta-Gaub
|
918349b227
|
Merge pull request #4196 from ctrlaltdavid/20277
CR for Job #20277 - Interface user agent string change
|
2015-01-30 16:52:30 -08:00 |
|
Andrew Meadows
|
7a2def167b
|
Merge pull request #4206 from sethalves/rework-bandwidth-meter
Rework bandwidth meter dialog
|
2015-01-30 16:41:07 -08:00 |
|
Andrew Meadows
|
9da6b623a3
|
move shape polymorphism to ModelEntityItem
|
2015-01-30 16:25:35 -08:00 |
|
Andrew Meadows
|
bc52ba1d29
|
restore polymorphism for Box and Sphere entities
|
2015-01-30 16:18:50 -08:00 |
|
David Rowe
|
729fbbf5ac
|
A further custom User-Agent string
|
2015-01-30 15:56:01 -08:00 |
|
Stephen Birarda
|
f78f6ab4cf
|
fix check for debug/release icon
|
2015-01-30 15:41:44 -08:00 |
|
Stephen Birarda
|
2c74502394
|
move Interface icon back in icon sub-folder
|
2015-01-30 15:26:29 -08:00 |
|
Stephen Birarda
|
c4a2da15d1
|
change interface icon to lowercase
|
2015-01-30 15:26:07 -08:00 |
|
Seth Alves
|
067deefeb6
|
avoid use of snprintf
|
2015-01-30 15:23:40 -08:00 |
|
Stephen Birarda
|
ae87dac523
|
update to new interface icon
|
2015-01-30 15:22:21 -08:00 |
|
Ryan Huffman
|
1f24658f67
|
Remove BillboardOverlay::replyFinished()
|
2015-01-30 14:45:45 -08:00 |
|
Ryan Huffman
|
efd383d269
|
Update BillboardOverlay to use NetworkTexture
|
2015-01-30 14:42:41 -08:00 |
|
Seth Alves
|
eda7785d3b
|
minor edit to make diff nicer
|
2015-01-30 14:41:03 -08:00 |
|
Andrew Meadows
|
80f6f718d0
|
EntityItem base class now computes shapeInfo
|
2015-01-30 14:17:29 -08:00 |
|
Andrew Meadows
|
b035c5b082
|
fix for updating moving models
|
2015-01-30 14:16:32 -08:00 |
|
David Rowe
|
5474c0634e
|
Merge branch 'master' into 20277
Conflicts:
libraries/script-engine/src/ScriptEngine.cpp
|
2015-01-30 13:49:45 -08:00 |
|