Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 04:55:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
21509 commits 71 branches 56 tags 1.2 GiB
Commit graph

21509 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
39d0851cc2 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-06 10:39:58 -08:00
Stephen Birarda
c96085eb91 repairs to warnings shown in Xcode 2015-02-06 10:12:04 -08:00
Brad Hefta-Gaub
a4c1a116e7 Merge pull request #4240 from birarda/master 
remove the text comparisons from examples dir
 2015-02-06 10:03:22 -08:00
Stephen Birarda
65418b8b67 remove the text comparisons from images dir 2015-02-06 10:02:44 -08:00
Andrew Meadows
5ea785f4ad Merge pull request #4232 from thoys/cursor_is_visible_and_oculus_cursor_visibility 
Ability to make cursor invisible again (both OS-cursor and oculus rectile) and js-interface to cursorVisible boolean
 2015-02-06 08:58:14 -08:00
Thijs Wenker
27147fde2a add Write function to the Window.cursurVisible property 2015-02-06 14:45:22 +01:00
Brad Hefta-Gaub
f8d62d332a Merge pull request #4222 from jherico/text-renderer 
Text renderer refactor to use signed distance field font rendering
 2015-02-05 21:58:41 -08:00
Brad Davis
9b7743c6d3 making test code identical on old and new renderer 2015-02-05 21:25:16 -08:00
Brad Davis
39794a7a40 Getting rid of some warnings 2015-02-05 21:00:34 -08:00
Brad Davis
be3cca2d04 Working on performance test 2015-02-05 13:11:35 -08:00
Brad Davis
dc1cc84c1c Working on porting to mac compatible shaders 2015-02-05 12:58:09 -08:00
Brad Hefta-Gaub
9058e9116a Merge pull request #4233 from ctrlaltdavid/fix-lookwithmouse 
Don't hide mouse events from C++ GUI
 2015-02-05 11:38:04 -08:00
Brad Hefta-Gaub
16717b322e Merge pull request #4237 from huffman/edit-user-data 
Edit user data
 2015-02-05 11:37:30 -08:00
Brad Hefta-Gaub
dda0a8a811 Merge pull request #4235 from huffman/edit-drag-drop-entities 
Add drag-drop functionality for placing entities
 2015-02-05 11:37:15 -08:00
Brad Hefta-Gaub
d76ede624c Merge pull request #4234 from AndrewMeadows/bispinor 
fix physics crash on disconnect from domain-server
 2015-02-05 11:36:02 -08:00
Ryan Huffman
6863895533 Remove value from animation settings textarea 2015-02-05 11:19:18 -08:00
Ryan Huffman
850de6e67e Add User Data to entity properties panel 2015-02-05 11:19:01 -08:00
Brad Davis
230d761ec3 fix display name scaling 2015-02-05 10:47:35 -08:00
Ryan Huffman
1e11e658a8 Update drag/drop distance to be based on cameraManager.enabled rather than camera mode 2015-02-05 10:18:34 -08:00
Ryan Huffman
2343da0a8a Update drag/drop distance while in non-independent mode 2015-02-05 10:16:51 -08:00
Ryan Huffman
41720dbc4b Add drag-drop functionality for placing entities 2015-02-05 10:07:31 -08:00
Andrew Meadows
b4da2ddd52 fix physics crash on disconnect from domainserver 2015-02-05 09:13:32 -08:00
David Rowe
c0ac9333e9 Don't hide mouse events from C++ GUI 2015-02-04 23:04:06 -08:00
Brad Davis
da05c26aad Moving shaders to standard format, adding bounding box support and using it in text node 2015-02-04 21:32:05 -08:00
Brad Davis
e1af9f8126 Merge remote-tracking branch 'upstream/master' into text-renderer 2015-02-04 21:04:47 -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
ZappoMan
8fd11e70cc clamp dt for skipTimeForward to prevent near infinite loops 2015-02-04 15:16: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
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
Brad Hefta-Gaub
2fb64e1989 Merge pull request #4226 from huffman/edit-entities-modal 
Edit entities modal
 2015-02-04 10:56:56 -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