Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 14:23:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
55761 commits 69 branches 56 tags 1.2 GiB
Commit graph

55761 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
ca526e0776 git rid of a lambda 2017-06-05 07:11:25 -07:00
Ken Cooke
024499bdc4 Optimized NVTT library with fast gamma conversion 2017-06-04 12:59:15 -07:00
Howard Stearns
05f41fb4f8 cleanup 2017-06-04 08:13:12 -07:00
Howard Stearns
a0ea306aed cleanup, and include missing allowBackface parameter 2017-06-04 07:55:23 -07:00
Howard Stearns
3d62900daf When we do precision detailed picking on a model, check the back faces, too. In other words, precision picking from inside a model works. 2017-06-03 16:49:16 -07:00
Howard Stearns
fd01258c76 cleanup 2017-06-03 16:02:58 -07:00
Howard Stearns
556dcd69ac wording change regarding use of exact for floors 2017-06-03 15:48:48 -07:00
Howard Stearns
02c46080f7 we don't need to force, but we do need some extra room for confined spaces 2017-06-03 15:43:14 -07:00
Sam Cake
d38a396e9d Fixing warning 2017-06-03 08:59:47 -07:00
Howard Stearns
c48b729527 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-02 18:05:20 -07:00
Anthony J. Thibault
7da73d0ff1 teleport.js should still function on avatars with no feet. 2017-06-02 18:01:40 -07:00
Ryan Huffman
52c60b35df Add startup_sent_to user activity event 2017-06-02 17:57:40 -07:00
samcake
f70702beb7 Introducing debug flags 2017-06-02 17:54:41 -07:00
Seth Alves
1b719ee654 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-02 16:31:23 -07:00
Seth Alves
9654e007a6 most input plugins are not head or hand controllers 2017-06-02 16:31:08 -07:00
Clément Brisset
0a864a7ce9 Merge pull request #10570 from ctrlaltdavid/21376 
Move record script files to unpublishedScripts directory
 2017-06-02 16:25:56 -07:00
manapa01
8e1577d3d3 Merge pull request #10596 from manapa01/Snapshot-Sound 
Snapshot sound
 2017-06-02 16:07:05 -07:00
Patrick Manalich
0b2de18e8e Volume Change 2017-06-02 16:04:03 -07:00
David Kelly
12cbc206d2 cr feedback 2017-06-02 15:59:15 -07:00
Clément Brisset
c636922a5d Merge pull request #10590 from huffman/fix/running-marker 
Update server-console to watch interface via pid rather than marker
 2017-06-02 15:57:44 -07:00
Clément Brisset
5f91d2dcb7 Merge pull request #10569 from ctrlaltdavid/21312 
Improve positioning of assets when added / imported
 2017-06-02 15:45:18 -07:00
David Kelly
9b34abeb40 oops initializer order... 2017-06-02 15:43:29 -07:00
Seth Alves
8a4ccf5c46 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-02 15:29:26 -07:00
Seth Alves
3359a0a794 work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation 2017-06-02 15:29:20 -07:00
David Kelly
f9e1f02888 protect _text member of Text3DOverlay with mutex 2017-06-02 14:59:27 -07:00
samcake
0a3c1712eb Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-02 14:35:05 -07:00
Seth Alves
142739eec7 Merge pull request #10602 from AndrewMeadows/simulation-ownership-002 
fixes for some simulation ownership problems
 2017-06-02 14:23:19 -07:00
Patrick Manalich
76901f5bf9 Final Application.cpp change 2017-06-02 14:08:56 -07:00
Seth Alves
c40a76f320 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-02 13:58:00 -07:00
Seth Alves
9088e288e0 don't worry about head controller being enabled, just check to see if head pose is valid 2017-06-02 13:57:53 -07:00
Ryan Huffman
a5296d50fc Replace static use of qApp with QCoreApplication 2017-06-02 13:51:39 -07:00
Ryan Huffman
c0bca73ec7 Merge pull request #10606 from huffman/feat/startup-went-to-event 
Add startup_sent_to user activity event
 2017-06-02 13:49:41 -07:00
seefo
fa726f43a6 Fixed a bug in Polaroid canRez listener 2017-06-02 13:47:58 -07:00
Stephen Birarda
d89febac71 use a sleep instead of a yield waiting for close event 2017-06-02 13:22:02 -07:00
Stephen Birarda
e3d8229abe rename ClosureEventSender to CloseEventSender 2017-06-02 13:21:55 -07:00
Stephen Birarda
ecc697dbe1 remove crash event definition for now 2017-06-02 13:21:45 -07:00
Stephen Birarda
40dfcb1e6e send quit event during shutdown on thread, with timeout 2017-06-02 13:21:37 -07:00
Stephen Birarda
f5d732f332 initial version of the ClosureEventSender using std::thread 2017-06-02 13:21:28 -07:00
Chris Collins
34201ea1da Merge pull request #10599 from jherico/ktx_cache_wipe 
Add versioning support to the KTX cache
 2017-06-02 13:02:18 -07:00
Sam Gateau
8a2837e1f7 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-06-02 11:52:11 -07:00
seefo
7ade5b07a6 Final touches to Polaroids 2017-06-02 11:35:56 -07:00
Andrew Meadows
d480123e93 Merge pull request #10555 from ctrlaltdavid/21372 
Make stopwatch buttons work properly
 2017-06-02 11:27:27 -07:00
David Rowe
58c4a2f12a Fix icon for polylines in entities editor properties page 2017-06-03 06:26:13 +12:00
Brad Davis
1f95daf5c1 Add dev menu option to wipe KTX cache on next launch 2017-06-02 11:19:43 -07:00
seefo
655a411865 Cleaned up Polaroid code 2017-06-02 11:02:01 -07:00
Ryan Huffman
0d96f82888 Merge pull request #10592 from birarda/close-report 
Send a close event to API on shutdown
 2017-06-02 10:57:41 -07:00
Patrick Manalich
1f478bdf13 Repair Application.cpp 2017-06-02 10:44:58 -07:00
Patrick Manalich
a705e722f1 Ctrl-S sound feature added 2017-06-02 10:35:57 -07:00
Patrick Manalich
0c71cf4bda Edit: Snapshot will make sound when initially clicked 2017-06-02 10:24:27 -07:00
Patrick Manalich
4e61db8263 Snapshot will make sound when initially clicked 2017-06-02 10:24:27 -07:00