Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 01:56:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72532 commits 25 branches 0 tags 1.1 GiB
Commit graph

1947 commits

Author SHA1 Message Date
Dante Ruiz
36c2cceb57 fix for failing to enter domain 2018-10-05 15:39:51 -07:00
Dante Ruiz
5d011bafb2 small tweaks 2018-10-04 17:02:44 -07:00
Dante Ruiz
651f37aceb Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged 2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d fix loading progress 2018-10-04 15:01:16 -07:00
Wayne Chen
0a7102b4d3 Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged 2018-10-04 08:59:26 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack 
Remove UndoStack API
 2018-10-01 17:13:48 -07:00
Wayne Chen
747aab2097 persisting signed values 2018-09-27 10:16:11 -07:00
Ryan Huffman
09b2565e76 Remove UndoStack API 
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
 2018-09-26 14:43:11 -07:00
Seth Alves
ff2a47e7e6 fix several uninitialized reads 2018-09-26 09:33:12 -07:00
Dante Ruiz
fa5dfb6e28 Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial 2018-09-26 09:18:12 -07:00
Dante Ruiz
57ae8ff8a1 update interstitial page stability count and loading bar 2018-09-24 16:09:53 -07:00
Wayne Chen
69d5299362 patching fix for previous commits 2018-09-24 15:22:46 -07:00
Dante Ruiz
d3368146ce saving work 2018-09-21 11:42:26 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged 
Interstitial Page with 404 Redirect
 2018-09-12 08:39:52 -07:00
Wayne Chen
20cab87a17 Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged 2018-09-11 18:53:06 -07:00
Wayne Chen
a7321f950a pushing requested changes - adding timeout refusal 2018-09-11 18:32:17 -07:00
Wayne Chen
cb0aa8055f
Merge pull request #13961 from wayne-chen/loginOnLaunch 
Pop up login dialog on launch
 2018-09-11 17:43:29 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -07:00
Dante Ruiz
c97d646083 making requested changes and fixing compile issue for jenkins 2018-09-11 15:57:44 -07:00
Wayne Chen
60a5b0eeaf
Merge pull request #1 from danteruiz/interstitalMerged 
handle unable to connect to domain case
 2018-09-10 17:23:50 -07:00
Wayne Chen
c194c236f1 adding inlines 2018-09-10 17:10:13 -07:00
Dante Ruiz
de5a0a714b handle unable to connect to domain case 2018-09-10 16:25:17 -07:00
Wayne Chen
dcacfdba7c adding popup property to qml 2018-09-10 16:22:55 -07:00
Stephen Birarda
adac872a11 clear other avatars in agent on avatar mixer disconnect 2018-09-07 15:04:14 -07:00
Wayne Chen
2e17140c07 fixing loadServerlessDomain function to be from 404 redirect 2018-09-04 18:24:01 -07:00
Wayne Chen
c47788efe4 merging with dante's PR 2018-09-04 18:00:06 -07:00
Wayne Chen
c95cb97b9b adding working version with networking signals 2018-08-31 19:29:48 -07:00
Wayne Chen
5f43f5b276 adding different method for handling redirect 2018-08-30 17:40:13 -07:00
Dante Ruiz
8c77820e30 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-30 09:45:41 -07:00
Wayne Chen
6689c15564 Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect 2018-08-28 19:22:34 -07:00
Wayne Chen
8a9ad421e7 adding serverless file + redirection if conn fail 2018-08-28 15:50:14 -07:00
Sam Gateau
d9d23e7fcf
Merge pull request #13877 from luiscuenca/multiplyOtherAvatars 
Create N replicas of each other-avatar on the client side
 2018-08-28 09:02:13 -07:00
danteruiz
e2cd695dfb PR code clean up 2018-08-27 11:01:29 -07:00
Dante Ruiz
af19849a75 fixing merge conflict 2018-08-24 15:48:42 -07:00
luiscuenca
ddbadf5a69 change to Test API 2018-08-24 11:59:46 -07:00
Andrew Meadows
10d0833c19 use DynamicsWorld::numCollisionObjects instead of our own count 2018-08-23 15:57:54 -07:00
Andrew Meadows
777b90bdc0 add 'physics body count' to debug stats 2018-08-23 12:59:28 -07:00
Dante Ruiz
26a30edec9 trying to fix loading bar 2018-08-21 18:27:21 -07:00
Dante Ruiz
db3d3d3d93 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-21 09:56:59 -07:00
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs 
Migrating to scribe program descriptors
 2018-08-20 14:48:54 -07:00
Ryan Huffman
5d44877f56 Fix functionality sometimes getting stuck if window loses focus 2018-08-15 13:32:58 -07:00
Dante Ruiz
75cc1c62c0 mostly done interstitial page 2018-08-10 16:53:34 -07:00
Brad Davis
f03370c826 Migrating to scribe program descriptors 2018-08-09 17:58:34 -07:00
Dante Ruiz
2377626203 exposing physics progress 2018-08-03 10:47:58 -07:00
Dante Ruiz
048196ec6f disble sending avatar and audio packets during interstitial mode 2018-08-02 11:39:06 -07:00
Dante Ruiz
0b7d6cb720 start interstitial page work 2018-07-31 14:10:19 -07:00
Sam Gondelman
b53772f9ca
Merge pull request #13431 from Cristo86/android_stop_downloads_bg 
Android - Prevent pending downloads to happen when going back to home
 2018-07-12 15:22:56 -07:00
Cristian Luis Duarte
be8351dc0d Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background 2018-07-06 20:43:52 -03:00
Wayne Chen
cb89b046b4 moving copyToClipboard from slots to functions 2018-07-06 11:07:35 -07:00
Wayne Chen
0facbedbbc adding Q_INVOKABLE method for copying to Application clipboard 2018-07-06 11:03:58 -07:00