ZappoMan
0e19e1f8a5
cleanup some dead code
2015-01-13 13:48:28 -08:00
ZappoMan
60aec8ac00
add support for multiple backup rules
2015-01-13 13:41:32 -08:00
Atlante45
2a82ff9768
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
Sam Gateau
522e7698a5
first step factorizing the packDeferredFragment
2015-01-13 10:23:00 -08:00
Sam Gateau
6d217e1479
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-01-13 10:07:27 -08:00
Sam Gateau
fc698a8525
first step factorizing the packDeferredFragment
2015-01-12 18:51:26 -08:00
Atlante45
79b9a898de
Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating
2015-01-12 17:34:13 -08:00
Atlante45
7d39b45f16
Hopefully fixes the windows compile error
2015-01-12 17:34:07 -08:00
Brad Hefta-Gaub
535f6e267b
Merge pull request #4069 from ctrlaltdavid/static-glew
...
Use static GLEW in render-utils for Windows
2015-01-12 17:30:47 -08:00
ZappoMan
ea3a5b7fcd
use last backup files timestamp as last backup time.
2015-01-12 17:29:10 -08:00
Atlante45
b6ba82653f
Remove glm dependency
2015-01-12 17:00:39 -08:00
Atlante45
74d819fe25
Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating
2015-01-12 16:42:35 -08:00
Atlante45
80af2adf12
Remove constexpr because windows can't handle them
2015-01-12 16:42:27 -08:00
Clément Brisset
206e1e48f6
Merge pull request #4086 from huffman/std-to-qstring
...
Std to qstring
2015-01-12 16:19:28 -08:00
Stephen Birarda
661221a189
repairs to AudioScriptingInterface playSound
2015-01-12 16:04:00 -08:00
Atlante45
ea3626d87f
Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating
2015-01-12 16:03:32 -08:00
Sam Gateau
1566157250
Use the DeferredBuffer.slh in point and spot lights
2015-01-12 15:52:31 -08:00
Atlante45
8415098fc2
Set different caches size depending on cache type
2015-01-12 15:36:36 -08:00
Sam Gateau
c45f618852
Factorising the shader code to unpack data from the deferred buffer
2015-01-12 15:00:35 -08:00
Andrew Meadows
7a2ecd27fd
fix typo
2015-01-12 14:32:32 -08:00
ZappoMan
7b65c75414
first cut at restoreFromMostRecentBackup
2015-01-12 14:32:13 -08:00
Atlante45
e70e435dcc
Added Min/Max values for cache size
2015-01-12 12:45:13 -08:00
ZappoMan
1562aab6da
intitial pass at lock file
2015-01-12 12:35:17 -08:00
Andrew Meadows
081037bc5f
merge upstream/master into andrew/inertia
2015-01-12 12:34:50 -08:00
Andrzej Kapolka
cad8313e56
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2015-01-12 12:00:20 -08:00
Andrzej Kapolka
5f7a304c85
Crash fix.
2015-01-12 12:00:01 -08:00
Andrew Meadows
bece05a994
entity prop defaults move to their own header
2015-01-12 11:49:31 -08:00
Atlante45
81bf1e4f53
Some code maintainance
2015-01-12 11:46:38 -08:00
Atlante45
bad96e0ba4
cache size getter/setter
2015-01-12 11:37:42 -08:00
Atlante45
ea0ffd0125
Introduce reserveUnusedResource
2015-01-12 11:37:00 -08:00
Atlante45
cb3f07e6f5
Remove unusedResourcesMaxCount
2015-01-12 11:18:55 -08:00
Atlante45
08317b51da
Use removeUnusedResources
2015-01-12 11:12:50 -08:00
David Rowe
17925c7a81
Use more appropriate QNetworkReply error code
...
This error code is available now that Interface is built with Qt 5.3.
2015-01-12 11:06:05 -08:00
Sam Gateau
06b44626f3
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2015-01-12 10:09:50 -08:00
Stephen Birarda
d30490c760
resolve conflicts on merge with upstream master
2015-01-12 09:25:37 -08:00
Atlante45
5cdc76ad35
Put cache max size/count as class members
2015-01-11 22:48:42 -08:00
Andrew Meadows
89a782c55a
remove functional code from inside assert
2015-01-11 13:31:37 -08:00
ZappoMan
60f55c7f3f
remove important code from assert so it still runs in release build
2015-01-11 12:07:16 -08:00
Sam Gateau
26a316db3a
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
2015-01-11 11:35:19 -08:00
Sam Gateau
e639c5a549
playing with the ambient lighting
2015-01-11 11:33:21 -08:00
Andrew Meadows
5309fb6a43
remove lock at EntityTreeRenderer::loadEntityScript
2015-01-11 10:44:36 -08:00
Andrew Meadows
e711b86519
scale DEFAULT_DIMENSIONS correctly
...
also remove a block of commented out cruft
2015-01-10 19:07:58 -08:00
Andrew Meadows
1184f5b668
merge upstream/master into andrew/inertia
2015-01-10 12:45:14 -08:00
Andrew Meadows
25e64d619c
move statics out of EntityItem
...
This makes for much more readable core dumps
2015-01-10 11:46:42 -08:00
Andrew Meadows
ecd352fd4d
merge upstream/master into andrew/bispinor
2015-01-10 07:47:52 -08:00
Andrew Meadows
99e1fdd46e
fix for EntityServer crash
...
adding EntityItem::_element backpointer for easier add/remove logic
2015-01-10 07:44:26 -08:00
Andrzej Kapolka
d002359989
Stitching improvement.
2015-01-09 16:43:51 -08:00
chris
8bb69d0a90
Update std::string instances to QString
2015-01-09 16:22:52 -08:00
Brad Hefta-Gaub
f18594cfdb
Merge pull request #4076 from Atlante45/master
...
Don't call delete later unless you have to
2015-01-09 15:43:45 -08:00
Atlante45
6d67b8e20c
Don't call delete later unless you have to
2015-01-09 15:32:08 -08:00
Andrzej Kapolka
dfbc3502fa
Use ray intersection code to get heightfield height.
2015-01-09 15:06:47 -08:00
Atlante45
063e95bd79
Clement doesn't know how to use radians
2015-01-09 14:31:34 -08:00
Andrzej Kapolka
70890c68aa
"Fill" brush (removes dual contour data).
2015-01-09 14:19:13 -08:00
Andrzej Kapolka
e3074d726b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
libraries/metavoxels/src/Spanner.cpp
2015-01-09 11:52:05 -08:00
Andrzej Kapolka
d82f269263
Don't show grid for tools where it isn't needed, started on "fill" tool.
2015-01-09 11:46:40 -08:00
Atlante45
02b9aaacf8
Bump packet version
2015-01-09 11:16:58 -08:00
Atlante45
f2b7cb005a
Removed leans/Changed Head rotation in avatardata packets
2015-01-09 11:16:49 -08:00
Atlante45
16e1fc8c3a
Added isMyAvatar to AvatarData too
2015-01-09 11:16:05 -08:00
Atlante45
05d2887c94
Move Torso twist to HeadData with Lean
2015-01-09 11:15:01 -08:00
Andrew Meadows
4946ec18b6
remove some TODO comments
2015-01-09 09:28:01 -08:00
Philip Rosedale
336378679f
Merge pull request #4068 from ctrlaltdavid/type-definitions
...
Fix miscellaneous types and casts
2015-01-09 08:40:08 -08:00
Philip Rosedale
285e588266
Merge pull request #4072 from Atlante45/network_replies_cleanup
...
Windows crash fix
2015-01-09 07:42:36 -08:00
Andrzej Kapolka
0dc4b26367
Basic stack merging.
2015-01-08 21:37:53 -08:00
Atlante45
441a1e4fee
Turns out windows doesn't like constexpr
2015-01-08 18:35:23 -08:00
Atlante45
891d8d5abf
Removed unecessary foreach
2015-01-08 18:22:25 -08:00
David Rowe
a5b3ae397a
Code review
2015-01-08 18:20:23 -08:00
Atlante45
ea832cfd45
Added constant
2015-01-08 17:33:47 -08:00
Atlante45
77e4a2ef35
Add byte limit to chaches
2015-01-08 17:06:05 -08:00
Atlante45
1c4903c346
Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix
2015-01-08 16:33:01 -08:00
David Rowe
75758c1a3e
Use static GLEW in render-utils for Windows
2015-01-08 15:40:54 -08:00
Andrzej Kapolka
c99e2c3ec6
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
2015-01-08 14:57:03 -08:00
David Rowe
07b30da2ac
Fix miscellaneous types and casts
2015-01-08 13:44:51 -08:00
Atlante45
8dbaeeb646
Delete each entityItems
2015-01-08 13:08:43 -08:00
Andrzej Kapolka
ec32739689
CSG improvements.
2015-01-08 12:52:52 -08:00
Andrew Meadows
f8c512b690
fix deleteEntity() to actually delete result
2015-01-08 12:42:16 -08:00
Atlante45
e73f8baf93
Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix
2015-01-08 11:54:54 -08:00
Atlante45
6fc3e1cf81
change message size
2015-01-08 11:51:14 -08:00
Atlante45
af9525ed33
Bump AvatarData packet number
2015-01-08 11:49:39 -08:00
Atlante45
0bae05b924
Remove chat message
2015-01-08 11:25:53 -08:00
Atlante45
b8a3bdb6bd
Cleanup headers
2015-01-08 11:25:35 -08:00
Andrew Meadows
b0b2eb5d38
use exact equality for filtering dimension changes
2015-01-08 11:09:32 -08:00
Andrew Meadows
1d371a9627
merge upstream/master into andrew/inertia
2015-01-08 10:24:05 -08:00
Andrew Meadows
c37c1515ba
EntitySimulation is lockable
...
also DeleteEntityOperator just removes the entities
and EntityTree does the actual delete
(after properly locking its _simulation)
2015-01-08 10:22:25 -08:00
Andrzej Kapolka
4c3163fae8
Closer to working stitching.
2015-01-07 17:24:26 -08:00
Andrew Meadows
d2bd95703a
use degrees/sec for EntityItem angular velocity
2015-01-07 14:04:22 -08:00
Andrew Meadows
af9bafae87
fix typo
2015-01-07 12:48:16 -08:00
Andrew Meadows
1745548665
fix rapid attenuation of angular velocity
2015-01-07 12:42:50 -08:00
Andrzej Kapolka
48fb9a27ba
Progress on heightfield/voxel interface.
2015-01-06 17:55:04 -08:00
ZappoMan
e0338dd787
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
2015-01-06 16:42:25 -08:00
Clément Brisset
fb6fb8a38d
Merge pull request #4050 from birarda/lasagna-not-spaghetti
...
put back current address storage in Menu
2015-01-06 16:29:52 -08:00
Stephen Birarda
9c191be106
use the AddressManager's method to store current address
2015-01-06 16:13:06 -08:00
ZappoMan
1bc91e7d29
removed renderTriangleProxies
2015-01-06 16:01:06 -08:00
Andrzej Kapolka
78c4bcd2ec
Heightfield conversion Hermite bits.
2015-01-06 15:39:06 -08:00
Andrzej Kapolka
a20b12ad44
Material painting for stacks.
2015-01-06 14:25:26 -08:00
ZappoMan
1bfce7d876
more removal of immediate mode
2015-01-06 14:14:13 -08:00
ZappoMan
873403a333
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
...
Conflicts:
interface/src/Audio.cpp
interface/src/Audio.h
interface/src/Menu.cpp
interface/src/Menu.h
2015-01-06 12:27:16 -08:00
Philip Rosedale
413cbacbc1
Merge pull request #4043 from ZappoMan/voxelEctomy
...
more voxel-ectomy cleaning up some remaining references to voxels
2015-01-06 10:07:38 -08:00
ZappoMan
ac1f7c9a84
multi-mode renderVertices
2015-01-06 09:52:27 -08:00
Stephen Birarda
5fadfa8c17
remove doubled friend declaration, is in macro
2015-01-06 09:35:11 -08:00
ZappoMan
b940dcfdb3
more voxel-ectomy cleaning up some remaining references to voxels
2015-01-06 09:27:48 -08:00
Andrew Meadows
f3255eeb0e
Merge pull request #4008 from birarda/lasagna-not-spaghetti
...
some Audio cleanup in prep for audio untangle
2015-01-06 09:13:12 -08:00
ZappoMan
570607c044
renderLines
2015-01-06 08:58:41 -08:00
ZappoMan
0606861b66
dashed lines in GeometryCache
2015-01-05 21:45:17 -08:00
ZappoMan
a9b7367fa9
more work on eliminating immediate mode calls
2015-01-05 20:51:05 -08:00
Brad Hefta-Gaub
a88346467b
Merge pull request #4042 from samcake/tot
...
Change sun location to be the direction for lighting
2015-01-05 20:36:28 -08:00
ZappoMan
9545bd1907
add alternate renderGrid for audio scope
2015-01-05 19:34:37 -08:00
Andrzej Kapolka
5a46f3e20d
Material/ray testing bits.
2015-01-05 18:37:47 -08:00
Sam Gateau
4ffb3e4e7e
just do the sun location modification
2015-01-05 17:31:47 -08:00
Andrew Meadows
0a8437a578
increasing default restitution to 0.5
2015-01-05 17:31:23 -08:00
ZappoMan
bd1612f6a4
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
2015-01-05 16:51:31 -08:00
Sam Gateau
2fdcbb1a97
changing the atmoshpere position
2015-01-05 16:46:42 -08:00
ZappoMan
a20fa1242d
first cut are removing immediate mode GL_LINES
2015-01-05 15:46:48 -08:00
Andrew Meadows
e2884c56f5
only predict remote transform for moving objects
2015-01-05 15:16:03 -08:00
Atlante45
be050b0469
Added missing deletes
2015-01-05 15:13:07 -08:00
Andrew Meadows
11de33b98b
merge upstream/master into andrew/inertia
2015-01-05 15:02:53 -08:00
Andrew Meadows
75a8faec86
purge support for voxels from PhysicsEngine
2015-01-05 15:02:18 -08:00
Andrew Meadows
244a8503ef
include damping in remote extrapolation model
2015-01-05 14:48:16 -08:00
Stephen Birarda
51bba4884f
resolve conflicts on merge with upstream master
2015-01-05 14:40:48 -08:00
ZappoMan
c2d45df541
add renderBevelCornersRect to GeometryCache
2015-01-05 14:39:14 -08:00
Andrzej Kapolka
808cb2e4bc
Substantial cleanup, working on interface between heightfields and dual
...
contour surfaces.
2015-01-05 14:33:40 -08:00
Sam Gateau
f03b253260
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2015-01-05 13:23:14 -08:00
Andrew Meadows
162854c5a5
Merge pull request #4025 from ZappoMan/voxelEctomy
...
Voxel ectomy
2015-01-05 13:20:30 -08:00
Sam Gateau
901ea16ba0
clean code
2015-01-05 13:17:12 -08:00
Brad Hefta-Gaub
125dc5010e
Merge pull request #4039 from AndrewMeadows/inertia
...
Bullet physics part 2
2015-01-05 13:10:55 -08:00
Sam Gateau
7529b3d1b0
clean code
2015-01-05 13:10:32 -08:00
Andrew Meadows
0b9c9daed9
Merge pull request #4034 from ZappoMan/multiThreadedPerformanceTimer
...
Multi threaded performance timer
2015-01-05 13:01:59 -08:00
dev
e3d474db3d
FIx shaders for mac
2015-01-05 12:27:16 -08:00
Andrew Meadows
6fb4e1f622
oops, need to update angularVelocity after damping
2015-01-05 12:23:55 -08:00
Andrew Meadows
bf6b8f9ca7
do not zero small velocities for non-bullet case
2015-01-05 12:01:09 -08:00
Sam Gateau
b8e44a3e7a
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2015-01-05 11:27:53 -08:00
Sam Gateau
458ea6759e
Adding the shadow.slh file containing the shader functions used for shadowing, itis used by both normal and cascaded shadow deferred lighting passes
2015-01-05 11:27:29 -08:00
Andrew Meadows
3b7770f405
change meaning of damping to agree with bullet
...
0 = no damping
1 = 100% damping
The new formula is: velocity *= (1 - damping)^dt
2015-01-05 11:23:01 -08:00
Stephen Birarda
dfb02aea0c
resolve conflicts on merge, add cstring inc
2015-01-05 09:25:30 -08:00
Andrew Meadows
d032eab0de
merge upstream/master into andrew/inertia
2015-01-05 09:19:37 -08:00
Andrew Meadows
30200ef7eb
add damping to ObjectMotionState
2015-01-05 09:17:46 -08:00
Philip Rosedale
a01ab38f1b
Merge pull request #4029 from Atlante45/new_glm_fix
...
Fix compile error with new glm version
2015-01-04 11:26:37 -08:00
Andrzej Kapolka
a504d03b14
Normal fix.
2015-01-02 17:14:17 -08:00
ZappoMan
4cc641320b
fix PerformanceTimer to handle timer stacks on multiple threads
2015-01-02 15:04:48 -08:00
ZappoMan
139f96c8b0
remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe
2015-01-02 14:41:09 -08:00
Philip Rosedale
384899e977
Merge pull request #4032 from Atlante45/uninitialized_entity_members
...
Initialize entities' _locked and _script
2015-01-02 14:01:55 -08:00
Andrzej Kapolka
3959f99910
Fixed voxel textures.
2015-01-02 13:57:27 -08:00
Atlante45
022beff569
Initialize entities' _locked and _script
2015-01-02 12:37:00 -08:00
Sam Gateau
46ab4833be
applying the shadowing improvment to the cascaceded path shader and cleaning the code
2015-01-02 12:12:41 -08:00
Sam Gateau
24d39f4453
refining the shadowing
2015-01-02 11:29:54 -08:00
Sam Gateau
ef7c002237
Improving the shadow effect with lightmaps
2015-01-02 10:31:34 -08:00
Andrzej Kapolka
e242459ea2
More render progress.
2014-12-31 17:33:43 -08:00
Andrew Meadows
0d3e78fdb8
modify extrapolation behavior when bullet enabled
...
Allows Bullet to specify an object as "at rest"
by setting velocity to zero.
Also, moved velocity damping above position integration
to get the same order of operations as Bullet.
2014-12-31 16:32:09 -08:00
Andrzej Kapolka
08dfd28ec0
More rendering bits.
2014-12-31 15:53:38 -08:00
Atlante45
b1f0ec8dfb
Fix compile error with new glm version
2014-12-31 15:49:56 -08:00
Sam Gateau
02949dbc5a
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2014-12-31 10:59:42 -08:00