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

12488 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
8686fecdad Switch OctreeSceneStats to quintX 2014-04-28 16:08:26 -07:00
Stojce Slavkovski
9f070406ed missing 'extra debugging' check icon; fix font 2014-04-29 00:02:24 +02:00
Ryan Huffman
24350761ac Update layout of login messages and move text to .ui file 2014-04-28 13:16:50 -07:00
Ryan Huffman
46d4a31f01 Update login images 2014-04-28 13:16:06 -07:00
Andrew Meadows
ea2e96ac6f toggle collision and gravity with timers 2014-04-28 13:02:54 -07:00
Ryan Huffman
d5d440eec5 Update font on login window 2014-04-28 12:04:28 -07:00
Ryan Huffman
6f502777a5 Update forgot password URL 2014-04-28 12:03:54 -07:00
Andrew Meadows
a7c4b02f2d merge new work into andrew/inertia 2014-04-28 09:52:06 -07:00
Ryan Huffman
fb42d9ccc6 Update login to move focus to password on fail 2014-04-28 09:21:37 -07:00
Ryan Huffman
45fdd00608 Merge remote-tracking branch 'upstream/master' into 19598 
Conflicts:
	interface/src/ui/FramelessDialog.h
 2014-04-28 09:13:00 -07:00
Ryan Huffman
01f66420de Fix issue with icon being disabled on login window while authenticating 2014-04-28 09:11:09 -07:00
Ryan Huffman
81a0cbe761 Update Menu to use new login dialog 2014-04-28 09:01:13 -07:00
Ryan Huffman
cbd5fbe9b3 Add loginFailed signal to AccountManager 2014-04-28 08:59:44 -07:00
Ryan Huffman
9bf3b3c6bf Add hideOnBlur and TOP position to FramelessDialog 2014-04-28 08:59:28 -07:00
Ryan Huffman
23397a4b10 Add LoginDialog 2014-04-28 08:55:03 -07:00
Konstantin
ec410d105b Fix CustomUrl 
Fixed custom url so that hifi://domain/ works.
 2014-04-27 00:31:28 +02:00
Konstantin
f829a5b323 Fix CustomUrl 
Fixed custom url so that hifi://domain/ works. Also goes earlier to the location.
 2014-04-27 00:29:38 +02:00
Ryan Huffman
f889cef3aa Remove the ability to drag the RunningScripts window 2014-04-25 16:15:11 -07:00
Ryan Huffman
792ab7e17e Update icon for Load Script button 2014-04-25 15:57:10 -07:00
Brad Hefta-Gaub
3ab61f231b Merge pull request #2729 from AndrewMeadows/inertia 
expose MyAvatar.collisionGroups to JS
 2014-04-25 15:07:24 -07:00
Andrew Meadows
b05a315b5a merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-25 14:52:44 -07:00
Brad Hefta-Gaub
b0a561198b Merge pull request #2721 from Atlante45/improved_undo 
Handle subtrees with undo
 2014-04-25 14:32:49 -07:00
Andrew Meadows
39252a8339 swissArmyJetpack.js now toggles "obey gravity" 2014-04-25 14:17:39 -07:00
Andrew Meadows
c2f1507df1 move AVATAR_MOTION_OBEY_GRAVITY to libs 2014-04-25 14:16:42 -07:00
Andrew Meadows
357aac833e expose AVATAR_MOTION_OBEY_GRAVITY const to JS 2014-04-25 14:15:40 -07:00
Andrew Meadows
2d5bfc81cd add Vec3.distance(Vec3, Vec3) for JS 2014-04-25 14:14:34 -07:00
Andrew Meadows
ecae89489e mispelled slot 2014-04-25 14:13:44 -07:00
Clément Brisset
c2a91b4ee9 Merge pull request #2732 from ZappoMan/fixtimestamps 
improved guards against extremely unlikely packets
 2014-04-25 13:55:13 -07:00
Clément Brisset
f0a87c1072 Merge pull request #2733 from birarda/master 
pass the owner scope for oauth token requests
 2014-04-25 13:42:00 -07:00
Atlante45
3143e10bd8 CR 2014-04-25 13:33:59 -07:00
Stephen Birarda
8e12c0d8e5 pass the owner scope to auth requests 2014-04-25 13:22:18 -07:00
ZappoMan
7c1b5ba092 Merge branch 'master' of https://github.com/worklist/hifi into fixtimestamps 
Conflicts:
	libraries/shared/src/SharedUtil.cpp
 2014-04-25 13:14:52 -07:00
Brad Hefta-Gaub
588128ea53 Merge pull request #2731 from Atlante45/fix_for_non_fired_timestamp_timer 
Fix timestamp timer not fired
 2014-04-25 13:02:19 -07:00
Ryan Huffman
958238efa7 Cleanup implementation of script loading to reduce copy/paste 2014-04-25 12:45:26 -07:00
Ryan Huffman
8480d02414 Fix 1-9 keys not working in Running Scripts widget 2014-04-25 12:44:46 -07:00
Atlante45
8b4a910040 Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
Atlante45
860766fb49 Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo 2014-04-25 11:41:43 -07:00
ZappoMan
6acdf9cd6c fix issues with bad timestamps 2014-04-25 11:21:02 -07:00
Ryan Huffman
c3d8cce4a6 Add plus icon to LoadScript button 2014-04-25 10:30:56 -07:00
Ryan Huffman
5a8a78e7b8 Update location of Load Script button 2014-04-25 10:14:18 -07:00
Ryan Huffman
61e8a20550 Update running scripts widget to forward mouse release events 2014-04-25 10:11:56 -07:00
Ryan Huffman
76d8090938 Disallow resizing of running scripts widget 2014-04-25 10:11:34 -07:00
Ryan Huffman
dd844437b6 Add option to disallow resizing in FramelessDialog 2014-04-25 10:11:22 -07:00
Ryan Huffman
225c022511 Update RunningScriptsWidget to use FramelessDialog 2014-04-25 10:10:50 -07:00
Ryan Huffman
84e7b1598c Merge remote-tracking branch 'upstream/master' into RunningScripts 2014-04-25 08:45:54 -07:00
Andrew Meadows
f91c098589 merge 2014-04-24 19:13:22 -07:00
Andrew Meadows
afb12bcd70 add swissArmyJetpack.js 2014-04-24 19:12:23 -07:00
Philip Rosedale
9884d74f60 Merge pull request #2728 from Atlante45/fix_audio_jitter 
Fix audio jitter
 2014-04-24 18:25:16 -07:00
Atlante45
cf7fe2306b Fix audio jitter 2014-04-24 18:10:51 -07:00
Philip Rosedale
c66805e2fb Merge pull request #2727 from Atlante45/fix_error_from_remove_gettimeofday 
Fix error introduced with gettimeofday removing + spelling mistake
 2014-04-24 17:40:47 -07:00