Andrew Meadows
48374ef5bc
more ignoreForCollisions to collisionless
2016-01-19 09:06:17 -08:00
Andrew Meadows
7fb145e819
namechange ignoreForCollisions --> collisionless
2016-01-19 09:06:17 -08:00
Brad Hefta-Gaub
fca5b29e6f
Merge pull request #6786 from AlessandroSigna/overlays
...
Thread-safe access to EntityTree in OverlayPanel
2016-01-19 09:02:45 -08:00
samcake
29945bba92
Merge pull request #6837 from zzmp/feat/render-shadow
...
Add RenderShadowTask
2016-01-18 15:45:51 -08:00
Howard Stearns
6f84a67453
Merge pull request #6840 from jherico/qml_cleanup
...
File dialogs and modal message boxes in QML
2016-01-18 15:04:37 -08:00
Seth Alves
7b63e5b286
Merge pull request #6853 from sethalves/fix-typo-in-edit-js-code
...
fix property name typo
2016-01-18 14:53:41 -08:00
Seth Alves
9428da61cf
fix property name typo
2016-01-18 14:31:55 -08:00
Howard Stearns
5caf10beed
Merge pull request #6848 from ZappoMan/entityServerSideSizeCheck
...
Include checking the angular size of entities on the server side for LOD support
2016-01-18 14:13:34 -08:00
Brad Hefta-Gaub
b8747709ef
CR feedback, dead code cleanup
2016-01-18 12:11:23 -08:00
Brad Hefta-Gaub
d10e1cc39d
CR feedback, dead code cleanup
2016-01-18 12:09:21 -08:00
Seth Alves
94bafb4a1e
Merge pull request #6832 from AndrewMeadows/no-collisionsWillMove
...
namechange collisionsWillMove --> dynamic
2016-01-18 11:51:59 -08:00
Zach Pomerantz
6434d98365
Separate directional shaders with(out) shadowmaps
2016-01-18 11:11:28 -08:00
Seth Alves
d8dceade2e
Merge pull request #6833 from PhilipRosedale/searchChoice
...
Choice of hand ray pick or head pick
2016-01-18 11:03:30 -08:00
Brad Hefta-Gaub
88af387214
cleanup
2016-01-18 10:10:24 -08:00
Brad Hefta-Gaub
2774df38bc
check for entity size before including it for LOD
2016-01-18 09:06:57 -08:00
Brad Davis
5aa8398adb
Working on keyboard focus issues
2016-01-17 20:56:07 -08:00
Philip Rosedale
9b3155188d
Squeeze a little to search, a lot to grab
2016-01-17 19:10:40 -08:00
Philip Rosedale
23a8d57ca2
Always show search ray
2016-01-17 14:14:00 -08:00
Philip Rosedale
588719a4c2
merge conflict fix
2016-01-17 13:07:55 -08:00
James B. Pollack
8c4abd2a2d
Merge pull request #6847 from howard-stearns/tribbles
...
tribbles
2016-01-16 18:28:58 -08:00
James B. Pollack
28f1a86527
Merge pull request #6821 from ericrius1/whiteboardFix
...
Some fixes to whiteboard to get rid of gaps between lines and jagged …
2016-01-16 18:19:33 -08:00
James B. Pollack
3631db4e2d
Merge pull request #6845 from howard-stearns/render-matrix
...
render test script
2016-01-16 18:16:49 -08:00
James B. Pollack
2d628001c9
Merge pull request #6846 from howard-stearns/static-edits
...
edit-test script
2016-01-16 18:14:50 -08:00
Andrew Meadows
c1a1cbf718
fix typo
2016-01-16 15:55:10 -08:00
Howard Stearns
1985aa9d77
Drops a bunch of "tribbles" (small spheres) in front of you.
...
They edit change color at 60hz and jump randomly at an average 1hz for 30 seconds, and then dissapear after 60 seconds.
Useful for testing the load of physical objects.
2016-01-16 13:26:39 -08:00
Howard Stearns
994d13df5a
A test script to confirm that the specified edit rate can be achieved for the specified number of objects.
2016-01-16 11:32:19 -08:00
Howard Stearns
63db6d0f72
A script to test rendering load by creating a rectangular matrix of the specified objects, with no physical or entity changes after creation, either in front of you or overhead.
2016-01-16 11:17:13 -08:00
Brad Davis
cf8d2c5182
Integrate file open dialog into running scripts dialog
2016-01-15 23:53:37 -08:00
Brad Davis
746c388f7a
Cleanup of QML windowing and message boxes
2016-01-15 23:14:49 -08:00
Zach Pomerantz
7f3e102b5e
Rename renderLights to renderItems
2016-01-15 17:55:07 -08:00
Zach Pomerantz
7fd20bb036
Set shadow pipelines manually to avoid duplication
2016-01-15 17:55:07 -08:00
Zach Pomerantz
331d32ef78
Add render Jobs for Shape sorting
2016-01-15 17:55:07 -08:00
Zach Pomerantz
4bbf206f64
Clean up DrawTask
2016-01-15 17:55:07 -08:00
Zach Pomerantz
625eee2b9c
Clean RenderShadowTask ctor
2016-01-15 17:55:07 -08:00
Zach Pomerantz
f3a5be9ec0
Decrease shadowMap res to 1024
2016-01-15 17:55:07 -08:00
Zach Pomerantz
562c909ad8
Update shadow shaders
2016-01-15 17:55:07 -08:00
Zach Pomerantz
b2c9cf7452
Fit shadowmap to viewFrustum better
2016-01-15 17:55:07 -08:00
Zach Pomerantz
2b27e48bf9
Update shadow shaders
2016-01-15 17:55:07 -08:00
Zach Pomerantz
bc379e920b
Update shadow programs
2016-01-15 17:55:07 -08:00
Zach Pomerantz
fad38c0bfb
Add uniform buffer to LightStage
2016-01-15 17:55:07 -08:00
Brad Hefta-Gaub
29b9592c8c
Merge pull request #6838 from ctrlaltdavid/20763
...
Fix reading model's "textures" property
2016-01-15 17:02:14 -08:00
Brad Hefta-Gaub
8ffd30f89a
Merge pull request #6844 from jherico/web_crash
...
Fix JS web window crash caused by race condition
2016-01-15 16:44:51 -08:00
Andrew Meadows
84282d0114
final repairs after rebase
2016-01-15 15:28:26 -08:00
Andrew Meadows
e763c055b3
more namechanges in JS scripts
2016-01-15 15:24:46 -08:00
Andrew Meadows
29a52bf0ba
namechange collisionsWillMove --> dynamic
2016-01-15 15:23:52 -08:00
Andrew Meadows
952f5b23f6
namechange collisionsWillMove --> dynamic
2016-01-15 15:21:25 -08:00
Andrew Meadows
8b420adbc8
namechange MotionType to PhysicsMotionType
2016-01-15 15:21:25 -08:00
Brad Davis
bb02a1eda2
Fix JS web window crash caused by race condition
2016-01-15 14:45:40 -08:00
Zach Pomerantz
5c1c1e3a3b
Change LightStage setFrustum signature to near/farDepth
2016-01-15 12:57:31 -08:00
Zach Pomerantz
d6e5e2de81
Fix orientation of shadow frustum
2016-01-15 12:43:45 -08:00