Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 06:06:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25585 commits 76 branches 59 tags 1.2 GiB
Commit graph

8914 commits

Author SHA1 Message Date
ZappoMan
73428ec12d add support to not displace very large clipboards on import 2015-05-11 14:21:58 -07:00
Sam Gateau
f2c4e04a5a clean up for pr 2015-05-11 14:06:10 -07:00
Sam Gateau
45e70c98f8 Fixed the cube map loading issue 2015-05-11 13:43:15 -07:00
Brad Davis
332d2091e5 Fixing license 2015-05-11 13:22:43 -07:00
Brad Hefta-Gaub
aade273b6c Merge pull request #4827 from sethalves/refix-max-octree-pps-2 
fix octree max-packet-per-second setting
 2015-05-11 13:13:00 -07:00
Brad Davis
c0fc0a226b Fixing info-view popup on every launch 2015-05-11 13:10:36 -07:00
Brad Davis
abab54aed8 Working on display plugins 2015-05-11 13:08:53 -07:00
Brad Davis
6a5c7b8b42 Merge remote-tracking branch 'upstream/master' into plugins_pt2 
Conflicts:
	libraries/script-engine/src/MenuItemProperties.cpp
 2015-05-11 12:40:17 -07:00
Brad Davis
1624ca4120 Merge branch 'master' into plugins_pt2 2015-05-11 12:32:49 -07:00
Brad Davis
c12b74ebd0 Merge pull request #4816 from ctrlaltdavid/fix-pragma 
Disable pragma that Windows doesn't know about
 2015-05-11 12:30:54 -07:00
Brad Davis
e5dc3908ba Merge pull request #4825 from Nex-Pro/Non-JSON-Menu-Items-Fix 
Fix for addMenuItem separator boolean
 2015-05-11 12:27:11 -07:00
Seth Alves
ddb907ae5f inline setMaxQueryPacketsPerSecond 2015-05-11 12:15:52 -07:00
Seth Alves
635f49258d formatting 2015-05-11 12:04:31 -07:00
Seth Alves
de9e74a725 put max-octree-pps in Application rather than in the Octree 2015-05-11 12:01:13 -07:00
Howard Stearns
51a29bdba6 Put back the script-fix that belongs in this branch. 2015-05-11 11:53:48 -07:00
Seth Alves
83748096ef max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree 2015-05-11 11:37:53 -07:00
Stephen Birarda
8c6715e4fc resolve conflicts on merge with upstream/master 2015-05-11 11:10:22 -07:00
Nex Pro
fb9ff6e016 In some cases when the addMenuItem function was called the separator boolean was true by default. 
This fix addresses this issue by setting it to false.
 2015-05-11 18:50:54 +01:00
Sam Gateau
72c3270ec6 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-11 10:48:29 -07:00
Sam Gateau
f1fcce3ea0 refactoring th ecube texure loading to support 2 different layouts 2015-05-11 10:47:45 -07:00
Clément Brisset
5160eb5b94 Merge pull request #4819 from ZappoMan/moreZoneProperties 
More Zone Atmosphere Work: add automatic day/hour calculation
 2015-05-11 19:38:27 +02:00
Seth Alves
d86b22f7c8 Merge pull request #4824 from howard-stearns/cache-mod-time 
Cache mod time
 2015-05-11 10:38:23 -07:00
Clément Brisset
421ebeb3d7 Merge pull request #4795 from birarda/sequence-numbers 
add sequence number support to NL, don't double send data from AvatarMixer
 2015-05-11 19:23:33 +02:00
Howard Stearns
57f0d9435d Remove change that doesn't belong in this branch. 2015-05-11 10:17:31 -07:00
Howard Stearns
cdef09c9dd Add comment (and force previous change to the right branch). 2015-05-11 10:12:03 -07:00
Howard Stearns
aed165809c Use resource cache as long as it is no older than network resource. 
This allows chache to be used when cdn provides different values for get-vs-head, or for cdn with different resource times in different requests of different sessions.
 2015-05-11 10:01:49 -07:00
Howard Stearns
17e3f3b48d Merge branch 'master' of https://github.com/highfidelity/hifi into inline-entity-scripts 2015-05-11 09:35:31 -07:00
David Rowe
662f07a921 Better #if condition for clang 2015-05-11 09:31:12 -07:00
Clément Brisset
d2046c0685 Merge pull request #4821 from sethalves/fix-http-cache 
Fix http cache
 2015-05-11 18:19:00 +02:00
Atlante45
e51040db53 CR 2015-05-11 14:31:22 +02:00
Atlante45
f941ca9601 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_wireframe 2015-05-11 14:20:16 +02:00
Brad Hefta-Gaub
b572c13660 Merge pull request #4817 from sethalves/fix-octree-max-pps 
undo mistaken change of setting name
 2015-05-10 21:26:46 -07:00
Sam Gateau
9c27106435 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-10 18:04:53 -07:00
Seth Alves
e6023c59c1 if _reply is NULL, it doesn't make sense to worry about if it's finished loading or not. 2015-05-10 17:15:48 -07:00
Anthony J. Thibault
ede42285b1 Improvements to particle entity. 
* Changed particle geometry to billboarded quads
* Added texture support
* Added ajt-test.js particle test script.
* GeometryCache support for batched quads with texCoords.
* Bug fix for infinite loop if _lifetime was very large.
* Don't reset the simulation on animation loop.
* stop emitting particles on animation stop, but keep simulating until there are no more living particles.
* Removed some trailing whitespace
 2015-05-10 17:13:46 -07:00
Seth Alves
68e01d2bd9 quiet compiler 2015-05-10 17:03:42 -07:00
ZappoMan
17c3c1a18d add support for automatic hour/day calculations and backward compatibility on stage properties 2015-05-10 15:22:02 -07:00
Seth Alves
34deba7fff undo mistaken change of setting name 2015-05-09 17:59:45 -07:00
David Rowe
70f7329a7e Disable pragma that Windows doesn't know about 2015-05-09 17:59:10 -07:00
Howard Stearns
6337158cfc Fix "simple inline/"direct code injection" entity scripts fail to load" (https://app.asana.com/0/32622044445063/33562012389754) 2015-05-09 13:34:35 -07:00
Howard Stearns
c0a71da9e3 Handle empty face groups, such as in the rama cyclinder that crashed the Friday meeting (http://headache.hungry.com/~seth/hifi/stickCollisionModel.obj). 2015-05-09 13:16:34 -07:00
Sam Gateau
23ef568269 fixing file 2015-05-09 11:48:30 -07:00
Sam Gateau
d51904b7b3 fixing file 2015-05-09 11:43:21 -07:00
Sam Gateau
5a11143a5d Using the skybox cubemap for ambient lighting 2015-05-09 11:40:46 -07:00
ZappoMan
0b6a815a20 moved zone stage properties into a group 2015-05-08 20:17:01 -07:00
Stephen Birarda
ebeba81233 make sure an ACM asks for PID in log 2015-05-08 17:37:48 -07:00
Philip Rosedale
72e1ea688a Merge pull request #4808 from ZappoMan/moreZoneProperties 
add has stars to edit.js & fix background mode: nothing bug
 2015-05-08 17:10:45 -07:00
Stephen Birarda
acac2f5a22 don't init if Settings not init 2015-05-08 16:51:27 -07:00
Stephen Birarda
ddb52348bc don't force use of Settings to all QCoreApplication 2015-05-08 16:24:39 -07:00
Brad Hefta-Gaub
5bab226d64 Merge pull request #4811 from AndrewMeadows/isothermal 
remove verbose log about failure to build shape
 2015-05-08 15:55:16 -07:00
Brad Hefta-Gaub
bfb2b278ee Merge pull request #4791 from jherico/scale 
Fixing scale resolution issues
 2015-05-08 15:54:24 -07:00
Stephen Birarda
78942b0a87 let QSettings destructor call Setting::Manager sync 2015-05-08 15:49:28 -07:00
Andrew Meadows
e89471e7d6 enable non-moving update when obj is active 2015-05-08 15:41:00 -07:00
Andrew Meadows
289dcb0e7f only set ACTIVATE flag on non-zero velocity 2015-05-08 15:39:45 -07:00
Stephen Birarda
637600697b remove ScriptEngine stop completion debug 2015-05-08 15:35:48 -07:00
Stephen Birarda
8359a1a492 add debug for completion of Agent script-engine stop 2015-05-08 15:30:11 -07:00
Bradley Austin Davis
03bd17ed49 Rebasing onto scale changes 2015-05-08 15:09:46 -07:00
Bradley Austin Davis
0751443a01 Merge branch 'master' into scale 2015-05-08 15:03:24 -07:00
Stephen Birarda
897ed84cca remove debug calls used to find ACApp stall 2015-05-08 14:56:49 -07:00
Stephen Birarda
0a295bada1 add debugging to catch AC kill hang 2015-05-08 14:32:16 -07:00
Andrew Meadows
a2ffc1029b clear MotionState pointer in body on delete 2015-05-08 14:18:44 -07:00
Andrew Meadows
603afefaab silence verbose no-very-helpful log message 2015-05-08 14:16:38 -07:00
ZappoMan
1936f4c114 fix zone:nothing bug 2015-05-08 14:03:58 -07:00
Stephen Birarda
99a9f2df90 don't allow an AC monitor to take over other local ACs 2015-05-08 14:02:19 -07:00
Stephen Birarda
3d06a86670 drop packets on floor when shutting down 2015-05-08 11:57:25 -07:00
Philip Rosedale
671a38beee Merge pull request #4804 from AndrewMeadows/nova 
fix for physics wakeup when moving camera view
 2015-05-08 11:11:26 -07:00
Stephen Birarda
be58347aec consider assignment completed when worker thread is gone 2015-05-08 10:40:04 -07:00
Stephen Birarda
0f71e93c7f ensure no new OST creation on OctreeServer shutdown 2015-05-08 10:12:14 -07:00
ZappoMan
e8f43c7f4b set default atmosphere properties to match the default atmosphere 2015-05-08 10:03:24 -07:00
Andrew Meadows
ada48bcb70 fix for glitchy physics updates 2015-05-08 09:06:31 -07:00
Brad Hefta-Gaub
47630e9a0e Merge pull request #4798 from samcake/blue 
Add the loading of cube map and the rendering of skybox but broken
 2015-05-08 08:13:39 -07:00
Clément Brisset
55bcb992d9 Merge pull request #4796 from sethalves/fix-octree-max-pps 
Fix octree max pps
 2015-05-08 16:28:42 +02:00
Atlante45
52397bf87a Fix wireframe render for meshes with special properties 2015-05-08 15:59:39 +02:00
Seth Alves
a775c1fb98 Merge pull request #4792 from howard-stearns/objReader-tweak 
Obj reader tweak
 2015-05-07 18:39:37 -07:00
Sam Gateau
deb303838d Cleaning code 2015-05-07 17:15:45 -07:00
Sam Gateau
351b92627a Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-07 17:06:41 -07:00
Sam Gateau
ce5295a55f THese is not final but we have a basic working framework so let's try to share 2015-05-07 17:06:15 -07:00
Stephen Birarda
a3ce02181e fix ThreadedAssignment setFinished debug 2015-05-07 17:06:09 -07:00
Stephen Birarda
d75d204ff6 standardize cleanup of ThreadedAssignments 2015-05-07 17:03:43 -07:00
Howard Stearns
8db8e56af0 Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak 2015-05-07 16:41:52 -07:00
Seth Alves
20f138989c Merge branch 'master' of github.com:highfidelity/hifi into fix-octree-max-pps 2015-05-07 16:01:23 -07:00
Seth Alves
8c3a57566b fix name of settings key for max octree pps 2015-05-07 16:00:30 -07:00
Stephen Birarda
305835ea79 Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers 2015-05-07 15:38:35 -07:00
Stephen Birarda
bfccf02912 use lamdbas for linkedDataCreateCallback 2015-05-07 15:37:02 -07:00
Andrew Meadows
e7e4d80be5 always remove from _pendingAdds just in case 2015-05-07 15:22:58 -07:00
Andrew Meadows
1879a67804 cleanup 2015-05-07 14:42:09 -07:00
Philip Rosedale
b7b62c8d42 Merge pull request #4772 from AndrewMeadows/nova 
PhysicsEngine cleanup in preparation for collidable avatars
 2015-05-07 14:33:35 -07:00
Stephen Birarda
e3acf861ff fix for unverified datagram writes 2015-05-07 14:07:14 -07:00
Seth Alves
0347af9682 minor cleanup 2015-05-07 14:03:50 -07:00
Sam Gateau
72e01a7929 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-07 13:49:48 -07:00
ZappoMan
20fe43c852 wire up new zone properties, fix bug in group proprties decode 2015-05-07 13:05:00 -07:00
Howard Stearns
aad4c06244 Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak 2015-05-07 12:03:56 -07:00
Bradley Austin Davis
c31d36be59 Fixing scale resolution issues 2015-05-07 12:01:56 -07:00
Seth Alves
f52747d8c1 re-enable code that ignores old packets 2015-05-07 11:53:57 -07:00
Sam Gateau
54c47fe3f9 merging 2015-05-07 11:35:58 -07:00
Seth Alves
d52a45b57e Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-07 11:30:46 -07:00
Andrew Meadows
f0618501dd fix non-physical kinematic motion 
also can set objects collisionless again
 2015-05-07 11:29:42 -07:00
Sam Gateau
653d2e72b1 Skybox kind of working 2015-05-07 11:23:11 -07:00
Atlante45
591548dc38 Missing comma 2015-05-07 20:15:40 +02:00
Atlante45
faabf29e84 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 19:58:26 +02:00
Howard Stearns
9acdb3fb28 Proper defaults for material properties and a fail-safe for missing uv coordinates. 2015-05-07 10:47:50 -07:00
Clément Brisset
345875d0c4 Merge pull request #4775 from ZappoMan/skyboxPropertiesInZones 
added skybox group properties to zones, wired up color to the actual skybox rendering
 2015-05-07 19:35:33 +02:00
Andrew Meadows
47f978b86e merge 2015-05-07 10:31:27 -07:00
Andrew Meadows
070140440d fix crash bug when invalid entity ptr accessed 2015-05-07 10:30:22 -07:00
Andrew Meadows
fe5cfdf495 fix crash bug 
when obj deleted but dangling pointer still on _pendingAdd
which would not be removed during getObjectsToDelete()
because backpointers had been disconnected
 2015-05-07 10:28:38 -07:00
Seth Alves
867fe18472 put some code back now that entity-server is doing simple simulation again. don't draw blue physics-enabled dot unless debug menu-item is checked 2015-05-07 10:11:36 -07:00
Seth Alves
ddec6d5207 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-07 09:54:09 -07:00
Seth Alves
fe14202f51 add getName passthrough to ObjecdtMotionState, don't compute model shapes until the model has been simulated 2015-05-07 09:53:39 -07:00
Atlante45
cafaeed822 Restore polygon mode after entities rendering 
Default setting are causing issues so we just reset the polygon mode
since this won't matter once everything has moved to the new rendering
pipeline.
 2015-05-07 13:34:22 +02:00
Atlante45
366964e424 Fix static initialisation fiasco 2015-05-07 13:00:56 +02:00
Atlante45
721eeccce2 Restaure GL to default after we render a batch 2015-05-07 12:01:22 +02:00
Atlante45
00571dad00 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-07 10:13:59 +02:00
Sam Gateau
bba7dcfe5f Try to fix the transform stack issue in 1st person 2015-05-06 23:32:02 -07:00
ZappoMan
496da6fcd5 wire up the skybox color property to the new skybox renderer 2015-05-06 20:36:06 -07:00
Seth Alves
fabff7fdf4 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-06 18:26:00 -07:00
ZappoMan
af2c3d91cf Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones 2015-05-06 18:05:54 -07:00
Andrew Meadows
00c6944125 merge 2015-05-06 17:49:18 -07:00
Andrew Meadows
411bf1a35c fix for entity-server kinematic simulation 2015-05-06 17:48:10 -07:00
Seth Alves
5ac8558168 flash yellow box when transmitting an edit packet 2015-05-06 17:03:27 -07:00
Seth Alves
cc5f2ee451 in isMovingVsServer look at entity velocity only 2015-05-06 16:26:27 -07:00
Seth Alves
ba6f6d19cc disable updateServerPhysicsVariables 2015-05-06 16:20:16 -07:00
Seth Alves
630f1ce9d9 isMovingVsServer function 2015-05-06 16:13:07 -07:00
Bradley Austin Davis
3b8108e887 Fix inverted icons 2015-05-06 16:09:17 -07:00
Seth Alves
e73503a53d Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1 2015-05-06 16:05:13 -07:00
Seth Alves
b0ccabe38e update a motionstate's idea of what the entity-server thinks when an incoming update packet arrives 2015-05-06 16:05:05 -07:00
Andrew Meadows
452e84d43f only update physics when proper flags are set 2015-05-06 16:02:03 -07:00
Andrew Meadows
7b1886a285 harvest outgoing changes for non-NULL entities 2015-05-06 16:01:25 -07:00
Seth Alves
c63b8a93ec oops fix endless loop 2015-05-06 15:48:45 -07:00
Seth Alves
4c3cbea261 don't auto-remove simulation owner unless the Node is gone. put back code that causes interfaces to give up ownership 2015-05-06 15:32:02 -07:00
Stephen Birarda
e540a6dbb3 fix packet sequence number unmarshal 2015-05-06 14:48:10 -07:00
Seth Alves
a057d7dfa3 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-06 14:41:54 -07:00
ZappoMan
b7dfbd103a Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones 2015-05-06 14:41:53 -07:00
Brad Hefta-Gaub
5551997cdc Merge pull request #4780 from samcake/blue 
Add support for Skybox and rendering path of background according to Zones
 2015-05-06 14:41:06 -07:00
Seth Alves
fe06ce2931 pull from upstream 2015-05-06 14:31:22 -07:00
Seth Alves
86ec12b22c don't increase moving-without-simulator counter unless the thing is moving enough 2015-05-06 14:30:45 -07:00
Seth Alves
719747ee2d Merge pull request #4725 from howard-stearns/objReader 
Textures for .obj reader:
 2015-05-06 14:30:29 -07:00
Stephen Birarda
ff676958e8 fix hash replacement in PacketHeaders 2015-05-06 14:24:11 -07:00
Sam Gateau
8fd77f964c Fix include filke case for ubuntu... 2015-05-06 14:23:42 -07:00
Seth Alves
fe308c0189 only do infection during collisions if one of the objects is being simulated by this interface 2015-05-06 13:50:14 -07:00
Seth Alves
96a44314c9 don't have interface give up ownership 2015-05-06 13:29:54 -07:00
Sam Gateau
00c45dbb43 missing includes 2015-05-06 12:38:12 -07:00
Howard Stearns
35337ef2c2 Spell out order-of-evaluation for the compiler. 2015-05-06 12:28:45 -07:00
Sam Gateau
0fbccf1d33 get ready for PR, SKY_DOME by default 2015-05-06 12:22:19 -07:00
Sam Gateau
1b5185abeb fix the conditional on the texture pointer which was wrong and bring back atmosphere sky dome 2015-05-06 12:19:19 -07:00
Seth Alves
a72ac3ead2 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-06 12:19:04 -07:00
Bradley Austin Davis
ea6f840fdb Merge remote-tracking branch 'upstream/master' into plugins_pt1 2015-05-06 12:18:04 -07:00
samcake
06e1330e42 Clean up the includes in gpu, make the skybox shader works 2015-05-06 12:12:54 -07:00
Brad Hefta-Gaub
4de6d645e5 Merge pull request #4701 from jherico/infoview 
Infoviews & Browser in QML
 2015-05-06 12:12:21 -07:00
Brad Davis
a9de502e76 removing commented out old implementation. 2015-05-06 12:03:47 -07:00
Howard Stearns
d2dbb2c116 Missing the code! 2015-05-06 11:57:34 -07:00
Stephen Birarda
c5e189bbf2 use new PacketHeaders calls from LimitedNodeList 2015-05-06 11:52:03 -07:00
Andrew Meadows
326d17072e merge seth/dice-on-table-1 into andrew/nova 2015-05-06 11:50:12 -07:00
Andrew Meadows
c97b11a6e9 no ownership of kinematic objects on collision 2015-05-06 11:48:31 -07:00
Andrew Meadows
6e6fec158d split ignore/activation thresholds for updates 2015-05-06 11:47:33 -07:00
Andrew Meadows
f0c778a802 fix bug preventing taking of simulation ownership 2015-05-06 11:46:42 -07:00
Andrew Meadows
646661d037 update body gravity when proper dirty bits are set 2015-05-06 11:46:25 -07:00
Bradley Austin Davis
fc73676b4d Merge branch 'master' into plugins_pt1 2015-05-06 11:43:25 -07:00
Stephen Birarda
ba9ed12415 store last sequence number sent with data 2015-05-06 11:35:34 -07:00
Stephen Birarda
e2986f5702 add get seq num, cleanup PacketHeaders methods 2015-05-06 11:34:58 -07:00
ZappoMan
f2ebb6e821 fix output of group names to be lowercase 2015-05-06 11:30:41 -07:00
Seth Alves
f75eef4295 Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1 2015-05-06 11:20:45 -07:00
Seth Alves
129a3a82da clear incoming flags after adding an entity to simulation. If an entity has a shape-type of none, don't keep asking it for a shape 2015-05-06 11:20:39 -07:00
Andrew Meadows
e61470517c track all entities added to simulation 2015-05-06 11:01:16 -07:00
samcake
50012ee9de fixing build issues on MAc 2015-05-06 11:00:37 -07:00
Stephen Birarda
b0c7af1714 store last seq for node/packet type combo 2015-05-06 10:41:41 -07:00
Sam Gateau
fe3b5d1867 preparing for PR, back to the default background mode SKy_DOME 2015-05-06 10:27:31 -07:00
Stephen Birarda
5b1514a390 Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers 2015-05-06 10:12:17 -07:00
Sam Gateau
c86a8b3944 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2015-05-06 09:54:08 -07:00
Sam Gateau
dc81a3ecc2 Cube texture are working with the GL backend, useing it in SKybox successfullly 2015-05-06 09:53:36 -07:00
Atlante45
8de5e636bb Bit of cleanup 2015-05-06 17:39:18 +02:00
Atlante45
50ba154615 Correctly wire setDrawZones 2015-05-06 17:04:01 +02:00
Atlante45
52191f922c Render Sphere/Box zones 2015-05-06 16:57:53 +02:00
Atlante45
6d2fe945af Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-06 09:53:57 +02:00
Andrew Meadows
14f925b48e merge seth/dice-on-table-1 into andrew/nova 
Conflicts:
	libraries/physics/src/EntityMotionState.cpp
	libraries/physics/src/ObjectMotionState.h
 2015-05-05 16:54:53 -07:00
Andrew Meadows
50f73602f6 cleanup PhysicalEntitySimulation::_outgoingChanges 2015-05-05 16:51:07 -07:00
Andrew Meadows
d4701b4310 namechange getIncomingDF --> getAndClearIncomingDF 2015-05-05 16:49:41 -07:00
Andrew Meadows
550820ee45 set EntityItem::_simulated in the correct location 2015-05-05 16:48:56 -07:00
Seth Alves
4a7fe50084 Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1 2015-05-05 16:43:43 -07:00
Seth Alves
c35edd8eb4 some debugging on Andrew's refactor 2015-05-05 16:40:10 -07:00
Seth Alves
c9f97b9d42 Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1 2015-05-05 15:50:24 -07:00
Andrew Meadows
2668ff6d0a check for DIRTY_ROTATION bit when copying rotation 2015-05-05 15:34:50 -07:00
Andrew Meadows
8523a96e2b implement setShouldClaimSimulationOwnership() 2015-05-05 15:34:26 -07:00
Howard Stearns
4090f892b2 Merge remote-tracking branch 'upstream/master' into objReader 2015-05-05 14:58:18 -07:00
ZappoMan
0cb14650b6 added skybox group properties to zones 2015-05-05 14:12:02 -07:00
Atlante45
8b2442ce6e clear list after loop 2015-05-05 22:56:37 +02:00
Seth Alves
82828f0b93 print when bullet and local octree don't agree on position of an entity 2015-05-05 13:52:10 -07:00
Atlante45
863280300e Fix pickMeshList incorrect arguments 2015-05-05 22:37:00 +02:00
Seth Alves
1cd93b9ec8 pull andrew's branch, add back in visual indicator of an entity being active in bullet 2015-05-05 13:14:22 -07:00
Seth Alves
8aafce6382 Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1 2015-05-05 12:53:28 -07:00
Atlante45
73b7530ec6 Add wireframe pipelines 2015-05-05 21:50:06 +02:00
Stephen Birarda
a481c57315 fix for writeDatagram with hash and sequence number 2015-05-05 12:44:47 -07:00
ZappoMan
5fc5df7c55 change skyboxMode to backgroundMode 2015-05-05 12:38:44 -07:00
Atlante45
429c1e1231 Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones 2015-05-05 21:33:55 +02:00
Stephen Birarda
6b3cf1ba4a remove dependency of PacketHeaders on NodeList 2015-05-05 12:19:42 -07:00
Sam Gateau
b1fb05e543 merge 2015-05-05 12:04:30 -07:00
Sam Gateau
13482575d2 merge 2015-05-05 12:03:45 -07:00
Sam Gateau
6d02d4d25e adding skybox step by step 2015-05-05 11:40:00 -07:00
samcake
61f6139f4f Merge pull request #4764 from ZappoMan/atmosphereInZones 
First cut at adding "Atmosphere" support to zone
 2015-05-05 11:00:58 -07:00
Stephen Birarda
c76ae56d64 allow optional sequence numbers in packets 2015-05-05 11:00:27 -07:00
Andrew Meadows
813d702fc5 fix infinite loop in while 2015-05-05 11:00:25 -07:00