Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-12 20:37:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21847 commits 25 branches 0 tags 1.1 GiB
Commit graph

21847 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
fe3f01be7e Merge pull request #4225 from ZappoMan/memleak 
actually delete resources... even on windows
 2015-02-04 11:57:54 -08:00
Stephen Birarda
9461d5d8d1 drop samples from ring buffer if muted 2015-02-04 11:47:53 -08:00
Seth Alves
bcf0846310 merge from master 2015-02-04 11:30:22 -08:00
Brad Davis
ba277e802a Working on OSX compilability 2015-02-04 11:29:31 -08:00
Seth Alves
a645d784d8 uint32_t rather than uint, which mac doesn't like 2015-02-04 11:26:05 -08:00
Stephen Birarda
f3e120f45d temp disable gvr-interface target to allow build 2015-02-04 11:15:03 -08:00
Stephen Birarda
e47333a808 specify QScriptable include under QtScript 2015-02-04 11:08:26 -08:00
Brad Hefta-Gaub
2fb64e1989 Merge pull request #4226 from huffman/edit-entities-modal 
Edit entities modal
 2015-02-04 10:56:56 -08:00
Thijs Wenker
38aab9570b Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-02-04 19:55:12 +01:00
Stephen Birarda
30afadc7b7 fixes for new settings API 2015-02-04 10:53:05 -08:00
Ryan Huffman
2b00e3fadc Add force option to deleteEntity 2015-02-04 10:49:49 -08:00
Ryan Huffman
3af025574f Decrease distance from object when focusing 2015-02-04 10:45:24 -08:00
ZappoMan
ded035094a actually delete resources... even on windows 2015-02-04 10:45:04 -08:00
Ryan Huffman
02d828443b Update zoom sensitivity when using keys 2015-02-04 10:44:54 -08:00
Ryan Huffman
36238bb5df Update editEntities to use left click for select 2015-02-04 10:43:55 -08:00
Ryan Huffman
09752589b8 Reenable on/off button 2015-02-04 10:43:28 -08:00
Ryan Huffman
4fbc7a5dcd Add focus easing and auto-focus to menu and settings 2015-02-04 10:42:01 -08:00
Ryan Huffman
01a00b5127 Disable editEntities always-on 2015-02-04 10:40:50 -08:00
samcake
5d3ede051c Merge pull request #4224 from birarda/master 
fix for exception handled lookup in LimitedNodeList
 2015-02-04 10:40:32 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Stephen Birarda
a2002d169f fix for exception handled lookup in LimitedNodeList 2015-02-04 10:27:33 -08:00
Chris Collins
ee49ce08cb Added the script look with mouse to default script 
Look with touch does not work on PC’s or any mouse that does not accept
two finger touch. I have therefore added look with mouse to default
scripts.
 2015-02-04 09:53:38 -08:00
Brad Davis
8ca70c9e80 Removing some dev modifications 2015-02-03 23:30:43 -08:00
Brad Davis
0dcf5b001f Some more cleanup 2015-02-03 23:26:15 -08:00
Brad Davis
f471597a73 Merge branch 'develop' into text-renderer 2015-02-03 23:07:19 -08:00
Brad Davis
d34c2ae26a Merge branch 'master' into develop 2015-02-03 23:06:49 -08:00
Brad Davis
cb7f4ca672 Pre-pull checking 2015-02-03 23:06:09 -08:00
Brad Davis
3ead8fc8a2 Adding some more example images 2015-02-03 22:32:03 -08:00
Brad Davis
53b0fd409d Tweaking text scaling value to more closely match old text renderer 2015-02-03 22:30:39 -08:00
Brad Davis
1af2b65714 Fixing scaling to lineHeight 2015-02-03 22:21:32 -08:00
Brad Davis
42703d2234 Working on testing code 2015-02-03 22:13:16 -08:00
Brad Davis
77ce737f61 Working on porting renderable text item to new code 2015-02-03 22:11:24 -08:00
Brad Davis
9a6175a3b9 Starting to work on replacement for clip planes 2015-02-03 22:10:44 -08:00
Brad Hefta-Gaub
de58c4a007 Merge pull request #4217 from Atlante45/master 
Fix for fps bug/field of view
 2015-02-03 19:13:52 -08:00
Brad Hefta-Gaub
bb8362b104 Merge pull request #4219 from ctrlaltdavid/20267 
CR for Job #20267 - Create progress.js script as download progress indicator
 2015-02-03 19:07:36 -08:00
Brad Hefta-Gaub
01f594b535 Merge pull request #4221 from AndrewMeadows/bispinor 
proof Andrew has a working Windows build on his laptop
 2015-02-03 19:07:01 -08:00
Brad Davis
0c78af9abb Working on text rendering refactor 2015-02-03 18:57:39 -08:00
Atlante45
fc4bf0c325 Don't check gl errors 2015-02-03 18:55:52 -08:00
Brad Hefta-Gaub
b9ee1294fa Merge pull request #4216 from ctrlaltdavid/20281 
Fix orientation of non-solid rectangle3d overlays, too
 2015-02-03 18:52:51 -08:00
Atlante45
7a03daa76f Inline setFieldOfView 2015-02-03 18:51:26 -08:00
Brad Hefta-Gaub
79b04afaf8 Merge pull request #4210 from ctrlaltdavid/20280 
CR for Job #20280 - Warn if Interface and Stack have incompatible build level
 2015-02-03 18:51:17 -08:00
Brad Davis
d64e7c464a Merge branch 'develop' into text-renderer 2015-02-03 18:44:06 -08:00
Brad Davis
190669d168 Merge branch 'master' into develop 2015-02-03 18:43:51 -08:00
Brad Davis
cab31e7190 Working on text coordinates 2015-02-03 18:43:24 -08:00
Andrew Meadows
35cbc9a41d pass FBXGeometry by const reference 
this fixes a bug on windows about misaligned data in function call
 2015-02-03 18:40:55 -08:00
Andrew Meadows
547a416c3b merge upstream/master into andrew/bispinor 2015-02-03 18:33:10 -08:00
Seth Alves
450787fde2 Merge branch 'master' of github.com:highfidelity/hifi into rework-bandwidth-meter 2015-02-03 17:33:27 -08:00
Andrew Meadows
1e00d2199a Merge pull request #4218 from samcake/temp0 
Fix the lightmap not displaying when using the texcoord0
 2015-02-03 17:23:25 -08:00
Seth Alves
3d23446dcb remove a couple more sprintfs 2015-02-03 17:21:41 -08:00
Atlante45
e4591e0d03 Work arount for QVariant not converting to QVariant 2015-02-03 17:11:32 -08:00