SamGondelman
589e88af4a
Merge remote-tracking branch 'upstream/master' into scriptvec3
2018-09-04 17:54:45 -07:00
SamGondelman
9b75c7e07f
trying to separate colors and vectors
2018-09-04 17:20:05 -07:00
SamGondelman
0c8a4cc81e
merge with master
2018-08-28 17:31:51 -07:00
SamGondelman
aae06e8f49
faster aabox ray intersection and pre-computed inverse direction
2018-08-27 15:40:33 -07:00
Sam Gondelman
6730635931
Merge branch 'master' into scriptvec3
2018-08-27 10:43:52 -07:00
SamGondelman
3d048c77ba
Merge remote-tracking branch 'upstream/master' into recurse
2018-08-24 11:39:05 -07:00
SamGondelman
b5b7167644
add to stats
2018-08-23 17:56:24 -07:00
Andrew Meadows
10d0833c19
use DynamicsWorld::numCollisionObjects instead of our own count
2018-08-23 15:57:54 -07:00
Andrew Meadows
777b90bdc0
add 'physics body count' to debug stats
2018-08-23 12:59:28 -07:00
SamGondelman
283c0c0311
s i m p l i f y
2018-08-23 11:47:56 -07:00
Wayne Chen
4daa30c1d0
changing text for check preference
2018-08-22 15:58:37 -07:00
Wayne Chen
c32cc1ead2
adding implementation
2018-08-22 15:42:15 -07:00
Sam Gondelman
f0986a7f5a
Merge branch 'master' into scriptvec3
2018-08-20 10:56:45 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy
...
Trying to fix dependency shutdown
2018-08-16 13:14:58 -07:00
John Conklin II
032e67fd8e
Merge pull request #13748 from ElderOrb/FB16831
...
FB16831 qml-related warnings in log
2018-08-14 16:40:07 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges
...
New Default Strafe Animations Plus Animation Tuning Support
2018-08-10 15:03:30 -07:00
Anthony J. Thibault
c4c3581285
Fix memory corruption in PerformanceTimer when Stats are active
...
PerformanceTimer was neither thread safe nor re-entrant. Because it was being used increasingly on render and worker threads it has increased the likelihood of heap corruption.
I was able to identify this by enabling full page heap verification using the gflags app.
https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/enable-page-heap
2018-08-08 09:53:26 -07:00
amantley
84619e7adc
cleaned up to match coding standards
2018-08-07 10:40:11 -07:00
amantley
1ad6b041cd
updated the elipes equation code for determining the forward speed of the avatar. We can now set the max forward == walkSpeed, max side and backwards == walkBackwardsSpeed and the sprint speed == sprintSpeed
2018-08-06 18:36:32 -07:00
SamGondelman
e3756a6dae
Merge branch 'destroy' of github.com:SamGondelman/hifi into destroy
2018-08-06 11:21:51 -07:00
SamGondelman
9806bce403
weak pointers to nodeList
2018-08-06 11:21:32 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy
2018-08-06 09:51:14 -07:00
amantley
08889b627a
Merge remote-tracking branch 'upstream/master' into animationBlendChanges
2018-08-06 09:16:53 -07:00
Dante Ruiz
9bebd1e623
making changes
2018-08-03 18:11:55 -07:00
amantley
375d726535
added the new animations for strafe and walk to the resource file and updated the avatar-animation.json file
2018-08-03 16:48:43 -07:00
Sam Gondelman
7772e8adf2
Merge branch 'master' into scriptvec3
2018-08-03 14:57:49 -07:00
Alexander Ivash
5a2506e94f
FB16831 qml-related warnings in log
...
fix is based on exposing C++ objects to QML before root object is created (as root object might already require C++ objects)
2018-08-03 17:10:41 +03:00
amantley
bd88d5f15b
merging with ik leg fix code in master
2018-08-02 09:48:04 -07:00
SamGondelman
1ba28de5b6
try to fix nodelist not getting destroyed
2018-08-01 17:52:27 -07:00
SamGondelman
8a9c27ed92
Merge remote-tracking branch 'upstream/master' into destroy
2018-08-01 16:07:48 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244
...
Move scriptable caches' APIs into scripting interfaces
2018-08-01 11:50:13 -07:00
SamGondelman
2ca217eb4a
merge with master
2018-07-30 17:43:15 -07:00
amantley
541d2deed5
added the parent alpha into the child animation weight, removed extra hand overlay print outs
2018-07-30 14:45:25 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic
...
Parabolic Picking + Pointers
2018-07-30 10:49:02 -07:00
amantley
637a214165
added the anim stack print out static object for the list of motion and weights
2018-07-27 17:25:00 -07:00
amantley
b28ce40f09
adding the anim stack print out feature half way done
2018-07-27 08:46:40 -07:00
r3tk0n
f8c611b1d0
Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp
2018-07-26 15:35:12 -07:00
SamGondelman
6a52b7b8f3
CR improvements
2018-07-26 12:15:12 -07:00
David Rowe
baf88ab508
Revise scriptable resource caches' interfaces
2018-07-26 16:12:16 +12:00
NissimHadar
ce53b44b02
CR comments.
2018-07-25 15:58:46 -07:00
NissimHadar
630df7c233
Corrects loading of texture and default visibility.
2018-07-25 13:28:23 -07:00
David Rowe
16e06de9cd
Move scriptable caches into scripting interfaces
...
Removed non-working getResource() API functions.
2018-07-25 22:10:14 +12:00
amantley
b91df1b2d4
cleaned up stray files and old hud code
2018-07-24 17:25:27 -07:00
amantley
91b9865f27
Merge remote-tracking branch 'upstream/master' into animationBlendChanges
2018-07-24 17:14:24 -07:00
SamGondelman
645f905239
cleanup, model performance improvements
2018-07-24 13:25:49 -07:00
SamGondelman
318ef907b8
parabola/polyvox, fixing some bugs
2018-07-24 10:08:35 -07:00
amantley
aa92865b21
added the code to display the alphas for the motion blends
2018-07-23 17:45:24 -07:00
John Conklin II
27b35d84cc
Merge pull request #13652 from r3tk0n/16206-flying-settings
...
MS16206 - Enable flight by default in desktop, controls menu changes re: flying
2018-07-23 15:19:46 -07:00
r3tk0n
3108d650de
Restore original menu string for flying
...
Restore the original menu string for flying as it apparently *does* effect jumping.
2018-07-20 08:29:11 -07:00
SamGondelman
956c1511b6
Merge remote-tracking branch 'upstream/master' into parabolic
2018-07-19 15:23:25 -07:00
