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 #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
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
Seth Alves
08d63b7fd8
first attempt at palm rotation
2015-07-09 11:03:02 -07:00
Philip Rosedale
542a5f100a
Merge pull request #5280 from BingShearer/airhockey
...
Air Hockey UI Fix
2015-07-09 10:04:21 -07:00
Brad Davis
2fff560ff9
Fixing log file viewer
2015-07-09 09:54:35 -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
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
Howard Stearns
ef4620cabb
Add a button to create/toggle-away sword.
...
When brandished, display hit points (in overlay for this user).
2015-07-08 11:52:37 -07:00
Philip Rosedale
49baa711eb
Merge pull request #5273 from cozza13/20609
...
CR for Job #20609 - Remove lobby.js from default scripts
2015-07-08 11:42:11 -07:00
Philip Rosedale
574758eae9
Merge pull request #5252 from ctrlaltdavid/20601
...
DO NOT MERGE - QA for #20601 - Fix and improve eye gaze
2015-07-08 11:37:40 -07:00
Andrew Meadows
58c32dbf20
remove whitespace from end of lines
2015-07-08 11:30:04 -07:00
Chris Collins
16e79cc85f
Remove lobby.js from the default scripts
...
Lobby.js has some bugs that are not going to be fixed in the short
term. Therefore we are removing it from default scripts.
2015-07-08 11:17:03 -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
30dd9728eb
Merge pull request #5271 from howard-stearns/fight-club-scripts
...
Baseline versions of the scripts we've been handing around for fight-club.
2015-07-07 16:13:07 -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
Andrew Meadows
e4ec049f50
Merge pull request #5265 from jherico/oglplus
...
Updating oglplus version and switching to url based dist
2015-07-07 15:49:36 -07:00
