Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 01:07:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
10338 commits 69 branches 56 tags 1.2 GiB
Commit graph

5604 commits

Author SHA1 Message Date
Stephen Birarda
b705ec560f cleanup resources directory references by copying beside the executable 2014-03-06 11:46:49 -08:00
Stephen Birarda
c737283935 qrc references should only use a single slash 2014-03-06 10:45:47 -08:00
Stephen Birarda
94a0db04f9 don't copy resources into OS X bundle 2014-03-06 10:41:44 -08:00
Stephen Birarda
403f91c988 update resource references to use Qt resource system 2014-03-06 10:41:11 -08:00
Stephen Birarda
cc554c53f1 use Qt Resource System to compile in resources 2014-03-06 10:25:15 -08:00
Andrzej Kapolka
82011905be Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-05 18:10:55 -08:00
Andrzej Kapolka
a7af3bc284 Merge branch 'master' of https://github.com/highfidelity/hifi 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-03-05 18:08:59 -08:00
Andrzej Kapolka
ad25455f86 Track hysteresis for next model separately, but just in case, don't use 
recursion to fall back on hysteresis value.  Closes #2209.
 2014-03-05 18:06:14 -08:00
ZappoMan
a54e401377 Merge branch 'master' of https://github.com/worklist/hifi into particle_collions_penetration 
Conflicts:
	libraries/script-engine/src/Vec3.cpp
 2014-03-05 18:04:57 -08:00
Philip Rosedale
c2a63c4206 Merge pull request #2190 from AndrewMeadows/shapes 
Collision Shapes
 2014-03-05 17:59:42 -08:00
Andrzej Kapolka
3930b3e824 Display names are great, but not in the shadow map. Closes #2208. 2014-03-05 17:44:08 -08:00
Andrzej Kapolka
78221c7de2 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-05 17:13:00 -08:00
ZappoMan
d89cb2bf5e added penetration support to particle collisions JS callbacks 2014-03-05 15:03:54 -08:00
Andrew Meadows
a1856ac18b fix bad transform math for placing shapes 2014-03-05 11:57:07 -08:00
Andrew Meadows
89f664c0ee fixing incorrect documentation comment 2014-03-05 11:52:47 -08:00
Andrew Meadows
2bc8e142b4 cruft removal 2014-03-05 11:51:42 -08:00
Stephen Birarda
395263ff3d add time to the interface logs - closes #2205 2014-03-05 09:55:06 -08:00
Andrew Meadows
7db5aaaf37 new collision pipeline for avatar shapes 2014-03-05 07:08:59 -08:00
Philip Rosedale
e4924cdca8 Merge pull request #2202 from birarda/authentication 
remove deprecated qt5 methods in CMakeList files
 2014-03-04 18:30:22 -08:00
ZappoMan
c031359a54 fix infinite reloading of missing script files 2014-03-04 16:20:17 -08:00
Atlante45
f90062b38c Merge branch 'master' of https://github.com/highfidelity/hifi into freeglut_fix 2014-03-04 13:18:22 -08:00
Atlante45
3c99cf162d Fix was at the wrong spot 2014-03-04 13:17:19 -08:00
Andrzej Kapolka
1357aee01e Use mipmaps and trilinear filtering for models. Closes #2180. 2014-03-04 13:03:31 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
Andrew Meadows
57e217c7fb Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 12:10:12 -08:00
AndrewMeadows
ea0fe95baa Merge pull request #2191 from birarda/null-checks 
more null pointer cleanup
 2014-03-04 12:07:39 -08:00
ZappoMan
d5e7e98b5e Merge pull request #2192 from Atlante45/freeglut_fix 
fix for windows
 2014-03-04 11:51:14 -08:00
Andrew Meadows
d537b4118d Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 2014-03-04 11:40:59 -08:00
Atlante45
9767846c91 fix for windows 2014-03-04 11:06:23 -08:00
Atlante45
894f85fcb5 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-04 10:49:26 -08:00
Atlante45
66b0590509 Review fixes 2014-03-04 10:48:53 -08:00
Stephen Birarda
f5aaad1f33 remove if checks in cases where delete handles null 2014-03-04 10:05:43 -08:00
Andrew Meadows
3d426a24f1 Fixing build warnings 2014-03-04 09:54:34 -08:00
Andrew Meadows
d0ac8eec74 removing unused variable 2014-03-04 09:54:12 -08:00
Andrew Meadows
7ba5bc71ea Merge branch 'master' of ssh://github.com/highfidelity/hifi into shapes 
Conflicts:
	interface/src/renderer/FBXReader.cpp
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-03-04 09:01:24 -08:00
ZappoMan
1a5b0ee02e Merge pull request #2170 from birarda/cmake-quotes 
complete quoting of various cmake commands
 2014-03-04 09:00:26 -08:00
Atlante45
84f8e6ee19 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-03 17:55:30 -08:00
Atlante45
bb3c8f2a7a Removed ClipboardOverlay 2014-03-03 17:54:58 -08:00
Andrew Meadows
4ef2067421 Use capsules for some joints and render them. 2014-03-03 17:49:24 -08:00
Andrew Meadows
1a8c10e132 Correcting a comment. 2014-03-03 17:35:52 -08:00
Atlante45
f1ce034c35 Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels 2014-03-03 16:47:42 -08:00
Atlante45
ef9ff0fa74 Put initialization and deletion of localVoxelSystems on render thread 2014-03-03 16:46:25 -08:00
Stephen Birarda
e16a325006 optionally do not reference OPENGL_INCLUDE_DIR for win 2014-03-03 16:36:37 -08:00
Andrzej Kapolka
64c4e58160 Tie the avatar LOD distance multiplier to the LOD parameter calculated for 
voxels.
 2014-03-03 16:34:28 -08:00
Stephen Birarda
bb3a8677be Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes 2014-03-03 16:31:25 -08:00
Andrzej Kapolka
f5eaa330d8 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-03 15:48:38 -08:00
Philip Rosedale
5c0ec0ff6b Merge pull request #2175 from ZappoMan/bugfixes 
Fixes to particle deadlock, and some other crashes
 2014-03-03 15:42:09 -08:00
Andrzej Kapolka
75c9e44545 Render the billboard if we don't have both models. Closes #2178. 2014-03-03 15:33:37 -08:00
Andrzej Kapolka
7ecfeeaba3 Do the actual reading of the reply on the worker thread. Otherwise, when we 
read from the cache, we're reading synchronously from a file.  Closes #2171.
 2014-03-03 15:16:13 -08:00
Andrzej Kapolka
85083d74bc Fix for annoying "QThreadStorage" warning. 2014-03-03 13:39:01 -08:00