Commit graph

37491 commits

Author SHA1 Message Date
Ryan Huffman
ef7d60687b Add prompt dialog before shutting down 2016-01-08 14:54:48 -08:00
Ryan Huffman
8a4855c411 Add getLogs to Process 2016-01-08 11:16:11 -08:00
Ryan Huffman
ab516f6543 Add forceful shutdown of processes if no response after 2.5s 2016-01-08 11:15:54 -08:00
Ryan Huffman
9c4e0d5b19 Add ac monitor status monitoring 2016-01-08 11:14:15 -08:00
Ryan Huffman
e0acaacc65 Add missing ; to line 2016-01-08 11:13:19 -08:00
Ryan Huffman
8113c46df5 Add log window 2016-01-08 11:13:03 -08:00
Ryan Huffman
72f5320942 Update console to pass http status port to AC Monitor 2016-01-08 11:12:16 -08:00
Ryan Huffman
0a88415393 Update console to not shut down when all windows are closed 2016-01-08 11:10:37 -08:00
Ryan Huffman
98e1c42183 Fix openFileBrowser not working with paths with spaces 2016-01-08 11:10:14 -08:00
Ryan Huffman
e70906a9c6 Add graceful shutdown of home server 2016-01-08 11:09:48 -08:00
Ryan Huffman
87794981c6 Update root app data location 2016-01-08 11:08:34 -08:00
Ryan Huffman
cd049586ea Centralize state updates in Process 2016-01-08 11:07:58 -08:00
Ryan Huffman
51ee7f6ddb Update Process to store its log file locations 2016-01-08 11:05:59 -08:00
Ryan Huffman
9539954b43 Update Process to store log files in provided directory 2016-01-08 11:04:56 -08:00
Ryan Huffman
4851def51c Add status HTTP server to AC Monitor 2016-01-08 10:35:04 -08:00
Ryan Huffman
d567c215bb Update console log paths to be in OS app data directory 2016-01-08 08:47:16 -08:00
Ryan Huffman
c8b40c2948 Add uncaught exception backtrace logging 2016-01-08 08:45:40 -08:00
Stephen Birarda
404fb2f781 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-07 16:02:32 -08:00
Brad Davis
3a7ec33d38 Merge pull request #6790 from ZappoMan/menuGroups
Menu restructuring
2016-01-07 17:48:20 -05:00
Brad Hefta-Gaub
45b85735d3 disable the not yet implemented menu items 2016-01-07 14:37:42 -08:00
Brad Hefta-Gaub
e9ec561a55 add separator in View menu 2016-01-07 14:28:44 -08:00
Brad Hefta-Gaub
cdc982c6e5 mini mirror off by default 2016-01-07 14:22:20 -08:00
Brad Hefta-Gaub
a8383238e4 make mini mirror a standard option 2016-01-07 13:46:55 -08:00
Philip Rosedale
c5ab29071e Merge pull request #6791 from jherico/qml_hang
Stop QML hanging the app on shutdown
2016-01-07 13:29:47 -08:00
Brad Hefta-Gaub
04a5f5ce1b remove dead code for friends, since its handled by users.js 2016-01-07 13:26:03 -08:00
Philip Rosedale
3e8f26d591 Merge pull request #6789 from jherico/url_loop
Stop looping on URL fixing
2016-01-07 13:10:54 -08:00
Brad Hefta-Gaub
d51f514281 reworking of view/camera mode to match spec 2016-01-07 12:42:18 -08:00
Brad Davis
660304a0a3 Stop QML hanging the app on shutdown 2016-01-07 12:25:25 -08:00
Brad Hefta-Gaub
1508a637ab Menu restructuring 2016-01-07 12:09:02 -08:00
Seth Alves
bc538a0f7d Merge pull request #6756 from AndrewMeadows/physics-cleanup-003
more correct management of MotionState pointers
2016-01-07 11:04:28 -08:00
Andrew Meadows
8ae1e750ab Merge pull request #6783 from sethalves/fix-h0ld-action
try harder to ensure that a held object is active in bullet
2016-01-07 10:53:55 -08:00
Andrew Meadows
0df920d9a3 Merge pull request #6718 from birarda/master
cleanup QTimer management in ThreadedAssignment
2016-01-07 10:53:35 -08:00
Brad Davis
144af19ebd Stop looping on URL fixing 2016-01-07 10:52:28 -08:00
Seth Alves
cf9af462b5 replace some logging with an assert 2016-01-07 10:21:39 -08:00
Andrew Meadows
42711e5bad remove unused variable 2016-01-07 10:20:03 -08:00
Andrew Meadows
36e19b43c9 add some comments; specify const and overrides 2016-01-07 10:19:46 -08:00
Andrew Meadows
c1206ca73d fix bad merge 2016-01-07 10:19:46 -08:00
Andrew Meadows
4f29156da1 fixing asserts for EntityItem delete pipeline 2016-01-07 10:19:46 -08:00
Andrew Meadows
e0ec941476 fix typo 2016-01-07 10:19:46 -08:00
Andrew Meadows
6a642bdcf8 fix misusage of smart-pointers 2016-01-07 10:19:46 -08:00
Andrew Meadows
e8e965d548 fix crash mode for empty LineEntityItem 2016-01-07 10:19:46 -08:00
Andrew Meadows
6eb177091b overhaul of MotionState cleanup
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
2016-01-07 10:19:46 -08:00
Andrew Meadows
8886f48c78 minor cleanup 2016-01-07 10:19:46 -08:00
Andrew Meadows
f5d24a87ca remove entities from physics before we delete them 2016-01-07 10:19:46 -08:00
Andrew Meadows
b34df211df cleanup API for removal from EntitySimulation 2016-01-07 10:19:46 -08:00
Andrew Meadows
4208380d1c namechange 2016-01-07 10:19:46 -08:00
Andrew Meadows
534bfa5983 remove dangling whitespace 2016-01-07 10:19:46 -08:00
Brad Hefta-Gaub
553e455a53 Merge pull request #6759 from huffman/script-engine-slot-exception
Add logging of signal slot exceptions in ScriptEngine
2016-01-07 08:54:34 -08:00
Brad Hefta-Gaub
a78d5274e7 Merge pull request #6780 from jherico/z_order
Address some z-ordering issues in overlay windows
2016-01-06 20:08:52 -08:00
Brad Hefta-Gaub
cb88ebd1e4 Merge pull request #6787 from Atlante45/fix/skybox
Fix skybox rendering
2016-01-06 20:07:22 -08:00