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

12436 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
8938c1c38b fixed bad particle reference 2014-05-01 15:18:43 -07:00
ZappoMan
12daae0308 added missing files 2014-05-01 14:12:11 -07:00
ZappoMan
f7da070d77 more work, cleanup names, remove translation use snap to center 2014-05-01 11:29:17 -07:00
ZappoMan
293963c546 implement snap to center in model 2014-05-01 09:02:41 -07:00
ZappoMan
bb6444f5a9 more hacking got it working 2014-05-01 07:30:56 -07:00
ZappoMan
85484affa9 hacking 2014-04-30 17:55:54 -07:00
ZappoMan
e886090e76 removed dead code 2014-04-30 14:40:49 -07:00
ZappoMan
3322d1f7ff example JS for models 2014-04-30 14:18:57 -07:00
ZappoMan
f53df4c597 removed velocity, gravity, etc from models 2014-04-30 14:18:35 -07:00
ZappoMan
be3d307b27 added cmake support for STREAMABLE 2014-04-30 13:48:09 -07:00
ZappoMan
0182a6d895 models working end to end 2014-04-30 11:12:49 -07:00
ZappoMan
58c852d210 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-04-30 09:29:06 -07:00
ZappoMan
f993f984c9 first cut at modelserver 2014-04-30 09:26:14 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07:00
Brad Hefta-Gaub
19b76e3331 Merge pull request #2750 from Atlante45/master 
Fixed QLINE_MIN_WIDTH warning on mac
 2014-04-30 09:19:09 -07:00
Brad Hefta-Gaub
84e231acfa Merge pull request #2734 from huffman/RunningScripts 
Running scripts
 2014-04-30 09:18:53 -07:00
Philip Rosedale
53a2bb441a Merge pull request #2749 from Atlante45/fixes 
Only glow body + fixed display name scale
 2014-04-29 17:40:29 -07:00
Atlante45
e9a01a39a2 Fixed QLINE_MIN_WIDTH warning on mac 2014-04-29 17:38:55 -07:00
Ryan Huffman
1551da9e99 Remove magic number in RunningScripts 2014-04-29 17:23:30 -07:00
Ryan Huffman
8ee90715bd Revert changes to call to saveSettings in Application 2014-04-29 17:20:15 -07:00
Ryan Huffman
fa9e37daad Remove unneeded qDebug() 2014-04-29 17:16:12 -07:00
Ryan Huffman
2ba0c8c237 Remove magic numbers from RunningScriptsWidget 2014-04-29 17:10:09 -07:00
Ryan Huffman
98a736a39c Remove duplicate method declaration 2014-04-29 17:04:11 -07:00
Ryan Huffman
39c959d245 Clean up implementation of 1-9 in RunningScripts 2014-04-29 17:03:38 -07:00
Ryan Huffman
e0ec0f681f Fix code not compliant with coding standards 2014-04-29 16:50:13 -07:00
Atlante45
7787cf97b6 Only glow body + fixed display name scale 2014-04-29 16:30:14 -07:00
Ryan Huffman
edcff0b67f Merge remote-tracking branch 'upstream/master' into RunningScripts 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/FramelessDialog.cpp
	interface/src/ui/FramelessDialog.h
 2014-04-29 16:28:36 -07:00
AndrewMeadows
a934ffb1d7 Merge pull request #2745 from ZappoMan/rayintersection 
added support for returning accuracy of ray intersections and other octree tests that can fail due to getting lock
 2014-04-29 15:29:02 -07:00
ZappoMan
4aa96e1fbe added support for returning accuracy of ray intersections and other octree tests that can fail due to getting lock 2014-04-29 15:10:28 -07:00
Brad Hefta-Gaub
8a823ee4c4 Merge pull request #2743 from Atlante45/clockSkew_win_bug 
Clock skew win bug
 2014-04-29 14:15:59 -07:00
Atlante45
49eadac024 Bumped octree stats packet version 2014-04-29 13:52:07 -07:00
Atlante45
85d007adfd Merge branch 'master' of https://github.com/highfidelity/hifi into clockSkew_win_bug 2014-04-29 12:49:02 -07:00
Atlante45
f74bd491d6 CR 2014-04-29 12:48:50 -07:00
Brad Hefta-Gaub
4c84d2e2a1 Merge pull request #2741 from AndrewMeadows/inertia 
update swissArmyJetpack.js script
 2014-04-29 12:15:14 -07: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
Atlante45
6595b29a4f More bug tracking 2014-04-29 10:55:30 -07: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