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

46271 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
2ba35e6398 skip non-existant meshes 2016-08-18 11:48:56 -07:00
Seth Alves
15ce40ecf4 merge from upstream 2016-08-18 11:46:02 -07:00
Seth Alves
6b46b3082c try, try again 2016-08-18 11:45:03 -07:00
Zach Pomerantz
813fefd599 reimplement buffer get for (c)end 2016-08-18 11:26:25 -07:00
Andrew Meadows
cb9a5466d5 workaround bad FBXMesh data rather than assert 2016-08-18 11:09:48 -07:00
James B. Pollack
37846d9f0c store settings 2016-08-18 11:07:50 -07:00
Clément Brisset
d1fb723b01 Merge pull request #8444 from zzmp/fix/skybox 
fix flashing in default skybox, and allow skybox lighting without textures
 2016-08-18 11:07:09 -07:00
Seth Alves
43c5735baa don't use -Wsuggest-override on older gcc 2016-08-18 11:05:31 -07:00
James B. Pollack
1eaac8605f invert the structure and make it work with oculus 2016-08-18 10:43:37 -07:00
Seth Alves
ccaf7379fc missed some more due to conditional compilation 2016-08-18 10:31:53 -07:00
samcake
b5296410c3 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-18 10:20:33 -07:00
Seth Alves
09b7a5188c a few more 2016-08-18 10:15:35 -07:00
Seth Alves
722e88253d missed one 2016-08-18 09:59:40 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
James B. Pollack
09cd0b8f4a debug prints 2 2016-08-18 09:24:01 -07:00
James B. Pollack
7768e65e8b update name 2016-08-18 09:22:43 -07:00
James B. Pollack
54a5bf3b23 Merge pull request #8465 from sethalves/fix-3d-overlay-lines 
fix -- make 3d-line overlays work again
 2016-08-18 09:06:26 -07:00
James B. Pollack
9e14191217 recondition 2016-08-18 08:57:37 -07:00
James B. Pollack
cfbc589829 debug prints 2016-08-18 08:43:26 -07:00
Seth Alves
8487f825a0 don't return reference to local variables 2016-08-18 08:01:42 -07:00
Seth Alves
2ff35768aa make 3d-line overlays work again 2016-08-17 18:45:09 -07:00
James B. Pollack
8ede4ddb66 longform 2016-08-17 17:33:24 -07:00
Ryan Huffman
d46af500c1 Fix wrong property name in entity activity tracking 2016-08-17 17:00:56 -07:00
James B. Pollack
e69c89a93e y 2016-08-17 17:00:17 -07:00
howard-stearns
0f415abd6b dual purpose address bar - switchable between html and qml 2016-08-17 16:56:52 -07:00
Ryan Huffman
25b9d756ca Update entity edit tracking to track count rather than bool 2016-08-17 16:54:04 -07:00
Brad Davis
89df5768f3 Merge pull request #8435 from imgntn/touch_grip 
Map oculus touch grip to trigger
 2016-08-17 16:38:58 -07:00
howard-stearns
d58cc8ddd9 use html card from user_story id, and close things when 
receiveHifiSchemeUrl
 2016-08-17 16:35:29 -07:00
howard-stearns
e75f950ac7 Signal receivedHifiSchemeURL 2016-08-17 16:34:59 -07:00
James B. Pollack
fdfcc235b6 as functions 2016-08-17 16:24:59 -07:00
James B. Pollack
514d6ec139 get lsy lsx rsy values 2016-08-17 16:22:44 -07:00
James B. Pollack
fc65d246ee update whens 2016-08-17 16:13:23 -07:00
James B. Pollack
a4a41faf24 demo and only do for vive 2016-08-17 16:12:07 -07:00
James B. Pollack
82a8887275 add whens 2016-08-17 15:50:19 -07:00
Clément Brisset
8b54c92494 Merge pull request #8459 from ctrlaltdavid/21032 
QA READY: Fix Asset Browser dialog
 2016-08-17 15:37:43 -07:00
Brad Davis
a32ab77b7d Address issues with random camera locations caused by bad HMD sensor poses 2016-08-17 15:22:30 -07:00
James B. Pollack
a7ba4ce1f9 jumping 2016-08-17 15:11:07 -07:00
James B. Pollack
8bc6ca2fa1 demo changes 2016-08-17 15:08:43 -07:00
David Rowe
9fa4a20e55 Fix Asset Browser dialog 2016-08-18 09:37:26 +12:00
Anthony J. Thibault
7b248b440a Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-17 13:55:12 -07:00
David Kelly
37dc324cec Merge pull request #8454 from howard-stearns/ux-improvements 
snapshot ux improvements
 2016-08-17 12:23:12 -08:00
elisa-lj11
5d19267d00 Safeguard against file corruption 
This is what could be a temporary (or permanent) fix to users trying to
delete important files on their computer through JS
 2016-08-17 11:10:38 -07:00
Brad Hefta-Gaub
87964c89da Merge pull request #8453 from huffman/feat/sandbox-logs-button 
Add a button to the sandbox log window to open the log directory
 2016-08-17 10:47:04 -07:00
howard-stearns
8823f48666 new snapshot review behavior 2016-08-17 10:00:20 -07:00
howard-stearns
17d9db487d adjust .qml for useFeed being a c++ property instead of qml. 2016-08-17 09:57:46 -07:00
howard-stearns
347b20e506 expose to scripts the ability to show dedicated qml windows such as 
preferences
 2016-08-17 09:54:15 -07:00
howard-stearns
2a099d5577 expose to scripts the ability to open the feed 2016-08-17 09:53:26 -07:00
howard-stearns
48ff26eeb7 provide a way to programmatically show the feed (showing address bar in 
feed mode).
 2016-08-17 09:50:38 -07:00
Ryan Huffman
8ba105d1e4 Fix open-log-dir button handler 2016-08-17 09:36:42 -07:00
Ryan Huffman
0e259dcd29 Add open log dir button to server-console 2016-08-17 09:29:45 -07:00