Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 17:35:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
27629 commits 71 branches 56 tags 1.2 GiB
Commit graph

27629 commits

Author SHA1 Message Date
Brad Hefta-Gaub
af20969eb9 Merge pull request from jherico/lisa 
Restore audio scope
 2015-07-09 19:03:29 -07:00
Brad Hefta-Gaub
74ef91550c Merge pull request from venkatn93/master 
Entities are now added/removed from rendering based on Scene.shouldRenderEntities
 2015-07-09 18:54:06 -07:00
Brad Davis
cf7f3336d0 Merge pull request from samcake/daft 
Remove unecessary dependencies in DeferredLightingEffect
 2015-07-09 17:51:26 -07:00
Brad Davis
a92a7980d7 Restore audio scope 2015-07-09 17:49:25 -07:00
Andrew Meadows
270ea7af9e Merge pull request from sethalves/palm-rotation 
action changes to allow "hold" action to track palm rotation
 2015-07-09 17:44:28 -07:00
Niraj Venkat
007d662db1 Re-added for shouldRenderEntities 2015-07-09 17:40:14 -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
Seth Alves
d0d0b2a143 Merge pull request from birarda/master 
potential fix for windows domain connect cycling
 2015-07-09 17:04:06 -07:00
Niraj Venkat
bd91daf712 Removing debug code 2015-07-09 16:27:23 -07:00
Niraj Venkat
adf5b95835 Changing formatting 2015-07-09 16:25:29 -07:00
Niraj Venkat
52095fd38d Fixing merge 2015-07-09 16:23:40 -07:00
Niraj Venkat
1dce5f80cc Entities are now added/removed from rendering based on Scene.shouldRenderEntities 2015-07-09 16:17:58 -07:00
Stephen Birarda
efb89c281f fix creation of QTimer parented by NodeList 2015-07-09 16:02:29 -07:00
Stephen Birarda
a4f1145f06 fix QTimer connection to nodeList 2015-07-09 16:01:41 -07:00
Stephen Birarda
408ecb9735 move domain server check in timer to node thread 2015-07-09 15:59:32 -07:00
Philip Rosedale
cac239ad88 Merge pull request from ZappoMan/waitToSendAllEdits 
Allow Assignment Client scripts to do edits in their shutdown handler
 2015-07-09 15:42:31 -07:00
Seth Alves
fa06f50841 fix header comment 2015-07-09 15:34:03 -07:00
Sam Gateau
e14f10ed0f Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-09 15:29:17 -07:00
Brad Hefta-Gaub
f0a1bc15a9 Merge pull request 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 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
Seth Alves
5312beeaf4 if an action changes its own arguments, cause reserialisation 2015-07-09 14:50:31 -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
Seth Alves
050c472d6a Merge branch 'master' of github.com:highfidelity/hifi into palm-rotation 2015-07-09 13:39:37 -07:00
Philip Rosedale
c4911dbbd4 Merge pull request from AndrewMeadows/arsenic 
fix ObjectActionOffset logic
 2015-07-09 12:22:23 -07:00
Brad Hefta-Gaub
489a8b4b3d Merge pull request from jherico/homer 
Move log file writing to a separate thread
 2015-07-09 12:22:13 -07:00
Seth Alves
d197bf2a85 use palm rotation data in hold action 2015-07-09 12:18:32 -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
Seth Alves
08d63b7fd8 first attempt at palm rotation 2015-07-09 11:03:02 -07:00
Philip Rosedale
542a5f100a Merge pull request 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 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