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

12669 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thijs Wenker
4bdc945f94 Changed font sizes in script-editor to pixels, it should he readable in both Windows and OSX now 2014-04-29 20:12:16 +02:00
Atlante45
ef281e2a5f Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-04-29 11:01:57 -07:00
Atlante45
6595b29a4f More bug tracking 2014-04-29 10:55:30 -07:00
Stojce Slavkovski
d24b55871f Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-04-29 19:05:16 +02:00
Andrew Meadows
2c7fcada3b make gravity transitions faster 2014-04-29 10:00:12 -07:00
Clément Brisset
4c42a403e7 Merge pull request #2738 from huffman/19598 
Login window
 2014-04-28 19:28:50 -07:00
Ryan Huffman
87c10e70cd Add parentheses around conditionals for clarity 2014-04-28 18:31:50 -07:00
Philip Rosedale
5484eba208 Merge pull request #2739 from AndrewMeadows/inertia 
add status button for local gravity
 2014-04-28 17:33:20 -07:00
Andrew Meadows
4937a0af2e add status button for local gravity 2014-04-28 17:29:44 -07:00
Philip Rosedale
75f75a78f3 Merge pull request #2737 from AndrewMeadows/inertia 
swissArmyJetpack.js toggles gravity for avatar
 2014-04-28 17:16:22 -07:00
Andrew Meadows
ae3b58a33f use setGravity() instead of setting it directly 2014-04-28 16:46:16 -07:00
Andrew Meadows
c7dbc5984f add local gravity option parameter for MyAvatar 2014-04-28 16:40:22 -07:00
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
Stojce Slavkovski
963ad64d07 Fixed online user presence in chat window 2014-04-28 23:49:59 +02:00
Atlante45
0457f2035d more editModels work 2014-04-28 14:02:09 -07: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
Stojce Slavkovski
0073db4abd change to public chat room 2014-04-27 20:49:26 +02: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
Stojce Slavkovski
5c7fb3eca5 Add chat mention notifications 2014-04-26 22:19:33 +02:00
Stojce Slavkovski
91d7bd252d Merge branch 'master' of https://github.com/worklist/hifi into 19597 2014-04-26 08:03:52 +02:00
Stephen Birarda
1c2032790a allow passing of OAuth client secret to DS on command-line 2014-04-25 17:02:19 -07:00
Atlante45
2224025b38 Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-04-25 16:42:09 -07:00
Stephen Birarda
86f3cf2a75 allow passing of oauth info to DS 2014-04-25 16:39:45 -07:00
Ryan Huffman
f889cef3aa Remove the ability to drag the RunningScripts window 2014-04-25 16:15:11 -07:00
Stephen Birarda
e50e4d33be Merge branch 'master' of https://github.com/highfidelity/hifi into oauth-ds 2014-04-25 16:10:55 -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