Andrew Meadows
|
75d468da9e
|
set _lastEdited to _created rather than to zero
|
2014-12-17 15:59:16 -08:00 |
|
Andrew Meadows
|
44ebf37510
|
handle case where obj at rest but still falls
|
2014-12-17 15:52:34 -08:00 |
|
Andrew Meadows
|
1e5c44f117
|
accept changes with the same Edit timestamp
|
2014-12-17 15:48:49 -08:00 |
|
Andrew Meadows
|
e36ee2a961
|
more correct creation and edit times for entities
|
2014-12-17 12:19:34 -08:00 |
|
Brad Hefta-Gaub
|
61ec1bdd6a
|
Merge pull request #3977 from huffman/fix-minor-grid
Fix minor grid spacing not updating
|
2014-12-17 09:13:32 -08:00 |
|
Ryan Huffman
|
b95eac759e
|
Fix minor grid spacing not updating
|
2014-12-17 08:52:48 -08:00 |
|
Brad Hefta-Gaub
|
9c52086066
|
Merge pull request #3976 from birarda/simple-script-persist
simple model for persistent scripts in domain-server settings
|
2014-12-16 19:49:23 -08:00 |
|
Stephen Birarda
|
77bc00e410
|
a simple model for persistent scripts in domain-server
|
2014-12-16 18:34:39 -08:00 |
|
Clément Brisset
|
7632dbead3
|
Merge pull request #3968 from ZappoMan/InterfaceConfigEctomy
Librarization
|
2014-12-16 14:56:11 -08:00 |
|
ZappoMan
|
b449f650a0
|
more Model cleanup
|
2014-12-16 14:22:02 -08:00 |
|
ZappoMan
|
89101872bb
|
move Model and AnimationHandle to libraries
|
2014-12-16 14:04:39 -08:00 |
|
ZappoMan
|
85c8951734
|
really remove the debug settings from Model rendering
|
2014-12-16 13:57:22 -08:00 |
|
Brad Hefta-Gaub
|
d322f587a7
|
Merge pull request #3972 from DaveDubUK/Window.nonBlockingForm-fix
Window.non blocking form fix
|
2014-12-16 13:52:27 -08:00 |
|
ZappoMan
|
efa8a752f2
|
remove dependency on Menu from Model
|
2014-12-16 13:14:57 -08:00 |
|
ZappoMan
|
16c1e597f1
|
remove Application dependency from Model
|
2014-12-16 12:53:22 -08:00 |
|
ZappoMan
|
58183515e6
|
more windows shenanigans
|
2014-12-16 12:23:54 -08:00 |
|
ZappoMan
|
1ed2c62bbf
|
try this
|
2014-12-16 12:15:57 -08:00 |
|
ZappoMan
|
ee34dfffc1
|
try this
|
2014-12-16 12:05:23 -08:00 |
|
ZappoMan
|
ec5c33fecc
|
try this
|
2014-12-16 11:57:06 -08:00 |
|
ZappoMan
|
a9b3fdd3eb
|
try this
|
2014-12-16 11:44:15 -08:00 |
|
ZappoMan
|
fc1e1ecfc0
|
move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled
|
2014-12-16 11:27:44 -08:00 |
|
ZappoMan
|
4d79a08533
|
remove Application dependencies from AmbientOcclusion and DeferredLightingEffect
|
2014-12-16 10:32:03 -08:00 |
|
DaveDubUK
|
7ab9dfbfe1
|
Window.nonBlockingForm-fix
|
2014-12-16 14:48:28 +00:00 |
|
DaveDubUK
|
9493440d32
|
Window.nonBlockingForm-fix
|
2014-12-16 13:33:10 +00:00 |
|
DaveDubUK
|
cd95f7bd23
|
Window.nonBlockingForm active status was not being tested correctly. Was causing unexpected fail on second attempt to show form
|
2014-12-16 13:20:11 +00:00 |
|
ZappoMan
|
5cba44fd5b
|
moved JointState
|
2014-12-15 19:49:16 -08:00 |
|
ZappoMan
|
660bf2720e
|
convert AnimationCache to DependencyManager
|
2014-12-15 19:48:15 -08:00 |
|
ZappoMan
|
02737a4ec4
|
move JointState to libraries
|
2014-12-15 19:38:30 -08:00 |
|
ZappoMan
|
fac6ff572b
|
see if this works
|
2014-12-15 19:29:53 -08:00 |
|
ZappoMan
|
41c135c4e5
|
move GlowEffect to libraries
|
2014-12-15 19:19:21 -08:00 |
|
ZappoMan
|
8f3d23c5b3
|
remove Menu dependency from GlowEffect
|
2014-12-15 19:06:54 -08:00 |
|
ZappoMan
|
4eef4c2438
|
move RenderUtils.cpp/h to libraries
|
2014-12-15 18:52:40 -08:00 |
|
ZappoMan
|
e52338d25c
|
get rid of InterfaceConfig.h in GlowEffect
|
2014-12-15 17:38:57 -08:00 |
|
ZappoMan
|
37abe8e89c
|
move RenderUtils.cpp/h to libraries
|
2014-12-15 17:35:26 -08:00 |
|
ZappoMan
|
e53833b306
|
make GlowEffect support DependencyManager
|
2014-12-15 17:29:48 -08:00 |
|
ZappoMan
|
79bc5e0507
|
Merge branch 'master' of https://github.com/highfidelity/hifi into InterfaceConfigEctomy
|
2014-12-15 16:48:07 -08:00 |
|
Brad Hefta-Gaub
|
f987f77094
|
Merge pull request #3971 from ey6es/master
Fix for crash on exit due to cache references' not being cleared.
|
2014-12-15 16:47:09 -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 |
|
Brad Hefta-Gaub
|
40f4a78a85
|
Merge pull request #3970 from ey6es/master
Fixes for missing audio device.
|
2014-12-15 15:21:10 -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
|
753dc07cdd
|
cleanup windows hackery
|
2014-12-15 14:58:47 -08:00 |
|
ZappoMan
|
0c14b0f8fc
|
windows build hackery
|
2014-12-15 14:47:26 -08:00 |
|
ZappoMan
|
bc78beb05f
|
windows build hackery
|
2014-12-15 14:41:15 -08:00 |
|
ZappoMan
|
f802e99a24
|
windows build hackery
|
2014-12-15 14:32:33 -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
|
dee8f69722
|
windows build hackery
|
2014-12-15 13:33:47 -08:00 |
|
ZappoMan
|
ea6d6e9f72
|
windows build hackery
|
2014-12-15 13:26:27 -08:00 |
|