Andrew Meadows
9c5f51917a
declare EntitySimulation::getEntitiesToDelete()
2015-04-29 16:26:46 -07:00
Andrew Meadows
31ab16ac62
move stuff into ObjectMotionState
2015-04-29 16:16:44 -07:00
Andrew Meadows
ab38572620
new PhysicsEngine API is mostly in place
...
doesn't compile, of course
large code movements are done
non-physical kinematics have been lost --
will readd in PhysicalEntitySimuation class
2015-04-29 09:48:02 -07:00
Andrew Meadows
c0a5753317
PhysicalEntitySimulation sends outgoing packets
2015-04-28 17:12:29 -07:00
Andrew Meadows
2f9306ee77
SimpleEntitySimulation abides to new API
2015-04-28 16:28:03 -07:00
Andrew Meadows
14b6ee608a
more PhysicalEntitySimulation implementation
...
with changes to API's accordingly (does not compile yet)
2015-04-28 15:07:37 -07:00
Andrew Meadows
087d0a027d
merge upstream/master into andrew/nova
2015-04-28 10:07:49 -07:00
Andrew Meadows
34974272af
proposal for PhysicsEngine API in Application
2015-04-28 10:06:05 -07:00
Andrew Meadows
304850372e
initial implementation of PhysicalEntitySimulation
2015-04-28 10:05:10 -07:00
Brad Hefta-Gaub
50eecb15b3
Merge pull request #4712 from Atlante45/compound_zones_fix
...
Compound zones fix
2015-04-28 09:48:05 -07:00
Andrew Meadows
e646ff6847
Merge pull request #4708 from ctrlaltdavid/fix-audio-mouth
...
Fix audio-driven mouth viewed by others
2015-04-28 09:28:22 -07:00
Atlante45
ab9d81b5e2
Correct comments
2015-04-28 18:09:09 +02:00
Atlante45
fe0bd456e1
Zones now use Models instead of FBXGeometries
2015-04-28 17:07:40 +02:00
Atlante45
b7263eeacf
Added a more efficient convexHullContains to Model
...
New version computes each submesh's bounding box once and checks against it
before checking against triangles.
2015-04-28 17:05:38 +02:00
Atlante45
4911aa58bc
Fix Model setURL with delayload
...
Without this condition the model stays in a state where the geometry
is downloaded but not referenced
That way, another call to setURL with update the geometry reference
instead of returning.
2015-04-28 17:02:32 +02:00
Clément Brisset
bc8f6708b6
Merge pull request #4698 from ctrlaltdavid/fps-facetracker
...
Facetracker FPS refactor
2015-04-28 14:04:17 +02:00
Brad Davis
f49f37ac89
Merge pull request #4670 from thoys/fix-run_one_interface_per_user
...
Multiple instances of interface on Windows (one per user)
2015-04-28 01:22:21 -07:00
Brad Davis
c685874b05
Merge pull request #4705 from birarda/avatar-mixer-throttling
...
add macro to recursively correctly handle OS X bundle resources
2015-04-28 01:19:36 -07:00
samcake
1acd27db08
Merge pull request #4709 from jherico/resources
...
Removing debug hack to load resources from source folder
2015-04-27 23:42:45 -07:00
Brad Davis
897e47e8e6
Removing debug hack to load resources from source folder
2015-04-27 23:17:56 -07:00
David Rowe
d6eb04c3b0
Fix audio-driven mouth viewed by others
2015-04-27 21:43:57 -07:00
Brad Hefta-Gaub
086abe8468
Merge pull request #4707 from sethalves/dont-rez-if-no-rez-rights
...
don't create entities in local tree if the entity-serer isn't going to accept them.
2015-04-27 20:33:03 -07:00
Seth Alves
6f441e3490
if our Node isn't allowed to create entities in this domain, don't try.
2015-04-27 19:07:53 -07:00
Philip Rosedale
5fad6b97ff
Merge pull request #4706 from ZappoMan/useAvatarCrashFix
...
fix crash in scripts using useAvatar methods
2015-04-27 17:10:10 -07:00
ZappoMan
62a421361c
fix crash in scripts using useAvatar methods
2015-04-27 16:58:34 -07:00
Seth Alves
e48552f243
Merge pull request #4702 from AndrewMeadows/thermonuclear
...
PhysicsEngine cleanup in preparation for colliding avatars
2015-04-27 16:20:27 -07:00
Seth Alves
1fb40652f1
Merge pull request #4699 from jherico/build-notes
...
Updating the build notes to refelect the new Qt version requirement
2015-04-27 16:18:36 -07:00
Stephen Birarda
ec2f54b90a
add a macro to recursively correctly handle resources
2015-04-27 16:02:52 -07:00
Seth Alves
d22ca6a390
Merge pull request #4703 from ZappoMan/rootEntitiesBugFix
...
fix bug in parsing root element data
2015-04-27 15:52:04 -07:00
ZappoMan
1ef58139a4
fix bug in parsing root element data
2015-04-27 15:07:32 -07:00
Andrew Meadows
31e5758422
namechange updateObjectEasy()-->updateBodyEasy()
2015-04-27 13:04:59 -07:00
Andrew Meadows
72deb2e49b
merge upstream/master into andrew/thermonuclear
...
Conflicts:
libraries/entities/src/EntityItem.h
libraries/physics/src/EntityMotionState.cpp
2015-04-27 12:54:21 -07:00
Andrew Meadows
c097a0038a
Merge pull request #4685 from sethalves/detect-ballistic
...
various physics-related experiments
2015-04-27 12:41:50 -07:00
Seth Alves
bdc6bb3c2d
Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic
2015-04-27 12:20:58 -07:00
Seth Alves
2e5049a190
fix bug caused by no-longer reusing a variable
2015-04-27 12:20:01 -07:00
Brad Hefta-Gaub
90c47a6046
Merge pull request #4695 from jherico/ui-refactor
...
New UI library, some bug fixes and features
2015-04-27 11:16:10 -07:00
Seth Alves
e14b4c6ad4
cleanups
2015-04-27 11:01:48 -07:00
Brad Davis
a12bfd95f4
Merge remote-tracking branch 'upstream/master' into ui-refactor
...
Conflicts:
libraries/render-utils/src/MatrixStack.h
2015-04-27 10:59:57 -07:00
Seth Alves
8278f52a79
cleanups
2015-04-27 10:59:51 -07:00
Seth Alves
b23427a3c8
hook up menu-items to control debug rendering of collision hulls and owned simulations
2015-04-27 10:32:47 -07:00
Seth Alves
2cdbe8bf7b
merge from upstream
2015-04-27 09:57:36 -07:00
Seth Alves
e007617112
hook up menu-items to control debug rendering of collision hulls and owned simulations
2015-04-27 09:56:24 -07:00
Brad Davis
c08fde8ecd
Merge pull request #4697 from sethalves/quiet-compiler
...
quiet compiler, remove some trailing control-Ms
2015-04-27 09:26:01 -07:00
Seth Alves
26511575c2
Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic
2015-04-27 06:44:59 -07:00
Brad Davis
3071be162a
Coding standards
2015-04-26 20:11:27 -07:00
Andrew Meadows
e3d29d74af
name changes and preparation for more cleanup
2015-04-26 15:24:30 -07:00
Andrew Meadows
b760a03360
pass arguments by const reference
2015-04-26 15:24:00 -07:00
Brad Davis
2e61b5a933
Coding standards
2015-04-25 16:59:43 -07:00
Brad Davis
0afe8c0e32
Coding standards
2015-04-25 16:46:05 -07:00
Brad Davis
7c16fd05c1
Merge branch 'master' into ui-refactor
2015-04-25 16:35:43 -07:00
