Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 11:09:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
53895 commits 76 branches 59 tags 1.2 GiB
Commit graph

2662 commits

Author SHA1 Message Date
Zach Fox
9ace7a7488 Merge pull request #10279 from andrewd440/21174 
21174 Make the Particle Emitter Easier to Use
 2017-04-26 15:35:29 -07:00
Andrew Lowry
d3a9114676 Uses spaces instead of tabs for Edit.qml and EditTabView.qml. 2017-04-26 18:29:38 -04:00
anshuman64
5bd9b2e631 Merge pull request #10130 from ctrlaltdavid/21249 
New avatar record and playback script
 2017-04-26 15:18:30 -07:00
Zach Pomerantz
532284f779 fix tablet resolve typo 2017-04-26 16:28:42 -04:00
Seth Alves
c7ab4994ea Merge pull request #10282 from druiz17/tablet-webview-keyboard 
Added tabletwebview keyboard for HMD
 2017-04-25 19:30:49 -07:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249 
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
 2017-04-26 13:24:18 +12:00
Atlante45
62b7855e1f Add pending to stats 2017-04-25 15:56:23 -07:00
Dante Ruiz
851eece0e4 removed comments 2017-04-25 23:26:16 +01:00
Dante Ruiz
b78bae37be added keyboard for tabletWebview 2017-04-25 23:22:27 +01:00
Brad Hefta-Gaub
0783433d75 Merge pull request #10251 from birarda/edit-baked-column 
add a column to edit.js to identity baked models
 2017-04-25 13:04:48 -07:00
David Rowe
d52125e2f5 Merge branch 'master' into 21249 2017-04-25 07:19:56 +12:00
Andrew Lowry
6a218eaca9 Embeds colpick color picker in dat.GUI for particle explorer. 
Cleans up eslint for particleExplorer.js.
 2017-04-24 13:35:37 -04:00
Andrew Lowry
aea89824c5 Switches tablet edit tab to particle explorer when particle entities are 
selected or created.
 2017-04-24 13:35:37 -04:00
Ken Cooke
a5ed3007b3 Merge pull request #10248 from vladest/notify-sound-inject 
Notify sound inject
 2017-04-21 09:26:36 -07:00
David Rowe
477237cca2 Red "recording" ring animation with countdown numbers inside 2017-04-21 16:07:50 +12:00
David Rowe
aaf9b40bb3 New app icon 2017-04-21 15:20:08 +12:00
David Rowe
daedb94b04 Merge branch 'master' into 21249 2017-04-21 14:50:28 +12:00
Stephen Birarda
924624b127 add new glyphs with check, reference in entityList 2017-04-20 14:21:13 -07:00
Vladyslav Stelmakhovskyi
023d03d9f8 Implemented snap sound using sound injector 2017-04-20 17:43:16 +02:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
David Rowe
9088d1ef9c Tablet version of recordings browser dialog 2017-04-19 16:15:22 +12:00
samcake
2c16b2bf3a Expose the runtime from the engine in Stats 2017-04-18 18:12:42 -07:00
David Rowe
00b6b2a2c0 Implement desktop recordings browser dialog 2017-04-19 12:34:59 +12:00
Zach Fox
7505b82189 Merge pull request #10046 from Triplelexx/21224 
21224 - Allow people to save avatar bookmarks
 2017-04-18 11:10:50 -07:00
David Rowe
dae6d6fb69 Stub desktop dialog to select recording to play from ATP assets 2017-04-18 11:43:42 +12:00
Dante Ruiz
31b61c3225 removed white space 2017-04-18 00:24:34 +01:00
Dante Ruiz
e46d9da98f fixed merge conflict 2017-04-18 00:22:35 +01:00
Zach Fox
7a7cfb84e5 Remove HMD keyboard focus toggle on AddressBar input 2017-04-17 10:08:40 -07:00
Zach Fox
a4587e33f3 Tiny forward/backward icon updates 2017-04-14 13:19:33 -07:00
Zach Fox
a623ced64e Fix hover states on back/forward buttons 2017-04-14 12:43:07 -07:00
Dante Ruiz
863d64b2fd removed comments and non-needed files 2017-04-14 18:06:44 +01:00
Dante Ruiz
7189d4d7fa daving web work 2017-04-14 17:01:23 +01:00
Zach Fox
0543709081 Focus fix 2017-04-13 16:10:36 -07:00
Zach Fox
520ceebf5b Small HMD tweaks 2017-04-13 15:52:59 -07:00
Zach Fox
d9dc8ebc41 More improvements 2017-04-13 15:48:51 -07:00
Zach Fox
f23f9ec698 Merge pull request #10207 from zfox23/gifShareImprovements 
Snapshot sharing improvements
 2017-04-12 16:33:44 -07:00
Zach Fox
71caf85a27 Quick fix! 2017-04-12 14:57:44 -07:00
Zach Fox
c724c2e50b New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
87b2d5bf8a New loading icon 2017-04-12 14:45:57 -07:00
David Kelly
a12407ddda Merge pull request #10202 from davidkelly/dk/3934 
Connection sort change
 2017-04-12 10:42:04 -07:00
David Kelly
058a5b14a4 damn linter didn't run - vimrc work ahead... 2017-04-12 10:22:40 -07:00
David Kelly
9376ac646f offline people sort change 2017-04-12 08:41:36 -07:00
Chris Collins
b07ed13023 Merge pull request #10184 from druiz17/snapshot-fix 
snapshot bug fixes
 2017-04-11 13:00:46 -07:00
Chris Collins
c86acfafef Merge pull request #10120 from huffman/feat/stick-default-avatar 
Change default avatar to ball and stick avatar
 2017-04-11 12:56:25 -07:00
Dante Ruiz
9c79e62004 webview-fix 2017-04-11 18:49:40 +01:00
Dante Ruiz
d823093ddb fixed merge conflict 2017-04-11 16:58:25 +01:00
Seth Alves
d5f5192954 Merge pull request #10174 from vladest/fix-snapshot-login-cancel 
Check if dialog was opened from StackView and then pop or just go to …
 2017-04-11 07:07:29 -07:00
Chris Collins
d8581c1026 Merge pull request #10176 from vladest/snaps_hover 
Added hover to Snaps and Places
 2017-04-10 16:09:43 -07:00
Seth Alves
eb281389f5 fix includeActions so places show up in All 2017-04-10 14:46:31 -07:00
Howard Stearns
99ba07dcb2 Merge pull request #10181 from davidkelly/dk/infoButtonFix 
re-enable the info button for user images on nearby tab
 2017-04-10 13:27:33 -07:00