Andrew Meadows
dd3a7b9b9d
EntitySimulation takes EntityItem* rather than ID
2014-11-26 12:12:43 -08:00
Andrew Meadows
0d98555740
add EntitySimulation and SimpleEntitySimulation
2014-11-24 22:29:24 -08:00
Andrew Meadows
e574c5766b
EntityItem::setSimulationState() now public
2014-11-24 22:28:27 -08:00
Andrew Meadows
8966ab32d8
add lifetime to gun bullets
2014-11-24 20:37:52 -08:00
Andrew Meadows
1c636fe6b2
more correct entity list maintenance
2014-11-24 20:37:09 -08:00
Andrzej Kapolka
c5e923f091
Merge pull request #3859 from samcake/tot
...
support texture transform and lightmap
2014-11-24 15:42:49 -08:00
Sam Gateau
1f10a44ae4
More typos in glsl
2014-11-24 15:38:12 -08:00
Sam Gateau
6a63099a0f
Fixed syntax issues and review critics, put all the debugging code in a #define block
2014-11-24 15:24:20 -08:00
Sam Gateau
68e2df8fc2
add a emissive parameter value to the lightmap shaders
2014-11-24 14:35:42 -08:00
Sam Gateau
f67b4b9ff4
clean out comments so the 2 rendering modes for entities work, scene batch or per model batch
2014-11-24 11:44:54 -08:00
Sam Gateau
6591f4dac2
adjust lighmap shading equation
2014-11-24 11:18:21 -08:00
Ryan Huffman
664de8215f
Merge pull request #3850 from Adrianl3d/master
...
Added notifications.js
2014-11-24 10:38:37 -08:00
Sam Gateau
8b23a2cd1e
adding the shader files for the lightmap case
2014-11-24 10:33:31 -08:00
Adrianl3d
ffe66cd5c5
Clean up code
...
Fix code to standards
2014-11-25 04:23:00 +10:00
Sam Gateau
1f22d5b493
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2014-11-24 10:05:39 -08:00
Philip Rosedale
137642f8a5
Merge pull request #3858 from ZappoMan/modelSceneRendering
...
make render entities as scene the default
2014-11-23 14:08:25 -08:00
Philip Rosedale
64761bedd9
Merge pull request #3857 from ZappoMan/lobbyTweaks
...
Added "description" to lobby
2014-11-23 14:07:55 -08:00
ZappoMan
2e9a9bf5c2
make render entities as scene the default
2014-11-23 12:01:58 -08:00
ZappoMan
80c1f5038c
Merge branch 'master' of https://github.com/highfidelity/hifi into lobbyTweaks
2014-11-23 11:39:05 -08:00
ZappoMan
f23d8f6c20
text sizing tweaks
2014-11-23 11:21:05 -08:00
ZappoMan
437af06245
switch to 3d text for description
2014-11-23 11:16:33 -08:00
ZappoMan
5ea6973fe7
fix isFacingAvatar for 3d text overlays
2014-11-23 10:53:03 -08:00
Philip Rosedale
a4f3fc1cb5
Merge pull request #3855 from ZappoMan/sitEntityScript
...
fix bugs in unloading scripts when changing domains
2014-11-22 23:42:25 -08:00
ZappoMan
53bd8fd6d2
handle no description and blank panels better
2014-11-22 21:30:58 -08:00
ZappoMan
efe202b7e8
make a version of computePick that works off of view frustum even when in HMD mode, updates to lobby
2014-11-22 21:25:43 -08:00
ZappoMan
310e31377d
handle line wrapping in description
2014-11-22 14:49:56 -08:00
ZappoMan
f014025b81
first cut at lobby tweaks
2014-11-22 14:28:06 -08:00
ZappoMan
93755e6506
fix bugs in unloading scripts when changing domains
2014-11-22 11:53:50 -08:00
Brad Hefta-Gaub
e9207ab74d
Merge pull request #3854 from PhilipRosedale/master
...
Entity script allowing you to grab and 'inspect' an object
2014-11-22 07:44:14 -08:00
Adrianl3d
2edd252576
Fix persist time
...
Set persist time to 10 secs
2014-11-22 21:47:14 +10:00
Sam Gateau
87471df7a1
First version of the lighmap working
2014-11-21 18:08:34 -08:00
Philip Rosedale
983975e872
lets you grab an object and turn it near your face to better see it
2014-11-21 20:05:36 -06:00
Stephen Birarda
6df2116ee0
Merge pull request #3853 from birarda/master
...
have domain-server report its ID at /id
2014-11-21 16:51:41 -08:00
Adrianl3d
6a66351e7f
Clean up code
...
Fix indentations, whitespace, and layout
2014-11-22 10:39:34 +10:00
Stephen Birarda
dff5695965
have domain server report its ID at /id
2014-11-21 16:20:44 -08:00
AndrewMeadows
8d9df8570c
Merge pull request #3847 from ey6es/metavoxels
...
Big metavoxel update: removed unused pieces, converted heightfields to "spanners" in order to allow arbitrary transforms, switched to 16 bit heightfields with lossless compression, some rendering improvements.
2014-11-21 15:57:00 -08:00
Clément Brisset
d23cc24ed2
Merge pull request #3851 from ZappoMan/flightTimeDebugging
...
fix to drift in usecTimestampNow() caused when computer sleeps
2014-11-21 15:20:03 -08:00
ZappoMan
bd2adf08e3
fix to drift in usecTimestampNow() caused when computer sleeps
2014-11-21 13:33:53 -08:00
Andrzej Kapolka
41eaf340c6
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-11-21 12:47:26 -08:00
Andrzej Kapolka
296718e2aa
Removed redundant members, clarified class names, used better hash factors.
2014-11-21 12:46:24 -08:00
Brad Hefta-Gaub
9c9381e57e
Merge pull request #3849 from ctrlaltdavid/suppress-gverb-warnings
...
Suppress Windows C4305 compiler warnings in gverb includes
2014-11-21 11:07:55 -08:00
Philip Rosedale
8ca2a613a2
Merge pull request #3848 from PhilipRosedale/master
...
Jump with number keys to preset places, improve HeadMove
2014-11-21 01:07:36 -06:00
Philip Rosedale
85419a3e2d
limit max distance of movement, don't pull to 3P unless going back
2014-11-21 01:04:52 -06:00
David Rowe
9e32b2c64e
Suppress Windows C4305 compiler warnings in gverb includes
2014-11-20 20:58:31 -08:00
Philip Rosedale
5d6d9ae0df
cleaner version
2014-11-20 22:53:49 -06:00
Philip Rosedale
069f1be89d
jump with number keys to preset places
2014-11-20 22:48:03 -06:00
Brad Hefta-Gaub
a8d718be82
Merge pull request #3843 from PhilipRosedale/master
...
Fix jumpy eyes when turning toward or away from someone
2014-11-20 20:01:58 -08:00
Andrzej Kapolka
87cc565c1a
I believe this should be a better hash function for the voxel coordinates.
2014-11-20 18:16:57 -08:00
Philip Rosedale
e07f53d022
remove unused test audio filters
2014-11-20 19:57:24 -06:00
Philip Rosedale
6e89437bce
simplify audio scope menu(s)
2014-11-20 19:34:56 -06:00
