Brad Davis
|
58ca2e4148
|
Merge branch 'master' into oculus
|
2015-02-17 18:36:48 -08:00 |
|
Andrew Meadows
|
1c8f1bbcdd
|
Merge pull request #4299 from talentraspel/20338
removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMou…
|
2015-02-17 17:47:47 -08:00 |
|
Andrew Meadows
|
d7664718ee
|
Merge pull request #4303 from sethalves/font-load-failed
Font load failed
|
2015-02-17 17:31:26 -08:00 |
|
Andrew Meadows
|
80c973c285
|
Merge pull request #4301 from sethalves/fixes-for-vrchat
fix uninitialized geometry cache id in Line3DOverlay
|
2015-02-17 17:28:55 -08:00 |
|
Grayson Stebbins
|
f7cc7ad7e7
|
Added note about running inside visual studio
|
2015-02-17 17:14:47 -08:00 |
|
Seth Alves
|
8c7e147b82
|
include debug symbols
|
2015-02-17 15:16:03 -08:00 |
|
Seth Alves
|
ef2d386c75
|
attempt to load Courier if the requested font-family fails to load
|
2015-02-17 15:12:24 -08:00 |
|
Seth Alves
|
9fcb7591e6
|
don't crash if font load fails
|
2015-02-17 14:52:20 -08:00 |
|
Seth Alves
|
dd64eeb282
|
fix uninitialized geometry cache id in Line3DOverlay
|
2015-02-17 11:47:29 -08:00 |
|
Andrew Meadows
|
53855c89e9
|
Merge pull request #4289 from birarda/dependencies
add gverb and glm as cmake external projects
|
2015-02-17 10:00:29 -08:00 |
|
Kai Ludwig
|
4048627de7
|
2n try: removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script.
|
2015-02-17 18:50:20 +01:00 |
|
Stephen Birarda
|
d299f015d1
|
use binary dir for externals as well
|
2015-02-17 09:46:39 -08:00 |
|
Kai Ludwig
|
fa1bcc43e6
|
removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script.
|
2015-02-17 18:40:20 +01:00 |
|
Andrew Meadows
|
5cd1950bed
|
Merge pull request #4297 from huffman/fix-mouse-look-clash
Fix mouse look clash
|
2015-02-17 09:33:50 -08:00 |
|
Andrew Meadows
|
bc664435e7
|
Merge pull request #4296 from thoys/20318
CR for Job #20318 - BUG: Login menu item not popping up
|
2015-02-17 09:28:53 -08:00 |
|
Andrew Meadows
|
dba206337b
|
Merge pull request #4294 from thoys/20348
CR for Job #20348 - Change audio meter background back to white
|
2015-02-17 09:24:05 -08:00 |
|
Andrew Meadows
|
d896f3a811
|
Merge pull request #4252 from thoys/20224
CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads
|
2015-02-17 09:03:17 -08:00 |
|
Ryan Huffman
|
97e70920ce
|
Move handling of add model buttons to mouseRelease
|
2015-02-17 08:23:39 -08:00 |
|
Ryan Huffman
|
d1f7a730ad
|
Make add-model button non-selectable
|
2015-02-17 08:23:11 -08:00 |
|
Thijs Wenker
|
4a3550ce0e
|
toggleQAction(); in constructor to make the right initial button connection
|
2015-02-17 02:27:07 +01:00 |
|
Thijs Wenker
|
42e4eee15e
|
audio meter background "back in black" / "paint it black"
|
2015-02-16 23:14:27 +01:00 |
|
Andrew Meadows
|
ac93f86522
|
Merge pull request #4292 from birarda/master
add a NULL initializer for linked data create callback
|
2015-02-16 12:26:15 -08:00 |
|
Stephen Birarda
|
20b0dee80c
|
add a NULL initializer for the linked data create callback
|
2015-02-16 12:07:22 -08:00 |
|
Andrew Meadows
|
935b5ab5b3
|
Merge pull request #4290 from ZappoMan/backupFixes
fix a couple of bugs in backup settings
|
2015-02-16 09:56:20 -08:00 |
|
Stephen Birarda
|
feaad37751
|
add a GET_PROJ_NAME var to skip external projects
|
2015-02-16 09:38:53 -08:00 |
|
Clément Brisset
|
84bd1aeedf
|
Merge pull request #4283 from birarda/master
fix for ASI playSound called from same thread
|
2015-02-16 09:12:59 -08:00 |
|
Stephen Birarda
|
8acaa062a2
|
Merge pull request #4281 from Atlante45/fix_mute_environnement
Fix mute environnement
|
2015-02-16 09:11:47 -08:00 |
|
Stephen Birarda
|
a1bf06f004
|
can't use find module for external proj
|
2015-02-16 09:10:18 -08:00 |
|
ZappoMan
|
573d7971ac
|
fix a couple of bugs in backup settings
|
2015-02-13 20:23:12 -08:00 |
|
Brad Hefta-Gaub
|
9b6049489b
|
Merge pull request #4280 from AndrewMeadows/inertia
remove a couple crash modes on shutdown
|
2015-02-13 17:11:56 -08:00 |
|
Andrew Meadows
|
76b10a60ba
|
Merge pull request #4285 from ZappoMan/editLogging
added logging of edit commands in the server
|
2015-02-13 17:02:05 -08:00 |
|
Andrew Meadows
|
45208d468e
|
Merge pull request #4282 from ZappoMan/bugfix
some backup logging improvements & a bug fix
|
2015-02-13 16:54:25 -08:00 |
|
Stephen Birarda
|
9683ed92e3
|
use proper lib path on WIN32 for gverb
|
2015-02-13 16:40:48 -08:00 |
|
Brad Hefta-Gaub
|
f6ff0665ca
|
Merge pull request #4286 from huffman/fix-nat-dims
Fix "reset to natural dimensions" when dimensions not known
|
2015-02-13 16:31:34 -08:00 |
|
Brad Hefta-Gaub
|
2f492082c1
|
Merge pull request #4287 from sethalves/fix-Rectangle3d-drawing-problem
fix Rectangle3d drawing problem
|
2015-02-13 16:30:46 -08:00 |
|
Stephen Birarda
|
018b8497bd
|
use non-redirecting glm link to avoid https error
|
2015-02-13 16:21:19 -08:00 |
|
Andrew Meadows
|
9122364c3b
|
merge upstream/master into andrew/inertia
|
2015-02-13 16:20:09 -08:00 |
|
Andrew Meadows
|
cfbf8fdca7
|
explicit cleanup of loaded model animations
in Application dtor
|
2015-02-13 16:19:10 -08:00 |
|
Stephen Birarda
|
28fabcb788
|
avoid ubuntu libssl error by using http links
|
2015-02-13 16:17:45 -08:00 |
|
Stephen Birarda
|
691cf2d893
|
remove gverb from win build guide
|
2015-02-13 16:12:47 -08:00 |
|
Stephen Birarda
|
d337cadb10
|
add gverb to list of auto-deps
|
2015-02-13 16:12:03 -08:00 |
|
Stephen Birarda
|
48e7aa7433
|
handle android build of gverb for external project
|
2015-02-13 16:06:30 -08:00 |
|
Andrew Meadows
|
45ec7fdf07
|
Merge pull request #4288 from ZappoMan/dependancyCleanup
change ScriptCache and SoundCache to derive from Dependency
|
2015-02-13 16:00:47 -08:00 |
|
Stephen Birarda
|
4300836810
|
make gverb a cmake external project
|
2015-02-13 15:47:35 -08:00 |
|
ZappoMan
|
1fc0225939
|
change ScriptCache and SoundCache to derive from Dependency
|
2015-02-13 15:33:41 -08:00 |
|
Seth Alves
|
42511f3b7f
|
M-x mangle buffer
|
2015-02-13 15:23:22 -08:00 |
|
Seth Alves
|
98b445b22f
|
the geometryCacheID for Rectangle3DOverlay wasn't being initialized (so was randomish). if they overlapped, some would be drawn looking like others
|
2015-02-13 15:21:03 -08:00 |
|
Ryan Huffman
|
2df850eb8d
|
Fix natural dimensions check
|
2015-02-13 15:02:16 -08:00 |
|
Ryan Huffman
|
0495833ca6
|
Disallow entity models to be reset to natural dimensions if unknown
|
2015-02-13 15:00:37 -08:00 |
|
ZappoMan
|
bc5a1477e6
|
added logging of edit commands in the server
|
2015-02-13 14:59:57 -08:00 |
|