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
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
d10e1cc39d
CR feedback, dead code cleanup
2016-01-18 12:09:21 -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
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
Andrew Meadows
8b420adbc8
namechange MotionType to PhysicsMotionType
2016-01-15 15:21:25 -08:00
Philip Rosedale
0ec754cf5f
Merge pull request #6839 from hyperlogic/tony/squeeze-hands-part-deux
...
Updated animations for left hand grasp
2016-01-14 16:57:46 -08:00
Brad Hefta-Gaub
a70adc8a57
Merge pull request #6823 from jherico/tool_window
...
Tool window in QML
2016-01-14 16:56:27 -08:00
Brad Davis
98df0d8fcc
Merge pull request #6836 from ZappoMan/menuGroups
...
wire up audio show level meter menu
2016-01-14 19:27:47 -05:00
Anthony J. Thibault
90516d95f2
Updated animations for left hand grasp
2016-01-14 16:22:58 -08:00
Philip Rosedale
a8d13cb947
Merge pull request #6831 from hyperlogic/tony/squeeze-hands-part-deux
...
Simplify grab animation logic
2016-01-14 15:49:00 -08:00
Brad Davis
e76e13c05c
Removing close button on tool window, fixing dragging
2016-01-14 14:20:31 -08:00
Brad Hefta-Gaub
0ad39feeb6
juggle developer menus a bit
2016-01-14 13:31:01 -08:00
Brad Hefta-Gaub
2177765b09
wire up audio show level meter menu
2016-01-14 13:12:16 -08:00
Anthony J. Thibault
51d678670d
Updated grab animations for right hand
2016-01-14 12:57:30 -08:00
Brad Davis
d924e042bc
Merge pull request #6834 from ZappoMan/hmdFixes
...
fix issues with HMD lookout 2D, and cleanup
2016-01-14 12:42:23 -05:00
Anthony J. Thibault
c267d672d2
Updated hand grab animations
...
Left hand is old squeeze hands poses
Right hand is new hydra grasp poses
2016-01-14 08:57:27 -08:00
Brad Hefta-Gaub
6b76cf484d
fix issues with HMD lookout 2D, and cleanup
2016-01-14 08:48:55 -08:00
Andrew Meadows
82e261480f
Merge pull request #6827 from howard-stearns/physics-timing
...
Physics timing
2016-01-14 08:39:29 -08:00
Brad Hefta-Gaub
8f8afabbfe
Merge pull request #6811 from Atlante45/master
...
Fix skybox not always rendering correctly
2016-01-13 21:00:48 -08:00
Anthony J. Thibault
75b3523c33
Simplify grab animation logic
...
Moved all animation control out of the handControllerGrab.js script and back into
squeezeHands.js
Deleted old hydra/squeezeHands.js to avoid confusion.
Added new sqeezeHands.js script to the default scripts.
2016-01-13 17:57:51 -08:00
Zach Pomerantz
2938829167
Add shadow items to stats
2016-01-13 17:49:37 -08:00
Brad Davis
b6272b7824
Migrate tool window to overlay/QML
2016-01-13 15:40:37 -08:00
howard-stearns
830dcb582a
Merge branch 'master' of https://github.com/highfidelity/hifi into physics-timing
2016-01-13 13:32:38 -08:00
howard-stearns
8a77e2ee95
Split physics perf timing into three parts: updateStates, stepSimulation,
...
and harvestChanges.
2016-01-13 13:31:37 -08:00
Atlante45
205c14eb43
Remove unused headers
2016-01-13 11:47:43 -08:00
Atlante45
11dc3cd261
Move primitive rendering out of DeferredLightingEffect
2016-01-13 11:47:43 -08:00
Atlante45
12f9091dc1
Fix doInBatch lambdas
2016-01-13 11:47:43 -08:00
Atlante45
0008b1a055
Code cleanup
2016-01-12 20:49:25 -08:00
Andrew Meadows
e1ba4ff0a8
add CollisionMask entity property
2016-01-12 15:08:52 -08:00
Brad Hefta-Gaub
cd167e43fb
Merge pull request #6812 from jherico/running_scripts
...
Running scripts in QML
2016-01-12 13:40:47 -08:00
Brad Davis
e7bfcba44f
Fix 'load' button
2016-01-12 13:17:06 -08:00
Brad Davis
2ed54d8ea7
Cleanup running scripts
2016-01-12 13:11:03 -08:00
Howard Stearns
d1a72e8d63
Merge pull request #6807 from hyperlogic/tony/grab-script-hand-animation
...
Move hand animation control into grab script
2016-01-12 13:02:59 -08:00
Brad Davis
dcc6739bce
Final functionality for running scripts
2016-01-12 12:40:46 -08:00
Brad Davis
a9eb5b8229
Load script from file
2016-01-12 12:40:45 -08:00
Brad Davis
4f975de6a6
Working on crash fixes, file open dialog
2016-01-12 12:40:43 -08:00
Brad Davis
21534cbde0
Layout for running scripts
2016-01-12 12:40:42 -08:00
Anthony J. Thibault
fee6bda721
Updated hand animation references.
2016-01-12 12:18:26 -08:00
Brad Hefta-Gaub
4c98c3a7a5
Merge pull request #6815 from ctrlaltdavid/20773
...
Resume Interface in 1st person if exit in 1st person
2016-01-12 12:05:12 -08:00
Brad Hefta-Gaub
8619be28ef
Merge pull request #6816 from ctrlaltdavid/20772
...
Don't use cache when use load script "from Disk" button
2016-01-12 11:46:41 -08:00
Brad Hefta-Gaub
5b9607ca29
fix merge
2016-01-12 10:36:59 -08:00
Brad Hefta-Gaub
6ac9b737d2
Merge branch 'master' of https://github.com/highfidelity/hifi into fixCrashRedux
...
Conflicts:
interface/src/Application.cpp
2016-01-12 10:35:24 -08:00
Brad Hefta-Gaub
5ec5ff9ad0
temporary fix to crash on startup
2016-01-12 09:11:20 -08:00
David Rowe
71ed8d2a64
Change camera to first person if start up with it in camera entity mode
...
Same as happens if start up with camera in independent mode.
2016-01-12 17:39:39 +13:00
