Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 21:59:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40871 commits 76 branches 59 tags 1.2 GiB
Commit graph

40871 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
75c3fd18c9 Expose HMD worn to scripting 2016-03-11 11:00:58 -08:00
howard-stearns
e538edba0a Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility 2016-03-11 10:22:01 -08:00
howard-stearns
9cdd0ac6d0 Respect zone visibility property. 2016-03-11 10:19:44 -08:00
Anthony Thibault
ab390f7d2e Merge branch 'master' into tony/smooth-hands 2016-03-11 10:06:31 -08:00
Ryan Huffman
631aad80f9 Add Q_DECLARE_METATYPE(AssetMappingModel*) and fix indentation 2016-03-11 09:53:08 -08:00
Anthony J. Thibault
5eeb4ca594 Fix one frame lag controller lag/jitter 
Move userInputMapper->update() after inputPlugin->pluginUpdate().
 2016-03-11 09:28:25 -08:00
Brad Hefta-Gaub
d1c024fb39 Merge pull request #7286 from zzmp/fix/skybox-tex 
Clean up skybox rendering
 2016-03-11 08:50:23 -08:00
Brad Hefta-Gaub
d8d500c318 Merge pull request #7291 from ericrius1/uniformBugRepro 
Rapid uniform change test
 2016-03-11 08:45:52 -08:00
Brad Hefta-Gaub
9b89654d6a Merge pull request #7312 from jherico/crashes 
Better threaded handling of QML overlays
 2016-03-11 08:45:08 -08:00
Brad Hefta-Gaub
d5c8e69c48 Merge pull request #7319 from samcake/red 
Supporting RenderItems being added Outside the RenderSpatialTree volume
 2016-03-11 08:34:50 -08:00
Seth Alves
510d96af0e Merge pull request #7316 from ZappoMan/toggleOverlay 
Repair Toggle Overlays
 2016-03-11 06:45:06 -08:00
Seth Alves
0d15706f34 Merge pull request #7315 from hyperlogic/tony/avatar-speed-stat-fix 
Stats: fix for avatar velocity stat being stuck at 0.1
 2016-03-11 06:37:23 -08:00
samcake
8281e1bc8f Obvioously, Austin was right, too many application.h... 2016-03-11 00:32:29 -08:00
samcake
729890342e Fixing the linux warning for unused variable 2016-03-11 00:27:56 -08:00
Zach Pomerantz
755efd1840 Update test shaders 2016-03-10 23:03:03 -08:00
Brad Davis
4b20de264f Merge pull request #7322 from imgntn/spatial 
Change spelling of "spatial" in entity properties (edit.js)
 2016-03-10 22:59:50 -08:00
Zach Pomerantz
2508b14126 Workaround for scribe not scrubbing #else 2016-03-10 22:53:21 -08:00
Zach Pomerantz
27884b26e9 Mark px shaders dirty on change 2016-03-10 22:53:07 -08:00
Zach Pomerantz
4dad797e20 Only add buffer/tex to skymap if asked for 2016-03-10 22:52:44 -08:00
Zach Pomerantz
25607709a5 Add test for skybox 2016-03-10 22:52:07 -08:00
James B. Pollack
aa884d9e3b spatial 2016-03-10 22:45:44 -08:00
James B. Pollack
7ae9006b30 add current version to console menu 2016-03-10 22:42:53 -08:00
Zach Pomerantz
40378920b1 Merge branch 'master' of github.com:highfidelity/hifi into fix/skybox-tex 2016-03-10 21:44:31 -08:00
Stephen Birarda
a9dd88d834 Merge pull request #7320 from zzmp/feat/shader-includes 
Compile shaders into separate dir for inclusion
 2016-03-10 21:07:49 -08:00
Zach Pomerantz
4eca43027a Add texture, color to px skybox 2016-03-10 21:05:36 -08:00
Zach Pomerantz
243fbf8299 Specify and create shaders folder 2016-03-10 20:49:33 -08:00
Anthony J. Thibault
ab19d3e5a2 Moved animation after physics, hand poses are in world frame. 
There are still some debug hacks enabled so I can test in the vive room.
 2016-03-10 20:44:35 -08:00
Zach Pomerantz
11867aa71d Compile shaders to their own folders 2016-03-10 20:10:54 -08:00
Anthony J. Thibault
807d31743c Removed Hand, HandData & PalmData 
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.

The hand controller debug drawing is slightly different, but still works.
 2016-03-10 19:33:31 -08:00
David Rowe
e175c19754 Style checkbox for menu items 2016-03-11 15:51:27 +13:00
Clément Brisset
4bb3314d87 Merge pull request #103 from birarda/atp-mappings 
fix for selected index crashes
 2016-03-10 18:36:29 -08:00
Stephen Birarda
7ccba8b406 remove debug for selected index crash 2016-03-10 18:36:12 -08:00
Stephen Birarda
7675c83f92 clear selection on reload 2016-03-10 18:34:28 -08:00
Stephen Birarda
8e2b06a8e5 use an explicit selection model for treeview 2016-03-10 18:32:18 -08:00
David Rowe
fb0f97264c Style HMD menu items 2016-03-11 15:24:35 +13:00
samcake
24d712b7b4 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-03-10 18:14:22 -08:00
samcake
58b84b67ea Fixing the outside the octree bug 2016-03-10 18:14:11 -08:00
Clément Brisset
843bff1dcf Merge pull request #102 from birarda/atp-mappings 
append a trailing slash for folder rename
 2016-03-10 18:04:11 -08:00
Stephen Birarda
39e869fdfd append a trailing slash for folder rename 2016-03-10 17:54:38 -08:00
Philip Rosedale
e87ef52a4c Merge pull request #7302 from hyperlogic/tony/wrong-way-overlay 
More reliable and usable UI sphere overlay location
 2016-03-10 17:43:50 -08:00
Brad Davis
87c9961aa8 Expose a property in display plugins to determine if the device is visble to the user 2016-03-10 17:19:32 -08:00
Clément Brisset
4d2797c25a Merge pull request #101 from birarda/atp-mappings 
fix add to world after upload name change
 2016-03-10 17:15:13 -08:00
Stephen Birarda
625032f748 fix for add to world after upload name change 2016-03-10 17:10:49 -08:00
Clément Brisset
49ce6a87fe Merge pull request #100 from birarda/atp-mappings 
add to world on upload, trim for paths
 2016-03-10 17:00:35 -08:00
Stephen Birarda
6f550292f4 pass delete paths by reference for trimming 2016-03-10 16:57:39 -08:00
Stephen Birarda
6ae5ed6588 add trimming to MappingRequest ctors 2016-03-10 16:57:39 -08:00
Stephen Birarda
e94e2ece2e add trimming to paths on asset server 2016-03-10 16:57:39 -08:00
Stephen Birarda
52ee2499fc add trim prior to rename in AssetServer 2016-03-10 16:57:39 -08:00
Stephen Birarda
979fda7c8b add trimming for upload mapping 2016-03-10 16:57:39 -08:00
Stephen Birarda
ed4df72eed cleanup logging for asset browser 2016-03-10 16:57:39 -08:00