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

36906 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
a1851e2a1a change a comment in packager.js 2016-01-04 13:54:39 -08:00
Stephen Birarda
f172c2b251 remove packaging options debug 2016-01-04 13:54:01 -08:00
Stephen Birarda
b3c5bafabc rename tooltip for tray to proper name 2016-01-04 13:53:34 -08:00
Stephen Birarda
1b79908546 setup packaging as a script 2016-01-04 13:53:26 -08:00
Stephen Birarda
efa0813ae9 Merge remote-tracking branch 'origin/console' into console-dev 2016-01-04 13:18:27 -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
Stephen Birarda
3f7aa6a15a changes to shortcut names for win installer 2016-01-04 12:04:22 -08:00
Stephen Birarda
eef1139328 use new target names for console 2016-01-04 11:59:05 -08:00
Ryan Huffman
471c555bca Add shared memory back into main.cpp 2016-01-04 11:58:56 -08:00
Stephen Birarda
5f997c7cb7 fix for application name with space on win 2016-01-04 11:22:41 -08:00
Stephen Birarda
6755c31cd8 some changeover from stack manager to console for installer 2016-01-04 11:01:34 -08:00
Stephen Birarda
817bbb09d2 rename console target to High Fidelity Console 2016-01-04 10:54:51 -08:00
Stephen Birarda
90cf69b9b5 add console handling to installer component consolidation 2016-01-04 10:47:25 -08:00
Stephen Birarda
b3e46d1ed8 some macro renaming and cleanup 2016-01-04 10:26:37 -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