Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-17 18:48:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22301 commits 6 branches 1 tag 1.1 GiB
Commit graph

22301 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
9122364c3b merge upstream/master into andrew/inertia 2015-02-13 16:20:09 -08:00
Andrew Meadows
cfbf8fdca7 explicit cleanup of loaded model animations 
in Application dtor
 2015-02-13 16:19:10 -08:00
Stephen Birarda
28fabcb788 avoid ubuntu libssl error by using http links 2015-02-13 16:17:45 -08:00
Stephen Birarda
691cf2d893 remove gverb from win build guide 2015-02-13 16:12:47 -08:00
Stephen Birarda
d337cadb10 add gverb to list of auto-deps 2015-02-13 16:12:03 -08:00
Stephen Birarda
48e7aa7433 handle android build of gverb for external project 2015-02-13 16:06:30 -08:00
Andrew Meadows
45ec7fdf07 Merge pull request #4288 from ZappoMan/dependancyCleanup 
change ScriptCache and SoundCache to derive from Dependency
 2015-02-13 16:00:47 -08:00
Stephen Birarda
4300836810 make gverb a cmake external project 2015-02-13 15:47:35 -08:00
ZappoMan
1fc0225939 change ScriptCache and SoundCache to derive from Dependency 2015-02-13 15:33:41 -08:00
Seth Alves
42511f3b7f M-x mangle buffer 2015-02-13 15:23:22 -08:00
Seth Alves
98b445b22f the geometryCacheID for Rectangle3DOverlay wasn't being initialized (so was randomish). if they overlapped, some would be drawn looking like others 2015-02-13 15:21:03 -08:00
Ryan Huffman
2df850eb8d Fix natural dimensions check 2015-02-13 15:02:16 -08:00
Ryan Huffman
0495833ca6 Disallow entity models to be reset to natural dimensions if unknown 2015-02-13 15:00:37 -08:00
ZappoMan
bc5a1477e6 added logging of edit commands in the server 2015-02-13 14:59:57 -08:00
Stephen Birarda
ab0692229d fix GLM includes for gvr-interface and shared 2015-02-13 14:54:21 -08:00
Stephen Birarda
6e63c1c1ad set the GLM_INCLUDE_DIRS var in cache so find hits it 2015-02-13 14:50:12 -08:00
Andrew Meadows
589077bce6 try again: move stuff around in ~Application 2015-02-13 14:01:56 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Brad Hefta-Gaub
5c048db5f5 Merge pull request #4284 from sethalves/fix-butterflies 
if butterflies stop moving, they are no longer kinematic, so give them a velocity
 2015-02-13 12:45:08 -08:00
Stephen Birarda
50c9bb2ae5 remove glm as manual dep in BUILD guides 2015-02-13 12:33:29 -08:00
Stephen Birarda
28430d928a use direct connection to ensure injector is stopped 2015-02-13 11:52:51 -08:00
Seth Alves
6ff4f8c2c0 give butterflies an initial velocity so that they are on the kinematics list 2015-02-13 11:52:23 -08:00
Stephen Birarda
1ba85518fc fix for playSound called from same thread 2015-02-13 11:36:41 -08:00
Andrew Meadows
37be7251fe merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2015-02-13 11:10:13 -08:00
Andrew Meadows
5113258d72 Merge pull request #4279 from birarda/android 
fix cleanup of AudioClient, avoid gvr-interface crash on OS X
 2015-02-13 10:58:50 -08:00
Brad Hefta-Gaub
59b2c38eb1 Merge pull request #4277 from huffman/fix-select-box 
Update editEntities to not select new entity when edit tools are off
 2015-02-13 10:50:11 -08:00
Brad Hefta-Gaub
1827d9f3cd Merge pull request #4256 from samcake/temp1 
Getting rid of glLIghts and replacing by the model::Light
 2015-02-13 10:49:53 -08:00
Stephen Birarda
9136154cd5 fix double subdir include, clear up build guide 2015-02-13 10:48:27 -08:00
Stephen Birarda
2f875cc08e remove the glm find module 2015-02-13 10:38:13 -08:00
Stephen Birarda
9c13bec476 remove glm include where no longer required 2015-02-13 10:38:01 -08:00
Stephen Birarda
263afdd22c use external project glm in physics tests 2015-02-13 10:37:17 -08:00
Stephen Birarda
0e32ed280a put back glm dependency via external proj in entities-renderer 2015-02-13 10:36:23 -08:00
Stephen Birarda
d3973a724c remove glm requirement in audio tests 2015-02-13 10:35:52 -08:00
Stephen Birarda
b713551087 use external project glm in script-engine 2015-02-13 10:35:06 -08:00
Stephen Birarda
fa6f6a6b71 use external project glm in render-utils 2015-02-13 10:34:19 -08:00
Stephen Birarda
d7ce10dedb use external project glm for physics library 2015-02-13 10:33:35 -08:00
Stephen Birarda
8994cc0268 use external project glm for octree library 2015-02-13 10:32:27 -08:00
Stephen Birarda
1d90c1c827 use glm external project in model library 2015-02-13 10:31:41 -08:00
Stephen Birarda
16615b9be0 use glm external project in metavoxels library 2015-02-13 10:30:22 -08:00
Stephen Birarda
54ce79db5a remove glm dependency in gpu library 2015-02-13 10:29:19 -08:00
Stephen Birarda
26b93731f8 use glm as external project in fbx library 2015-02-13 10:28:06 -08:00
Stephen Birarda
4d5d647d84 use external project glm in environment library 2015-02-13 10:27:24 -08:00
Stephen Birarda
0e790daa5b remove glm dependency from entities-renderer 2015-02-13 10:26:23 -08:00
Stephen Birarda
866295b09e use external project glm in entities library 2015-02-13 10:24:46 -08:00
Stephen Birarda
a4752aaab0 use external project glm in avatars 2015-02-13 10:22:09 -08:00
Stephen Birarda
df8e51f835 use external project glm in more targets 2015-02-13 10:21:21 -08:00
Stephen Birarda
e3475d4d7f Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-02-13 10:19:00 -08:00
Andrew Meadows
d69efa03d8 Merge pull request #4276 from birarda/master 
repairs to memory management for AudioInjectors
 2015-02-13 10:15:07 -08:00
Stephen Birarda
2c7e225ef7 use cmake ExternalProject for glm in Interface 2015-02-13 10:14:47 -08:00
Stephen Birarda
13fc0b1fcd fix AudioInjector debug line to be more clear 2015-02-13 09:36:16 -08:00