Andrew Meadows
|
7304585103
|
Merge pull request #4271 from huffman/fix-overlays-text-size
Fix overlays text size
|
2015-02-12 09:35:37 -08:00 |
|
Andrew Meadows
|
357dd963f3
|
Merge pull request #4273 from ZappoMan/bugfix
fix the quad color being broken after rendering text
|
2015-02-12 09:00:16 -08:00 |
|
Andrew Meadows
|
e737921e67
|
Merge pull request #4270 from sethalves/clean-up-stats
put bandwidth stats in first overlay column rather than in their own
|
2015-02-12 08:58:53 -08:00 |
|
Andrew Meadows
|
5bb504ad55
|
Merge pull request #4268 from huffman/remove-upload-model
Remove upload from file from editEntities.js
|
2015-02-12 08:57:22 -08:00 |
|
ZappoMan
|
7a45b1bc96
|
fix the quad color being broken after rendering text
|
2015-02-11 15:50:04 -08:00 |
|
Ryan Huffman
|
341e31a074
|
Remove extraneous initialized check
|
2015-02-11 13:08:11 -08:00 |
|
Ryan Huffman
|
51ff897ee5
|
Update Font to not setup GL until first draw
|
2015-02-11 12:59:12 -08:00 |
|
Ryan Huffman
|
a527bd85ba
|
Update Text3DOverlay::textSize to use new TextRenderer::getExtents
|
2015-02-11 12:13:26 -08:00 |
|
Seth Alves
|
a281695132
|
keep bandwidths stats visible even if stats are expanded
|
2015-02-11 11:35:52 -08:00 |
|
Seth Alves
|
62507721c7
|
put bandwidth stats in first overlay column rather than in their own
|
2015-02-11 11:05:44 -08:00 |
|
Ryan Huffman
|
d7e18d6f6d
|
Update TextOverlay::textSize to use new TextRenderer::getExtents
|
2015-02-11 11:04:04 -08:00 |
|
Brad Hefta-Gaub
|
9a7ed8055f
|
Merge pull request #4267 from samcake/master
Fix performance bug for NetworkGeometry::isLoadedWithTextures() and glTransform removal
|
2015-02-11 09:45:29 -08:00 |
|
Ryan Huffman
|
957686e12e
|
Remove upload from file from editEntities.js
|
2015-02-11 09:04:56 -08:00 |
|
Andrew Meadows
|
5975380892
|
Merge pull request #4266 from ZappoMan/bugfix
fix color issues with quads
|
2015-02-11 09:03:10 -08:00 |
|
Andrew Meadows
|
13c953494c
|
Merge pull request #4264 from huffman/entity-resize
Increase entity-resize timeout to 2 minutes
|
2015-02-11 09:02:26 -08:00 |
|
Andrew Meadows
|
68c1e9ef71
|
Merge pull request #4260 from birarda/master
replace data with metaverse for highfidelity urls, allow optional gvr-interface build
|
2015-02-11 09:02:18 -08:00 |
|
Sam Gateau
|
a6f006a36d
|
more cleaning
|
2015-02-10 18:41:36 -08:00 |
|
Sam Gateau
|
b9fd116dbf
|
Introduce a cache bit in networkGemometry to capture the status of texture LOaded and avoid requiring everything once everything is loaded and get rid of the Transform stack calls on gl from gpu
|
2015-02-10 18:38:48 -08:00 |
|
ZappoMan
|
8016fb5e0d
|
fix color issues with quads
|
2015-02-10 17:35:27 -08:00 |
|
Ryan Huffman
|
6eca8610b6
|
Increase entity-resize timeout to 2 minutes
|
2015-02-10 15:54:04 -08:00 |
|
Brad Hefta-Gaub
|
3e8f7dc3da
|
Merge pull request #4263 from huffman/text-size
Increase size of text entity
|
2015-02-10 15:04:32 -08:00 |
|
Ryan Huffman
|
9997ef1b97
|
Increase size of text entity
|
2015-02-10 14:23:00 -08:00 |
|
Brad Hefta-Gaub
|
d84398524b
|
Merge pull request #4258 from ctrlaltdavid/fix-windows-windowing
Fix maximized Windows window unintentionally changing to windowed
|
2015-02-10 12:01:29 -08:00 |
|
Brad Hefta-Gaub
|
cf5fb49562
|
Merge pull request #4261 from Atlante45/reverb_memory_leak
Reverb memory leak
|
2015-02-10 12:00:54 -08:00 |
|
Brad Hefta-Gaub
|
c06ca24819
|
Merge pull request #4259 from huffman/update-entity-list-style
Update entity list style
|
2015-02-10 11:50:17 -08:00 |
|
Stephen Birarda
|
d2d7507903
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-02-10 10:53:53 -08:00 |
|
Stephen Birarda
|
53f58ad382
|
add possibility of desktop GVR build
|
2015-02-10 10:51:20 -08:00 |
|
Atlante45
|
562b289c05
|
Fix warning
|
2015-02-10 19:25:38 +01:00 |
|
Atlante45
|
438978b855
|
Fix reverb memory leak
|
2015-02-10 19:25:12 +01:00 |
|
Stephen Birarda
|
fe79d8902e
|
replace data with metaverse for highfidelity urls
|
2015-02-10 10:05:38 -08:00 |
|
Andrew Meadows
|
8a7f130c5b
|
Merge pull request #4257 from ZappoMan/bugfix
fix a couple of bugs
|
2015-02-10 09:27:50 -08:00 |
|
Andrew Meadows
|
26b4882ddf
|
Merge pull request #4254 from birarda/master
handle custom domain port if returned via place API
|
2015-02-10 09:26:53 -08:00 |
|
Ryan Huffman
|
39cc6c86ae
|
Update selected entity color to have more contrast
|
2015-02-10 09:03:48 -08:00 |
|
Ryan Huffman
|
8d65caaaef
|
Update entity list search input to be full width with margin
|
2015-02-10 09:03:21 -08:00 |
|
Ryan Huffman
|
7ac3bd3ee8
|
Add padding to buttons in entity list
|
2015-02-10 09:02:53 -08:00 |
|
David Rowe
|
45c0d0e6a9
|
Fix Windows --url command line parameter handling
|
2015-02-09 23:50:43 -08:00 |
|
David Rowe
|
4fa2b3a6e9
|
Fix maximized Windows window unintentionally changing to windowed
This stops a maximized Windows window changing to being windowed when
you click on a menu item.
|
2015-02-09 22:07:12 -08:00 |
|
ZappoMan
|
2f981686fa
|
fix bad colors on windows
|
2015-02-09 15:38:50 -08:00 |
|
ZappoMan
|
ea33c66681
|
fix formating issue in performance stats
|
2015-02-09 15:04:43 -08:00 |
|
Stephen Birarda
|
5f7c4278b8
|
handle custom domain-server port if it is present
|
2015-02-09 13:01:38 -08:00 |
|
Brad Hefta-Gaub
|
9aa9dac7f3
|
Merge pull request #4253 from ctrlaltdavid/fix-vsync-menu-item
Fix VSync menu item on Windows
|
2015-02-09 12:37:50 -08:00 |
|
Brad Hefta-Gaub
|
967b04af1a
|
Merge pull request #4251 from jherico/master
Fixing bug in text renderer causing glyphs to float at different depths
|
2015-02-09 12:24:47 -08:00 |
|
David Rowe
|
468433e70a
|
Fix VSync menu item on Windows
|
2015-02-09 12:01:53 -08:00 |
|
Brad Davis
|
b28920f4ed
|
Fixing bug in text renderer causing glyphs to float at different depths
|
2015-02-08 15:37:55 -08:00 |
|
Brad Hefta-Gaub
|
6378009992
|
Merge pull request #4249 from birarda/master
don't force requirement of both debug and release versions of bullet
|
2015-02-08 12:52:41 -08:00 |
|
Brad Hefta-Gaub
|
0e779f34e1
|
Merge pull request #4250 from thoys/rssdk_fix_missing_constants
rssdk fix missing constants
|
2015-02-07 21:24:55 -08:00 |
|
Thijs Wenker
|
3ccbe50092
|
remove warnings for non-RSSDK builds
|
2015-02-07 19:07:10 +01:00 |
|
Thijs Wenker
|
c7b19277ee
|
rssdk fix missing constants
|
2015-02-07 13:40:51 +01:00 |
|
Stephen Birarda
|
adbf6de3e6
|
actually append found libraries to BULLET_LIBRARIES
|
2015-02-06 17:02:36 -08:00 |
|
Brad Hefta-Gaub
|
12ab841191
|
Merge pull request #4248 from samcake/temp0
Remove unneeded texture memory once loaded to GPU and Lightmap control in FBX
|
2015-02-06 16:52:40 -08:00 |
|