ZappoMan
|
41c135c4e5
|
move GlowEffect to libraries
|
2014-12-15 19:19:21 -08:00 |
|
ZappoMan
|
37abe8e89c
|
move RenderUtils.cpp/h to libraries
|
2014-12-15 17:35:26 -08:00 |
|
ZappoMan
|
79bc5e0507
|
Merge branch 'master' of https://github.com/highfidelity/hifi into InterfaceConfigEctomy
|
2014-12-15 16:48:07 -08:00 |
|
Andrzej Kapolka
|
892141fe14
|
Fix for crash on exit due to cache references' not being cleared.
|
2014-12-15 16:36:26 -08:00 |
|
ZappoMan
|
b1d1cfee44
|
cmake cleanup
|
2014-12-15 15:29:05 -08:00 |
|
Andrzej Kapolka
|
50c1e9fb40
|
Fixes for missing audio device.
|
2014-12-15 22:41:35 -08:00 |
|
ZappoMan
|
bfcc78c57d
|
replaced Application::resourcesPath() with PathUtils::resourcesPath()
|
2014-12-15 15:20:18 -08:00 |
|
ZappoMan
|
df7e115556
|
move ProgramObject to libraries
|
2014-12-15 14:21:22 -08:00 |
|
ZappoMan
|
49cacd85bd
|
move GeometryCache to library
|
2014-12-15 14:00:41 -08:00 |
|
ZappoMan
|
7b973453b4
|
move TextureCache to library
|
2014-12-15 13:14:16 -08:00 |
|
ZappoMan
|
0b95403949
|
cleanup the windows hackery a little
|
2014-12-15 12:25:20 -08:00 |
|
ZappoMan
|
95d820ee8b
|
more windows hackery
|
2014-12-15 12:16:01 -08:00 |
|
ZappoMan
|
4e7368b643
|
more windows hackery
|
2014-12-15 12:09:30 -08:00 |
|
ZappoMan
|
28f2dc62ea
|
add windowshacks.h to GPUConfig.h and move it to shared
|
2014-12-15 11:49:01 -08:00 |
|
ZappoMan
|
3de3540ebe
|
move back into interface for now
|
2014-12-15 08:37:33 -08:00 |
|
ZappoMan
|
4ac673fe63
|
more render util cleanup
|
2014-12-15 08:16:42 -08:00 |
|
ZappoMan
|
2df4c017f1
|
move GeometryCache out of application and remove dependency on Model
|
2014-12-15 08:15:55 -08:00 |
|
ZappoMan
|
e253b8afa4
|
move TextureCache out of interface and Application
|
2014-12-15 08:14:53 -08:00 |
|
Atlante45
|
e40961df12
|
Checking that T is in fact derived from Dependency
|
2014-12-14 21:34:27 -08:00 |
|
Atlante45
|
28786721a6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dependancy_manager
|
2014-12-13 01:18:33 -08:00 |
|
Atlante45
|
9aea2843ac
|
Remove pointer check
|
2014-12-12 21:20:26 -08:00 |
|
Atlante45
|
50fd52377f
|
Couple improvements to the dependency manager
|
2014-12-12 21:10:45 -08:00 |
|
Atlante45
|
14cda00ebc
|
First implementation of the DependencyManager
|
2014-12-12 20:52:41 -08:00 |
|
Stephen Birarda
|
687072f19c
|
fix for domain failed reconnect after disconnect
|
2014-12-12 09:47:15 -08:00 |
|
Brad Hefta-Gaub
|
31cbd6e88c
|
Merge pull request #3954 from ctrlaltdavid/20226
CR for Job #20226 - Change Overlays.getTextWidth into Overlays.getTextSize
|
2014-12-11 14:33:24 -08:00 |
|
Stephen Birarda
|
f58d21d6f0
|
have ShutdownEventListener handle WM_CLOSE or SIGTERM
|
2014-12-11 10:21:11 -08:00 |
|
Andrzej Kapolka
|
d402f767c1
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-12-10 15:23:27 -08:00 |
|
Andrzej Kapolka
|
c57fd15bc9
|
Rather than loading the entire FBX file into a byte array, read it straight
from the QNetworkReply.
|
2014-12-10 15:22:48 -08:00 |
|
ZappoMan
|
f2ed1337b5
|
fix ray picking output distance to be meters
|
2014-12-10 11:04:32 -08:00 |
|
David Rowe
|
ff6db7a9fa
|
Merge branch 'master' into 20226
|
2014-12-09 19:20:30 -08:00 |
|
Leonardo Murillo
|
8d88c537bf
|
Merge pull request #3938 from ZappoMan/fixcrash
potential fix to crash on windows startup
|
2014-12-09 19:12:53 -08:00 |
|
David Rowe
|
136c3a2cce
|
Replace 2D and 3D text overlay textWidth() method with textSize()
|
2014-12-09 18:32:53 -08:00 |
|
ZappoMan
|
628046f13c
|
potential fix to crash on windows startup
|
2014-12-09 18:26:59 -08:00 |
|
Sam Gateau
|
cf081f0deb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
|
2014-12-09 18:13:07 -08:00 |
|
AndrewMeadows
|
9aaaae6759
|
Merge pull request #3934 from ZappoMan/bugfixes
fix a bug in MovingEntitiesOperator that would sometimes leave dangling entities
|
2014-12-09 18:08:14 -08:00 |
|
AndrewMeadows
|
1697636db5
|
Merge pull request #3933 from ZappoMan/entityCollisions
move emit of collisions to after done moving entities, so that callbacks can delete entities
|
2014-12-09 17:46:41 -08:00 |
|
Sam Gateau
|
8617c319d4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
|
2014-12-09 17:30:26 -08:00 |
|
ZappoMan
|
426517b072
|
fix a bug in MovingEntitiesOperator that would sometimes leave dangling entities
|
2014-12-09 17:11:01 -08:00 |
|
Andrzej Kapolka
|
fa8f4e3b06
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-12-09 12:16:09 -08:00 |
|
Andrzej Kapolka
|
5fb9905186
|
Rather than reducing rate on first drop, wait until three consecutive packets
have been dropped.
|
2014-12-09 12:14:21 -08:00 |
|
Atlante45
|
36eecf1d15
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus
|
2014-12-09 11:53:47 -08:00 |
|
Atlante45
|
eaaaa0687c
|
spacing
|
2014-12-09 11:53:14 -08:00 |
|
Andrzej Kapolka
|
343f610442
|
Use the 1450 limit everywhere, in case other places are running into the issue
I experienced with metavoxels.
|
2014-12-08 18:45:05 -08:00 |
|
ZappoMan
|
3c09ca71cb
|
move emit of collisions to after done moving entities, so that callbacks can delete entities
|
2014-12-08 18:09:49 -08:00 |
|
Andrzej Kapolka
|
d0ca75dd2c
|
Reduce the MTU size to deal with Windows networking issue.
|
2014-12-08 18:04:45 -08:00 |
|
Brad Hefta-Gaub
|
651e550063
|
Merge pull request #3925 from AndrewMeadows/thermonuclear
fix for non-animating models
|
2014-12-08 16:58:16 -08:00 |
|
Andrew Meadows
|
675a2dd989
|
add DIRTY_UPDATEABLE flag for changes that need it
|
2014-12-08 16:32:25 -08:00 |
|
Andrew Meadows
|
27bfc9907f
|
fix bug preventing butterflies from animating
(forgot to make base method virtual)
|
2014-12-08 16:31:36 -08:00 |
|
ZappoMan
|
efbe8ce757
|
Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions
|
2014-12-08 14:15:20 -08:00 |
|
ZappoMan
|
0592b74a06
|
make collision callbacks work
|
2014-12-08 14:15:03 -08:00 |
|