Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-14 09:27:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36897 commits 17 branches 0 tags 1.1 GiB
Commit graph

36897 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
4851def51c Add status HTTP server to AC Monitor 2016-01-08 10:35:04 -08:00
Ryan Huffman
d567c215bb Update console log paths to be in OS app data directory 2016-01-08 08:47:16 -08:00
Ryan Huffman
c8b40c2948 Add uncaught exception backtrace logging 2016-01-08 08:45:40 -08:00
Stephen Birarda
6484bf9e94 Merge pull request #65 from huffman/console 
Add shared memory back into main.cpp
 2016-01-04 13:17:37 -08:00
Ryan Huffman
471c555bca Add shared memory back into main.cpp 2016-01-04 11:58:56 -08:00
Stephen Birarda
9520bd7ba7 remove the beta stack-manager icons 2016-01-04 09:59:27 -08:00
Stephen Birarda
02069bfcd2 Merge remote-tracking branch 'leo/master' into console 2016-01-04 09:57:55 -08:00
Leonardo Murillo
0bd823e20c Fix to install path 2015-12-31 10:09:27 -06:00
Leonardo Murillo
2bad5437a9 Adding default content set as optional installer component 2015-12-31 09:07:11 -06:00
Leonardo Murillo
379cdf1d5d Merge branch 'master' of github.com:highfidelity/hifi 2015-12-31 09:06:44 -06:00
Eric Levin
9276c78368 Merge pull request #6741 from PhilipRosedale/master 
Improved hand controller grab and mouse movement
 2015-12-30 11:10:37 -08:00
Stephen Birarda
6ae4fc55a7 Merge pull request #64 from birarda/console-dev 
switch to a tray only console for MVP
 2015-12-30 09:45:49 -08:00
Stephen Birarda
a8896de140 remove dead code, use stop index 2015-12-30 09:45:23 -08:00
Andrew Meadows
a5c19c04e5 Merge pull request #6672 from ctrlaltdavid/fix-nodelist-shutdown 
Don't send a domain-server check in when shutting down
 2015-12-30 08:43:19 -08:00
Andrew Meadows
b83987331b Merge pull request #6725 from huffman/fix-avatar-get-myavatar 
Fix crash when getting MyAvatar.sessionUUID from AvatarManager
 2015-12-30 08:41:52 -08:00
Brad Davis
76eba89f7d Merge pull request #6745 from hyperlogic/tony/neuron-plugin 
Support for Perception Neuron
 2015-12-30 11:39:32 -05:00
Andrew Meadows
ec27c75332 Merge pull request #6660 from hyperlogic/tony/anim-expressions 
AnimExpression: boolean expression parser and evaluator
 2015-12-30 08:36:44 -08:00
Brad Davis
65862bfd02 Merge pull request #6747 from hyperlogic/tony/glmhelpers-tests 
Added tests for GLMHelpers::safeEulerAngles.
 2015-12-30 11:35:17 -05:00
Philip Rosedale
118f919c8b fix merge conflicts 2015-12-30 00:42:14 -08:00
Philip Rosedale
e995b29712 can target without grabbing 2015-12-30 00:36:11 -08:00
Philip Rosedale
6d857296f9 show search sphere instead of beams, start at center of view 2015-12-29 23:37:10 -08:00
Philip Rosedale
54edd94dd2 Merge pull request #6743 from zzmp/fix/skymap-tex-load 
Guard against unloaded skymap tex
 2015-12-29 21:34:48 -08:00
Philip Rosedale
a44a64d9c0 Merge pull request #6748 from ericrius1/gunFix 
Fixing issue with muzzle flash and hit sparks being out of sync for pi…
 2015-12-29 21:31:40 -08:00
James B. Pollack
5caa6cbdbf Update pistol.js 
leading zeroes
 2015-12-29 18:38:57 -08:00
ericrius1
4cc94b44ba muzzle is in sync 2015-12-29 18:30:07 -08:00
Stephen Birarda
9065a49d05 only hide the dock if on OS X 2015-12-29 18:18:18 -08:00
ericrius1
1a84b5c0f0 Fixing issue with muzzle flash and hit point being out of sync for pistol 2015-12-29 18:13:34 -08:00
Stephen Birarda
fd4b949fdc drop to 0.35.4 for windows console compatibility 2015-12-29 18:13:31 -08:00
Stephen Birarda
59f2573038 give browser window a title and icon 2015-12-29 17:59:29 -08:00
Stephen Birarda
6b4db2707e Merge branch 'console' into console-dev 2015-12-29 17:55:22 -08:00
Stephen Birarda
948bc45d49 Merge branch 'console' of github.com:birarda/hifi into console 2015-12-29 17:55:10 -08:00
Stephen Birarda
abea65fa84 resolve conflicts on merge with upstream/master 2015-12-29 17:54:45 -08:00
Stephen Birarda
c886cde59d create a hidden browser window 2015-12-29 16:49:00 -08:00
Stephen Birarda
e399a3709e remove debug for bytes read from message 2015-12-29 11:44:06 -08:00
Stephen Birarda
5887867ccf use a QLocalServer to handle multiple instance launches 2015-12-29 11:10:40 -08:00
Eric Levin
f71a4807f7 Merge pull request #6667 from imgntn/light_mod 
Entity Sliders for Changing Spotlight Properties
 2015-12-29 10:58:47 -08:00
Zach Pomerantz
12fa223004 Render SKY_DOME when SKY_MAP tex is loading 2015-12-29 10:58:23 -08:00
Anthony J. Thibault
5d596bcbc4 Added tests for GLMHelpers::safeEulerAngles. 
To verify that converting to and from quats and eulers will use the same angle order.

Also I fixed some naming inconsistencies in GeometryUtilTests.
 2015-12-29 10:07:38 -08:00
Anthony J. Thibault
e10cecd310 Build fix for linux #2? 2015-12-29 09:23:03 -08:00
Anthony J. Thibault
c35995b8e3 Build fix for linux? 2015-12-29 08:51:44 -08:00
Leonardo Murillo
ea6850c423 Changes per convo with Philip 2015-12-29 10:16:27 -06:00
Leonardo Murillo
d8f52e62fe Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-29 10:16:17 -06:00
Anthony J. Thibault
7e514d2f4d Mac build fix 2015-12-28 18:42:03 -08:00
Anthony J. Thibault
4661152aa7 NeuronAvatar.js: Now aligns the head with the HMD if active 2015-12-28 17:57:24 -08:00
Eric Levin
034b28e1b3 Merge pull request #6742 from zzmp/fix/empty-poly-line 
Guard against empty polyline index out of range
 2015-12-28 17:30:27 -08:00
Stephen Birarda
16e44086b2 replace console tray icons 2015-12-28 16:42:48 -08:00
Leonardo Murillo
2ac42d9a2b Merge branch 'master' of https://github.com/highfidelity/hifi 2015-12-28 18:37:19 -06:00
James B. Pollack
2ec712a5db disable near grabbing on sliders 2015-12-28 15:27:17 -08:00
James B. Pollack
c266a093e0 clear sliders at cleanup 2015-12-28 15:17:00 -08:00
James B. Pollack
9f342ba8ce readme 2015-12-28 15:14:59 -08:00