Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-04 05:18:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12225 commits 25 branches 0 tags 1.1 GiB
Commit graph

6501 commits

Author SHA1 Message Date
Andrew Meadows
f46a5dc966 fix #2718 for warning about unused variable 2014-04-23 10:13:05 -07:00
Andrew Meadows
bfe1ee377b remove warning about signed/unsigned comparison 
Also change n.f to be n.0f as per coding standard
 2014-04-23 08:56:53 -07:00
Andrew Meadows
67d0920f81 merge upstream/master into andrew/inertia 2014-04-23 08:40:48 -07:00
Andrew Meadows
5992651c27 update avatar collision shapes when necessary 2014-04-22 20:55:28 -07:00
Philip Rosedale
ee929f2551 Merge pull request #2712 from matsukaze/master 
Job #19574. Add new audio oscilloscope.
 2014-04-22 20:22:57 -07:00
matsukaze
d6e4f217f5 Expanded variable names. 2014-04-22 21:57:41 -04:00
matsukaze
1ff3b83644 Changed const color data and method signatures. 
Changed constant color data and method signatures from unsigned int to
array of float. Changed glColor4f to glColor4fv.
 2014-04-22 19:42:51 -04:00
matsukaze
015cbce322 Changed constant names for improved readability. 2014-04-22 18:57:22 -04:00
Andrew Meadows
364431328f remove include StreamUtils.h 2014-04-22 14:26:40 -07:00
Andrew Meadows
0b9ebe4c08 avatar-voxels collisions work again 2014-04-22 11:51:36 -07:00
Clément Brisset
f64988f73d Merge pull request #2711 from ZappoMan/quiet_logs 
quite the error messages about failed locks
 2014-04-22 11:51:20 -07:00
ZappoMan
ae443a3136 fix headers 2014-04-22 11:27:50 -07:00
Andrew Meadows
f033990fae merge upstream/master into andrew/inertia 2014-04-22 10:49:44 -07:00
Andrew Meadows
7537d240bb toward working avatar-vs-voxel collisions again 2014-04-22 10:48:42 -07:00
AndrewMeadows
94fabf7875 Merge pull request #2709 from ZappoMan/shared_and_weak_pointers 
Voxel/Particle Server Performance Improvements
 2014-04-22 10:28:39 -07:00
matsukaze
99cb1da5ec Reverting inadvertently committed local changes. 2014-04-22 07:40:31 -04:00
Thijs Wenker
59cc930556 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-22 13:12:38 +02:00
Thijs Wenker
6c89521f1d Style 2014-04-22 13:12:21 +02:00
matsukaze
6e575bc8af Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-22 06:54:53 -04:00
matsukaze
ff7a1bd60f Job #19574. Add audio oscilloscope.' 2014-04-22 06:53:59 -04:00
ZappoMan
1846036659 quite the error messages about faild locks 2014-04-21 20:58:43 -07:00
Andrew Meadows
06794f33f3 add accessor for Model::_boundingShape 2014-04-21 18:23:19 -07:00
Atlante45
681aab5bf0 Remove printf and replace them by qDebug() 2014-04-21 16:17:45 -07:00
Thijs Wenker
70ac93c20d Style 2014-04-21 21:44:50 +02:00
Thijs Wenker
e348f66151 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-21 21:40:01 +02:00
Thijs Wenker
9faee0d82d - Style 
- Script Editor can run script file once at time, but you can still start multiple scripts through the original ways.
 2014-04-21 21:37:49 +02:00
matsukaze
5b72a6dfcb Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-21 15:24:27 -04:00
Thijs Wenker
c1ed38f4de Style 2014-04-21 21:23:39 +02:00
ZappoMan
25a859f95e Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 2014-04-21 10:12:34 -07:00
U-Uthoypia\Thijs
0e28ff2fcd This should fix the ubuntu build 2014-04-21 06:33:20 +02:00
Thijs Wenker
77994ae0cb header cleanup (hopefully the ubuntu test-build will like this) 2014-04-21 06:20:18 +02:00
Thijs Wenker
5bffb17643 #include <QMessageBox.h> -> #include <QMessageBox> 2014-04-21 05:51:34 +02:00
Brad Hefta-Gaub
697036bf47 Merge pull request #2701 from ZappoMan/master 
fix switching audio device bug
 2014-04-20 20:29:57 -07:00
Thijs Wenker
23068b0356 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-21 05:26:42 +02:00
Thijs Wenker
c016d6557e - few Adjustments in Application class for Script editor 
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
 2014-04-21 05:25:28 +02:00
Brad Hefta-Gaub
b9dd276e32 Merge pull request #2700 from SydoxX/PageUp/Down 
Add PageUp/Down to controls
 2014-04-20 20:20:14 -07:00
ZappoMan
80dd0c3356 fix switching audio device bug 2014-04-20 20:18:56 -07:00
Konstantin
615f8b8dad Fix spacing 2014-04-19 16:35:48 +02:00
Konstantin
6c376d6fa6 Add PageUp/Down to controls 
When you press PageUp/Down now you fly up and down.
 2014-04-19 15:02:57 +02:00
Brad Hefta-Gaub
d848326039 Merge pull request #2699 from Atlante45/glow_when_speaking_option 
Made glowing when speaking an option
 2014-04-18 21:22:53 -07:00
Brad Hefta-Gaub
d0c10475d5 Merge pull request #2698 from Atlante45/master 
ModelUploader update to handle new behaviour
 2014-04-18 21:21:09 -07:00
Atlante45
716bc58c2d Fixed Jenkins failure 2014-04-18 18:10:11 -07:00
Atlante45
05545b684d Made glowing when speaking an option 2014-04-18 17:47:21 -07:00
Atlante45
c664b4a087 Fixed JSON parsing 2014-04-18 17:04:38 -07:00
Atlante45
1121773154 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-18 16:56:34 -07:00
Atlante45
8a7a590602 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 
Conflicts:
	interface/src/ui/Stats.cpp
 2014-04-18 16:07:08 -07:00
Atlante45
d6e7caa4db Removed Debug 2014-04-18 16:02:01 -07:00
Atlante45
b098a7a294 Fixed wire cube overlay not drawn with right line width 2014-04-18 15:59:37 -07:00
Atlante45
aa73527157 Some code cleaning 2014-04-18 15:58:56 -07:00
Brad Hefta-Gaub
16cd2ca5c3 Merge pull request #2680 from SydoxX/master 
URL scheme to go to location
 2014-04-18 15:34:12 -07:00