Seth Alves
|
9b37b83eb6
|
Merge pull request #5320 from AndrewMeadows/barium
fix grab.js when using the spring action
|
2015-07-14 11:02:42 -07:00 |
|
Seth Alves
|
3394c50499
|
Merge pull request #5319 from howard-stearns/sword-update-2
Update sword script for current controller/physics behavior.
|
2015-07-14 10:59:41 -07:00 |
|
Brad Hefta-Gaub
|
f88163b99c
|
Merge pull request #5314 from jherico/homer
Qt 5.5 fixes
|
2015-07-14 10:35:12 -07:00 |
|
Brad Hefta-Gaub
|
049419cec7
|
Merge pull request #5307 from howard-stearns/remove-octreeFades
Remove old octreeFade code that wasn't working anyway
|
2015-07-14 10:24:01 -07:00 |
|
Brad Davis
|
1c8ec3b1c9
|
preventing unused warnings
|
2015-07-14 10:16:06 -07:00 |
|
Howard Stearns
|
5196648b22
|
Remove obsolete enum member.
|
2015-07-14 09:57:19 -07:00 |
|
Howard Stearns
|
c49851cf03
|
Update sword script for current controller/physics behavior.
|
2015-07-14 09:33:08 -07:00 |
|
Andrew Meadows
|
69db9aa01a
|
fix grab transitions between vert and horiz planes
|
2015-07-14 09:24:37 -07:00 |
|
Andrew Meadows
|
7610fe48c2
|
filter action updates during simulation ownership
This fixes a bug where actions can be thrashed (created/deleted)
by late entity update echos from the entity-server.
|
2015-07-14 09:24:37 -07:00 |
|
Brad Davis
|
684d466b44
|
Merge pull request #5308 from venkatn93/avatar
Avatars rendered correctly based on Scene.shouldRenderAvatars
|
2015-07-14 09:06:49 -07:00 |
|
Niraj Venkat
|
ef3c6b25e0
|
More coding standard changes
|
2015-07-14 00:45:38 -07:00 |
|
Niraj Venkat
|
1f1a5f8e75
|
Coding standard and fixing pointers
|
2015-07-13 22:57:11 -07:00 |
|
Philip Rosedale
|
c81053fc83
|
Merge pull request #5318 from samcake/punk
Fixing the ImageOverlay Bug
|
2015-07-13 22:25:46 -07:00 |
|
samcake
|
99ae0326ad
|
FIxing th ecompilation issue on mac, ready to ship
|
2015-07-13 19:17:09 -07:00 |
|
Clément Brisset
|
a432752c39
|
Merge pull request #5316 from ctrlaltdavid/20604
QA for #20604 - Add an "is looking at me" indicator above avatars' heads
|
2015-07-13 16:40:11 -07:00 |
|
Sam Gateau
|
f08c608195
|
Remove dead code
|
2015-07-13 16:33:04 -07:00 |
|
Clément Brisset
|
de4a0447f9
|
Merge pull request #5315 from sethalves/fix-pointer.js
update pointer.js to use relative-to-entity line-point ends
|
2015-07-13 16:26:38 -07:00 |
|
Sam Gateau
|
5555ccd225
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2015-07-13 16:19:09 -07:00 |
|
Sam Gateau
|
4743bbad80
|
Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js
|
2015-07-13 16:18:39 -07:00 |
|
Clément Brisset
|
c99382ee74
|
Merge pull request #5287 from ctrlaltdavid/20607
CR for Job #20607 - Interface upgrade message has bad formatting
|
2015-07-13 16:07:17 -07:00 |
|
Clément Brisset
|
24eb4c8263
|
Merge pull request #5309 from sethalves/quiet-compiler
quiet compiler
|
2015-07-13 15:55:35 -07:00 |
|
Clément Brisset
|
fb0dab3bca
|
Merge pull request #5317 from ZappoMan/fixLingeringModels
fix the lingering model parts sometimes left behind when switching domains
|
2015-07-13 15:53:24 -07:00 |
|
ZappoMan
|
5676246d75
|
fix the lingering model parts sometimes left behind when switching domains
|
2015-07-13 15:26:52 -07:00 |
|
Niraj Venkat
|
10e0a93ac0
|
Fix for avatar rendering not working on domain exit/entry
|
2015-07-13 15:22:00 -07:00 |
|
David Rowe
|
59f456a2f2
|
Add an "is looking at me" indicator above avatars' heads
Menu item: Developer > Avatar > Show Who's Looking at Me
|
2015-07-13 14:16:39 -07:00 |
|
Howard Stearns
|
8ddbe139a7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-octreeFades
|
2015-07-13 13:19:39 -07:00 |
|
Seth Alves
|
d44bb1a0d8
|
update javascript to use relative-to-entity line-point ends
|
2015-07-13 11:42:29 -07:00 |
|
Andrew Meadows
|
a24fd13665
|
Merge pull request #5312 from sethalves/fix-hold-action-deserialize
fix hold-action deserialization.
|
2015-07-13 11:33:16 -07:00 |
|
Seth Alves
|
7a6cf40b54
|
quiet compiler
|
2015-07-13 07:39:11 -07:00 |
|
Seth Alves
|
5aca0c28ef
|
quiet compiler
|
2015-07-13 07:37:59 -07:00 |
|
Howard Stearns
|
d1952583ab
|
Merge branch 'master' of https://github.com/highfidelity/hifi into remove-octreeFades
|
2015-07-13 07:24:08 -07:00 |
|
Brad Hefta-Gaub
|
db8d8a34bf
|
Merge pull request #5310 from sethalves/improve-voxel.js
allow voxels.js to work on an empty voxel-space
|
2015-07-13 07:17:12 -07:00 |
|
Seth Alves
|
f011d5c7f7
|
remove commented code
|
2015-07-12 20:42:17 -07:00 |
|
Brad Davis
|
d3cdfb5084
|
Merge remote-tracking branch 'upstream/master' into homer
|
2015-07-12 18:52:27 -07:00 |
|
Brad Davis
|
29333d0cad
|
Qt5.5 fixes
|
2015-07-12 18:52:15 -07:00 |
|
Seth Alves
|
848e5bcebf
|
this code can be called for hold actions if they end up in an svo save. revert a line from a previous commit
|
2015-07-12 13:43:21 -07:00 |
|
Seth Alves
|
fb23eb0faf
|
Merge pull request #5301 from samcake/yellow
Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture
|
2015-07-12 11:36:03 -07:00 |
|
Seth Alves
|
87152a4de2
|
Merge pull request #5302 from AndrewMeadows/astatine
cleanup of ObjectActionSpring and AvatarActionHold
|
2015-07-12 11:17:09 -07:00 |
|
Seth Alves
|
c56b2918a4
|
allow voxels.js to work on an empty voxel-space
|
2015-07-12 10:35:44 -07:00 |
|
Seth Alves
|
c17c9f1818
|
quiet compiler
|
2015-07-12 10:29:43 -07:00 |
|
Andrew Meadows
|
9ce9c541de
|
fix activation of object when action changes
|
2015-07-10 18:45:40 -07:00 |
|
Niraj Venkat
|
f95bd3f7bd
|
Fixing build error
|
2015-07-10 17:46:20 -07:00 |
|
Niraj Venkat
|
bbd7b2a65e
|
Removed unused functions
|
2015-07-10 17:31:49 -07:00 |
|
Niraj Venkat
|
dacc6f66c0
|
Avatars rendered correctly based on Scene.shouldRenderAvatars
|
2015-07-10 17:26:56 -07:00 |
|
Philip Rosedale
|
2480402515
|
Merge pull request #5305 from howard-stearns/sword-update
Functional sword script
|
2015-07-10 17:05:24 -07:00 |
|
Brad Hefta-Gaub
|
2439e4faab
|
Merge pull request #5304 from jherico/homer
Removing heap allocation from property flag parsing, adding some manual tests
|
2015-07-10 17:04:50 -07:00 |
|
Howard Stearns
|
51be245159
|
Remove old octreeFade code that wasn't working anyway.
|
2015-07-10 16:55:45 -07:00 |
|
Brad Davis
|
eb9d52fbb3
|
Helps to actually commit the fix
|
2015-07-10 16:11:56 -07:00 |
|
Brad Davis
|
c1b72db18d
|
Still trying to get jenkins builds to work
|
2015-07-10 16:00:51 -07:00 |
|
Howard Stearns
|
c340d336dc
|
Functional sword script:
Mouse and hydra.
Switchable hands.
Scores above buttons (2d) and above head in-world.
Adds avatar hit sound while sword is brandished.
|
2015-07-10 15:43:56 -07:00 |
|