Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:53:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55596 commits 71 branches 56 tags 1.2 GiB
Commit graph

55596 commits

This branch
This branch
All branches
Author SHA1 Message Date
Olivier Prat
8af2f75996 Added FadeManager to centralize some common fade effect data and functions 2017-06-06 16:11:12 +02:00
Olivier Prat
e7eca7728f Debug fade management moved out of the inner render loop 2017-06-06 14:57:52 +02:00
Olivier Prat
1936c209a5 Working fade debugging scripts for both opaque and transparents 2017-06-05 17:21:33 +02:00
Olivier Prat
cce99ef8c4 Added translucent shaders 2017-06-05 16:56:57 +02:00
Olivier Prat
74bb3213e4 Added shadow shader variants 2017-06-05 16:44:32 +02:00
Olivier Prat
08fcd6c357 Added new shaders 2017-06-05 16:32:36 +02:00
Olivier Prat
cbcf9ebe9f Merge branch 'master' of git://github.com/highfidelity/hifi into 21378 2017-06-05 11:13:27 +02:00
Olivier Prat
1433ae4b34 Merged from 21274 2017-06-05 11:12:57 +02: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
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
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
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
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
Andrew Meadows
d480123e93 Merge pull request #10555 from ctrlaltdavid/21372 
Make stopwatch buttons work properly
 2017-06-02 11:27:27 -07:00
Brad Davis
1f95daf5c1 Add dev menu option to wipe KTX cache on next launch 2017-06-02 11:19:43 -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
Ryan Huffman
0fdbf4a342 Add startup_sent_to user activity event 2017-06-02 09:59:29 -07:00
Seth Alves
bc2311cb35 Merge pull request #10561 from AndrewMeadows/sanity-check-physics 
fix crash in EntityMotionState::handleDeactivation()
 2017-06-02 09:55:20 -07:00
David Kelly
70b6236890 Merge pull request #10605 from davidkelly/dk/analyticsForBubble 
Add UserActivity calls for bubble usage
 2017-06-02 09:48:15 -07:00
David Kelly
2feea16063 added comment 2017-06-02 09:47:03 -07:00
Seth Alves
f47a49e631 Merge pull request #10597 from druiz17/record-standard 
Saved recording are officially g zipped and pose are played back to the standard endpoint
 2017-06-02 09:44:03 -07:00
Ryan Huffman
de2f8bd944 Add clarifying comment to use of kill in isProcessRunning 2017-06-02 08:58:35 -07:00
David Kelly
4dae77cd9d make sure we dont log the initial call to onBubbleToggled 2017-06-02 08:45:02 -07:00
Brad Davis
9a80a81321 Merge pull request #10565 from vladest/fix_claraio_download_clones 
Make sure that there is only one connection created for web events, s…
 2017-06-01 20:42:50 -07:00
Ryan Huffman
86da91ac8d Remove the runningMarker timer 2017-06-01 18:19:13 -07:00
Ryan Huffman
0536f8974a Remove shutdownWatcher option inside sandbox 2017-06-01 18:13:40 -07:00
Ryan Huffman
aa48f3f063 Rename watchProcessShutdown to shutdownWith 2017-06-01 18:13:27 -07:00
Stephen Birarda
6a89726a6a Merge pull request #10593 from birarda/log-api-session-id 
print the metaverse session ID to the debug log
 2017-06-01 18:02:17 -07:00
Stephen Birarda
6d1bbc389d use a sleep instead of a yield waiting for close event 2017-06-01 17:57:23 -07:00
Stephen Birarda
9fad8d1821 rename ClosureEventSender to CloseEventSender 2017-06-01 17:52:01 -07:00
Andrew Meadows
29a05d7eb4 bid immediately when creating new entity 
also clear EntityMotionState::_numInactiveUpdates on new ownership
 2017-06-01 17:39:21 -07:00
Andrew Meadows
74827fc4c8 recently moved static objects added to changelist 
since static objects are not active this will make the interface
release ownership of recently changed static objects
 2017-06-01 17:39:21 -07:00
Andrew Meadows
e34f979ed9 add EntityMotionState::isLocallyOwned() for cleaner logic 2017-06-01 17:39:21 -07:00
Andrew Meadows
c56a6c44f8 minor formatting fix 2017-06-01 17:39:21 -07:00
Brad Davis
b9f9cddea0 Add versioning support to the KTX cache 2017-06-01 17:16:24 -07:00
David Kelly
37b738ff8b initial cut at some UserActivities for the bubble 2017-06-01 16:46:31 -07:00
Brad Davis
3fdad14ca4 Merge pull request #10571 from jherico/ktx_tests 
FileCache refactoring and test, plus KTX unit tests
 2017-06-01 16:09:14 -07:00
Stephen Birarda
0f22b07026 move session ID logging later in app startup 2017-06-01 16:07:36 -07:00
anshuman64
694d1d042d Merge pull request #10573 from druiz17/head-puck 
Added head puck configuration
 2017-06-01 16:06:00 -07:00
Stephen Birarda
06b3ecfdc3 also log metaverse session ID during ctor of AccountManager 2017-06-01 15:50:56 -07:00
Dante Ruiz
77eb75db95 add .json to extension 2017-06-01 22:48:59 +01:00