Ryan Huffman
5c3be10c6c
Rename destructibleEntity
2017-02-03 10:00:54 -08:00
Ryan Huffman
83ec0063c0
Update destructibleEntity to also be growable
2017-02-03 10:00:53 -08:00
Ryan Huffman
3cddf65ba1
Add wantsTrigger to blocks
2017-02-03 10:00:52 -08:00
Ryan Huffman
5022cdd2a7
Update tower defense blocks to grow
2017-02-03 10:00:51 -08:00
Ryan Huffman
ef62e6feb1
Add bow to tower defense
2017-02-03 10:00:50 -08:00
Ryan Huffman
e2e0e9d96d
Add sounds and other improvements to tower defense
2017-02-03 10:00:49 -08:00
Ryan Huffman
8b9eef19c1
Integrate spawner, target, etc. into tower defense
2017-02-03 10:00:48 -08:00
Ryan Huffman
12ac274c60
Update towerButton.js reference to be relative
2017-02-03 10:00:47 -08:00
Ryan Huffman
5dbaa0ffa8
Move td files to DomainContent
2017-02-03 10:00:46 -08:00
Atlante45
58f8bd0059
Tower Defense AC script first draft
2017-02-03 10:00:45 -08:00
Ryan Huffman
5ac3ad7e50
Add border around block
2017-02-03 10:00:44 -08:00
Ryan Huffman
6598bb8d85
Add teamAreaEntity.js
2017-02-03 10:00:43 -08:00
Ryan Huffman
f53595c240
Add targetEntity.js
2017-02-03 10:00:42 -08:00
Ryan Huffman
44389bcad6
Add launcher to tower defense
2017-02-03 10:00:41 -08:00
Ryan Huffman
fa2fc83d38
Add destructibleEntity.js
2017-02-03 10:00:40 -08:00
samcake
87e2936a05
Merge pull request #9592 from samcake/blue
...
Adding instrumentation for traces regarding Image and texture loading and preparation
2017-02-02 22:16:07 -08:00
sam
c4ec0cc069
fixing a bad cDebug
2017-02-02 22:09:52 -08:00
Chris Collins
bac5bd5c0e
Merge pull request #9595 from hyperlogic/bug-fix/tablet-ui-bugfixes
...
tablet-ui: Bug fixes
2017-02-02 17:53:47 -08:00
Anthony Thibault
3a36410f7c
Merge pull request #9571 from hyperlogic/bug-fix/tablet-ui-no-domain
...
Tablet should work even when not connected to any domain.
2017-02-02 17:49:40 -08:00
Anthony J. Thibault
6bef9e888b
Merge branch 'master' into bug-fix/tablet-ui-no-domain
2017-02-02 17:21:20 -08:00
Seth Alves
f40285c688
Merge pull request #9597 from druiz17/tabletStylus
...
better scrolling and fixed button touching
2017-02-02 16:56:13 -08:00
Anthony Thibault
be4fbb63cf
Merge pull request #9583 from sethalves/fix-post-tablet-edit-buttons
...
fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked
2017-02-02 16:01:56 -08:00
Anthony Thibault
59b33bbc53
Merge pull request #9585 from sethalves/use-local-tablet-model
...
use tablet model from distribution rather than from s3
2017-02-02 16:01:15 -08:00
Seth Alves
998fbfb909
Merge pull request #9596 from sethalves/fix-equip-from-other-pov
...
fix -- don't honor gravity in simple extrapolation on entities equipped by others
2017-02-02 15:49:10 -08:00
David Kelly
72153f6b3e
Merge pull request #9593 from howard-stearns/filter-gets-isAdd-argument
...
filter gets isAdd argument
2017-02-02 16:41:17 -07:00
Seth Alves
9dfaf3026b
Merge pull request #9591 from druiz17/master
...
fixed issue of tablets buliding up when flying fast
2017-02-02 15:21:29 -08:00
Dante Ruiz
0ec8071288
better scrolling and fixed button touching
2017-02-02 23:16:39 +00:00
Seth Alves
6b44f62982
don't honor gravity in simple extrapolation on entities equipped by others
2017-02-02 14:20:21 -08:00
Anthony J. Thibault
b44e5b5a1f
tablet-ui: preferences for tablet ui scaling
...
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
2017-02-02 14:05:07 -08:00
howard-stearns
4499a92a82
filter gets isAdd argument
2017-02-02 13:07:08 -08:00
samcake
446aaf3bce
Turn off cpu mip map to add instrumentation to master
2017-02-02 11:58:02 -08:00
Anthony J. Thibault
5890503ec0
Can now grab tablet in 2d mode even when it embedded in geometry
2017-02-02 10:56:56 -08:00
Anthony J. Thibault
9df887de2a
You can no longer scale the tablet with double-grab
2017-02-02 10:16:02 -08:00
samcake
e77b920592
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-02 10:08:05 -08:00
Dante Ruiz
2cc1ee008d
added clicking sounds to tablet menus
2017-02-02 17:46:42 +00:00
Dante Ruiz
2af72f1a50
fixed tablet buliding up when flying fast
2017-02-02 17:03:53 +00:00
sam
3aa239b004
More instrumentation during texture load
2017-02-01 22:00:03 -08:00
Seth Alves
f4e57898c6
Merge pull request #9575 from thoys/patch-9
...
Readme fix, default AC parameters example
2017-02-01 20:25:51 -08:00
Howard Stearns
49af783553
Merge pull request #9590 from sethalves/fix-pal-audio-meter
...
hook pal audio meter up again
2017-02-01 20:23:56 -08:00
Howard Stearns
4c9d8199b7
Merge pull request #9588 from zfox23/PAL_FixIdentityChangeSpam
...
PAL: Fix Spam upon Identity Change
2017-02-01 20:23:03 -08:00
Seth Alves
f907af1b9b
Merge pull request #9587 from hyperlogic/bug-fix/tablet-ui-network-2d-tablet
...
Tablet-ui: fix tablet orientation for users in 2d desktop mode
2017-02-01 20:17:40 -08:00
Seth Alves
0dead3b458
Merge pull request #9589 from hyperlogic/bug-fix/tablet-ui-button-click-volume
...
tablet-ui: reduced volume of button click
2017-02-01 20:16:38 -08:00
Seth Alves
4ae163ac60
hook pal audio meter up again
2017-02-01 19:01:55 -08:00
Anthony J. Thibault
de55a5dfe6
tablet-ui: reduced volume of button click
2017-02-01 18:47:50 -08:00
Zach Fox
5ea3c5dffd
Skipped this line
2017-02-01 18:13:24 -08:00
sam
2ecda8b64e
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-02-01 18:03:07 -08:00
Anthony J. Thibault
9d124983a6
Tablet-ui: fix tablet orientation for users in 2d desktop mode
...
Double 180 flip. Once before to account for -z forward of camera.
Once after to account for avatar 180 flip.
2017-02-01 17:48:28 -08:00
Zach Fox
4af5118654
First pass
2017-02-01 17:04:21 -08:00
Seth Alves
d9bdbb92ef
use tablet model from distribution rather than from s3
2017-02-01 16:55:29 -08:00
Seth Alves
6671324a33
fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked
2017-02-01 16:29:12 -08:00
