Seth Alves
8b6e89a5c4
fix stopFarTrigger entity method call. re-add code to keep more than one distance grab per object from happening
2016-01-18 11:13:33 -08:00
Stephen Birarda
7be6a4aaf9
fix null logWindow closure during shutdown
2016-01-18 11:13:16 -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
Stephen Birarda
88604a0110
make sure ADD_REMOVE_ICON_NAME set for nsis
2016-01-18 10:57:45 -08:00
Stephen Birarda
7d4a7983ed
update the installer icon and header
2016-01-18 10:38:38 -08:00
Stephen Birarda
ba6c4d90df
install the ssleay32 dll, not lib
2016-01-18 10:34:42 -08:00
Stephen Birarda
f9c84f0913
include console targets in all for PR/prod
2016-01-18 10:26:35 -08:00
Stephen Birarda
d4597f9e8b
Revert "comment out manual ssleay copying"
...
This reverts commit 0355e816b0
.
2016-01-18 10:11:36 -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
AlessandroSigna
737a00a2cb
Typo fixed
2016-01-18 16:20:32 +01: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
David Rowe
0b71f1e1b8
Make filter in Running Scripts window be case-insensitive
2016-01-16 16:29:01 +13:00
David Rowe
51cb9dd05e
Fix crash in Running Scripts when edit filter after highlighting script
2016-01-16 15:50:33 +13: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
Stephen Birarda
2af10d6baa
fix shutdown call for console
2016-01-15 16:02:32 -08:00
Stephen Birarda
0355e816b0
comment out manual ssleay copying
2016-01-15 16:02:24 -08:00
Stephen Birarda
fcaf38cc57
don't set AC version for data directory fix
2016-01-15 15:56:47 -08:00
Stephen Birarda
eede4d5c30
fix log open and remove 1x menubar
2016-01-15 15:50:49 -08:00
Stephen Birarda
8d47d70543
remove old nsis template and image
2016-01-15 15:41:34 -08:00
Stephen Birarda
9aeda32f3f
remove committed conflict markers
2016-01-15 15:41:34 -08:00
Stephen Birarda
4e94817959
hookup share when passed action on settings page
2016-01-15 15:41:34 -08:00
Stephen Birarda
e3c9860f64
add a dummy share option to the menu
2016-01-15 15:41:34 -08:00
Stephen Birarda
6e8b54bc65
remove the branding tag in installer
2016-01-15 15:41:34 -08:00