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

39424 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Collins
ca15638463 Merge pull request #7080 from ZappoMan/fixPersistMono 
add support for persisting the mono preview mode option
 2016-02-11 13:03:49 -08:00
Chris Collins
38ba852c2e Merge pull request #7075 from Atlante45/fix/add-to-scene 
Fix "Add to scene" option while dropping model
 2016-02-11 13:02:36 -08:00
Ken Cooke
27494e54c5 use the correct macro for detecting GCC 2016-02-11 12:58:23 -08:00
Ryan Huffman
6d55c5223c Fix osx stopping icon 2016-02-11 12:16:11 -08:00
howard-stearns
93d72833bf Merge branch 'master' of https://github.com/highfidelity/hifi into clear-away-on-buttons 2016-02-11 12:10:53 -08:00
Ryan Huffman
76c9e298f5 Update tray icon images 2016-02-11 11:54:29 -08:00
Ryan Huffman
c4c1fdc6db Fix server console not shutting down with new icons 2016-02-11 10:32:26 -08:00
Zach Pomerantz
d0f3ad75b8 Nest Persistent in Config to compile on nix 2016-02-11 10:27:32 -08:00
Brad Davis
2ee1f18e06 Allow closed tabs to delete properly 2016-02-11 10:27:24 -08:00
Chris Collins
a4afa03fe5 Merge pull request #7077 from sethalves/clean-up-grab-signaling 
Clean up grab signaling + various fixes
 2016-02-11 10:20:56 -08:00
Zach Pomerantz
a7778daed2 Change graphics dialog to persisted dropdowns 2016-02-11 10:15:13 -08:00
Stephen Birarda
62e842bf2b Merge pull request #7052 from huffman/bugsplat 
BugSplat integration
 2016-02-11 10:10:44 -08:00
samcake
31230e81bb Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-02-11 10:05:58 -08:00
samcake
355b8ee40d THursday morning the frustum culling seems broken in one particular angle 2016-02-11 10:05:39 -08:00
Zach Pomerantz
84197e5eb2 Add persistent render engine configuration file 2016-02-11 10:00:44 -08:00
Zach Pomerantz
66e1d9668c Add ComboBox preference 2016-02-11 10:00:44 -08:00
Zach Pomerantz
5eeaa9a33e Move graphics settings to dedicated dialog 2016-02-11 10:00:44 -08:00
samcake
99e9b3ecdd Merge pull request #7043 from zzmp/fix/render-ui 
Revamp the render engine ui
 2016-02-11 09:57:51 -08:00
Clément Brisset
911591c0ea Merge pull request #7082 from birarda/hrtf-map-crash 
fix for HRTF map crash
 2016-02-11 09:57:20 -08:00
Ryan Huffman
d226416306 Update params to MiniDmpSender to be const 2016-02-11 09:46:31 -08:00
Ryan Huffman
71b72aceb8 Fix CHECKED_FOR_BUGSPLAT_ONCE 2016-02-11 09:46:12 -08:00
Atlante45
51168a8a29 Explicitely cast to float 2016-02-11 09:35:31 -08:00
Stephen Birarda
52cd4ae1a5 make sure the AudioMixerClientData exists before using it 2016-02-11 09:34:21 -08:00
Brad Hefta-Gaub
a40a562db2 handle two conner cases where preload would get called twice 2016-02-11 09:33:52 -08:00
Stephen Birarda
367e558b19 address PR comments for whitespace and constant 2016-02-11 09:30:07 -08:00
Clément Brisset
c3218a3af9 Merge pull request #7069 from AndrewMeadows/another-crash-fix 
Fix crash when propagating simulation ownership on deleted objects
 2016-02-11 09:29:08 -08:00
Zach Pomerantz
3bace3cdbb Rework the qml for brevity 2016-02-11 08:48:01 -08:00
Zach Pomerantz
9c5881345a Disable the AO gpuTimer pending cpp fix 2016-02-11 08:48:00 -08:00
Zach Pomerantz
86412c1890 Fix default debug buffer size 2016-02-11 08:47:59 -08:00
Zach Pomerantz
dbc59ccc2b Revamp render engine debug JS script 2016-02-11 08:47:59 -08:00
Zach Pomerantz
991d6328ef Fix JSON integration for JobConfig 2016-02-11 08:47:58 -08:00
Zach Pomerantz
5f395654f0 Integrate JobConfig with JSON/qml 2016-02-11 08:47:51 -08:00
Zach Pomerantz
eb6ff725c4 Fix circle3d FindRayIntersection to scale by radius 2016-02-11 08:24:48 -08:00
Ryan Huffman
3355019cbe Add custom bugsplat flags 2016-02-11 08:17:20 -08:00
Ryan Huffman
813d5e5ba0 Add headers and proper bugsplat checking to cmake files 2016-02-11 08:17:05 -08:00
Brad Hefta-Gaub
118b95af14 Merge pull request #7079 from sethalves/remove-assert 
remove incorrect assert
 2016-02-10 22:28:59 -08:00
Brad Hefta-Gaub
d77d102384 add support for persisting the mono preview mode option 2016-02-10 22:01:17 -08:00
Seth Alves
3a2b082a7f remove incorrect assert 2016-02-10 20:47:22 -08:00
Seth Alves
ffce38769f properties hold local velocities, not world-frame ones 2016-02-10 19:16:08 -08:00
Brad Davis
ff3c934c6c Merge pull request #7067 from hyperlogic/tony/vive-support 
Re-enable OpenVR support
 2016-02-10 19:04:35 -08:00
Seth Alves
6a646f1c24 put isMoving back and change all uses to isMovingRelativeToParent 2016-02-10 19:01:41 -08:00
Seth Alves
880aedd444 update to track grab-script changes 2016-02-10 19:01:25 -08:00
Seth Alves
3fe01ccf10 cleanups 2016-02-10 18:32:05 -08:00
Stephen Birarda
f0ca412b29 use the existing not mixed count for injector inactivity 2016-02-10 18:22:57 -08:00
Seth Alves
ecf22cd8b8 update toybox toys to use changed grab entityMethod calls 2016-02-10 18:22:20 -08:00
Seth Alves
3e71efcdbb all code that asks isMoving appears to mean relative to parent 2016-02-10 18:21:44 -08:00
Atlante45
913172b490 Fix extension checking 2016-02-10 18:17:13 -08:00
Andrew Meadows
ac60917b54 sigh... protect againt null MotionStates 2016-02-10 17:58:38 -08:00
Andrew Meadows
fed03edde3 manually removing contact manifolds was a bad idea 2016-02-10 17:58:38 -08:00
Andrew Meadows
532f0683e8 remove all contact info before removing objects 2016-02-10 17:58:38 -08:00