Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-18 14:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65177 commits 6 branches 1 tag 1.1 GiB
Commit graph

65177 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
f946ce48d6 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-23 16:46:55 -08:00
Seth Alves
5632f9d8fd clean up debug prints. put filename in window title-bar when connected to a serverless domain 2018-02-23 16:46:42 -08:00
howard-stearns
8f44a52140 Merge branch 'end-seeding' of github.com:howard-stearns/hifi into end-seeding 2018-02-23 16:37:00 -08:00
Zach Fox
fe515e949b New UI for new HFC users 2018-02-23 16:36:20 -08:00
Atlante45
800d15b405 Make sure settings timer is running 2018-02-23 16:23:50 -08:00
howard-stearns
29a2fa6ca5 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-23 16:19:54 -08:00
Sam Gondelman
e10af9b83d
Merge pull request #12462 from SamGondelman/entityDelete 
Fix EntityItems not getting destroyed
 2018-02-23 16:17:52 -08:00
Zach Fox
cc98eb6424 Fix lightbox stuck 2018-02-23 16:14:42 -08:00
howard-stearns
f66e688f41 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-23 16:12:41 -08:00
howard-stearns
53614a1d9f almost working 2018-02-23 16:12:01 -08:00
Seth Alves
77febe0aab save avatar-entities which are created while using a serverless domain 2018-02-23 16:03:08 -08:00
Zach Fox
47b25740de Update commerceLightBox 2018-02-23 15:23:51 -08:00
howard-stearns
34253082d4 always reset when asked 2018-02-23 15:11:08 -08:00
Zach Fox
432e647f7a Fix 'What's This' link 2018-02-23 15:08:33 -08:00
David Back
283b5724ba CR changes 2018-02-23 15:02:51 -08:00
David Back
da391564a8 CR changes 2018-02-23 15:01:29 -08:00
David Back
a418129bea simplify to just changing timescales 2018-02-23 15:00:23 -08:00
howard-stearns
3c2626894c fixes 2018-02-23 14:54:03 -08:00
howard-stearns
050df2ac2a merge 2018-02-23 14:46:13 -08:00
Zach Fox
9b54ab1080 UI changes, V1 2018-02-23 14:42:05 -08:00
howard-stearns
09091d29f7 more logic framework 2018-02-23 14:35:30 -08:00
Dante Ruiz
2d9b4c496c Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-23 14:28:04 -08:00
Seth Alves
3be1988260 fix expandToLocalDataAbsolutePath 2018-02-23 14:27:28 -08:00
Stephen Birarda
b18d5db062
Merge pull request #12495 from huffman/fix/baking-stuck 
Fix/baking stuck
 2018-02-23 15:19:29 -07:00
Dante Ruiz
a4feef9724 Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-02-23 14:02:09 -08:00
Dante Ruiz
07b0431215 fix merge conflict 2018-02-23 14:00:36 -08:00
Seth Alves
1e49dc5ca2 try using app-local-data path for /~/ 2018-02-23 13:58:23 -08:00
howard-stearns
84f9bff330 basic element, but not pretty and not functioning 2018-02-23 13:56:56 -08:00
Seth Alves
3ee979fc34 don't send entity-edits to a server when in a serverless domain 2018-02-23 12:09:35 -08:00
Seth Alves
d7b4eda5cd
Merge pull request #23 from druiz17/serverless-domains 
use resource path
 2018-02-23 12:04:40 -08:00
Dante Ruiz
364081df63
Merge branch 'serverless-domains' into serverless-domains 2018-02-23 11:54:53 -08:00
Dante Ruiz
7ea4042fd3 remove unnessary files 2018-02-23 11:52:28 -08:00
Dante Ruiz
73ea0dbc05 use resources path instead 2018-02-23 11:51:31 -08:00
Seth Alves
9b8c925b72 still trying to get /~/ in json files to work right 2018-02-23 11:09:09 -08:00
Ryan Huffman
c368c84f59 Make BakeAssetTask::abort thread-safe 2018-02-23 11:06:11 -08:00
Seth Alves
277e1ebec4 fix /~/ expansion on osx 2018-02-23 10:50:57 -08:00
Dante Ruiz
d0ec84b6c8 remove menu option for booking marking avatar entities 2018-02-23 10:45:59 -08:00
Stephen Birarda
85bd0442a7
Merge pull request #12488 from Atlante45/feat/backups-integration 
Merge master into content archives PR
 2018-02-23 11:19:42 -07:00
Zach Fox
5ee28297f3 Don't use eventLoop, since that will block the UI 2018-02-23 10:19:00 -08:00
Seth Alves
eea9394cd2 Merge branch 'fix-shadows-on-osx-1' of github.com:sethalves/hifi into serverless-domains 2018-02-23 09:28:08 -08:00
Seth Alves
59bd05aa55 make shadow-related shader compile on osx 2018-02-23 09:22:34 -08:00
Dante Ruiz
d3be1a8a23 Merge branch 'master' of github.com:highfidelity/hifi 2018-02-23 09:20:03 -08:00
Thijs Wenker
a27a5a7e1f export boolean properties properly 2018-02-23 18:16:38 +01:00
Seth Alves
99893d81e2 merge from upstream 2018-02-23 09:14:48 -08:00
humbletim
7c571cd431 cleanup / addition error message detail 2018-02-23 10:31:57 -05:00
humbletim
058e4d1926 CR feedback; whitespace / remove unnecessary diffs 2018-02-23 09:12:33 -05:00
humbletim
f8fe06213d CR feedback; whitespace / remove unnecessary diffs 2018-02-23 09:11:23 -05:00
humbletim
ebdb5b3c17 CR feedback; remove unrollVertices; update getFace; guard more debug logging 2018-02-23 08:57:48 -05:00
humbletim
6ea4b660b7 CR feedback; remove ok bool pointer and all metadata; cleanup 2018-02-23 07:47:39 -05:00
vladest
b8102cfbd7 Make sure sort indicator is attached to the right of title 2018-02-23 10:06:16 +01:00