Clément Brisset
be07426d5a
Merge pull request #7515 from birarda/console-to-sandbox
...
rename the Server Console to Sandbox
2016-03-30 17:29:15 -07:00
Clément Brisset
14934678fc
Merge pull request #7513 from birarda/ice-server-lockup
...
use NetworkAccessManager in IceServer for single QNAM instance
2016-03-30 17:05:13 -07:00
Stephen Birarda
d8b0dbf3bf
fix indentation for last inactive check timestamp
2016-03-30 16:58:35 -07:00
Anthony Thibault
26b9469df5
Merge pull request #7516 from hyperlogic/tony/show-collision-geometry-crash-fix
...
Model: fix for crash when displaying collision mesh
2016-03-30 16:48:07 -07:00
Seth Alves
d9909fb7da
Merge pull request #7518 from hyperlogic/tony/model-hand-grab-fix
...
Model: Fix for equipped models not updating their matrices
2016-03-30 16:10:21 -07:00
samcake
c13e24438c
Merge pull request #7512 from zzmp/fix/light-buf-fmt
...
Correctly represent lighting framebuffer
2016-03-30 16:10:10 -07:00
Brad Hefta-Gaub
84bbeef72b
Merge pull request #7511 from zzmp/guard/gl
...
Add GL checks
2016-03-30 15:47:16 -07:00
Brad Hefta-Gaub
eb61a4fee9
Merge pull request #7514 from zzmp/guard/model-tex
...
Add lock on model texs
2016-03-30 15:46:52 -07:00
Brad Hefta-Gaub
4a1e82892a
Merge pull request #7494 from sethalves/use-local-scripts
...
Use local scripts
2016-03-30 15:46:32 -07:00
Brad Hefta-Gaub
2381ab1cba
Merge pull request #7496 from kencooke/master
...
make self-reverb depend on wetDryMix
2016-03-30 15:44:20 -07:00
Brad Hefta-Gaub
e31546e172
Merge pull request #7509 from samcake/orange
...
Avoid the spot lights flickering in Home
2016-03-30 15:44:08 -07:00
Zach Pomerantz
02273e067a
Add GL checks
2016-03-30 15:20:21 -07:00
Anthony J. Thibault
f6344c34e7
Model: Fix for equipped models not updating their matrices
2016-03-30 15:19:35 -07:00
samcake
6213e0859d
Expose to counters fro drawcalls, one for the API drawcalls and the other for gpu drawcalls spawned
2016-03-30 15:07:45 -07:00
Seth Alves
92981a6660
Merge pull request #7503 from sethalves/lock-tree-before-moving-av-children
...
lock entity-tree before moving entity-children of avatars
2016-03-30 15:05:38 -07:00
Seth Alves
e8f26b675a
try to fix path to osx scripts
2016-03-30 15:04:29 -07:00
Zach Pomerantz
01db2be6b8
Avoid JSON parsing texs every render cycle
2016-03-30 14:48:57 -07:00
Stephen Birarda
b6853a0679
fix packaged server console folder for OS X
2016-03-30 14:47:40 -07:00
Anthony J. Thibault
103257493c
Model: fix for crash when displaying collision mesh.
...
This was due to a default constructed PayloadPointer being sent to the scene via resetItem.
The fix is to A) not do that anymore, B) make resetItem more robust and not crash if this happens.
2016-03-30 14:24:28 -07:00
samcake
f09593e106
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-30 14:16:16 -07:00
Zach Pomerantz
54b8a9278d
Guard model texs
2016-03-30 14:11:45 -07:00
Zach Pomerantz
e4f12c81e0
Get remap textures through getter
2016-03-30 14:11:36 -07:00
Seth Alves
065c238dd0
Merge branch 'use-local-scripts' of github.com:sethalves/hifi into use-local-scripts
2016-03-30 14:02:21 -07:00
Seth Alves
62372415be
get this working on windows
2016-03-30 14:01:35 -07:00
samcake
3cf2eeb4d5
IMproving the perfplot qml and adding 2 more info
2016-03-30 13:58:32 -07:00
Stephen Birarda
f29647b519
use HF shortcuts for setup options
2016-03-30 13:56:57 -07:00
Stephen Birarda
7d042fc47d
keep server-console as sandbox folder in Program Files
2016-03-30 13:54:55 -07:00
Stephen Birarda
0a8072164d
be less redundant in prompt for running applications
2016-03-30 13:44:16 -07:00
Seth Alves
f5333423ff
remove unused variable
2016-03-30 13:43:06 -07:00
Seth Alves
bb43347599
Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts
2016-03-30 13:33:59 -07:00
Seth Alves
26e01bbacd
rewrite a bunch of path/url mangling code
2016-03-30 13:33:49 -07:00
Stephen Birarda
c2c7ae89db
remove bottom section from server-console splash
2016-03-30 13:27:44 -07:00
Stephen Birarda
7c0c48458e
remove padding from stack manager migration block
2016-03-30 13:25:47 -07:00
Stephen Birarda
53c16280bd
remove code for stack manager migration
2016-03-30 13:22:57 -07:00
Stephen Birarda
8be3931bbf
repair shortcut name for desktop interface
2016-03-30 13:20:31 -07:00
Stephen Birarda
02d93e2a11
cleanup fixes for old shortcuts in NSIS script
2016-03-30 13:09:36 -07:00
Stephen Birarda
bd3d08db3b
prepend Interface with High Fidelity in setup options
2016-03-30 13:00:23 -07:00
Stephen Birarda
8e9b337701
replace the server console logo with a sandbox logo
2016-03-30 12:56:09 -07:00
Stephen Birarda
a200e56f92
remove old startup menu item for Server Console
2016-03-30 12:52:11 -07:00
Stephen Birarda
05163367e1
delete old start menu items from before rename
2016-03-30 12:49:55 -07:00
Stephen Birarda
4940639e11
clear old desktop shortcuts from before rename
2016-03-30 12:48:11 -07:00
Stephen Birarda
2d1c4243f5
prepend desktop shortcuts with High Fidelity
2016-03-30 12:47:18 -07:00
Stephen Birarda
d80f612c62
continue to ignore old server console output directory
2016-03-30 12:44:10 -07:00
Stephen Birarda
bbbfa7227f
changes to electron app for Sandbox rename
2016-03-30 12:41:13 -07:00
Stephen Birarda
2ea0309955
change setup options and prompts to close running applications
2016-03-30 12:08:56 -07:00
Stephen Birarda
238f9e9298
remove the Stack Manager migration section
2016-03-30 12:07:45 -07:00
Stephen Birarda
724c95fbd6
leave executable name for server-console
2016-03-30 12:05:17 -07:00
Stephen Birarda
6bdedeb5ce
change packaging parameters for Sandbox/Interface
2016-03-30 11:59:49 -07:00
Stephen Birarda
4210bc178e
default the inactive timestamp for healthy startup
2016-03-30 11:44:55 -07:00
Stephen Birarda
e5adfc40b2
use the inactivity timer for ice-server lockup check
2016-03-30 11:42:41 -07:00
