Stephen Birarda
|
18e4c3b94c
|
Merge pull request #8119 from zzmp/fix/domain-hours-metadata-format
reformat operating hours to [[open,close]]
|
2016-06-22 09:30:12 -07:00 |
|
Clément Brisset
|
dfc84b5e6d
|
Merge pull request #8117 from Atlante45/neuron
Fix CMake 3.5 issue
|
2016-06-21 17:47:24 -07:00 |
|
Clément Brisset
|
fbc5f28e6e
|
Merge pull request #8115 from SamGondelman/updateBuildOSX
Update BUILD_OSX.md instructions for OpenSSL and Qt paths
|
2016-06-21 17:47:05 -07:00 |
|
Atlante45
|
89c50ab3df
|
Update neuron archive in cmakelists
|
2016-06-21 17:23:08 -07:00 |
|
Zach Pomerantz
|
e03974181a
|
reformat operating hours to [[open,close]]
|
2016-06-21 17:19:37 -07:00 |
|
SamGondelman
|
db8190ad49
|
fix typo
|
2016-06-21 16:56:00 -07:00 |
|
Howard Stearns
|
3879312968
|
Merge pull request #8116 from ZappoMan/cleanupPlugins
remove dead refereince to PluginContainer.h from space mouse
|
2016-06-21 16:51:06 -07:00 |
|
Brad Hefta-Gaub
|
d9e8026cd6
|
Merge pull request #8113 from AndrewMeadows/fix-kinematic-motion
fix setting velocity of inactive kinematic RigidBody
|
2016-06-21 16:32:04 -07:00 |
|
Brad Hefta-Gaub
|
f2f7e21eaf
|
remove dead refereince to PluginContainer.h from space mouse
|
2016-06-21 16:17:43 -07:00 |
|
SamGondelman
|
9a17f5b439
|
update homebrew instructions
|
2016-06-21 14:12:27 -07:00 |
|
Brad Hefta-Gaub
|
5878927bd0
|
Merge pull request #8050 from ZappoMan/cleanupPlugins
Cleanup plugins
|
2016-06-21 13:53:22 -07:00 |
|
Brad Hefta-Gaub
|
c18f5e19f5
|
Merge pull request #8090 from zzmp/doc/metadata-script
add example script for metadata from metaverse
|
2016-06-21 13:42:10 -07:00 |
|
Zach Pomerantz
|
c8ead2ad04
|
conform to coding braces standard
|
2016-06-21 13:28:15 -07:00 |
|
Brad Hefta-Gaub
|
5dcf5031a3
|
Merge pull request #8111 from zzmp/feat/domain-hours-metadata
add operating hours to domain
|
2016-06-21 13:14:13 -07:00 |
|
Brad Hefta-Gaub
|
160a5de271
|
CR feedback
|
2016-06-21 12:49:42 -07:00 |
|
Brad Hefta-Gaub
|
c322317878
|
rework plugins to not depend on PluginContainer unless they want to
|
2016-06-21 12:07:05 -07:00 |
|
Zach Pomerantz
|
c784fa42e9
|
log failure to fetch metadata
|
2016-06-21 11:34:23 -07:00 |
|
Brad Davis
|
ec87e2fe90
|
Merge pull request #8107 from zzmp/fix/metadata-tags-hosts-restrictions
fix metadata tags, hosts, restriction
|
2016-06-21 11:33:32 -07:00 |
|
Zach Pomerantz
|
52170eb12e
|
use refs for domain metadata parsing
|
2016-06-21 11:21:20 -07:00 |
|
Andrew Meadows
|
31706a3909
|
force activate kinmatic objects when necessary
|
2016-06-21 10:38:44 -07:00 |
|
samcake
|
117a39d52a
|
Merge pull request #8103 from SamGondelman/compileShaderFix
Reduce GLShader::compileShader log spam
|
2016-06-21 10:30:05 -07:00 |
|
Zach Pomerantz
|
807596596f
|
fix badging, parsing of operating hours
|
2016-06-21 00:18:38 -07:00 |
|
Zach Pomerantz
|
7fa7abdb1d
|
add operating hours to domain-server settings/UI
|
2016-06-20 22:58:20 -07:00 |
|
Zach Pomerantz
|
4e0aeea2b8
|
add time offset to domain-server UI
|
2016-06-20 16:19:19 -07:00 |
|
Brad Hefta-Gaub
|
10d79945d1
|
Merge pull request #8101 from humbletim/fix-entity-lifetime-guards
Fix entity lifetime guards (re: canRez/canRezTmp)
|
2016-06-20 15:52:54 -07:00 |
|
Brad Hefta-Gaub
|
d5c6296db5
|
Merge pull request #8095 from SamGondelman/skeletonFix
Fix skeleton switching bug
|
2016-06-20 15:52:40 -07:00 |
|
Zach Pomerantz
|
cfe9ac32d4
|
fix narrowing warning by casting -1
|
2016-06-20 14:46:20 -07:00 |
|
Zach Pomerantz
|
25b21dacda
|
clean domain metadata and update acl
|
2016-06-20 13:44:14 -07:00 |
|
Zach Pomerantz
|
40f2d36487
|
fix hosts/tags in domain-server settings
|
2016-06-20 11:38:38 -07:00 |
|
Zach Pomerantz
|
1c188a270d
|
Merge pull request #8087 from zzmp/feat/send-domain-descriptors
send domain metadata to metaverse for authed domains
|
2016-06-20 11:22:01 -07:00 |
|
SamGondelman
|
34d18da4e4
|
remove mutable
|
2016-06-20 11:11:54 -07:00 |
|
Brad Hefta-Gaub
|
b012e46dc7
|
Merge pull request #8097 from sethalves/make-permissions-names-case-insensitive
fix domain-server permissions-grid usernames to be case insensitive
|
2016-06-20 09:57:47 -07:00 |
|
humbletim
|
e65e6dc9ce
|
Fix entity lifetime guards (re: canRez/canRezTmp)
|
2016-06-19 13:40:03 -04:00 |
|
SamGondelman
|
c30c2b64b2
|
first pass at preventing repeated compileShader error prints
|
2016-06-17 17:49:27 -07:00 |
|
Seth Alves
|
d8a67850f2
|
treat usernames in permissions-grid on domain-server settings page as case-insensitive
|
2016-06-17 15:17:51 -07:00 |
|
Brad Hefta-Gaub
|
c297fa7c0e
|
Merge pull request #8060 from imgntn/usersUpdates
Hide users.js options when logged out
|
2016-06-17 14:17:42 -07:00 |
|
SamGondelman
|
caf4a9fa34
|
got rid of comparison warning
|
2016-06-17 14:17:32 -07:00 |
|
Brad Hefta-Gaub
|
abd368b69d
|
Merge pull request #8071 from ctrlaltdavid/20969
let user choose an existing file in the file save dialog
|
2016-06-17 14:14:37 -07:00 |
|
Brad Hefta-Gaub
|
852eda3101
|
Merge pull request #8066 from imgntn/faceCameraText
Add face camera option to edit.js text entity properties
|
2016-06-17 14:14:06 -07:00 |
|
SamGondelman
|
7d602986cd
|
removed multiple interface instances hack which you should never do anyways because it breaks everything
|
2016-06-17 12:01:02 -07:00 |
|
SamGondelman
|
5f7e49b087
|
possible fix, needs testing
|
2016-06-17 11:50:56 -07:00 |
|
Brad Hefta-Gaub
|
d8d4eb65ec
|
Merge pull request #8059 from Atlante45/feat/steamworks
Initial Steamworks integration
|
2016-06-16 18:49:51 -07:00 |
|
Brad Hefta-Gaub
|
3b132e7376
|
Merge pull request #8076 from ZappoMan/reduceLogSpam
don't log spam on empty URL
|
2016-06-16 18:25:54 -07:00 |
|
Brad Hefta-Gaub
|
99a0804429
|
Merge pull request #8086 from imgntn/activeElement
Fix some edit.js errors and log messages
|
2016-06-16 18:25:20 -07:00 |
|
Brad Hefta-Gaub
|
7d0cd38c8e
|
Merge pull request #8075 from ctrlaltdavid/20970
fix reporting of JSON export failure
|
2016-06-16 18:24:48 -07:00 |
|
Brad Hefta-Gaub
|
fd163ecc20
|
Merge pull request #8089 from ctrlaltdavid/20973
make audio device selection available without advanced menus enabled
|
2016-06-16 18:24:36 -07:00 |
|
Zach Pomerantz
|
aca3d4d90b
|
add example script for metadata from metaverse
|
2016-06-16 15:22:34 -07:00 |
|
David Rowe
|
77976281ab
|
Make audio device selection available without advanced menus enabled
|
2016-06-17 09:58:44 +12:00 |
|
Zach Pomerantz
|
0f9c637c5a
|
Wireframe a metadata overlay tutorial
|
2016-06-16 13:27:36 -07:00 |
|
Brad Hefta-Gaub
|
d7cd82a24e
|
Merge pull request #8085 from ZappoMan/fixShaders
fix v1 procedural shaders
|
2016-06-16 13:06:15 -07:00 |
|