Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 14:47:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
12579 commits 76 branches 59 tags 1.2 GiB
Commit graph

6744 commits

Author SHA1 Message Date
Thijs Wenker
5ea512f65a ScriptEditorWindow not modal, but yet always on foreground 2014-04-29 23:53:46 +02:00
Thijs Wenker
14e9cb770c Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-29 23:30:15 +02:00
Stephen Birarda
69e279e2c6 IC-1, remove some spaces in BuckyBalls 2014-04-29 14:05:16 -07:00
Thijs Wenker
d93f91a628 Resized ScriptEditorWindow 2014-04-29 22:17:45 +02:00
Thijs Wenker
2ba39f951a Merge branch '19561' of https://github.com/thoys/hifi into 19561 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2014-04-29 22:07:03 +02:00
Thijs Wenker
fc2ed9f9fb Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script. 2014-04-29 22:03:51 +02:00
Thijs Wenker
df14e1e6e4 Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script. 2014-04-29 21:51:20 +02:00
Clément Brisset
7c21fab50c Merge pull request #2736 from SydoxX/master 
Fix CustomUrl
 2014-04-29 12:07:44 -07:00
Konstantin
65706ae5f7 Re-add customUrl.startWith 2014-04-29 20:59:33 +02:00
Konstantin
14b91aa04b Remove 0,0,0 entry 2014-04-29 20:49:40 +02:00
Konstantin
ac8adad0e0 Remove 0,0,0 entry. 2014-04-29 20:49:20 +02:00
Clément Brisset
02d527baae Merge pull request #2740 from stojce/19617 
Code Review for Job #19617
 2014-04-29 11:29:12 -07:00
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
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
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
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
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
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
Andrew Meadows
b05a315b5a merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-25 14:52:44 -07:00
Andrew Meadows
c2f1507df1 move AVATAR_MOTION_OBEY_GRAVITY to libs 2014-04-25 14:16:42 -07:00
Andrew Meadows
ecae89489e mispelled slot 2014-04-25 14:13:44 -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
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
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
Atlante45
01637e8037 Fix error introduced with gettimeofday removing + spelling mistake 2014-04-24 17:37:48 -07:00
Clément Brisset
fd8ec9b5c2 Merge pull request #2723 from huffman/19554-2 
19554 - Chat Updates
 2014-04-24 16:44:22 -07:00
Ryan Huffman
d88897ccc7 Add error box when going to user/location that doesn't exist 2014-04-24 15:55:34 -07:00
Andrew Meadows
0b5c1b0a9a add MyAvatar::_motionBehaviors (for obeyGravity) 
Also reconcile Menu checkable set vs script-set collision groups.
 2014-04-24 15:43:03 -07:00
Leonardo Murillo
a21991c5c2 Fixing xml parsing 2014-04-24 16:22:34 -06:00
Leonardo Murillo
f4c98a8fa4 Fixing xml parsing 2014-04-24 16:21:49 -06:00
Ryan Huffman
5d71c97195 Merge remote-tracking branch 'origin/19554-2' into 19554-2 2014-04-24 14:56:11 -07:00
Ryan Huffman
b69fa73dfa Unsplit a line in FramelessDialog 2014-04-24 14:54:57 -07:00
Ryan Huffman
7b09812028 Remove insertFromMimeData override in ChatMessageArea 2014-04-24 14:54:26 -07:00
Ryan Huffman
ccad0aed9e Move ChatInputArea code in header to .cpp 2014-04-24 14:54:01 -07:00
Leonardo Murillo
27002a9406 Casting to QUrl 2014-04-24 15:10:37 -06:00
Ryan Huffman
a86af6b07f Add Load Script button to RunningScripts Dialog 2014-04-24 14:05:09 -07:00
Leonardo Murillo
ad0f0118bc fixes for new versioning: 2014-04-24 15:01:37 -06:00
Andrew Meadows
73d0674565 expose MyAvatar.collisionGroups to JS 2014-04-24 11:19:08 -07:00
Andrew Meadows
f07a418a27 namechange CollisionFlags --> CollisionGroups 2014-04-24 11:07:49 -07:00
Mohammed Nafees
29d64373b4 Merge branch master 2014-04-24 18:52:59 +05:30
Mohammed Nafees
dd74ea64e7 Further changes for child like behaviour 2014-04-24 17:18:24 +05:30
Ryan Huffman
1a5dbf3da6 Merge branch '19554-2' of github.com:huffman/hifi into 19554-2 2014-04-23 16:17:16 -07:00
Ryan Huffman
b0e1eab7ed Fix chat input textbox to use native scrollbar 
The border around the textedit was causing QT to use a non-native
scrollbar.  Moving the box into a frame that contains the border styling
fixes this.
 2014-04-23 16:15:51 -07:00
Andrzej Kapolka
4f8c1f9c65 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 16:09:23 -07:00
Clément Brisset
d441e6a453 Merge pull request #2717 from AndrewMeadows/inertia 
avatar bounding capsule collision against voxels
 2014-04-23 16:06:14 -07:00
Ryan Huffman
0cba95e7ad Reorder property initialization in FramelessDialog 2014-04-23 15:37:49 -07:00
Ryan Huffman
1774f6c9bd Add threshold to auto scroll 2014-04-23 15:37:28 -07:00
Ryan Huffman
d56a4e169e Add ChatInputArea 2014-04-23 15:24:21 -07:00
Andrew Meadows
10265a4a3e temp disable of screen flash for avatar collisions 2014-04-23 14:37:24 -07:00
Andrew Meadows
96ca537400 removing unused motion-state timers 2014-04-23 13:44:25 -07:00
Ryan Huffman
95357a7c35 Update chat input area to use a 14pt font 2014-04-23 12:30:40 -07:00
Andrzej Kapolka
2bac802407 One more unused variable. 2014-04-23 12:30:39 -07:00
Andrzej Kapolka
c8c3cf3664 Remove unused propagate option for applyRotationDelta. 2014-04-23 12:29:01 -07:00
Ryan Huffman
5fd585aab1 Fix error with cursor format getting reset when sending chat message 2014-04-23 12:26:59 -07:00
Andrzej Kapolka
d38d3db224 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 12:25:43 -07:00
Andrzej Kapolka
141250d51c Don't constrain elbow when rotating forearm with wrist. 2014-04-23 12:22:24 -07:00
Andrew Meadows
203dac054a remove unused MoveTarget stuff from MyAvatar 2014-04-23 12:19:48 -07:00
Andrew Meadows
39c193a679 remove unused getElapsedTime*() methods 2014-04-23 12:15:15 -07:00
Andrzej Kapolka
0386dec2a6 Provide option to align wrists with forearms. 2014-04-23 12:09:54 -07:00
Ryan Huffman
951d5004e1 Add ChatInputArea with custom paste 2014-04-23 11:57:43 -07:00
Andrew Meadows
37a5d9130f move _thrust from Avatar to MyAvatar 2014-04-23 11:55:28 -07:00
Andrzej Kapolka
09bb51261a Got that backwards. 2014-04-23 11:55:16 -07:00
Andrzej Kapolka
523498ee5b Revert to using weight that doesn't depend on number of free joints. 2014-04-23 11:52:22 -07:00
Andrew Meadows
359c14e319 cleanup: remove unused Avatar::_mode 
The mode, if it is required, should probably eventually live in
AvatarDAta since it will be determined by whatever engine is running the
avatar (script or interface) and then broadcast to the rest of the
world.  When we need it we'll add it back in the right place.
 2014-04-23 11:48:42 -07:00
Andrzej Kapolka
511fc8367f More work on IK. 2014-04-23 11:34:34 -07:00
Atlante45
f68d2d16a8 Inserted a char by mistake 2014-04-23 11:05:16 -07:00
Atlante45
ceb5208102 CR 2014-04-23 11:00:44 -07:00
Ryan Huffman
c65d5f08ca Merge remote-tracking branch 'upstream/master' into 19554-2 2014-04-23 10:54:51 -07:00
Ryan Huffman
9bea70ac54 Revert "Add emoticons to chat" 
This reverts commit 3c9b6264a8.
 2014-04-23 10:49:22 -07:00
Andrzej Kapolka
f7bc1ae62c Working on integrating rotation into IK. 2014-04-23 10:47:24 -07:00
Atlante45
ae566c55f6 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-23 10:38:29 -07:00
Andrew Meadows
f46a5dc966 fix #2718 for warning about unused variable 2014-04-23 10:13:05 -07:00
Andrzej Kapolka
c471a55f1f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 09:40:51 -07:00
Andrew Meadows
bfe1ee377b remove warning about signed/unsigned comparison 
Also change n.f to be n.0f as per coding standard
 2014-04-23 08:56:53 -07:00
Andrew Meadows
67d0920f81 merge upstream/master into andrew/inertia 2014-04-23 08:40:48 -07:00
Andrew Meadows
5992651c27 update avatar collision shapes when necessary 2014-04-22 20:55:28 -07:00
Philip Rosedale
ee929f2551 Merge pull request #2712 from matsukaze/master 
Job #19574. Add new audio oscilloscope.
 2014-04-22 20:22:57 -07:00
matsukaze
d6e4f217f5 Expanded variable names. 2014-04-22 21:57:41 -04:00
matsukaze
1ff3b83644 Changed const color data and method signatures. 
Changed constant color data and method signatures from unsigned int to
array of float. Changed glColor4f to glColor4fv.
 2014-04-22 19:42:51 -04:00
matsukaze
015cbce322 Changed constant names for improved readability. 2014-04-22 18:57:22 -04:00
Andrew Meadows
364431328f remove include StreamUtils.h 2014-04-22 14:26:40 -07:00
Andrew Meadows
0b9ebe4c08 avatar-voxels collisions work again 2014-04-22 11:51:36 -07:00
Clément Brisset
f64988f73d Merge pull request #2711 from ZappoMan/quiet_logs 
quite the error messages about failed locks
 2014-04-22 11:51:20 -07:00
Atlante45
3eeb3a539d Fixed lack of resolution in usecTimestampNow() 2014-04-22 11:48:43 -07:00
ZappoMan
ae443a3136 fix headers 2014-04-22 11:27:50 -07:00
Andrew Meadows
f033990fae merge upstream/master into andrew/inertia 2014-04-22 10:49:44 -07:00
Andrew Meadows
7537d240bb toward working avatar-vs-voxel collisions again 2014-04-22 10:48:42 -07:00
AndrewMeadows
94fabf7875 Merge pull request #2709 from ZappoMan/shared_and_weak_pointers 
Voxel/Particle Server Performance Improvements
 2014-04-22 10:28:39 -07:00
Atlante45
ddf14b0842 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-22 10:22:30 -07:00
matsukaze
99cb1da5ec Reverting inadvertently committed local changes. 2014-04-22 07:40:31 -04:00
Thijs Wenker
59cc930556 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-22 13:12:38 +02:00
Thijs Wenker
6c89521f1d Style 2014-04-22 13:12:21 +02:00
matsukaze
6e575bc8af Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-22 06:54:53 -04:00
matsukaze
ff7a1bd60f Job #19574. Add audio oscilloscope.' 2014-04-22 06:53:59 -04:00
ZappoMan
1846036659 quite the error messages about faild locks 2014-04-21 20:58:43 -07:00
Andrew Meadows
06794f33f3 add accessor for Model::_boundingShape 2014-04-21 18:23:19 -07:00
Atlante45
fd20686f0f Removed Systime.h includes 2014-04-21 17:23:06 -07:00
Atlante45
681aab5bf0 Remove printf and replace them by qDebug() 2014-04-21 16:17:45 -07:00
Atlante45
0479aaba46 Some gettimeofday removal fixes 2014-04-21 15:26:43 -07:00
Atlante45
f7f30e118c More gettimeofday cleanup 2014-04-21 15:17:11 -07:00
Thijs Wenker
70ac93c20d Style 2014-04-21 21:44:50 +02:00
Thijs Wenker
e348f66151 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-21 21:40:01 +02:00
Thijs Wenker
9faee0d82d - Style 
- Script Editor can run script file once at time, but you can still start multiple scripts through the original ways.
 2014-04-21 21:37:49 +02:00
matsukaze
5b72a6dfcb Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-21 15:24:27 -04:00
Thijs Wenker
c1ed38f4de Style 2014-04-21 21:23:39 +02:00
Atlante45
ab76e6a00c Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 
Conflicts:
	interface/src/Audio.cpp
 2014-04-21 12:19:19 -07:00
ZappoMan
25a859f95e Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 2014-04-21 10:12:34 -07:00
U-Uthoypia\Thijs
0e28ff2fcd This should fix the ubuntu build 2014-04-21 06:33:20 +02:00
Thijs Wenker
77994ae0cb header cleanup (hopefully the ubuntu test-build will like this) 2014-04-21 06:20:18 +02:00
Thijs Wenker
5bffb17643 #include <QMessageBox.h> -> #include <QMessageBox> 2014-04-21 05:51:34 +02:00
Brad Hefta-Gaub
697036bf47 Merge pull request #2701 from ZappoMan/master 
fix switching audio device bug
 2014-04-20 20:29:57 -07:00
Thijs Wenker
23068b0356 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-21 05:26:42 +02:00
Thijs Wenker
c016d6557e - few Adjustments in Application class for Script editor 
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
 2014-04-21 05:25:28 +02:00
Brad Hefta-Gaub
b9dd276e32 Merge pull request #2700 from SydoxX/PageUp/Down 
Add PageUp/Down to controls
 2014-04-20 20:20:14 -07:00
ZappoMan
80dd0c3356 fix switching audio device bug 2014-04-20 20:18:56 -07:00
Konstantin
615f8b8dad Fix spacing 2014-04-19 16:35:48 +02:00
Konstantin
6c376d6fa6 Add PageUp/Down to controls 
When you press PageUp/Down now you fly up and down.
 2014-04-19 15:02:57 +02:00
Brad Hefta-Gaub
d848326039 Merge pull request #2699 from Atlante45/glow_when_speaking_option 
Made glowing when speaking an option
 2014-04-18 21:22:53 -07:00
Brad Hefta-Gaub
d0c10475d5 Merge pull request #2698 from Atlante45/master 
ModelUploader update to handle new behaviour
 2014-04-18 21:21:09 -07:00
Atlante45
716bc58c2d Fixed Jenkins failure 2014-04-18 18:10:11 -07:00
Atlante45
05545b684d Made glowing when speaking an option 2014-04-18 17:47:21 -07:00
Andrzej Kapolka
e2558bdac0 Experimenting with tweaking the Euler angles so that z, rather than y, is in 
[-pi/2, pi/2].
 2014-04-18 17:16:20 -07:00
Atlante45
c664b4a087 Fixed JSON parsing 2014-04-18 17:04:38 -07:00
Atlante45
1121773154 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-18 16:56:34 -07:00
Atlante45
8a7a590602 Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool 
Conflicts:
	interface/src/ui/Stats.cpp
 2014-04-18 16:07:08 -07:00
Atlante45
d6e7caa4db Removed Debug 2014-04-18 16:02:01 -07:00