Atlante45
49993695a5
Made geometry refresh safe
2015-07-10 15:20:19 -07:00
Brad Davis
2ce8dba819
Removing heap allocation from property flag parsing, adding some manual tests
2015-07-10 15:08:10 -07:00
Brad Davis
200cbd7e8d
Merge pull request #5303 from ZappoMan/animationGlitch
...
fix motor proteins in cell science
2015-07-10 12:59:50 -07:00
ZappoMan
1dd40af162
fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change
2015-07-10 12:43:35 -07:00
Atlante45
5cfa1605df
Made Texture safe with resource refresh
2015-07-10 12:28:06 -07:00
Andrew Meadows
294c1ba367
always serialize ACTION_TYPE_SPRING
2015-07-10 12:25:11 -07:00
Andrew Meadows
56f00a526d
cleanup of ObjectActionSpring
2015-07-10 12:25:11 -07:00
Andrew Meadows
90ae1fea8b
handle case where action params are missing
2015-07-10 12:25:11 -07:00
Andrew Meadows
71440dfbc5
add checks for NaN
2015-07-10 12:25:11 -07:00
Atlante45
6c591131ba
Made Animations safe for resource reload
2015-07-10 12:01:51 -07:00
Sam Gateau
6c04e6d382
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-10 11:59:31 -07:00
samcake
014802fd45
Merge pull request #5277 from venkatn93/gpuquery
...
GPU Query infrastructure
2015-07-10 11:59:08 -07:00
Niraj Venkat
2e5fd04d9e
Fix to get build working on Linux
2015-07-10 11:27:34 -07:00
Sam Gateau
2c05349b06
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-10 11:10:07 -07:00
Sam Gateau
7fc9fd97ff
Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.
2015-07-10 11:03:12 -07:00
Atlante45
4702b39130
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-10 10:56:11 -07:00
Brad Hefta-Gaub
89231adc19
Merge pull request #5299 from jherico/homer
...
Performance optimizations in transform buffers and geometry cache
2015-07-09 19:16:15 -07:00
Brad Hefta-Gaub
74ef91550c
Merge pull request #5296 from venkatn93/master
...
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
2015-07-09 18:54:06 -07:00
Atlante45
90edf055f7
Clear unused resources before refresh
2015-07-09 18:00:07 -07:00
Brad Davis
6c5d7b8789
Performance optimizations in transform buffers and geometry cache
2015-07-09 17:53:26 -07:00
Brad Davis
cf7f3336d0
Merge pull request #5297 from samcake/daft
...
Remove unecessary dependencies in DeferredLightingEffect
2015-07-09 17:51:26 -07:00
Andrew Meadows
270ea7af9e
Merge pull request #5292 from sethalves/palm-rotation
...
action changes to allow "hold" action to track palm rotation
2015-07-09 17:44:28 -07:00
Sam Gateau
11f2d74030
Simple cleaning to remove dependancies on the viewStateInterface in the deferredLightingEffect
2015-07-09 17:33:25 -07:00
Niraj Venkat
706f85e4ce
Fixes to comply with coding standard
2015-07-09 17:31:38 -07:00
Seth Alves
bf6fce4e45
remove unneeded const
2015-07-09 17:05:15 -07:00
Atlante45
bfeb095fb4
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
2015-07-09 16:30:56 -07:00
Niraj Venkat
bd91daf712
Removing debug code
2015-07-09 16:27:23 -07:00
Niraj Venkat
1dce5f80cc
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
2015-07-09 16:17:58 -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
Seth Alves
2dc4922da3
bring over code from entity-level-locking branch
2015-07-09 15:23:05 -07:00
Sam Gateau
8c178d03df
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-09 15:16:52 -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
Seth Alves
a01fb6f1dc
if an action changes its own arguments, cause reserialisation
2015-07-09 14:32:34 -07:00
Seth Alves
85f206d49d
if an action is updating its own arguments, cause updates to go out over network
2015-07-09 14:13:01 -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
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
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
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
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
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
Niraj Venkat
4478d76618
attempt #3 - fixing ubuntu build
2015-07-08 15:28:25 -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
Andrew Meadows
58c32dbf20
remove whitespace from end of lines
2015-07-08 11:30:04 -07:00
Niraj Venkat
d2af313adf
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuquery
2015-07-08 10:01:47 -07:00
Niraj Venkat
7e59be6196
First take oon the query for the gpu
2015-07-08 10:00:58 -07:00
Andrew Meadows
a0a1b01ea9
coalesce dupe action data members: _id and _type
2015-07-07 17:50:08 -07:00
Andrew Meadows
e9df8cacc7
make some arguments const, cleanup some #includes
2015-07-07 17:50:08 -07:00
Andrew Meadows
77bd7b2821
some ObjectAction methods should be const
2015-07-07 17:50:08 -07:00
Andrew Meadows
f1b505d46b
Merge pull request #5266 from howard-stearns/expose-avatar-collisions-to-scripts
...
Expose avatar collisions to scripts, ...
2015-07-07 16:12:18 -07:00
ZappoMan
20a9227070
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
2015-07-07 13:16:42 -07:00
Howard Stearns
1c2972bd7c
Expose avatar collisions to scripts, and include velocityChange in exposed collision data.
2015-07-07 11:49:55 -07:00
samcake
5557dc4da2
clean and release the new deferredLIghtingEffect
2015-07-07 10:00:05 -07:00
ZappoMan
a59fd44014
quiet some log spam
2015-07-07 09:04:20 -07:00
Atlante45
687f9dda4a
Restore old offset behaviors
2015-07-06 18:21:17 -07:00
Atlante45
541d9ae431
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard
2015-07-06 18:05:43 -07:00
Brad Davis
bd938d5f4c
Merge pull request #5263 from ZappoMan/inBoundStats
...
Additional inbound entity stats
2015-07-06 17:12:19 -07:00
ZappoMan
05f28064bf
add stats for PPS for inbound from network into OctreePacketProcessor and processing out of OctreePacketProcessor
2015-07-06 16:03:42 -07:00
samcake
c090bd0bd7
Merge branch 'yellow' of https://github.com/samcake/hifi into daft
2015-07-06 15:46:21 -07:00
samcake
9649fe45e4
fix a bad paintRainbow function in the shader...
2015-07-06 15:45:26 -07:00
Sam Gateau
fe633cd545
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-06 15:04:02 -07:00
samcake
a2f6693bd7
getting the deferred lighting to work
2015-07-06 14:40:10 -07:00
Sam Gateau
4d48b98364
For a fistfull of magic numbers
2015-07-06 14:22:09 -07:00
Sam Gateau
95f5b14d45
CLenaing the interface of Item::Status to be more explicit and removing magic numbers
2015-07-06 12:47:35 -07:00
Sam Gateau
e63be58251
CLenaing the interface of Item::Status to be more explicit
2015-07-06 12:23:57 -07:00
Sam Gateau
2bbffff22f
Fixing typos
2015-07-06 10:22:25 -07:00
samcake
76e661f88d
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-05 12:08:56 -07:00
