Brad Davis
446f800aee
More profiling ranges and updated performance testing scripts
2015-07-09 15:43:30 -07:00
Philip Rosedale
cac239ad88
Merge pull request #5291 from ZappoMan/waitToSendAllEdits
...
Allow Assignment Client scripts to do edits in their shutdown handler
2015-07-09 15:42:31 -07:00
Brad Hefta-Gaub
f0a1bc15a9
Merge pull request #5286 from samcake/daft
...
Migrating the rendering openGL calls from DeferredLightingEffect to gpu::Batch
2015-07-09 15:23:45 -07:00
Brad Hefta-Gaub
81c74dda1f
Merge pull request #5289 from jherico/marge
...
Improve batched font rendering smoothing
2015-07-09 15:09:07 -07:00
samcake
1f13106f51
FIxed the issue on mac due to the abs function not correctly executing
2015-07-09 15:05:03 -07:00
ZappoMan
a8a4c99529
on script shutdown, wait to process all pending edit messages before ending the script engine
2015-07-09 15:01:16 -07:00
Brad Davis
06563264e2
Improve batched font rendering smoothing
2015-07-09 14:34:33 -07:00
Philip Rosedale
c4911dbbd4
Merge pull request #5288 from AndrewMeadows/arsenic
...
fix ObjectActionOffset logic
2015-07-09 12:22:23 -07:00
Brad Hefta-Gaub
489a8b4b3d
Merge pull request #5285 from jherico/homer
...
Move log file writing to a separate thread
2015-07-09 12:22:13 -07:00
Andrew Meadows
55207a8fb1
enforce coding standards
2015-07-09 11:59:28 -07:00
Andrew Meadows
ccf14b2e50
fix syntax error typo
2015-07-09 11:43:57 -07:00
Andrew Meadows
612e9649d8
fix update logic of ObjectActionOffset
2015-07-09 11:35:54 -07:00
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
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
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
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
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
Philip Rosedale
82cad5dab3
Merge pull request #5279 from howard-stearns/sword-toolbar
...
Sword:
2015-07-08 15:34:48 -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
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
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
