Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 16:30:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
36308 commits 76 branches 59 tags 1.2 GiB
Commit graph

36308 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
b70dde27df remove the all-important blah property 2015-12-21 12:36:57 -07:00
Stephen Birarda
303ea2a34b remove testing comment 2015-12-21 12:36:31 -07:00
Stephen Birarda
18c8fc8563 finish proper handling of restart for process group 2015-12-21 12:06:09 -07:00
Stephen Birarda
21c701dc6d handle circle color changes for server state 2015-12-21 11:47:15 -07:00
Stephen Birarda
9c793d4317 fix process update on shutdown, ignore logs 2015-12-21 11:03:28 -07:00
Stephen Birarda
7632a8af42 resolve conflicts on merge with birarda/console 2015-12-21 10:55:05 -07:00
Stephen Birarda
471fa0320c Merge pull request #56 from huffman/console 
Add server on/off, and log files
 2015-12-21 10:43:55 -07:00
Stephen Birarda
4763776901 remove previous interface styling/logic 2015-12-21 10:35:05 -07:00
Stephen Birarda
d4b7afbc25 handle styling of server management buttons 2015-12-18 16:26:30 -08:00
Stephen Birarda
7ada5485ed add the focus section, tweak window size 2015-12-18 15:30:15 -08:00
Stephen Birarda
3fccd1a80b additional styling of console tray 2015-12-18 14:48:55 -08:00
Stephen Birarda
735cd04020 stop the bounce effect when scrolling on OS X 2015-12-18 14:22:25 -08:00
Stephen Birarda
b33999ec1c add more styling for tray and header 2015-12-18 14:19:01 -08:00
Stephen Birarda
fa9c872e8e add the background image to the window 2015-12-18 13:44:59 -08:00
Stephen Birarda
86d65426e2 fix spacing in app name that screwed up require 2015-12-18 13:36:25 -08:00
Stephen Birarda
47f1c9e32d add base layout without any styling 2015-12-18 11:33:51 -08:00
Stephen Birarda
11513f0a68 change external naming to High Fidelity 2015-12-18 11:33:34 -08:00
Stephen Birarda
c7a7f9cd69 add empty style.less, don't allow window re-size 2015-12-18 10:45:13 -08:00
Stephen Birarda
c50852a46f move bootstrap and jquery to vendor, add electron-compiler 2015-12-18 10:38:11 -08:00
Ryan Huffman
5dc33015f7 Merge branch 'console' of github.com:birarda/hifi into console 2015-12-17 15:34:35 -08:00
Ryan Huffman
01cf1c1d79 Merge pull request #57 from birarda/console-packaging 
add latest icons, move source files to src
 2015-12-17 15:33:06 -08:00
Stephen Birarda
3b92e77fdf adjust console gitignore to handle all platforms 2015-12-16 15:08:52 -08:00
Stephen Birarda
146564d8cb rename icon files to console for searchability 2015-12-16 14:52:25 -08:00
Stephen Birarda
dba54b4352 icon repairs for OS X package 2015-12-16 14:49:54 -08:00
Stephen Birarda
04d8918afb update to new tray icon 2015-12-16 12:10:34 -08:00
Stephen Birarda
7fb433b212 re-organize console folder with src 2015-12-16 12:08:53 -08:00
Stephen Birarda
1ac5ba3b8c change packaging command per platform 2015-12-16 11:48:32 -08:00
Stephen Birarda
2ff9d7a28c update electron to 0.36.0, add packaging commands 2015-12-16 11:48:10 -08:00
Ryan Huffman
272ffda3db Merge branch 'console' of github.com:birarda/hifi into console 2015-12-16 10:23:01 -08:00
Stephen Birarda
20886748af resolve conflicts on merge with upstream/master 2015-12-16 10:21:24 -08:00
Stephen Birarda
ee2537c0ec Merge branch 'master' of https://github.com/highfidelity/hifi into console 2015-12-16 10:20:10 -08:00
Ryan Huffman
b4bd75e497 Update console Process logging to be optional 2015-12-16 09:21:00 -08:00
Ryan Huffman
5bdea485fc Add log opening to console 2015-12-16 09:11:24 -08:00
Ryan Huffman
b907a04a3f Add log directory to AssignmentClientMonitor 2015-12-16 09:08:51 -08:00
Ryan Huffman
195f58e130 Add log-directory option to AC monitor 2015-12-16 08:51:13 -08:00
Seth Alves
4429890cd8 Merge pull request #6668 from zzmp/fix/fbx-texture 
Load texture by convention with .obj
 2015-12-16 06:47:02 -08:00
Brad Davis
1e5793893b Merge pull request #6665 from ZappoMan/rightClickMenu 
fix bug in simulated left click - make qml menus work
 2015-12-15 21:40:00 -08:00
Zach Pomerantz
3280894e29 Load texture by convention with .obj 2015-12-15 19:30:15 -08:00
Clément Brisset
7c8f019507 Merge pull request #6663 from birarda/baseball 
update link to bat script in createBatButton.js
 2015-12-15 19:26:33 -08:00
Seth Alves
13a1eec48c Merge pull request #6658 from AndrewMeadows/linux-input-plugins 
correct input plugin load path on linux
 2015-12-15 18:39:27 -08:00
Brad Hefta-Gaub
76da3a14ac fix bug in simulated left click - make qml menus work 2015-12-15 17:58:07 -08:00
Stephen Birarda
13c83bb262 update link to bat script in createBatButton.js 2015-12-15 17:23:29 -08:00
Brad Davis
29516619ee Merge pull request #6661 from ZappoMan/rightClickMenu 
first cut at simulating mouse/reticle behavior with input contorllers
 2015-12-15 16:08:59 -08:00
Brad Hefta-Gaub
aa53900fa3 CR feedback 2015-12-15 15:40:50 -08:00
Brad Hefta-Gaub
6420a43858 fix type 2015-12-15 15:35:17 -08:00
Brad Hefta-Gaub
3e1e85aa18 Merge pull request #6659 from ctrlaltdavid/20757 
Fix signal connection to ScriptEngine::finished()
 2015-12-15 14:42:24 -08:00
Brad Hefta-Gaub
5a355bd22f Merge pull request #6653 from hyperlogic/tony/model-entity-animation-fix 
ModelEntityItem: fix for incorrect joint mapping
 2015-12-15 14:29:06 -08:00
Brad Hefta-Gaub
7d43504c0c Merge pull request #6615 from hyperlogic/tony/js-avatar-default-pose 
Expose Avatar default pose to JavaScript
 2015-12-15 14:27:53 -08:00
Ryan Huffman
1e9a8cedf0 Merge branch 'console' of github.com:birarda/hifi into console 2015-12-15 14:07:55 -08:00
Ryan Huffman
e1e290c08a Merge pull request #55 from birarda/console-dev 
check for local binaries in development
 2015-12-15 14:02:39 -08:00