Commit graph

27764 commits

Author SHA1 Message Date
Andrew Meadows
46bca30698 MotionState reports zero velocity for slow objects
This reduces the number of updates for an Entity that is effectively
at rest due to a balance between some spring action and gravity, but
nevertheless has a slight non-zero velocity at the end of each
simulation step.
2015-07-09 11:34:27 -07:00
samcake
8ed0c8a919 Merge branch 'daft' of https://github.com/samcake/hifi into daft 2015-07-09 11:21:56 -07:00
samcake
9c744dcc46 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-09 11:21:38 -07:00
Sam Gateau
2968286779 Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-09 11:19:45 -07:00
Seth Alves
08d63b7fd8 first attempt at palm rotation 2015-07-09 11:03:02 -07:00
David Rowe
daf34053a8 Tweak button positions 2015-07-09 10:15:28 -07:00
Philip Rosedale
542a5f100a Merge pull request #5280 from BingShearer/airhockey
Air Hockey UI Fix
2015-07-09 10:04:21 -07:00
Sam Gateau
110b009aa4 Less magic in this world 2015-07-09 09:55:25 -07:00
Brad Davis
2fff560ff9 Fixing log file viewer 2015-07-09 09:54:35 -07:00
Sam Gateau
8f4a108441 Dead code and disable debug info 2015-07-09 09:37:35 -07:00
David Rowe
db7f1d6d27 Change font to Trebuchet 2015-07-09 09:35:22 -07:00
Sam Gateau
fb37af3e04 Removing dead code 2015-07-09 09:25:07 -07:00
Sam Gateau
e901d5cad0 Uncommented a block left behind... 2015-07-09 09:21:53 -07:00
Brad Hefta-Gaub
fb07956689 Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix
fix for mirror rendering on windows
2015-07-09 08:38:55 -07:00
Sam Gateau
6b229d8d2d Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-09 03:45:55 -07:00
Sam Gateau
8314fe8c7f FInally getting a nice spot light volume working for all angles 2015-07-09 03:45:19 -07:00
Brad Davis
63dfd570f1 Adding priority support to GenericThread 2015-07-08 22:54:31 -07:00
Brad Davis
08d1364f81 Move file log persistence to a separate thread 2015-07-08 22:35:23 -07:00
Anthony J. Thibault
1be0e7ebc3 fix for mirror rendering on windows
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
  I think this was working on Mac due to the different code paths in
  GLBackendTransform::updateTransform for core vs legacy gl profile.
2015-07-08 21:33:27 -07:00
Brad Hefta-Gaub
02c3b63f45 Merge pull request #5282 from jherico/entity_parsing
Working on fixing entity item parsing
2015-07-08 21:02:23 -07:00
Brad Davis
b173ac397c Merge pull request #5278 from samcake/yellow
Adding more NSight instrumentation
2015-07-08 20:28:18 -07:00
Brad Davis
f2beb79d23 Updating buffer parser to use new heapless API 2015-07-08 18:54:38 -07:00
Brad Davis
49a14e3446 Merge remote-tracking branch 'upstream/master' into entity_parsing 2015-07-08 18:37:41 -07:00
Brad Davis
625cc86f83 Merge pull request #5283 from ZappoMan/optimizeByteCountCoded
Optimize ByteCountCoded<> to not do extra heap allocations
2015-07-08 18:35:02 -07:00
Atlante45
ee3a8b1b6e Clear resource caches instead of restarting 2015-07-08 18:23:16 -07:00
ZappoMan
7790e35d24 added bytes consumed result to decode, and exit early after bytes consumed 2015-07-08 18:19:12 -07:00
Brad Davis
600e9cbf52 Fixing template specialization compilation error on gcc/clang 2015-07-08 18:17:03 -07:00
Seth Alves
7bea4a54a3 Merge pull request #5274 from AndrewMeadows/argon
cleanup of EntityActionInterface and friends
2015-07-08 17:54:52 -07:00
ZappoMan
c0cdf3256c comment and dead code 2015-07-08 17:34:36 -07:00
ZappoMan
e885ac1821 improved performance of ByteCountCoding<> decode 2015-07-08 17:32:51 -07:00
Brad Davis
98e0688e98 Reducing heap allocation in network packet parsing 2015-07-08 17:21:38 -07:00
Niraj Venkat
58f127f299 Fixing names of GL enums 2015-07-08 17:17:31 -07:00
Philip Rosedale
61be0beba1 Merge pull request #5281 from howard-stearns/sword-offset-only-for-mosue
sword-offset-only-for-mouse
2015-07-08 17:13:45 -07:00
Howard Stearns
c8da325213 Fudge the offset so that operates only when using the mouse. 2015-07-08 16:59:54 -07:00
Bing Shearer
ba4049754a Restored indentatioN 2015-07-08 16:53:55 -07:00
Bing Shearer
6080ec4509 Air Hockey UI now follows window border 2015-07-08 16:29:43 -07:00
Bing Shearer
25a1108b61 Fixed spelling error 2015-07-08 16:24:23 -07:00
Niraj Venkat
1894b42773 Added EXT support for Mac GL Query calls 2015-07-08 16:11:36 -07:00
Philip Rosedale
82cad5dab3 Merge pull request #5279 from howard-stearns/sword-toolbar
Sword:
2015-07-08 15:34:48 -07:00
Niraj Venkat
4478d76618 attempt #3 - fixing ubuntu build 2015-07-08 15:28:25 -07:00
Howard Stearns
6813a3afe1 Sword:
+ init hands.
+ toolbar of brandishToggle/makeTarget/cleanup.
+ initial hit flash using overlays instead of ogl "fade".
2015-07-08 15:27:45 -07:00
Niraj Venkat
250d2e9e2c attempt #2 to fix jenkins build error 2015-07-08 15:14:28 -07:00
ZappoMan
6a9344a3f6 fix bug in old version of decode 2015-07-08 15:14:24 -07:00
Sam Gateau
4c44eb63da Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-08 14:25:41 -07:00
Sam Gateau
f992e875b4 Adding intrsumentation for nsight and hiding the nsight specific code in cpp 2015-07-08 14:25:13 -07:00
Niraj Venkat
a6ec668b2e attempt #1 to fix jenkins build error 2015-07-08 14:24:24 -07:00
Niraj Venkat
5ededf7515 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuquery 2015-07-08 13:42:31 -07:00
Atlante45
ed296850e2 Rename to clear cache and restart 2015-07-08 12:24:45 -07:00
Atlante45
39cb5100a3 Clear cache and restart first draft 2015-07-08 12:23:22 -07:00
Philip Rosedale
afdd4c862c Merge pull request #5275 from howard-stearns/sword-button-away-hit-points
Add a button to create/toggle-away sword.
2015-07-08 12:11:51 -07:00