Thijs Wenker
b711022796
planky:
...
- removed workaround for delayed overlay loading
- make buttons functional (reset, cleanup, save-default)
- only show live changes for the visual planky properties: blocksize , numLayers etc. (no physical properties)
2015-07-14 12:28:49 +02:00
Thijs Wenker
8ed9eb0633
Merge branch 'master' of https://github.com/worklist/hifi into 20552
2015-07-14 12:03:43 +02:00
Philip Rosedale
c81053fc83
Merge pull request #5318 from samcake/punk
...
Fixing the ImageOverlay Bug
2015-07-13 22:25:46 -07:00
Thijs Wenker
95948851f1
save, clear and reset button
2015-07-14 04:36:29 +02:00
samcake
99ae0326ad
FIxing th ecompilation issue on mac, ready to ship
2015-07-13 19:17:09 -07:00
Thijs Wenker
c8453bec67
planky: fix layer setting, restraints on values
2015-07-14 03:50:06 +02:00
Thijs Wenker
222234cf1d
wild planky changes on value change
2015-07-14 03:40:58 +02:00
Thijs Wenker
6d1df03617
planky: load / save settings
2015-07-14 03:19:23 +02:00
Thijs Wenker
1f453e07e3
connection between planky script and web-window
...
-load settings
-include toolbar
2015-07-14 02:18:17 +02: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
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
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
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
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
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
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
Sam Gateau
a12e3ec464
Merge branch 'yellow' of https://github.com/samcake/hifi into punk
2015-07-10 15:33:28 -07:00
Brad Davis
3db3676fae
Fixing compile failure
2015-07-10 15:26:22 -07:00
Sam Gateau
98f10e72ec
fix the wrong function name that happened missing a merge
2015-07-10 15:20:49 -07:00
Brad Davis
2ce8dba819
Removing heap allocation from property flag parsing, adding some manual tests
2015-07-10 15:08:10 -07:00
Brad Davis
200cbd7e8d
Merge pull request #5303 from ZappoMan/animationGlitch
...
fix motor proteins in cell science
2015-07-10 12:59:50 -07:00
ZappoMan
1dd40af162
fix AnimationLoop::setRunning() to not constantly reset the frame when the running state doesn't actually change
2015-07-10 12:43:35 -07:00
Andrew Meadows
9cb7e86877
cleanup of AvatarActionHold deserialization
2015-07-10 12:34:12 -07:00
Andrew Meadows
294c1ba367
always serialize ACTION_TYPE_SPRING
2015-07-10 12:25:11 -07:00
Andrew Meadows
56f00a526d
cleanup of ObjectActionSpring
2015-07-10 12:25:11 -07:00
Andrew Meadows
90ae1fea8b
handle case where action params are missing
2015-07-10 12:25:11 -07:00
Andrew Meadows
71440dfbc5
add checks for NaN
2015-07-10 12:25:11 -07:00
Sam Gateau
6c04e6d382
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-07-10 11:59:31 -07:00
samcake
014802fd45
Merge pull request #5277 from venkatn93/gpuquery
...
GPU Query infrastructure
2015-07-10 11:59:08 -07:00
samcake
09ea9b751f
Merge pull request #5300 from hyperlogic/ajt/transform-unit-test
...
Added unit test for shared/transform.
2015-07-10 11:35:13 -07:00
