Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
22495 commits 29 branches 0 tags 1.1 GiB
Commit graph

22495 commits

This branch
This branch
All branches
Author SHA1 Message Date
Virendra Singh
d4367924ad Clean up coding standard violations 2015-02-27 00:59:59 +05:30
Virendra Singh
93106be466 VHACD dependency build instructions 2015-02-27 00:58:55 +05:30
Virendra Singh
95839dd64e untabify the source files 2015-02-27 00:27:18 +05:30
Virendra Singh
36c3131524 Rectifying bad merge in BUILD.md and BUILD_WIN.md 2015-02-27 00:14:46 +05:30
Virendra Singh
19912930dd Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 2015-02-26 22:57:27 +05:30
Virendra Singh
bdb79f2619 Resetting from master 2015-02-26 22:56:21 +05:30
Philip Rosedale
c2e559342a Merge pull request #4341 from AndrewMeadows/bispinor 
load non-moving dynamic objects as "inactive" in physics engine
 2015-02-26 09:21:49 -08:00
Virendra Singh
ce60bb40d7 removed tags for *.md files 2015-02-26 22:32:47 +05:30
Virendra Singh
b3fdb19cad Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 
Conflicts:
	BUILD.md
	BUILD_WIN.md
 2015-02-26 22:16:35 +05:30
Leonardo Murillo
cfa6352c3a Merge pull request #4344 from birarda/master 
better handling for externals folder name for msvc12
 2015-02-25 17:58:07 -08:00
Stephen Birarda
53f265bca2 Merge branch 'master' of github.com:highfidelity/hifi 2015-02-25 17:49:02 -08:00
Stephen Birarda
f8627c8233 fix handling for vc12 externals 2015-02-25 17:48:26 -08:00
Andrew Meadows
7b68916010 Merge pull request #4343 from ZappoMan/hangOnExit 
BUG FIX: Hang on exit
 2015-02-25 17:02:26 -08:00
Virendra Singh
434c0b569f Make vhacd tool optional 2015-02-26 06:28:28 +05:30
ZappoMan
05d7d47045 some cleanup 2015-02-25 16:32:48 -08:00
ZappoMan
b03928cec7 some cleanup 2015-02-25 16:31:43 -08:00
ZappoMan
af43ba3444 used a registered quad for the audio box since its color constantly changes 2015-02-25 15:21:24 -08:00
ZappoMan
5eecb6a837 correctly delete glbuffers 2015-02-25 14:44:10 -08:00
Stephen Birarda
db7bfc1e6e Merge pull request #4342 from birarda/master 
look directly in Xcode app for 10.9 SDK
 2015-02-25 14:04:41 -08:00
Stephen Birarda
a7a9ede744 handle an SDK in Xcode beta 2015-02-25 13:53:57 -08:00
Stephen Birarda
e0d31f6e61 remove extra added spaces 2015-02-25 13:52:14 -08:00
Stephen Birarda
994c0386d3 cleanup command that looks for SDK 2015-02-25 13:50:59 -08:00
Stephen Birarda
d24287f627 look in Xcode application for 10.9 SDK 2015-02-25 13:48:28 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
Stephen Birarda
1c2606c6db fail out if windeployqt is not found 2015-02-25 13:12:37 -08:00
Stephen Birarda
a9fcde6265 fix two typos in BUILD guides 2015-02-25 13:07:52 -08:00
ZappoMan
912b851eb7 remove crufty references to QGLWidget 2015-02-25 12:54:34 -08:00
ZappoMan
d1e648b392 remove unused references to QGLWidget* parent in Overlay and Overlays 2015-02-25 12:34:38 -08:00
Brad Hefta-Gaub
e7b36166ec Merge pull request #4340 from huffman/fix-repeat-captured-keys 
Make KeyEvent objects equal even if they have differing isAutoRepeat val...
 2015-02-25 12:24:19 -08:00
Brad Hefta-Gaub
6d237f3f79 Merge pull request #4339 from huffman/fix-plane-pick 
Fix plane pick
 2015-02-25 12:23:45 -08:00
ZappoMan
a89691fc66 switch GLCanvas back to being owned by Application 2015-02-25 12:11:35 -08:00
Andrew Meadows
d85be49694 merge upstream/master into andrew/bispinor 2015-02-25 12:08:02 -08:00
Andrew Meadows
5776df1012 load dynamic obj as inactive when not moving 2015-02-25 12:07:19 -08:00
Stephen Birarda
33b0fd24a6 don't call copy dll step for scribe 2015-02-25 11:02:05 -08:00
ZappoMan
e66f12f958 add shutdown short circuiting to datagram processor 2015-02-25 10:56:08 -08:00
Stephen Birarda
66ab2ba9f9 fix for flipped conditional for dll fixup 2015-02-25 10:44:02 -08:00
Stephen Birarda
fd8240669b fix for windeployqt for executables 2015-02-25 10:39:44 -08:00
Ryan Huffman
660d9ad499 Make KeyEvent objects equal even if they have differing isAutoRepeat values 2015-02-25 10:28:45 -08:00
Ryan Huffman
c499352ad8 Update billboard and planar overlays to use new findRayRectangleIntersection signature 2015-02-25 10:27:11 -08:00
Ryan Huffman
14ec9b431e Update findRayRectangleIntersection to set out variable distance 2015-02-25 10:26:44 -08:00
Clément Brisset
b1e46c1bc8 Merge pull request #4337 from ZappoMan/crashonexit 
Fixes to various Crashes on shutdown
 2015-02-25 08:47:36 -08:00
ZappoMan
e87df0017a code review feedback 2015-02-25 08:26:54 -08:00
Clément Brisset
880c8f370f Merge pull request #4333 from birarda/master 
pass 10.9 SDK as CMAKE_OSX_SYSROOT
 2015-02-25 06:41:28 -08:00
Brad Hefta-Gaub
97e2e65cb3 Merge pull request #4336 from AndrewMeadows/bispinor 
lower threshold for ignoring rotation updates
 2015-02-24 20:13:22 -08:00
Brad Hefta-Gaub
0f4e098a61 Merge pull request #4334 from huffman/edit-ray-improvement 
Fix BillboardOverlay::findRayIntersection
 2015-02-24 20:13:05 -08:00
Brad Hefta-Gaub
8c26be49d7 Merge pull request #4330 from huffman/edit-off-on-domain-change 
Turn editEntities off on domain change
 2015-02-24 20:11:39 -08:00
Brad Hefta-Gaub
8b47de3150 Merge pull request #4329 from Seefo/master 
Cleaned up warnings on Windows
 2015-02-24 20:08:56 -08:00
Brad Hefta-Gaub
9ded2699e2 Merge pull request #4327 from thoys/20364 
CR for Job #20364 - Add toggle to turn off sounds in notifications.js
 2015-02-24 20:06:57 -08:00
Virendra Singh
ed09b619d1 OS check 
check OS for different filenames
 2015-02-25 09:12:19 +05:30
Kodey
a0a1564720 Merge branch '20305' of https://github.com/virneo/hifi into 20305 2015-02-25 08:45:29 +05:30