Seth Alves
9014397167
try again without macro
2015-04-07 09:59:04 -07:00
Seth Alves
e63b39f061
oops missed one
2015-04-07 09:15:40 -07:00
Seth Alves
fc5b442e12
interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging
2015-04-07 09:15:11 -07:00
Thijs Wenker
af34add63c
added example for the new Scripts functions:
...
example\misc\scriptsExample.js
2015-04-07 17:39:50 +02:00
Atlante45
5e3ed1c8e4
Compute correct mouse position
2015-04-07 17:15:16 +02:00
Atlante45
1cc4384404
Add new frame of reference for cursor
2015-04-07 17:13:30 +02:00
Atlante45
ae6ee54569
Fix ray collision not using inverse rot
2015-04-07 17:11:02 +02:00
Atlante45
73f9276c74
Fix warning
2015-04-07 17:10:31 +02:00
Thijs Wenker
a783f03025
New scripting functions Scripts.getPublic(), Scripts.getLocal() and Scripts.getRunning() functional.
2015-04-07 16:48:11 +02:00
Seth Alves
fb607e2b26
logging groups for library/shared and interface
2015-04-06 18:45:06 -07:00
Thijs Wenker
484b014fa7
Merge branch 'master' of https://github.com/worklist/hifi into 20367
2015-04-07 01:07:04 +02:00
Thijs Wenker
2b23108e61
ScriptsScripting Interface
2015-04-07 01:06:39 +02:00
Andrew Meadows
435ce106eb
Add DynamicCharacterController prototype
2015-04-06 16:03:13 -07:00
David Rowe
ce104e8c40
Merge branch 'master' into 20447
2015-04-06 15:18:19 -07:00
Brad Davis
74cf4b57b3
Ensure the frame timer doesn't re-engage on exit
2015-04-06 11:25:47 -07:00
Sam Gateau
7de54917b8
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-04-06 10:20:23 -07:00
Sam Gateau
ecdffadcb7
trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct
2015-04-06 10:17:31 -07:00
Sam Gateau
d6f74aa0ad
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-04-06 09:56:16 -07:00
Atlante45
a120e50cc0
Account for actual eye position in oculus pick ray
2015-04-06 18:29:02 +02:00
Andrew Meadows
96a834183f
Merge pull request #4594 from jherico/oculus3
...
Enable Direct HMD mode only on windows
2015-04-06 09:24:53 -07:00
Atlante45
a3f8076641
Quit VRMode before aboutToQuit runs
2015-04-06 17:55:48 +02:00
Clément Brisset
efbd74f539
Merge pull request #4597 from huffman/light-overlays
...
Light overlays
2015-04-06 16:02:44 +02:00
Sam Gateau
10269bd556
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-04-05 18:37:28 -07:00
Sam Gateau
00817ab64f
MErging with origin/orange, brinign the fix for shadows
2015-04-05 18:36:39 -07:00
David Rowe
765d66eee5
Fix running without DDE available
2015-04-04 19:20:44 -07:00
David Rowe
65c1fea689
Increase DDE head translation to make avatar better reflect RL
2015-04-04 19:08:23 -07:00
David Rowe
1eb5716ab7
Shut down DDE when Interface shuts down
2015-04-04 19:04:47 -07:00
David Rowe
00f5469fa8
Add menu item that resets DDE tracking
2015-04-04 17:31:32 -07:00
Seth Alves
e06dada756
Merge pull request #4592 from AndrewMeadows/thermonuclear
...
profiling for physics simulation
2015-04-04 15:00:44 -07:00
David Rowe
0d42c7a1c1
Start and stop DDE as separate process
2015-04-03 19:16:07 -07:00
David Rowe
f6bf1d4141
Disable DDE code if not Windows or OSX
2015-04-03 17:41:19 -07:00
ZappoMan
0bc1b02895
improvements to tracking model names
2015-04-03 17:24:53 -07:00
ZappoMan
50479d5d5e
set name to Default when using default url
2015-04-03 17:06:54 -07:00
ZappoMan
1a463a0256
more work on improved avatar UI adding model names and backward compatible support
2015-04-03 17:03:22 -07:00
Bradley Austin Davis
f75ddb95f5
Enable Direct HMD mode only on windows
2015-04-03 17:01:21 -07:00
Ryan Huffman
ce2c23de51
Fix color not working for wire circle3d
2015-04-03 16:28:12 -07:00
ZappoMan
aaf191b6dc
first cut at new avatar preferences UI
2015-04-03 14:31:43 -07:00
Sam Gateau
423434af10
FInd one of the issue with shadows for avatars
2015-04-03 12:34:30 -07:00
Sam Gateau
7718680091
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-04-03 10:33:24 -07:00
Andrew Meadows
88ee1c313a
Merge pull request #4583 from huffman/fix-script-editor-icons
...
Update script editor to set icons programatically
2015-04-03 09:31:58 -07:00
Bradley Austin Davis
44c9d4a742
Working on removing some of the warnings in the xcode build
2015-04-02 16:12:44 -07:00
Andrew Meadows
2089a8c2dd
temporary debug setup: dump physics stats on F key
2015-04-02 15:33:06 -07:00
Andrew Meadows
eaef08abd5
add break to Key_Comma switch case
2015-04-02 15:25:55 -07:00
Sam Gateau
f96079f4f9
fixed the getViewFUrstum warning in DEBUG mode
2015-04-02 14:43:15 -07:00
Brad Davis
605cf19f6f
Merge pull request #4565 from ctrlaltdavid/20422
...
CR for #20422 - Add the ability to manage friends via Interface
2015-04-02 14:10:40 -07:00
Andrew Meadows
a824403132
Merge pull request #4582 from sethalves/island
...
Comma toggles rendering of collision hulls; more changes to vhacd stuff
2015-04-02 10:37:17 -07:00
Bradley Austin Davis
8a757a4b6e
Further work on menu handling on OSX in fullscreen / VR mode
2015-04-02 10:27:11 -07:00
Bradley Austin Davis
fb2b1204db
Stop the menu from breaking on leaving HMD mode
2015-04-02 10:16:52 -07:00
Seth Alves
41ec2fdbe3
Merge branch 'master' of github.com:highfidelity/hifi into island
2015-04-02 09:19:54 -07:00
Ryan Huffman
df5a03b447
Update script editor to set icons programatically
2015-04-02 09:10:47 -07:00
Andrew Meadows
fc4e6e9355
merge upstream/master into andrew/bispinor
2015-04-02 09:04:15 -07:00
Andrew Meadows
f804b2311d
remove hover-friendly behavior
2015-04-02 08:40:47 -07:00
Clément Brisset
01dc1b058c
Merge pull request #4580 from birarda/master
...
use non-persistent settings to avoid lobby crash confusion
2015-04-02 17:37:24 +02:00
David Rowe
349cc3241d
Restore minimized windows to view
2015-04-01 18:59:34 -07:00
David Rowe
49de54de48
Use improved WebWindowClass for friends window
2015-04-01 18:58:59 -07:00
Seth Alves
abf83bcf9e
Merge branch 'master' of github.com:highfidelity/hifi into island
2015-04-01 18:26:26 -07:00
Seth Alves
79b1a6aeb0
comma key toggles rendering of collision hulls
2015-04-01 17:45:47 -07:00
Stephen Birarda
b27a86fb25
always render yourself, handle change of render values elsewhere
2015-04-01 17:36:43 -07:00
Andrew Meadows
b537625e59
Merge pull request #4574 from ZappoMan/crashOnExit
...
fix crash on shutdown related to entity scripts connecting to signals
2015-04-01 17:26:33 -07:00
Brad Hefta-Gaub
ad27d7353b
Merge pull request #4386 from jherico/oculus_old_renderer
...
DO NOT MERGE - Update Oculus SDK integration
2015-04-01 17:17:32 -07:00
Stephen Birarda
ee088e12f3
leverage scene scripting values to toggle rendering
2015-04-01 17:06:06 -07:00
Brad Hefta-Gaub
e5757575de
Merge pull request #4578 from samcake/orange
...
tweak the default specular value for the Primitive entities to less shiny
2015-04-01 16:36:53 -07:00
Bradley Austin Davis
58908f44ef
Fixing crash on exit when using (or used) VR mode
2015-04-01 16:05:46 -07:00
Sam Gateau
4a6046b07c
tweak the default specular value for the Primitive entities (sphere and cubes) so they do not shine so much
2015-04-01 15:50:04 -07:00
Bradley Austin Davis
fd47d4f3a5
Working on putting some more timing measurement into the code
2015-04-01 15:47:51 -07:00
Andrew Meadows
b37384d759
exit hover now not quite automatic when over floor
...
remove MyAvatar::jump() method for more general API
2015-04-01 15:13:27 -07:00
David Rowe
96e888864a
Merge branch 'master' into 20422
2015-04-01 14:56:48 -07:00
Stephen Birarda
526c9217a1
fix signup link from login dialog
2015-04-01 14:43:56 -07:00
Bradley Austin Davis
3b77118baa
Merge branch 'master' into oculus_old_renderer
2015-04-01 14:09:29 -07:00
Andrew Meadows
245729cba8
fix for avatar unable to jump into hover on mac
2015-04-01 13:47:40 -07:00
ZappoMan
aac824fb99
fix crash on shutdown
2015-04-01 13:47:25 -07:00
Bradley Austin Davis
a7dc1d26e6
Working on SDK vs client distortion performance differences
2015-04-01 13:23:55 -07:00
Sam Gateau
3b92910a91
Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters
2015-04-01 12:22:35 -07:00
David Rowe
e519928320
Move friends window to own class
2015-04-01 11:38:32 -07:00
ZappoMan
da9a8e8a97
CR feedback
2015-04-01 09:27:58 -07:00
ZappoMan
827e37b920
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI
2015-04-01 09:09:50 -07:00
Bradley Austin Davis
e520a62bcf
Merge branch 'master' into oculus_old_renderer
2015-04-01 09:09:06 -07:00
Sam Gateau
ad11503466
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-03-31 23:12:17 -07:00
Stojce Slavkovski
8514a39812
Use constants for URLs
2015-04-01 07:24:16 +02:00
David Rowe
e06f28b7c5
Merge branch 'master' into 20422
...
Conflicts:
examples/users.js
interface/src/Application.cpp
2015-03-31 21:01:54 -07:00
Bradley Austin Davis
db9ab3e699
Merge branch 'master' into oculus_old_renderer
2015-03-31 18:25:34 -07:00
Bradley Austin Davis
eb816f7f6a
Adding support for eye per frame mode and offscreen render scaling
2015-03-31 18:24:58 -07:00
Philip Rosedale
d57959503b
Merge pull request #4560 from AndrewMeadows/bispinor
...
improved bounding shape calculation for Mery model
2015-03-31 18:19:34 -07:00
Sam Gateau
0d721ec1e9
merging
2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72
Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations
2015-03-31 17:35:34 -07:00
Andrew Meadows
ef10e5734d
bounding box for skeleton with bad mesh weights
2015-03-31 16:53:33 -07:00
Stephen Birarda
61806935bb
add a networking constants class with metaverse URL
2015-03-31 16:40:21 -07:00
ZappoMan
d68143675a
first simple pass at using marketplace windows in preferences
2015-03-31 16:24:27 -07:00
Brad Hefta-Gaub
b6f670a8d8
Merge pull request #4554 from samcake/yellow
...
Better support for Nvidia Optimus Laptop
2015-03-31 15:56:01 -07:00
Bradley Austin Davis
a7eebfd002
Merge remote-tracking branch 'upstream/master' into oculus_old_renderer
2015-03-31 15:42:01 -07:00
Sam Gateau
b4d11e2eb5
Add the needed global variable exported to enable the nvidia gpu on optimus platform (laptops with intel integrated) also log the opengl version and gpu and driver used
2015-03-31 15:18:59 -07:00
Bradley Austin Davis
6757dfcc0c
Working on 0.5.0.1 port and addressing the direct HMD/v-sync conflict
2015-03-31 14:52:21 -07:00
David Rowe
154dacf791
Fix typo
2015-03-31 14:21:56 -07:00
Bradley Austin Davis
c4c6cf82a2
Working on migration to SDK 0.5.0.1
2015-03-31 13:27:11 -07:00
Bradley Austin Davis
56b5ad2e6b
Merge branch 'master' into oculus_old_renderer
2015-03-31 11:10:23 -07:00
Philip Rosedale
5325478940
Merge pull request #4528 from ZappoMan/avatarUI
...
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
2015-03-30 21:31:22 -07:00
Sam Gateau
ee4b9a483b
found the issue brekaing the render, i didn't do the Blend enable sync properly
2015-03-30 18:04:44 -07:00
Philip Rosedale
ce05d3104a
Merge pull request #4535 from ZappoMan/scriptCaching
...
Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts
2015-03-30 18:02:52 -07:00
ZappoMan
64fdca7d6d
fix no root joint warning
2015-03-30 17:32:42 -07:00
Sam Gateau
ee3ec3fe1a
found the issue brekaing the render, i didn't do the Blend enable sync properly
2015-03-30 17:28:58 -07:00
ZappoMan
3475bfb396
fix typos
2015-03-30 17:04:47 -07:00
Bradley Austin Davis
5e5bdec88d
Merge branch 'master' into oculus_old_renderer
2015-03-30 16:36:00 -07:00
Andrew Meadows
9b13f186e3
remove character from PhysicsEngine on shutdown
2015-03-30 15:51:58 -07:00
ZappoMan
36657c9473
first cut at script caching
2015-03-30 14:36:48 -07:00
Andrew Meadows
10af59296d
Merge pull request #4499 from sethalves/multi-hull-collisions
...
Multi hull collisions
2015-03-30 12:11:56 -07:00
Andrew Meadows
2404fb126f
Merge pull request #4527 from sethalves/valgrind
...
Valgrind told me to do it
2015-03-30 11:56:17 -07:00
Seth Alves
186cb1ec7a
merge from upstream
2015-03-30 11:28:47 -07:00
Sam Gateau
ab9be0cb41
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-03-30 10:11:08 -07:00
Sam Gateau
2a58a65a8f
back to the office monday morning, State almost working in the full piupeline
2015-03-30 10:10:39 -07:00
Seth Alves
7de15cda87
quiet compiler
2015-03-30 09:30:13 -07:00
Philip Rosedale
099a2b5319
Merge pull request #4521 from ctrlaltdavid/20416
...
CR for Job #20416 - Update notification.js to include a notification about being blocked from a server
2015-03-30 08:49:29 -07:00
David Rowe
cbf2012bf5
Add menu items that set visibility
...
And synchronize visibility settings between Interface and users.js.
2015-03-29 18:35:56 -07:00
ZappoMan
3bda65f4fe
if installing a body, and you have no head, make your head the default head
2015-03-28 19:19:11 -07:00
ZappoMan
80df8caefb
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI
2015-03-28 18:43:03 -07:00
Seth Alves
fc1e45fc58
valgrind says this is used before it's initialized
2015-03-28 17:10:46 -07:00
Seth Alves
986bc71e93
quiet compiler
2015-03-28 17:10:26 -07:00
David Rowe
be69c0b58f
Add add/remove friends menu item
...
This must display the dialog whether or not users.js is running. Both
C++ and JavaScript need to open or restore the same dialog, hence a new
dialog rather than using WebWindow with its JavaScript baggage.
2015-03-28 13:05:23 -07:00
ZappoMan
002fba8018
first cut at predicting FST type for set avatar
2015-03-27 16:56:03 -07:00
ZappoMan
baa2f947e5
classifying FSTReader and moving ModelType into that class
2015-03-27 16:30:00 -07:00
Seth Alves
fd69a54f10
Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions
2015-03-27 15:55:20 -07:00
Andrew Meadows
5b85a2aa44
merge upstream/master into andrew/inertia
2015-03-27 13:56:54 -07:00
Andrew Meadows
be5fdbf217
enable avatar collisions by default
...
also remove old gravity features
2015-03-27 13:36:20 -07:00
ZappoMan
6189926105
add type hint to FST in model packager
2015-03-27 13:23:29 -07:00
Philip Rosedale
6550b4e311
Merge pull request #4509 from AndrewMeadows/inertia
...
character transitions into "hover" when stepping over abyss
2015-03-27 13:16:36 -07:00
David Rowe
90c1da2094
Merge branch 'master' into 20416
...
Conflicts:
examples/notifications.js
2015-03-27 12:13:29 -07:00
Brad Hefta-Gaub
2255c30d58
Merge pull request #4512 from Atlante45/ordered_fst
...
Hint order for FST files
2015-03-27 09:41:50 -07:00
Andrew Meadows
e75bb3cd9c
merge upstream/master into andrew/inertia
2015-03-27 08:14:36 -07:00
Stephen Birarda
647e2d7829
Merge pull request #4517 from ZappoMan/menuCleanup
...
menu and display tweaks at Philip's request
2015-03-26 20:06:16 -07:00
Andrew Meadows
821ac605f5
smoother motion on steps
...
faster motion when "flying"
cleanup of MyAvatar::updatePosition()
2015-03-26 19:48:52 -07:00
Seth Alves
16875338bf
Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions
2015-03-26 18:55:43 -07:00
Seth Alves
7da87d6e15
set up a way to request ResourceCache downloads from a non-networking thread.
2015-03-26 18:37:55 -07:00
Stephen Birarda
ba82436d95
add user heartbeat if they choose not to send location
2015-03-26 16:50:40 -07:00
ZappoMan
6cff99f9d6
menu and display tweaks
2015-03-26 16:36:46 -07:00
Atlante45
716e9bfe4f
Hint order for FST files
2015-03-26 15:40:48 +01:00
ZappoMan
9e34dda7c9
Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks
2015-03-25 16:54:37 -07:00
Brad Hefta-Gaub
918154e407
Merge pull request #4491 from huffman/export-json
...
Update export entities to export as JSON
2015-03-25 16:49:23 -07:00
ZappoMan
c031ce15a7
dead code
2015-03-25 16:45:51 -07:00
ZappoMan
19feeacc51
dead code
2015-03-25 16:38:57 -07:00
ZappoMan
f46067b634
better tracking of being done with downshifting
2015-03-25 16:30:33 -07:00
Clément Brisset
b81e89ad3d
Merge pull request #4488 from ctrlaltdavid/20407
...
CR for 20407 - Make Sixense emulate mouse only if controllers aren't at the base
2015-03-26 00:24:17 +01:00
ZappoMan
68e730af45
handle throttle render case and clean up code logic to be more obvious
2015-03-25 15:48:50 -07:00
Seth Alves
c0b1ff4a57
Merge pull request #4500 from AndrewMeadows/inertia
...
avatar can jump when using CharacterController
2015-03-25 14:48:54 -07:00
Ryan Huffman
1c0e7e26a2
Merge pull request #4507 from birarda/friends-only-location
...
make friends-only discoverability mode work as described
2015-03-25 13:48:08 -07:00
Stephen Birarda
f075674415
Merge pull request #4502 from huffman/webwindow-open-url
...
Add more functionality to WebWindow (get/set url, raise)
2015-03-25 13:25:29 -07:00
ZappoMan
0c2a630a59
Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks
2015-03-25 12:51:21 -07:00
ZappoMan
ec2b11640c
more tweaks to LOD logic
2015-03-25 12:51:13 -07:00
Stephen Birarda
7a9c1e20ab
use new AccountManager API in DiscoverabilityManager
2015-03-25 12:04:47 -07:00
Stephen Birarda
89e5fef808
send friends_only key for discoverability
2015-03-25 11:46:08 -07:00
Leonardo Murillo
c3c1d4a5ae
Switching to .com
2015-03-25 12:36:37 -06:00
Ryan Huffman
bb4417acc6
Merge branch 'master' of github.com:highfidelity/hifi into webwindow-open-url
2015-03-25 10:49:24 -07:00
Clément Brisset
e6ac502fb5
Merge pull request #4497 from huffman/update-edit-help
...
Update edit help
2015-03-25 14:09:22 +01:00
Andrew Meadows
d497620976
avatar can jump with E key when walking
2015-03-24 23:05:46 -07:00
Andrew Meadows
b87360f0f5
merge upstream/master into andrew/inertia
2015-03-24 17:41:07 -07:00
Andrew Meadows
44eca08fa4
PhysicsEngine doesn't need AvatarData
...
MyAvatar now owns its CharacterController
fix for bug of phantom collision obj when avatar's physics are disabled
2015-03-24 17:38:35 -07:00
Philip Rosedale
fe61387121
Merge pull request #4498 from ZappoMan/LODUITweaks
...
Some LOD UI Tweaks
2015-03-24 17:34:27 -07:00
Ryan Huffman
d54526b8bb
Merge branch 'master' of git://github.com/highfidelity/hifi into webwindow-openurl
2015-03-24 15:43:36 -07:00
ZappoMan
b67cf3af24
more tweaks to LOD tools dialog
2015-03-24 14:33:06 -07:00
ZappoMan
f43b8bbe8e
make AvatarLODMultiplier based on octreeSizeScale
2015-03-24 13:59:46 -07:00
Ryan Huffman
3f986229d1
Rename edit-entities-commands.html to edit-commands.html
2015-03-24 13:43:10 -07:00
ZappoMan
619428c325
move LOD FPS settings to Preferences
2015-03-24 13:32:22 -07:00
Stephen Birarda
1a6865b41b
send immediate location update when domain changes
2015-03-24 13:15:30 -07:00
Ryan Huffman
2fc0ef80d0
Add SVO_JSON_EXTENSION to accepted extensions
2015-03-24 10:40:46 -07:00
Ryan Huffman
6d932508ff
Add support for .svo.json extension
2015-03-24 10:27:53 -07:00
ZappoMan
fa122a227b
tweaks to the LOD Tools UI
2015-03-23 16:44:07 -07:00
Ryan Huffman
61dc31ffe7
Update export entities to export as JSON
2015-03-23 14:09:45 -07:00
David Rowe
cb6abfb2e6
Display notification if domain connection refused
2015-03-23 12:05:56 -07:00
ZappoMan
9fb53e3d72
CR feedback
2015-03-23 11:13:42 -07:00
David Rowe
3de7222007
Make Sixense emulate mouse only if controllers aren't at the base
2015-03-23 09:06:15 -07:00
ZappoMan
19c8e526e1
add guards to _jointStates array size
2015-03-23 08:47:06 -07:00
Bradley Austin Davis
1d56266044
Merge branch 'master' into oculus_old_renderer
2015-03-20 09:56:54 -07:00
Brad Hefta-Gaub
3d6d79ae3a
Merge pull request #4478 from sethalves/maximum-capacity
...
Maximum capacity redux
2015-03-20 09:28:22 -07:00
Brad Hefta-Gaub
96bfb96936
Merge pull request #4468 from ctrlaltdavid/20399
...
CR for 20399 - Fix near field clipping on avatars with large heads
2015-03-19 20:02:17 -07:00
Andrew Meadows
a7dbd6779f
Merge pull request #4467 from huffman/avatar-thrust
...
Fix thrust not being applied w/ Physics + Avatar
2015-03-19 16:40:10 -07:00
ZappoMan
5f825211df
Merge branch 'master' of https://github.com/highfidelity/hifi into dragDropLinkAvatars
2015-03-19 15:12:06 -07:00
Seth Alves
baa8e9c86f
remove uneeded #includes
2015-03-19 13:05:30 -07:00
Seth Alves
817a6130ef
return a reason as part of the domain server's connection-denied packet. Don't apply max-capacity check to users in the editors list
2015-03-19 13:01:57 -07:00
ZappoMan
24132968fe
oops
2015-03-19 12:41:44 -07:00
ZappoMan
26670f9e41
remove unneeded debug
2015-03-19 12:15:12 -07:00
ZappoMan
c5314aceac
more DRYing up of code
2015-03-19 11:57:57 -07:00
ZappoMan
5814a14152
removed dead code
2015-03-19 11:42:00 -07:00
ZappoMan
e6cefa946c
more DRYing of code
2015-03-19 11:41:03 -07:00
ZappoMan
3c41ecd091
cleanup accepted files implementation
2015-03-19 11:29:41 -07:00
Brad Davis
31c7c93aa3
Merge branch 'master' into oculus_old_renderer
2015-03-19 10:05:22 -07:00
ZappoMan
8e0141b8e9
first cut at fst drag/drop support
2015-03-19 08:48:13 -07:00
samcake
c0a66a05f4
Merge pull request #4463 from ZappoMan/LODTweaks
...
MVP Task - tweaks to automatic-LOD adjustments & Display warning when LOD is decreased
2015-03-18 16:55:39 -07:00
Brad Davis
872012856f
Merge branch 'master' into oculus_old_renderer
2015-03-18 15:35:49 -07:00
Brad Davis
0c465ce2b5
Merge pull request #4460 from ZappoMan/runJSFiles
...
MVP task - Allow a script to be added to a users "running script" from the marketplace
2015-03-18 12:52:44 -07:00
David Rowe
c114442325
Merge branch 'master' into 20399
2015-03-18 12:44:29 -07:00
David Rowe
648a2e3b1d
Set clip distance on rendering frustum rather than camera
...
This fixes wrong clipping distance used for rendering in FPV if also
have rear view mirror.
2015-03-18 12:43:49 -07:00
ZappoMan
8239a295cb
Merge branch 'master' of https://github.com/highfidelity/hifi into LODTweaks
2015-03-18 11:54:05 -07:00
ZappoMan
a2e012f7a9
Merge branch 'master' of https://github.com/highfidelity/hifi into runJSFiles
2015-03-18 11:53:19 -07:00
Brad Davis
07ee350c09
Removing reported logspam from release builds
2015-03-18 10:24:53 -07:00
Brad Hefta-Gaub
53ae4b48bc
Merge pull request #4459 from ctrlaltdavid/20400
...
CR for 20400 - Name tags going through the head
2015-03-17 21:54:13 -07:00
Brad Hefta-Gaub
a5294ae3fa
Merge pull request #4436 from sethalves/persist-entities-as-json
...
Optionally persist entities as json
2015-03-17 21:53:17 -07:00
Brad Davis
d066271e4e
Merging from master
2015-03-17 18:28:58 -07:00
Brad Hefta-Gaub
55d9560c9e
Merge pull request #4469 from jherico/frustumFetchCheck
...
Fix broken aspect ratio in mirror
2015-03-17 17:06:21 -07:00
Brad Davis
1662230289
Adding some fixmes to the code, since globals are evil and such checks should be confined to debug mode only
2015-03-17 16:44:29 -07:00
David Rowe
7b54443bda
Adjust clip distance as HMD head moves backwards
2015-03-17 16:33:20 -07:00
David Rowe
a04bd09b83
Set clip near distance per skeleton model if no separate head model
2015-03-17 16:32:59 -07:00
Brad Davis
e616308911
Adding runtime check to ensure that the correct frustum is fetched during rendering
2015-03-17 16:28:44 -07:00
Ryan Huffman
870f1112e4
Fix thrust not being applied w/ Physics + Avatar
2015-03-17 16:17:44 -07:00
Brad Davis
895a0d7b85
Correcting frustum usage by the avatar renderer that was causing aspect ratio problem
2015-03-17 16:14:35 -07:00
Brad Davis
c88f6f8f07
Adding some documentation on the change
2015-03-17 13:49:06 -07:00
ZappoMan
1e03335012
implement scripting interface for LODManager
2015-03-17 13:18:29 -07:00
Brad Davis
71e59cfa88
Fix: Mini-mirror doesn't render avatar head when in first person mode
2015-03-17 13:15:15 -07:00
Ryan Huffman
d097b4409e
Add title to non-toolbar WebWindows
2015-03-17 10:40:51 -07:00
ZappoMan
e5be8d01b6
tweaks to automatic-LOD adjustments
2015-03-17 10:36:39 -07:00
Ryan Huffman
1e1c60847b
Add WebWindow::getURL
2015-03-17 09:07:01 -07:00
Ryan Huffman
8088b01356
Add WebWindow::raise
2015-03-17 09:06:48 -07:00
Ryan Huffman
46f6c9f888
Add WebWindow::setURL
2015-03-17 09:06:31 -07:00
ZappoMan
749bc1ee9b
support for loading of JS files by drag, web page urls, and openfile events
2015-03-17 08:38:39 -07:00
Brad Hefta-Gaub
d33d3afb52
Merge pull request #4454 from Atlante45/fix_mouse_visible_in_oculus
...
Hide cursor at MainWindow level when in VRMode
2015-03-17 08:06:05 -07:00
Atlante45
1f8a874ce6
Hide cursor in 3D TV mode too
2015-03-17 12:34:13 +01:00
David Rowe
d08a25f1a3
A more realistic default head height
2015-03-16 15:48:10 -07:00
David Rowe
913527eaa3
Calculate head height based on skeleton model mesh if no head model
...
This fixes the problem of some skeleton models with heads having
display names rendering through them.
2015-03-16 15:47:54 -07:00
Brad Davis
0d0e3b5eeb
Merge remote-tracking branch 'upstream/master' into oculus_old_renderer
2015-03-16 12:22:51 -07:00
Brad Davis
5aa4277d9b
Removing a superfluous clear from Application.cpp. It's only required in client distortion mode
2015-03-16 12:22:35 -07:00
Atlante45
c5010c4d55
Hide cursor at MainWindow level when in VRMode
2015-03-16 14:19:24 +01:00
Seth Alves
806280f9cc
Merge branch 'linux-tools-window-freakout' of github.com:sethalves/hifi into persist-entities-as-json
2015-03-15 09:00:24 -07:00
Seth Alves
bfa38521ed
linux desktops are often configured as point-to-focus. don't autohide tools window on linux
2015-03-15 07:59:32 -07:00
Seth Alves
6c4b808813
Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json
2015-03-15 07:10:56 -07:00
David Rowe
08c95555dd
Calculate head height based on model mesh rather than joints
...
This fixes the problem of some head models having display names
rendering through them.
2015-03-14 09:47:47 -07:00
Brad Davis
f699a9c6f2
Merge remote-tracking branch 'upstream/master' into oculus_old_renderer
2015-03-13 20:31:06 -07:00
Stephen Birarda
dcff4f5956
use HIGH_FIDELITY_USER_AGENT for DataWebPage
2015-03-13 18:25:17 -07:00
Stephen Birarda
859f81cdd7
some & squishes missed in review
2015-03-13 18:12:31 -07:00
Stephen Birarda
641581a825
Merge pull request #4446 from huffman/marketplace-window
...
Marketplace window
2015-03-13 17:51:44 -07:00
Ryan Huffman
235b5d77ae
Add missing include to DataWebPage
2015-03-13 17:38:36 -07:00
Ryan Huffman
47e63719ee
Handle svo request in DataWebPage as import requests
2015-03-13 17:35:33 -07:00
Ryan Huffman
aca509d5cc
Add Application::improtSVOFromURL
2015-03-13 17:35:06 -07:00
Philip Rosedale
009551c4dd
Merge pull request #4441 from AndrewMeadows/isentropic
...
more correct shape for avatar collision capsule
2015-03-13 17:33:16 -07:00
Ryan Huffman
9d5c0cf4e3
Add layout to WebWindowClass to that it maximizes the webview
2015-03-13 17:25:24 -07:00
Ryan Huffman
1193d86d7b
Update webwindow to use datawebview
2015-03-13 16:39:25 -07:00
Ryan Huffman
d512a67c8a
Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays
2015-03-13 14:13:56 -07:00
Ryan Huffman
53b5c7e971
Update WebWindow to raise when being set to visible
2015-03-13 14:11:01 -07:00
Ryan Huffman
dc3453a878
Add Window.raiseMainWindow()
2015-03-13 14:10:46 -07:00
Stephen Birarda
2b08c20900
Merge pull request #4440 from birarda/master
...
remove the close activity from Interface
2015-03-13 13:46:59 -07:00
Ryan Huffman
7ef1964a52
Add user agent for WebWindow
2015-03-13 11:52:02 -07:00
Ryan Huffman
93cdb3a293
Add option for non-tool window WebWindows
2015-03-13 11:51:40 -07:00
Ryan Huffman
2a84d9a6ab
Fix issue with .svo's not loading when the url has parameters
2015-03-13 10:06:49 -07:00
Andrew Meadows
924ebe1e54
propagate skeleton's bounding box into AvatarData
2015-03-13 09:39:47 -07:00
Andrew Meadows
645fc7dbc9
remove unused variable
2015-03-13 09:39:06 -07:00
Brad Davis
7e50d6359e
Merge remote-tracking branch 'upstream/master' into oculus_old_renderer
2015-03-12 22:54:44 -07:00
Brad Hefta-Gaub
fadd1a09e5
Merge pull request #4433 from ZappoMan/fix3DTV
...
fix rendering of models in 3D TV mode
2015-03-12 16:42:37 -07:00
Brad Hefta-Gaub
a6b5a73844
Merge pull request #4431 from ZappoMan/windowsMenuAssert
...
Fix windows assert
2015-03-12 16:42:10 -07:00
Andrew Meadows
be252147e2
merge upstream/master into andrew/isentropic
2015-03-12 16:38:59 -07:00
Andrew Meadows
6bd857c4ea
update Avatar in PhysicsEngine on load new body
2015-03-12 16:35:12 -07:00
Andrew Meadows
1f3a267b16
compute correct bounding shape dimensions
2015-03-12 16:34:47 -07:00
Andrew Meadows
2fad4153a9
remove unused Avatar::getBoundingRadius()
2015-03-12 16:34:27 -07:00
Stephen Birarda
0fe843db01
Revert "remove the launch activity from UserActivityLogger"
...
This reverts commit bc6ac9081f
.
2015-03-12 15:53:05 -07:00
Stephen Birarda
bc6ac9081f
remove the launch activity from UserActivityLogger
2015-03-12 15:08:05 -07:00
Stephen Birarda
0b55a0f123
remove the close event from UserActivityLogger
2015-03-12 15:06:44 -07:00
Stephen Birarda
471e55c8ce
fix some lingering warnings
2015-03-12 12:36:39 -07:00
Stephen Birarda
09e2c0987e
use Dependency customDeleter for Application NL
2015-03-12 12:27:48 -07:00
Stephen Birarda
7bfc747748
Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList""
...
This reverts commit 9269b2a0b2
.
2015-03-12 12:13:32 -07:00
Ryan Huffman
ebf70f818a
Merge branch 'master' of git://github.com/highfidelity/hifi into edit-light-2
...
Conflicts:
examples/editEntities.js
2015-03-12 11:39:26 -07:00
Seth Alves
b945ce5e7a
Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json
2015-03-12 11:38:01 -07:00
Stephen Birarda
9269b2a0b2
Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"
2015-03-12 11:28:07 -07:00
Stephen Birarda
4da9186045
Merge pull request #4429 from birarda/master
...
NOT MERGEABLE: graceful cleanup on Application dtor for NodeList
2015-03-12 11:26:56 -07:00
Seth Alves
4aa7b0eb0f
provide defaults for anything entity properties read from a map
2015-03-12 11:19:47 -07:00
ZappoMan
bbcce6a891
fix rendering of models in 3D TV mode
2015-03-12 10:59:12 -07:00
Stephen Birarda
3279e19b3d
Merge pull request #4430 from Atlante45/update_login_on_launch
...
Update Login menu item on creation
2015-03-12 10:55:07 -07:00
Seth Alves
898b9f4af3
Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json
2015-03-12 10:24:05 -07:00
Seth Alves
90f6b798b1
don't mess with tools window in this branch
2015-03-12 10:11:37 -07:00
Seth Alves
fb93d08dd8
change how tool window acts on linux
2015-03-12 09:13:29 -07:00
ZappoMan
cd52bab2e8
Merge branch 'master' of https://github.com/highfidelity/hifi into windowsMenuAssert
2015-03-12 08:59:51 -07:00
Atlante45
52c0ba817a
Remove dead code
2015-03-12 16:32:09 +01:00
Atlante45
d858956ad8
Merge branch 'master' of https://github.com/highfidelity/hifi into package_models
2015-03-12 16:31:03 +01:00
Brad Hefta-Gaub
f91a19a918
Merge pull request #4424 from huffman/open-svo
...
Handle drag-n-dropped .svos and using interface to open .svo files
2015-03-12 08:15:25 -07:00
Atlante45
decd240f60
Update Login menu item on startup after creation
2015-03-12 14:53:11 +01:00
Atlante45
bcfd4b50be
Merge branch 'master' of https://github.com/highfidelity/hifi into package_models
2015-03-12 14:18:37 +01:00
ZappoMan
b798761ec5
test fix for Austin's repro
2015-03-11 23:55:53 -07:00
Seth Alves
2a06816f71
added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting
2015-03-11 23:09:15 -07:00
Seth Alves
87ac38c3df
Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json
2015-03-11 18:35:13 -07:00
Brad Hefta-Gaub
356dbbec72
Merge pull request #4399 from ctrlaltdavid/20369
...
Fix for 20369
2015-03-11 18:09:07 -07:00
Stephen Birarda
d7e99594ae
make the application the parent of the node thread
2015-03-11 18:04:32 -07:00
Stephen Birarda
7a8e94f1e5
remove extra debug information for node thread cleanup
2015-03-11 17:18:49 -07:00
Stephen Birarda
69bc6c9761
Merge pull request #4426 from ZappoMan/fixAvatarManagerCrash
...
some cleanup of dead code related to timers
2015-03-11 17:14:40 -07:00
Stephen Birarda
5d9a3811ca
more graceful cleanup for Application NodeList and DatagramProcessor
2015-03-11 17:14:20 -07:00
Stephen Birarda
9f754e40d0
move all silent node timers into LimitedNodeList
2015-03-11 16:59:06 -07:00
ZappoMan
cab6cc8c75
fix crash on exit related to AvatarManager using TextureCach resources
2015-03-11 16:30:21 -07:00
ZappoMan
e87e0a1e0b
some cleanup of dead code related to timers
2015-03-11 16:27:04 -07:00
Ryan Huffman
0048b91311
Add handling for opening an .svo using interface
2015-03-11 15:42:16 -07:00
Ryan Huffman
c3c2a75f48
Handle .svo drop events and emit svoImportRequested
2015-03-11 15:38:15 -07:00
Ryan Huffman
2f885bb7f2
Move WindowScriptingInterface to DependencyManager
2015-03-11 15:34:29 -07:00
Seth Alves
48aca5c46f
Merge pull request #4423 from AndrewMeadows/isentropic
...
remove old ragdoll simulation and avatar interactions
2015-03-11 15:18:15 -07:00
Seth Alves
918cfa8b4e
Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json
2015-03-11 14:36:25 -07:00
Andrew Meadows
bd115aa8f8
merge upstream/master into andrew/isentropic
2015-03-11 14:30:22 -07:00
Andrew Meadows
feafa0a60b
remove old Ragdoll and avatar interactions
2015-03-11 14:29:03 -07:00
David Rowe
32897de80a
Rename Stereo Audio menu item
2015-03-11 12:41:47 -07:00
Brad Davis
349e180d3c
Merge branch 'master' into oculus_old_renderer
2015-03-11 11:45:43 -07:00
Clément Brisset
885e6206e9
Merge pull request #4420 from ctrlaltdavid/20394
...
CR for Job #20394 - Build friends.js v1
2015-03-11 11:17:04 -07:00
Atlante45
bfbc8ffb47
File extension is case insensitive
2015-03-11 18:35:15 +01:00
Atlante45
1609823e2b
Move helper function to top
2015-03-11 16:32:45 +01:00
Atlante45
a727669a15
Move menu option to tools
2015-03-11 16:30:24 +01:00
Atlante45
9b80c01357
Remove ModelUploader from the menu
2015-03-11 16:21:36 +01:00
Atlante45
95a6df7102
Remove ModelUploader
2015-03-11 16:18:39 +01:00
Atlante45
40c593bd0d
Working model packager
2015-03-11 16:17:13 +01:00
Atlante45
a949af3296
Merge branch 'master' of https://github.com/highfidelity/hifi into upload_thumbnail
2015-03-11 14:09:32 +01:00
David Rowe
3d11dde8ad
Check that the user configures a skeleton root joint
...
Instead of just checking that the model has a "Hips" joint.
2015-03-10 20:27:31 -07:00
Brad Davis
961173ede6
Merge remote-tracking branch 'upstream/master' into oculus_old_renderer
2015-03-10 19:45:25 -07:00
David Rowe
e57d63b20e
Merge branch 'master' into 20369
2015-03-10 18:55:27 -07:00
Leonardo Murillo
0509270bc6
Merge pull request #4415 from birarda/master
...
fix for SVG issues on Windows
2015-03-10 19:28:21 -06:00
Stephen Birarda
931a234ba7
fix reset for close button SVG in LoginDialog
2015-03-10 18:08:19 -07:00
Brad Hefta-Gaub
5cced9fc66
Merge pull request #4400 from samcake/temp0
...
Introduce gpu::Shader, Pipeline and State
2015-03-10 16:51:40 -07:00
Brad Hefta-Gaub
04837d5302
Merge pull request #4390 from ctrlaltdavid/20287
...
CR for 20287 - Don't show the application menu bar when in full screen
2015-03-10 16:36:11 -07:00
Seth Alves
48244840d5
merge from upstream
2015-03-10 15:43:40 -07:00
Seth Alves
cf20596d6d
Merge pull request #4406 from ZappoMan/svoFromURL
...
Support for importing from a network URL
2015-03-10 15:41:41 -07:00
Stephen Birarda
6afdb26042
let QMainWindow delete GLCanvas, just stop the QTimer instead
2015-03-10 13:19:32 -07:00
Ryan Huffman
36c14de250
Add rotation to facingAvatar billboard overlays
2015-03-10 13:11:39 -07:00
ZappoMan
feddea821a
cleanup import from file vs url
2015-03-10 12:35:12 -07:00
ZappoMan
5facb39aa7
support for import entities from network URL
2015-03-10 12:21:37 -07:00
Stephen Birarda
a8046b8316
fix a typo in comment, NULL glWidget pointer
2015-03-10 11:47:35 -07:00
Stephen Birarda
292354e180
manually call delete on GLCanvas in Application dtor
2015-03-10 11:33:49 -07:00
David Rowe
abb62fd8f9
Fix typo found in passing
2015-03-10 10:57:48 -07:00
Seth Alves
afd2c87dfe
Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json
2015-03-10 10:12:43 -07:00
Sam Gateau
c1a0d767c9
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2015-03-10 09:37:40 -07:00
Sam Gateau
853cf75f60
adding the atmosphere in the directional lighting pass, debug
2015-03-10 09:37:13 -07:00
David Rowe
2df3eed31e
Merge branch 'master' into 20287
...
Conflicts:
interface/src/Application.h
2015-03-10 09:31:15 -07:00
ZappoMan
89f3a091f1
remove debugging
2015-03-10 09:02:35 -07:00
Andrew Meadows
a758ccd75a
Merge pull request #4402 from birarda/master
...
add underlying controls for user discoverability
2015-03-10 08:30:46 -07:00
Atlante45
8bb974f01b
Move ModelPropertiesDialog to own file
2015-03-10 14:50:38 +01:00
Atlante45
f1460e5c5b
Fixed missing forward declaration
2015-03-10 11:50:49 +01:00
Atlante45
d0d9d4bbac
Introduced ModelPackager
2015-03-10 11:50:13 +01:00
Atlante45
f55e9b6c1c
ModelSelector implementation
2015-03-10 11:49:07 +01:00
Atlante45
60867cc931
Added ModelSelector class
2015-03-10 11:48:31 +01:00
Brad Davis
3bf278c4d3
Merge remote-tracking branch 'upstream/master' into oculus_old_renderer
2015-03-09 19:25:50 -07:00
Seth Alves
d0bbac2eb6
json writer sort of works. started on reader
2015-03-09 17:55:58 -07:00
Stephen Birarda
de38221cf6
default to All discoverability until UI is present
2015-03-09 17:28:44 -07:00
Stephen Birarda
c6afa131d9
store discoverability mode as an int
2015-03-09 17:26:56 -07:00
Stephen Birarda
cd382eeea5
expose discoverability changes to js
2015-03-09 17:20:09 -07:00
Stephen Birarda
6d900d5a40
handle discoverability change in DiscoverabilityManager
2015-03-09 17:05:57 -07:00
Stephen Birarda
0658b54263
move location update to DiscoverabilityManager
2015-03-09 16:48:39 -07:00
Stephen Birarda
77a60a3d72
remove discoverability setter until API ready
2015-03-09 16:34:00 -07:00
Stephen Birarda
f81ae30918
fix getUsername for AccountManager include in implementation
2015-03-09 16:32:09 -07:00
Stephen Birarda
2f22c0cd96
cleanup username API from GlobalServicesScriptingInterface
2015-03-09 16:28:01 -07:00
ZappoMan
2a5d25e010
more hacking on mixamo pipeline files
2015-03-09 16:02:07 -07:00
Brad Davis
320cfa7c9e
Merge remote-tracking branch 'upstream/master' into oculus_old_renderer
2015-03-09 14:54:09 -07:00
Brad Davis
76ce31d4c3
Limiting app pollution with Oculus headers, ensuring client distortion mode builds
2015-03-09 14:47:33 -07:00
Seth Alves
99300a5bc8
merge from master
2015-03-09 13:39:51 -07:00
David Rowe
531bb5738f
Merge branch 'master' into 20369
...
Conflicts:
interface/src/ModelUploader.cpp
2015-03-09 13:35:38 -07:00
David Rowe
ba92254385
Fix skeleton detection when uploading avatar model
2015-03-09 13:31:54 -07:00
Leonardo Murillo
9ccd0a5afa
Fixing updater
2015-03-09 14:12:47 -06:00
Brad Hefta-Gaub
750f8a09fa
Merge pull request #4394 from AndrewMeadows/isentropic
...
EntityItem now stores position in meters and angular velocity in radians/sec
2015-03-09 12:47:00 -07:00
ZappoMan
559945c0c6
temporarily remove skeleton check from upload
2015-03-09 10:50:09 -07:00
Andrew Meadows
c3a8c44545
oops, removing a typo
2015-03-09 09:55:35 -07:00
Andrew Meadows
c0ed3edbbb
remove exception when connecting to old server
2015-03-09 09:38:26 -07:00
Andrew Meadows
51d05cc43e
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
2015-03-09 08:51:49 -07:00
Atlante45
61649ee0a5
Fix dialog labels
2015-03-09 13:42:14 +01:00
Seth Alves
3604fd639a
formatting
2015-03-08 20:03:10 -07:00
Seth Alves
08c3fa6363
merge from upstream
2015-03-08 17:29:05 -07:00
Brad Hefta-Gaub
80675f8459
Merge pull request #4391 from ZappoMan/fbxFixes
...
different mixamo detection
2015-03-08 11:42:29 -07:00
Brad Hefta-Gaub
e2a367607a
Merge pull request #4384 from ctrlaltdavid/20369
...
CR for Job #20369 - Uploaded avatars without skeletons crash Interface
2015-03-08 11:42:07 -07:00
Brad Hefta-Gaub
21cd7e36e0
Merge pull request #4381 from Atlante45/disk_cache
...
Disk cache tweaks
2015-03-08 11:40:40 -07:00
Seth Alves
9ec72e4902
quiet warning on linux
2015-03-07 20:25:46 -08:00
Andrew Meadows
ba6e66f169
merge upstream/master into andrew/isentropic
2015-03-07 18:03:49 -08:00
Seth Alves
6e79fc8b68
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
2015-03-06 18:46:13 -08:00
ZappoMan
7088c0287a
different mixamo detection
2015-03-06 18:29:22 -08:00
samcake
174e359c50
Merge pull request #4387 from ZappoMan/fbxFixes
...
tweaks to hacks for detecting mixamo files
2015-03-06 17:25:19 -08:00
Brad Hefta-Gaub
c9dd96c98d
Merge pull request #4389 from birarda/master
...
render application overlay only if enabled
2015-03-06 17:06:05 -08:00
Andrew Meadows
f5352333f0
entities use radians per second for angular velocity
2015-03-06 16:42:06 -08:00
Brad Hefta-Gaub
fd6f8c7792
Merge pull request #4382 from huffman/import-export
...
Improvements to Import/Export entities
2015-03-06 16:31:57 -08:00
Andrew Meadows
021510ae68
merge upstream/master into andrew/isentropic
2015-03-06 15:38:10 -08:00
Andrew Meadows
373be95297
entity cubes are in meters
2015-03-06 15:32:03 -08:00
Stephen Birarda
a4963f1895
render application overlay only if enabled
2015-03-06 15:22:25 -08:00
ZappoMan
ffab6ffe48
tweaks to hacks for detecting mixamo files
2015-03-06 15:11:02 -08:00
David Rowe
032896f75c
Fix starting up fullscreen
2015-03-06 14:57:27 -08:00
David Rowe
22d9ff2788
Show/hide menu bar in non-VR fullscreen
2015-03-06 14:36:08 -08:00
Brad Davis
4fa5a0eca4
Merge branch 'master' into oculus_old_renderer
2015-03-06 12:56:19 -08:00
Brad Davis
e3d48dbb8f
Working on Xcode build
2015-03-06 12:53:10 -08:00
Seth Alves
7a2977446a
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
2015-03-06 08:47:05 -08:00
Clément Brisset
aed208a339
Merge pull request #4383 from huffman/fix-script-editor-icons
...
Fix issue with Script Editor icons not showing up on first show
2015-03-06 06:02:50 -08:00
Ryan Huffman
299035bc85
Move script editor show() call to DialogsManager
2015-03-05 15:05:17 -08:00
Ryan Huffman
03c03a20f9
Update pasteEntities to use vec3
2015-03-05 13:52:30 -08:00
Ryan Huffman
6848025504
Add exporting by entity ID to Application
2015-03-05 13:36:16 -08:00
Atlante45
7690301e58
Include functional
2015-03-05 21:49:22 +01:00
Ryan Huffman
71768ef275
Return entity IDs on paste
2015-03-05 12:36:45 -08:00
Ryan Huffman
a922619ebc
Add Clipboard.exportEntities that takes a list of entity IDs
2015-03-05 12:36:10 -08:00
Atlante45
f4d8ee39dc
Menu item for cache editor
2015-03-05 21:10:02 +01:00
Atlante45
908e946ac5
Hook up disk cache to the dialog manager
2015-03-05 21:09:23 +01:00
Atlante45
53f23d8452
Added disk cache editor
2015-03-05 21:08:14 +01:00
Atlante45
9d7144dab0
Bumped disk cache size to 10GB
2015-03-05 18:52:48 +01:00
Andrew Meadows
49eee89c19
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-03-05 08:22:02 -08:00
Brad Davis
c1c97fc8b6
Updating cmake files after merging from master
2015-03-04 23:32:27 -08:00
Brad Davis
d838b78df9
Merging from upstream
2015-03-04 21:53:31 -08:00
Seth Alves
ac0c4e8512
cap max speed at MAX_WALKING_SPEED
2015-03-04 19:57:06 -08:00
Andrew Meadows
ca1c9b4105
EntityItem::findEntities() uses meters
2015-03-04 16:05:29 -08:00
Seth Alves
a8b688d540
move _velocity into base class. walking on a cube works
2015-03-04 15:26:02 -08:00
Andrew Meadows
b9cbd1ea6e
witch internal EntityItem data to use meters
2015-03-04 09:38:37 -08:00
Seth Alves
b4998e9c53
falling onto an object works
2015-03-04 08:48:48 -08:00
David Rowe
8686e090c9
Don't upload skeletonless avatar model to HiFi servers
2015-03-03 22:34:07 -08:00
David Rowe
aad3f1dfd9
Automatically switch to default model if avatar model is skeletonless
2015-03-03 22:34:07 -08:00
David Rowe
30b77d4200
Don't crash if avatar model at start-up or loaded is skeletonless
2015-03-03 22:34:06 -08:00
Seth Alves
a254f017cc
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
2015-03-03 18:37:40 -08:00
Seth Alves
8eec66c066
merge upstream, avatar can now fall onto a cube
2015-03-03 18:37:16 -08:00
Stephen Birarda
0a74291377
Merge pull request #4373 from birarda/remove-xmpp
...
fix web chat link for IRC
2015-03-03 16:26:12 -08:00
Stephen Birarda
d3682b0297
fix web chat link for IRC
2015-03-03 16:03:47 -08:00
Brad Hefta-Gaub
fc048c3b03
Merge pull request #4368 from ctrlaltdavid/20377
...
CR for 20377
2015-03-03 15:51:42 -08:00
samcake
6b1f42df83
Merge pull request #4366 from ZappoMan/removeMetavoxels
...
remove metavoxels
2015-03-03 15:50:53 -08:00
Seth Alves
7e4b597ca3
keep physics specific code in PhysicsEngine
2015-03-03 15:45:10 -08:00
Seth Alves
5d4ef8d5b8
initial flailing
2015-03-03 14:30:26 -08:00
Stephen Birarda
8f2dc7e38b
resolve conflicts on merge with upstream master
2015-03-03 12:22:25 -08:00
Stephen Birarda
a961cd8ff3
show link to IRC in place of Qxmpp removal
2015-03-03 12:17:35 -08:00
Brad Hefta-Gaub
b118912708
Merge pull request #4361 from samcake/temp0
...
evolve the Transform stack away from the legacy GL to the brand new shader way
2015-03-03 11:43:01 -08:00
Brad Hefta-Gaub
29340b6586
Merge pull request #4369 from ctrlaltdavid/20370
...
CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361
2015-03-03 11:17:31 -08:00
David Rowe
1b34b80b1a
Use BrowsC_U to control both brows' up and down
2015-03-03 11:05:59 -08:00
Brad Hefta-Gaub
b88d52a310
Merge pull request #4363 from huffman/block-restricted-users
...
Add permission-checking to edit entities
2015-03-03 11:04:46 -08:00
Sam Gateau
4619ba1f5b
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2015-03-03 10:56:04 -08:00
Stephen Birarda
27b9b345ca
remove ChatWindow includes from DialogsManager
2015-03-03 10:15:34 -08:00
Stephen Birarda
b270297406
remove a missed XmppClient include
2015-03-03 10:14:35 -08:00
Stephen Birarda
e43da00537
remove xmpp chat support
2015-03-03 10:13:41 -08:00
Stephen Birarda
5a601f3676
resolve conflicts on merge with upstream/master
2015-03-03 10:01:24 -08:00
David Rowe
dd678dbc49
Use all DDE coefficients to achieve better face control
2015-03-02 19:05:13 -08:00
ZappoMan
5c3c94a618
remove metavoxels
2015-03-02 17:21:43 -08:00
Ryan Huffman
b370e025c9
Move EntityScriptingInterface instance to DependencyManager
2015-03-02 15:05:31 -08:00
ZappoMan
a338d96b9d
only render the overlay if we're actually rendering the overlay
2015-02-27 18:00:51 -08:00
ZappoMan
9cc66f3da7
cleanup stats display behavior, reset default settings for timing details
2015-02-27 17:57:42 -08:00
Sam Gateau
5652852d1a
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2015-02-27 17:35:59 -08:00
Sam Gateau
f92efa13c8
fix typo
2015-02-27 17:35:08 -08:00
Sam Gateau
5ab3cbb7ec
Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated
2015-02-27 17:11:16 -08:00
Philip Rosedale
af9108c79f
Merge pull request #4338 from ctrlaltdavid/20368
...
DO NOT MERGE - QA for 20368
2015-02-27 14:16:55 -08:00
Philip Rosedale
9eee213bce
Merge pull request #4353 from Atlante45/relax_face_tracker
...
Relax blendshapes
2015-02-27 13:36:22 -08:00
Sam Gateau
ea88cbd75f
Merge with upstream master
2015-02-27 13:19:50 -08:00
David Rowe
797b1649a6
Merge branch 'master' into 20368
...
Conflicts:
interface/src/devices/DdeFaceTracker.cpp
2015-02-27 12:48:21 -08:00
Brad Hefta-Gaub
08dc883b0e
Merge pull request #4351 from huffman/update-light-properties
...
Update light properties (primarily for editEntities.js)
2015-02-27 10:54:19 -08:00
Philip Rosedale
35205fbbf3
Merge pull request #4347 from samcake/temp1
...
Introducing the SunSkyStage
2015-02-27 10:37:02 -08:00
Atlante45
fa8e1549f6
Relax blendshapes
2015-02-27 19:33:01 +01:00
Atlante45
db90fcdb62
Simplify expression
2015-02-27 16:09:15 +01:00
Atlante45
8615bb7cff
Make relaxation go to EPSILON within TIME
2015-02-27 15:58:28 +01:00
Atlante45
9849efe013
Exponential relaxation
2015-02-27 15:33:24 +01:00
Stephen Birarda
fc2f6d47bb
remove references to PrioVR in interface code
2015-02-26 17:28:00 -08:00
Sam Gateau
d8ebb0c5b9
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2015-02-26 14:19:23 -08:00
David Rowe
21f12c1d6c
Use cache ID when rendering talk bubble sphere
2015-02-26 13:50:43 -08:00
Andrew Meadows
9ad88c3793
Referentials do math using meters
2015-02-26 13:42:08 -08:00
Atlante45
fdf9fdd877
Relax head/lean when not tracking
2015-02-26 20:05:47 +01:00
Ryan Huffman
e42b708b56
Update deferredLightingEffect::add*Light methods
2015-02-26 11:03:47 -08:00
Sam Gateau
fcb293d0b2
CLean up before pr
2015-02-26 10:45:00 -08:00
Atlante45
e37ef226fc
Simplify lookForward compute
2015-02-26 19:21:14 +01:00
Atlante45
682b3f5e61
Remove unused angular velocity
2015-02-26 19:18:52 +01:00
Atlante45
f560f97c6b
Only update active FaceTracker
2015-02-26 19:18:05 +01:00
Atlante45
b6968a6b15
Update Facetrackers
2015-02-26 19:15:49 +01:00
Atlante45
8eb4abc49c
Rework FaceTracker
2015-02-26 19:14:09 +01:00
Brad Davis
7f29a70157
Switchable between SDK/client distortion
2015-02-26 00:06:59 -08:00
Sam Gateau
a757229c0e
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-02-25 19:18:01 -08:00
Sam Gateau
6b29e314c2
Adding the Stage of the Scene and exposing control of the sun light from javascript
2015-02-25 19:05:27 -08:00
Andrew Meadows
7b68916010
Merge pull request #4343 from ZappoMan/hangOnExit
...
BUG FIX: Hang on exit
2015-02-25 17:02:26 -08:00
ZappoMan
b03928cec7
some cleanup
2015-02-25 16:31:43 -08:00
ZappoMan
af43ba3444
used a registered quad for the audio box since its color constantly changes
2015-02-25 15:21:24 -08:00
Andrew Meadows
8d4ea143ce
easy conversions of: InDomainUnits --> InMeters
2015-02-25 14:48:06 -08:00
Andrew Meadows
2f749e3c51
merge upstream/master into andrew/isentropic
...
Conflicts:
libraries/entities/src/TextEntityItem.h
2015-02-25 14:40:32 -08:00
Andrew Meadows
2ffb19a0ed
getPosition() --> getPositionInDomainUnits()
...
and friends
2015-02-25 14:35:04 -08:00
Leonardo Murillo
006b3ed0ac
Merge pull request #4300 from birarda/dependencies
...
NOT MERGEABLE - add some externals as cmake external projects
2015-02-25 13:22:49 -08:00
ZappoMan
912b851eb7
remove crufty references to QGLWidget
2015-02-25 12:54:34 -08:00
ZappoMan
d1e648b392
remove unused references to QGLWidget* parent in Overlay and Overlays
2015-02-25 12:34:38 -08:00
Brad Hefta-Gaub
6d237f3f79
Merge pull request #4339 from huffman/fix-plane-pick
...
Fix plane pick
2015-02-25 12:23:45 -08:00
ZappoMan
a89691fc66
switch GLCanvas back to being owned by Application
2015-02-25 12:11:35 -08:00
ZappoMan
e66f12f958
add shutdown short circuiting to datagram processor
2015-02-25 10:56:08 -08:00
David Rowe
23e172a0a1
Remove attempt at individual eyebrow control
2015-02-25 10:44:57 -08:00
David Rowe
c5fba3e0ce
Improve mouth resting position and smile
2015-02-25 10:44:08 -08:00
Ryan Huffman
c499352ad8
Update billboard and planar overlays to use new findRayRectangleIntersection signature
2015-02-25 10:27:11 -08:00
Clément Brisset
b1e46c1bc8
Merge pull request #4337 from ZappoMan/crashonexit
...
Fixes to various Crashes on shutdown
2015-02-25 08:47:36 -08:00
Brad Hefta-Gaub
0f4e098a61
Merge pull request #4334 from huffman/edit-ray-improvement
...
Fix BillboardOverlay::findRayIntersection
2015-02-24 20:13:05 -08:00
Brad Hefta-Gaub
8c26be49d7
Merge pull request #4330 from huffman/edit-off-on-domain-change
...
Turn editEntities off on domain change
2015-02-24 20:11:39 -08:00
David Rowe
b0ffaaa8b7
Smooth DDE blendshape coefficients a little
2015-02-24 18:53:35 -08:00
David Rowe
7a95ed2baa
Scale and clamp DDE blendshape coefficients
2015-02-24 17:38:20 -08:00
ZappoMan
310654831c
clean up comments remove dead code
2015-02-24 17:34:19 -08:00
ZappoMan
eab09eaf28
removed extra debugging
2015-02-24 17:15:58 -08:00
Ryan Huffman
eb21b74439
Replace Planar3DOverlay::findRayIntersection with GeometryUtil::findRayRectangleIntersection
2015-02-24 17:01:24 -08:00
Ryan Huffman
be7959bbcd
Fix BillboardOverlay findRayIntersection implementation
2015-02-24 17:00:55 -08:00
ZappoMan
89f7f2da2e
don't do idle process and painting if we're shutting down the application
2015-02-24 15:57:34 -08:00
ZappoMan
ca432a415f
Merge branch 'master' of https://github.com/highfidelity/hifi into crashonexit
2015-02-24 15:33:41 -08:00
Ryan Huffman
89c10ca2ec
Fix BillboardOverlay::findRayIntersection
2015-02-24 14:36:24 -08:00
David Rowe
e91a28a0a4
Rework DDE blendshape derivation and remove scaling and smoothing
2015-02-24 14:33:55 -08:00
ZappoMan
fd93b99f03
more hacking on script shutdown behavior
2015-02-24 14:02:46 -08:00
Andrew Meadows
1b669af79d
Merge pull request #4307 from Atlante45/fix_warnings
...
Fix warnings
2015-02-24 12:19:32 -08:00
Andrew Meadows
efcac708b6
Merge pull request #4331 from PhilipRosedale/master
...
Toyball is a textured baseball, added ability to get controller angular velocity
2015-02-24 12:19:20 -08:00
samcake
5202d2136a
Merge pull request #4319 from huffman/avatar-billboards
...
Fix avatar billboards all rendering as the same billboard
2015-02-24 11:22:38 -08:00
Philip Rosedale
d74856e01b
add angularVelocity to controller
2015-02-24 11:21:04 -08:00
Ryan Huffman
4641bd0cd9
Add Window.domainChanged signal for scripting
2015-02-24 10:47:37 -08:00
Brad Davis
670a566763
Porting oculus rendering to 0.4.4 SDK
2015-02-23 22:15:59 -08:00
Brad Davis
5ec0ad14c1
Merge branch 'master' into oculus
2015-02-23 20:21:43 -08:00
ZappoMan
6be8f4c0ec
more work on improving shutdown behavior
2015-02-23 17:32:31 -08:00
Sam Gateau
04a39275ef
Trying to setup correctly the projection matrix for all the different cases...
2015-02-23 16:47:43 -08:00
Sam Gateau
687c76a6f8
trying to ge the shadow to render correctly
2015-02-23 13:12:29 -08:00
Andrew Meadows
0455ccf7be
Merge pull request #4313 from ctrlaltdavid/20355
...
CR for 20355 - Initial Integration with DDE
2015-02-23 09:47:19 -08:00
ZappoMan
85cec79ff5
removing debug messages
2015-02-23 09:44:22 -08:00
Andrew Meadows
2519f66037
Merge pull request #4311 from huffman/application-dpi-scale
...
Application dpi scale
2015-02-23 09:43:12 -08:00
Stephen Birarda
437d5c7bdf
repairs to include locations for QXmpp and SDL2
2015-02-23 09:26:35 -08:00
Sam Gateau
90bff36fd3
trying to ge the shadow to render correctly
2015-02-22 18:48:48 -08:00
David Rowe
f169ab1238
Tidy and document DDE face tracker UDP socket opening and closing
2015-02-21 11:26:48 -08:00
David Rowe
8d9685ee39
Fix Face Tracking menu operation
2015-02-21 11:01:07 -08:00
Brad Davis
06b9b9cc88
Getting SDK based rendering and Direct HMD mode working
2015-02-21 00:15:12 -08:00
ZappoMan
2e7a43a7fb
more hacking
2015-02-20 18:47:47 -08:00
Ryan Huffman
e6d9a1b251
Merge branch 'master' of github.com:highfidelity/hifi into application-dpi-scale
...
Conflicts:
interface/src/ui/LoginDialog.cpp
2015-02-20 18:09:55 -08:00
ZappoMan
8c4474b2d0
more hacking
2015-02-20 17:55:04 -08:00
ZappoMan
0b607fa390
first cut at shutting down scripts ahead of other cleanup
2015-02-20 15:28:25 -08:00
Ryan Huffman
5c3cae471b
Fix avatar billboards all rendering as the same billboard
2015-02-20 09:48:04 -08:00
Brad Davis
16feaceab5
Working on oculus build
2015-02-20 09:32:25 -08:00
Andrew Meadows
aa667464c0
merge upstream/master into andrew/thermonuclear
2015-02-20 08:26:51 -08:00
Andrew Meadows
599ef68df8
fix for scratchy audio on windows
2015-02-20 08:26:11 -08:00
Brad Davis
9962166a1c
Merge branch 'master' into oculus
2015-02-19 20:30:20 -08:00
Ryan Huffman
4a8e3193a9
Add more comments to UIUtil::scaleWidgetFontSizes
2015-02-19 12:01:27 -08:00
Clément Brisset
d2ed782626
Merge pull request #4308 from Triplelexx/20315
...
CR for Job #20315 - Update contents of the "welcome to Interface" dialog
2015-02-19 10:27:27 -08:00
Andrew Meadows
21405135f9
Merge pull request #4310 from talentraspel/20323
...
CR for Job #20323 - BUG: another crash on exit in interface
2015-02-19 09:52:23 -08:00
Ryan Huffman
a8999964f6
Cleanup dpi scaling comments
2015-02-18 16:21:51 -08:00
Ryan Huffman
4751974c45
Revert "Add scaling for high-dpi Windows/Linux displays"
...
This reverts commit 2828b65bea
.
2015-02-18 16:16:50 -08:00
Ryan Huffman
03eb1a984f
Revert "Fix dpi scaling in getViewportDimensions"
...
This reverts commit 9b719273ab
.
2015-02-18 16:15:53 -08:00
Ryan Huffman
22d46e3e6b
Update runningscripts script font to match parent
2015-02-18 15:33:24 -08:00
Ryan Huffman
9b719273ab
Fix dpi scaling in getViewportDimensions
2015-02-18 15:30:39 -08:00
Ryan Huffman
2828b65bea
Add scaling for high-dpi Windows/Linux displays
2015-02-18 15:09:41 -08:00
David Rowe
24d03deb21
Fix typo
2015-02-18 15:02:44 -08:00
Ryan Huffman
b2e1d8a38c
Remove font scaling based on system DPI
2015-02-18 14:37:56 -08:00
Ryan Huffman
7dab39a2f1
Add qDebug message to scaleWidgetFontSizes
2015-02-18 14:16:33 -08:00
Ryan Huffman
ff1fb07b2d
Add high-dpi support to scaleWidgetFontSizes
2015-02-18 14:04:02 -08:00
David Rowe
889851f6ea
Fix typo
2015-02-18 13:51:50 -08:00
Ryan Huffman
e048f7a36c
Add font scaling to running scripts window
2015-02-18 13:34:28 -08:00
Ryan Huffman
9550339a2a
Move preferences dialog font scaling to UIUtil
2015-02-18 13:34:01 -08:00
Ryan Huffman
ba66155d46
Add font scaling to login dialog
2015-02-18 13:33:39 -08:00
Ryan Huffman
0d60c09d03
Add UI font scaling to UIUtil
2015-02-18 13:33:19 -08:00
David Rowe
d704af21ac
Generalize "faceshift" data handling to "facetracker"
...
DDE face tracking data is now broadcast to other avatars.
2015-02-18 12:41:54 -08:00
David Rowe
a66af77b23
Update DDE face tracker to work with menu item
2015-02-18 12:40:59 -08:00
David Rowe
c446e72226
Add Face Tracking menu item to select the face tracker to use
...
Includes new DDE Face Regression option.
2015-02-18 12:39:51 -08:00
Ryan Huffman
ab542c3599
Update DPI scaling to not update default fonts
2015-02-18 12:21:10 -08:00
Ryan Huffman
a5b737314d
Add auto-scale to preferences dialog
2015-02-18 11:44:15 -08:00
Kai Ludwig
d659ac573a
now all application timers should get stopped correctly on exit
2015-02-18 19:53:45 +01:00
Atlante45
5230b805d2
Fix warnings
2015-02-18 19:24:29 +01:00
Clément Brisset
3f117ce322
Merge pull request #4293 from AndrewMeadows/thermonuclear
...
fix crash in AudioScope for bad memory access
2015-02-18 06:03:03 -08:00
Brad Davis
58ca2e4148
Merge branch 'master' into oculus
2015-02-17 18:36:48 -08:00
Triplelexx
1bcb3f7c75
Merge remote-tracking branch 'upstream/master' into 20315
2015-02-17 20:45:44 +00:00
Seth Alves
dd64eeb282
fix uninitialized geometry cache id in Line3DOverlay
2015-02-17 11:47:29 -08:00
Andrew Meadows
9895df6e7e
merge upstream/master into andrew/thermonuclear
2015-02-17 10:05:36 -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
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
57797329d1
do sample size arithmetic before scaling by sizeof
2015-02-16 12:14:03 -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
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
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
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
Triplelexx
f615915fba
Merge pull request #1 from nbq/fortriplelexx
...
Clickable Links In InfoView
2015-02-14 00:14:19 +00:00
Jason Hawks
01b0810fec
added framework to make links clickable to InfoView
2015-02-13 18:52:33 -05: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
Triplelexx
81d4af86a7
Merge remote-tracking branch 'upstream/master' into 20315
2015-02-13 23:23:19 +00: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
Andrew Meadows
589077bce6
try again: move stuff around in ~Application
2015-02-13 14:01:56 -08:00
Andrew Meadows
37be7251fe
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
2015-02-13 11:10:13 -08:00
Andrew Meadows
5113258d72
Merge pull request #4279 from birarda/android
...
fix cleanup of AudioClient, avoid gvr-interface crash on OS X
2015-02-13 10:58:50 -08:00