Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 20:21:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
39127 commits 25 branches 0 tags 1.1 GiB
Commit graph

39127 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
7c0b3953e4 handle custom path in asset-server for assets 2016-02-11 15:34:43 -08:00
Stephen Birarda
f455e404e3 add an option for assets path 2016-02-11 15:19:57 -08:00
Brad Davis
e06bc26896 Prevent overlay cleanup from crashing the app 2016-02-11 15:17:58 -08:00
Stephen Birarda
0f4467c582 cleanup exit codes for queued DS exit 2016-02-11 15:17:34 -08:00
Ken Cooke
c4b09c3603 not supported by Clang 2016-02-11 15:15:50 -08:00
Stephen Birarda
aaf8e60de3 delay critical quit messages until just prior to quit 2016-02-11 15:11:21 -08:00
Seth Alves
89b85f3a78 Merge pull request #7087 from AndrewMeadows/crash-fix 
yet another attempt to avoid physics crashes
 2016-02-11 14:58:57 -08:00
Brad Hefta-Gaub
26ab1bdac4 move back to unordered_set so that OctreeElementBag will handle uniqueness 2016-02-11 14:50:18 -08:00
Stephen Birarda
a6ba8dd8e5 fix null STUN server socket check in LNL 2016-02-11 14:14:16 -08:00
Stephen Birarda
a089c43fdc don't send ice heartbeat with no ice-server socket 2016-02-11 14:07:05 -08:00
Andrew Meadows
2b91a31919 check for nullptr to avoid crashes 2016-02-11 13:53:01 -08:00
Stephen Birarda
3dbb444a65 Merge pull request #7068 from huffman/server-console-icons 
Update server console tray icons to include status
 2016-02-11 13:28:47 -08:00
howard-stearns
7c4e31687c simpler/better/more reliable (peek) 2016-02-11 13:27:56 -08:00
Chris Collins
c6bc91f8b2 Merge pull request #7084 from jherico/toolTabs 
Allow closed tabs to delete properly
 2016-02-11 13:20:20 -08:00
Brad Hefta-Gaub
894c75f8fc Merge pull request #7066 from zzmp/fix/circle3d-radii 
Add radius as property to circle3d
 2016-02-11 13:07:24 -08:00
Brad Hefta-Gaub
d14b9ab9b6 Merge pull request #7065 from zzmp/fix/circle3d-click 
Fix circle3d FindRayIntersection
 2016-02-11 13:07:00 -08:00
howard-stearns
0d8404e7e8 interact more safely with mappings 2016-02-11 13:05:47 -08:00
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
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