Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
55776 commits 29 branches 0 tags 1.1 GiB
Commit graph

55776 commits

This branch
This branch
All branches
Author SHA1 Message Date
Liv
0e27ad767c Move chat app to be included as part of the default scripts 2017-06-08 13:07:01 -07:00
Clément Brisset
dd3a7f7249 Merge pull request #10641 from highfidelity/stable 
stable -> master after sandbox PID hotfix
 2017-06-08 10:57:28 -07:00
Stephen Birarda
71bb55f661 Merge pull request #10642 from seefo/fb4399 
Resolved FB4399
 2017-06-08 10:42:12 -07:00
seefo
110a2f5d03 Resolved FB#4399 2017-06-08 10:35:50 -07:00
Stephen Birarda
f4d0bc69b1 Merge pull request #10630 from seefo/oven 
Added CLI to Oven tool
 2017-06-08 10:13:08 -07:00
seefo
0c7ffa0ac6 Replaced baker in OvenCLI with an std::unique_ptr 2017-06-08 09:48:30 -07:00
Howard Stearns
5352e85418 Merge pull request #10553 from howard-stearns/do-not-get-stuck-in-floor 
Do not get stuck in floor
 2017-06-07 20:11:38 -07:00
Stephen Birarda
f884de87ad Merge pull request #10637 from highfidelity/RC-42-Hotfix 
Build 42.1 Hotfix Update server-console to watch interface via pid rather than marker
 2017-06-07 19:05:40 -07:00
seefo
8d5b90afe7 Merge pull request #10600 from seefo/snapshot 
Added Polaroid Feature to Snapshot
 2017-06-07 17:05:29 -07:00
seefo
26bd6b67ae Final touches to polaroid feature 2017-06-07 16:52:16 -07:00
howard-stearns
9cf027a68c pr feedback 2017-06-07 16:44:13 -07:00
howard-stearns
fa74daf875 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-07 16:43:25 -07:00
howard-stearns
9b5b352bc7 Merge branch 'do-not-get-stuck-in-floor' of https://github.com/howard-stearns/hifi into do-not-get-stuck-in-floor 2017-06-07 16:21:08 -07:00
Ryan Huffman
2146f96091 Replace static use of qApp with QCoreApplication 2017-06-07 15:33:44 -07:00
Ryan Huffman
f10f717ea2 Add clarifying comment to use of kill in isProcessRunning 2017-06-07 15:33:37 -07:00
Ryan Huffman
3888385a72 Remove the runningMarker timer 2017-06-07 15:33:29 -07:00
Ryan Huffman
ccd473ad0c Remove shutdownWatcher option inside sandbox 2017-06-07 15:33:22 -07:00
Ryan Huffman
37321814b6 Rename watchProcessShutdown to shutdownWith 2017-06-07 15:33:16 -07:00
Ryan Huffman
34630f839f Fix isProcessRunning error in strict mode 2017-06-07 15:33:09 -07:00
Ryan Huffman
a654bfa692 Update server-console to watch interface via pid rather than marker 2017-06-07 15:33:02 -07:00
seefo
99e9e10882 Made requested changes to OvenCLI constructor 2017-06-07 11:36:56 -07:00
Anthony Thibault
0bbbcbba67 Merge pull request #10594 from sethalves/head-controller 
Head controller
 2017-06-07 10:53:13 -07:00
Seth Alves
69520ff3db pull from upstream, code review 2017-06-07 10:28:02 -07:00
Seth Alves
b1c7c251ac Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-07 10:09:46 -07:00
Brad Hefta-Gaub
e5ac3eeea7 Merge pull request #10548 from NeetBhagat/21255 
On Oculus Rift on/off, switch automatically to/from desktop mode
 2017-06-06 18:05:56 -07:00
David Kelly
06527ac0a2 Merge pull request #10611 from davidkelly/dk/4873 
protect _text member of Text3DOverlay with mutex
 2017-06-06 16:50:57 -07:00
seefo
a3d2fa2630 Made requested changed to Oven CLI 2017-06-06 16:13:18 -07:00
Stephen Birarda
d7b1f882c4 Merge pull request #10627 from seefo/readme 
Updated Windows build guide's markdown
 2017-06-06 15:22:26 -07:00
seefo
aa13812e3f Fixed multiline in BUILD_WIN.md 2017-06-06 15:20:26 -07:00
seefo
46400f4122 Cleaned up oven CLI 2017-06-06 15:05:26 -07:00
Brad Davis
171d3212fe Merge pull request #10623 from jherico/qml_engine_singleton 
Migrate to single QML engine
 2017-06-06 15:00:43 -07:00
seefo
9bc1bc47a2 Added CLI to Oven tool 2017-06-06 14:57:42 -07:00
Stephen Birarda
0ccd0d3fd6 Merge pull request #10621 from highfidelity/stable 
Merge Stable back into Master
 2017-06-06 10:39:03 -07:00
seefo
40823bf582 Updated Windows build guide's markdown 2017-06-06 10:11:46 -07:00
NeetBhagat
c3621d7c32 Resolved two issues: 
1) While in HMD mode -> open Tablet -> Click Desktop.  Desktop mode will be on.
2) Menu sync problem while switching modes.
 2017-06-06 22:31:14 +05:30
Seth Alves
ad1ee97324 remove cruft 2017-06-06 09:50:40 -07:00
Andrew Meadows
f1dd5fbb14 Merge pull request #10613 from hyperlogic/bugfix/teleport-with-no-feet 
teleport.js should still function on avatars with no feet.
 2017-06-06 09:33:00 -07:00
Anthony J. Thibault
90d241ca3c Account for avatar scale 2017-06-06 09:10:46 -07:00
seefo
b729707ce7 Removed old comments in SnapshotReview.js 2017-06-06 09:10:25 -07:00
NeetBhagat
ae9a928740 Merge branch 'master' into 21255 
# Conflicts:
#	interface/src/Application.cpp
 2017-06-06 19:06:50 +05:30
Howard Stearns
3de243b093 Include the radius of the sphere at the avatar's feet. 2017-06-05 18:48:11 -07:00
Brad Hefta-Gaub
77a6ecfdaa Merge pull request #10618 from kencooke/nvtt-optimized-gamma 
Optimized NVTT library with fast gamma conversion
 2017-06-05 16:24:09 -07:00
Seth Alves
20c9228050 Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller 2017-06-05 15:53:23 -07:00
Seth Alves
7a276f027f fix orientation used for 3d audio 2017-06-05 15:53:01 -07:00
Seth Alves
9fcc1e15b8 remove some cruft 2017-06-05 15:52:47 -07:00
Bradley Austin Davis
995fe11c05 Migrate to single QML engine 2017-06-05 15:14:44 -07:00
Clément Brisset
67970182aa Merge pull request #10579 from AndrewMeadows/fix-generateBasisVectors 
Fix generateBasisVectors() helper
 2017-06-05 14:47:18 -07:00
Brad Hefta-Gaub
51e00b9de9 Merge pull request #10614 from samcake/brown 
Introduce a stencil mask pass in the rendering to optimize HMD
 2017-06-05 14:14:11 -07:00
howard-stearns
91fff7d54d Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-05 13:44:56 -07:00
howard-stearns
d8a5938a75 Merge branch 'do-not-get-stuck-in-floor' of https://github.com/howard-stearns/hifi into do-not-get-stuck-in-floor 2017-06-05 13:32:47 -07:00