Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 06:26:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
24057 commits 69 branches 56 tags 1.2 GiB
Commit graph

11606 commits

Author SHA1 Message Date
Brad Hefta-Gaub
72f9ae3e85 Merge pull request #4643 from ctrlaltdavid/fix-auto-start-animation 
Fix auto start animation
 2015-04-15 10:14:26 -07:00
Clément Brisset
d6ee1c708d Merge pull request #4642 from ZappoMan/avatarUI 
New Avatar UI
 2015-04-15 19:13:23 +02:00
Brad Hefta-Gaub
6d6b66f19a Merge pull request #4641 from huffman/window-close-quit 
Quit application when main window is closed
 2015-04-15 09:42:52 -07:00
Brad Hefta-Gaub
a105f579ce Merge pull request #4621 from jherico/oculus_crash 
Attempt to stop the crashing on exit caused by the Oculus SDK
 2015-04-15 08:52:17 -07:00
Atlante45
2f2be70eb8 Merge branch 'master' of https://github.com/highfidelity/hifi into generated_ratio 2015-04-15 17:30:57 +02:00
Atlante45
c2c1ccc2b7 Remove generated audio options from menu 2015-04-15 15:50:22 +02:00
David Rowe
2c5201f116 Fix animation not automatically starting at start-up 2015-04-14 16:54:14 -07:00
ZappoMan
ae16bab7c2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2015-04-14 13:13:15 -07:00
ZappoMan
174e9f2133 more tweaks to preferences UI 2015-04-14 12:38:29 -07:00
Ryan Huffman
4d34ba7bdf Update main window to quit app when closed 2015-04-14 10:57:47 -07:00
ZappoMan
9262585bab first cut at moving avatar appearance into separate dialog box 2015-04-14 10:38:22 -07:00
David Rowe
f509d08378 Handle DDE already running 2015-04-13 23:12:13 -07:00
David Rowe
b7f7cebb80 Handle DDE stopping unexpectedly 2015-04-13 22:41:17 -07:00
David Rowe
3b6a35c38f Merge branch 'master' into 20447 2015-04-13 17:22:34 -07:00
David Rowe
13c038879d Don't repeat constant values 2015-04-13 17:13:03 -07:00
David Rowe
2c4f049851 Change OSX DDE program path per build system requirements 2015-04-13 17:11:27 -07:00
Andrew Meadows
f969517ab0 Merge pull request #4633 from Atlante45/master 
Fix ghost avatars
 2015-04-13 08:45:01 -07:00
Andrew Meadows
0a5ae8e7e1 Merge pull request #4610 from thoys/20367 
CR for Job #20367 - Enable getPublicScripts, and getRunningScripts
 2015-04-13 08:42:39 -07:00
Atlante45
809c7919aa Fix ghost avatars 2015-04-13 15:57:36 +02:00
David Rowe
caaf090b87 Fix typo 2015-04-12 13:02:27 -07:00
Andrew Meadows
e9159304d2 Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol 
Acceleration and owner in wire protocol
 2015-04-10 09:07:47 -07:00
Thijs Wenker
cf403a7ad8 Merge branch 'master' of https://github.com/worklist/hifi into 20367 2015-04-09 23:47:20 +02:00
Thijs Wenker
0cb5ee5bd1 - Scripts JS object renamed to ScriptDiscoveryService. 
- Renamed Example script file for the ScriptDiscoveryService.
- Moved ScriptDiscoveryService functions to the RunningScriptWidget
 2015-04-09 23:46:49 +02:00
samcake
91d6046051 Merge pull request #4622 from jherico/starfield_hack_fix 
Ensure blending is enabled during starfield rendering
 2015-04-09 09:45:14 -07:00
Seth Alves
73a1265624 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-09 09:21:06 -07:00
Brad Davis
5efb960645 Ensure blending is enabled during starfield rendering 2015-04-09 09:18:53 -07:00
Brad Davis
f496175fb9 Attempt to stop the crashing on exit caused by the Oculus SDK 2015-04-09 09:17:23 -07:00
Clément Brisset
36631dd3a3 Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting 
CR for Animation fixes
 2015-04-09 11:39:13 +02:00
Seth Alves
30a8b61df3 quiet compiler 2015-04-08 15:39:21 -07:00
Philip Rosedale
b949353b0b Merge pull request #4611 from AndrewMeadows/isentropic 
use DynamicCharacterController
 2015-04-08 08:03:01 -07:00
Brad Davis
9b34003e2d Merge pull request #4599 from Atlante45/fix_quit_vrmode_on_close 
Quit VRMode before aboutToQuit runs
 2015-04-07 17:06:29 -07:00
Andrew Meadows
92b4e2f1e1 Merge pull request #4572 from jherico/console 
Remove the console window created when you start interface on win32 platforms
 2015-04-07 16:49:26 -07:00
Philip Rosedale
af3073e6c3 Merge pull request #4584 from jherico/menu 
Stop the menu from breaking on leaving HMD mode
 2015-04-07 16:41:41 -07:00
Andrew Meadows
40c94fa00e merge upstream/master into andrew/isentropic 2015-04-07 16:23:38 -07:00
Andrew Meadows
b5f0c57dd1 jumping and hovering works with dynamic controller 2015-04-07 15:07:46 -07:00
Brad Davis
c1a1157df9 Merge branch 'master' into menu 2015-04-07 14:41:17 -07:00
David Rowe
09b929b729 Restart looped animation running at shutdown when Interface starts 2015-04-07 14:02:24 -07:00
David Rowe
670d455b90 Fix manually entered attachment model URL not being used 2015-04-07 13:47:37 -07:00
David Rowe
ccf3afadfb Fix manually entered joint mask value not being applied 2015-04-07 13:43:58 -07:00
David Rowe
082a9196ff Fix manually entered animation URL not being able to be started 2015-04-07 13:43:04 -07:00
Clément Brisset
61028d12b5 Merge pull request #4600 from jherico/render_crash_on_exit 
Ensure the frame timer doesn't re-engage on exit
 2015-04-07 22:17:47 +02:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1 
Introducing gpu::State and using it in the Model rendering path and more...
 2015-04-07 12:48:42 -07:00
Brad Davis
2f4c3057f3 Merge pull request #4604 from Atlante45/oculus_pick_offset 
Oculus pick offset
 2015-04-07 11:48:21 -07:00
Seth Alves
ef5dffecf6 fix filenames in comments 2015-04-07 10:03:14 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
e63b39f061 oops missed one 2015-04-07 09:15:40 -07:00
Seth Alves
fc5b442e12 interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging 2015-04-07 09:15:11 -07:00
Thijs Wenker
af34add63c added example for the new Scripts functions: 
example\misc\scriptsExample.js
 2015-04-07 17:39:50 +02:00
Atlante45
5e3ed1c8e4 Compute correct mouse position 2015-04-07 17:15:16 +02:00
Atlante45
1cc4384404 Add new frame of reference for cursor 2015-04-07 17:13:30 +02:00