Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 12:53:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22187 commits 71 branches 56 tags 1.2 GiB
Commit graph

22187 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Brad Hefta-Gaub
6c8a78a9a7 Merge pull request #4278 from huffman/fix-edit-grid 
Fix edit grid
 2015-02-12 17:20:03 -08:00
Brad Hefta-Gaub
3531463978 Merge pull request #4265 from Triplelexx/#20300 
#20300
 2015-02-12 17:19:01 -08:00
Andrew Meadows
c3b432c4b5 wrap explicit exit() in #ifndef DEBUG 2015-02-12 17:02:21 -08:00
Andrew Meadows
07a12f8b4c remove a couple crash modes on shutdown 2015-02-12 16:55:14 -08: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
Stephen Birarda
30b371559d fix a typo in RenderingClient 2015-02-12 15:11:24 -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
4e71e128f3 remove QThread not currently used in client 2015-02-12 13:42:36 -08:00
Stephen Birarda
6c25205856 fix audio cleanup and close action in Application 2015-02-12 13:35:22 -08:00
Ryan Huffman
813673b720 Fix grid tool not showing minor grid width 2015-02-12 13:19:09 -08:00
Ryan Huffman
a3d09e6adc Fix edit grid not showing up 2015-02-12 13:18:58 -08:00
Stephen Birarda
ff6f8ea4a1 cleaner cleanup of AudioClient from RenderingClient 2015-02-12 13:14:30 -08:00
Ryan Huffman
51ce8c7100 Update editEntities to not select new entity when edit tools are off 2015-02-12 13:09:37 -08:00
Stephen Birarda
ef9cc2aacc repair ability for desktop to add gvr target 2015-02-12 12:49:29 -08:00
Stephen Birarda
0154ac9734 final script repairs for new AudioInjector API 2015-02-12 11:52:20 -08:00
Stephen Birarda
1120a5f963 use new injector API in inWorldTestTone 2015-02-12 11:50:48 -08:00
Stephen Birarda
eda7d8ffb1 use new injector APIs in movable script 2015-02-12 11:49:01 -08:00
Stephen Birarda
70e085009b use injector restart in airGuitar script 2015-02-12 11:44:14 -08:00
Stephen Birarda
5f4e3528c2 override seek to handle warning once stopped 2015-02-12 11:29:55 -08:00
Stephen Birarda
5715642e04 fix for restart API in lobby script 2015-02-12 11:13:30 -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
Andrew Meadows
9f62e8bbf6 Merge pull request #4274 from sethalves/lockers-can-change-metavoxels 
if a MetavoxelEditMessage is received from a node which is not an editer...
 2015-02-12 09:51:25 -08:00
Andrew Meadows
5553f0f531 Merge pull request #4275 from ctrlaltdavid/20306 
CR for Job #20306 - When you load Interface on a PC if takes up the entire screen, this needs to change
 2015-02-12 09:50:12 -08:00
Andrew Meadows
7304585103 Merge pull request #4271 from huffman/fix-overlays-text-size 
Fix overlays text size
 2015-02-12 09:35:37 -08:00
Seth Alves
6506d87eb6 Merge branch 'master' of github.com:highfidelity/hifi into lockers-can-change-metavoxels 2015-02-12 09:16:56 -08:00
Andrew Meadows
357dd963f3 Merge pull request #4273 from ZappoMan/bugfix 
fix the quad color being broken after rendering text
 2015-02-12 09:00:16 -08:00
Andrew Meadows
e737921e67 Merge pull request #4270 from sethalves/clean-up-stats 
put bandwidth stats in first overlay column rather than in their own
 2015-02-12 08:58:53 -08:00
Andrew Meadows
5bb504ad55 Merge pull request #4268 from huffman/remove-upload-model 
Remove upload from file from editEntities.js
 2015-02-12 08:57:22 -08:00
Andrew Meadows
b4bd60e979 give TextEntityItem a box collision shape 2015-02-12 08:28:34 -08:00
Stephen Birarda
43e777163e use a QPointer to trigger delayed delete 2015-02-11 19:15:33 -08:00
David Rowe
6f03035169 Explicit casts for OSX and Linux 2015-02-11 18:05:25 -08:00
Stephen Birarda
79674fb94f use a wrapper on audio injector for script ownership 2015-02-11 17:20:00 -08:00
Stephen Birarda
449719bc7c add option to restart a local audio injector 2015-02-11 16:58:30 -08:00
Seth Alves
b9882e6488 if a MetavoxelEditMessage is received from a node which is not an editer of this domain, ignore it 2015-02-11 16:53:32 -08:00
Stephen Birarda
e3c4ead323 remove unecessary injector stops 2015-02-11 16:23:57 -08:00
Stephen Birarda
05b7cd819e use isPlaying property instead of getter 2015-02-11 16:21:45 -08:00
Stephen Birarda
f9174366dc fixes for new injector API in other scripts 2015-02-11 16:20:48 -08:00
Stephen Birarda
d8646f6ea0 repairs for new injector API in air guitar script 2015-02-11 16:17:10 -08:00
Stephen Birarda
6a5c0fd9f2 repairs for new injector API in lobby script 2015-02-11 16:16:01 -08:00
David Rowe
967afd8d67 Restore to windowed, maximized, or full screen appropriately at start-up 2015-02-11 16:13:04 -08:00
Stephen Birarda
4894a5b414 better handling of cleanup for local injector 2015-02-11 16:11:55 -08:00
Stephen Birarda
0498c5c708 provide old ASI APIs in AudioInjector 2015-02-11 15:57:32 -08:00
Stephen Birarda
7b485829c4 cleanup AudioInjector memory management 2015-02-11 15:52:00 -08:00