Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-06 08:09:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21916 commits 21 branches 0 tags 1.2 GiB
Commit graph

21916 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
e1af9f8126 Merge remote-tracking branch 'upstream/master' into text-renderer 2015-02-04 21:04:47 -08:00
Seth Alves
35430a4c7a Merge branch 'master' of github.com:highfidelity/hifi into allowed-editors 2015-02-04 16:31:49 -08:00
Seth Alves
afea5f3534 added allowed_editors to settings json 2015-02-04 16:31:36 -08:00
Clément Brisset
6a4577b6a5 Merge pull request #4231 from ZappoMan/crashonexit 
BUG FIXES: Crash on Exit with partially loaded scene & (near)-infinite loop in skipForward physics
 2015-02-04 16:16:56 -08:00
Brad Hefta-Gaub
af91eee5a0 Merge pull request #4220 from sethalves/rework-bandwidth-meter 
fix several signed/unsigned comps, avoid sprintf in overlay code
 2015-02-04 16:06:22 -08:00
Thijs Wenker
de3afa0637 keep a boolean for cursorHidden state, so we know when to hide the VR-mode-cursor while the normal cursor is hidden 2015-02-05 00:19:45 +01:00
Stephen Birarda
93a3158153 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-02-04 15:16:23 -08:00
ZappoMan
8fd11e70cc clamp dt for skipTimeForward to prevent near infinite loops 2015-02-04 15:16:18 -08:00
Stephen Birarda
c9c53453c3 repairs to local audio injector cleanup 2015-02-04 14:47:18 -08:00
Brad Davis
02f2f1c1bf Fixing header order and code style 2015-02-04 14:36:03 -08:00
Thijs Wenker
9dbcefed2a Fix for making cursor invisible over the glwidget and js-interface to cursorVisible boolean 2015-02-04 23:23:27 +01:00
Brad Hefta-Gaub
8b1a226d8e Merge pull request #4230 from huffman/fix-select-shadow 
Fix rotation of selection shadow for editEntities
 2015-02-04 14:03:19 -08:00
Brad Hefta-Gaub
97f888b340 Merge pull request #4227 from huffman/internal-delete-fix 
Add force delete to internal EntityTree deletes
 2015-02-04 14:02:34 -08:00
Brad Hefta-Gaub
8311d1a00a Merge pull request #4228 from ctrlaltdavid/20279 
CR for Job #20279 - Tools > Audio device selection doesn't work on Windows
 2015-02-04 13:59:14 -08:00
Brad Hefta-Gaub
18f67aabec Merge pull request #4229 from huffman/fix-text-default-props 
Update the default properties for text entities
 2015-02-04 13:58:52 -08:00
ZappoMan
698fcd8116 fix crash on shutdown 2015-02-04 13:54:14 -08:00
Ryan Huffman
0e28f66906 Fix rotation of selection shadow for editEntities 2015-02-04 13:45:06 -08:00
Ryan Huffman
efed79d76c Update the default properties for text entities 2015-02-04 13:37:11 -08:00
Brad Hefta-Gaub
83d397ed98 Merge pull request #4223 from cozza13/20299 
CR for Job #20299 - Add lookwithmouse.js to default scripts.
 2015-02-04 13:33:14 -08:00
ZappoMan
4061e14c2d move static members of ResourceManager into DependencyManager 2015-02-04 13:24:37 -08:00
Brad Davis
1745ba9a7e More OSX work, refactoring functions to shared, removing erroneuous Qt 5.4 dependency, fixing PrioVR text api usage 2015-02-04 12:42:27 -08:00
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
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