Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 22:20:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22109 commits 71 branches 59 tags 1.2 GiB
Commit graph

7232 commits

Author SHA1 Message Date
Andrew Meadows
53855c89e9 Merge pull request #4289 from birarda/dependencies 
add gverb and glm as cmake external projects
 2015-02-17 10:00:29 -08:00
Andrew Meadows
d896f3a811 Merge pull request #4252 from thoys/20224 
CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads
 2015-02-17 09:03:17 -08:00
Andrew Meadows
ac93f86522 Merge pull request #4292 from birarda/master 
add a NULL initializer for linked data create callback
 2015-02-16 12:26:15 -08:00
Stephen Birarda
20b0dee80c add a NULL initializer for the linked data create callback 2015-02-16 12:07:22 -08:00
Andrew Meadows
935b5ab5b3 Merge pull request #4290 from ZappoMan/backupFixes 
fix a couple of bugs in backup settings
 2015-02-16 09:56:20 -08:00
Clément Brisset
84bd1aeedf Merge pull request #4283 from birarda/master 
fix for ASI playSound called from same thread
 2015-02-16 09:12:59 -08:00
Stephen Birarda
8acaa062a2 Merge pull request #4281 from Atlante45/fix_mute_environnement 
Fix mute environnement
 2015-02-16 09:11:47 -08:00
ZappoMan
573d7971ac fix a couple of bugs in backup settings 2015-02-13 20:23:12 -08:00
Brad Hefta-Gaub
9b6049489b Merge pull request #4280 from AndrewMeadows/inertia 
remove a couple crash modes on shutdown
 2015-02-13 17:11:56 -08:00
Andrew Meadows
76b10a60ba Merge pull request #4285 from ZappoMan/editLogging 
added logging of edit commands in the server
 2015-02-13 17:02:05 -08:00
Andrew Meadows
45208d468e Merge pull request #4282 from ZappoMan/bugfix 
some backup logging improvements & a bug fix
 2015-02-13 16:54:25 -08:00
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
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
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
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Stephen Birarda
28430d928a use direct connection to ensure injector is stopped 2015-02-13 11:52:51 -08:00
Stephen Birarda
1ba85518fc fix for playSound called from same thread 2015-02-13 11:36:41 -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
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
0e32ed280a put back glm dependency via external proj in entities-renderer 2015-02-13 10:36:23 -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
Stephen Birarda
13fc0b1fcd fix AudioInjector debug line to be more clear 2015-02-13 09:36:16 -08:00
Atlante45
7a107adbc1 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_mute_environnement 2015-02-13 11:00:41 +01:00
Atlante45
4b7d4d7290 Don't use DataStream to write MuteEnv packet 2015-02-13 10:56:04 +01:00
ZappoMan
f1a5865201 added more logging to persist and backup, fixed bug in start up case for no models.svo and backup 2015-02-12 15:17:48 -08:00
Thijs Wenker
062c2cbcee HUD LookAt positions could be NULL now if whenever they're out of range 
HMD.HUDLookAtPosition2D -> HMD.getHUDLookAtPosition2D()
HMD.HUDLookAtPosition3D -> HMD.getHUDLookAtPosition3D()
 2015-02-12 22:55:44 +01:00
Stephen Birarda
6c25205856 fix audio cleanup and close action in Application 2015-02-12 13:35:22 -08:00
Stephen Birarda
ff6f8ea4a1 cleaner cleanup of AudioClient from RenderingClient 2015-02-12 13:14:30 -08:00
Stephen Birarda
5f4e3528c2 override seek to handle warning once stopped 2015-02-12 11:29:55 -08:00
Stephen Birarda
060b0bbfd6 tell injector it is not finished once restarted 2015-02-12 11:13:03 -08:00
Stephen Birarda
ea52cea5dd more cleanup for AudioInjector mem management 2015-02-12 10:56:40 -08:00
Stephen Birarda
7becf62ba9 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-02-12 10:28:04 -08:00
Brad Hefta-Gaub
fa5eebd93e Merge pull request #4269 from AndrewMeadows/thermonuclear 
ModelEntityItem gets _shapeType
 2015-02-12 10:06:01 -08:00