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

12142 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
25a859f95e Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 2014-04-21 10:12:34 -07:00
Stephen Birarda
b78a601514 Merge pull request #2706 from birarda/master 
fix broken DS build
 2014-04-21 09:31:41 -07:00
Stephen Birarda
07387a132e fix broken DS build 2014-04-21 09:31:21 -07:00
Stephen Birarda
2f1908a49b Merge pull request #2705 from birarda/master 
don't make scripts statically assigned
 2014-04-21 09:29:34 -07:00
Stephen Birarda
cc7d986398 don't make scripts statically assigned 2014-04-21 09:29:08 -07:00
Stephen Birarda
2491b75be4 Merge pull request #2704 from birarda/master 
correct the re-assignment of static assignments
 2014-04-21 08:51:46 -07:00
Stephen Birarda
419e092858 rename matching static method in DS 2014-04-21 08:48:29 -07:00
Stephen Birarda
c9b0444310 correct re-assignment of static assignments 2014-04-21 08:47:14 -07:00
Stephen Birarda
2657400d6c Merge pull request #2703 from birarda/master 
tweak so scripted assignments passed via config are static
 2014-04-21 01:11:01 -07:00
Stephen Birarda
c64ae35374 remove an extra bracket 2014-04-21 01:01:38 -07:00
Stephen Birarda
36b58b178c have scripted assignments added via config be static 2014-04-21 01:00:56 -07: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
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
ZappoMan
59cbda20c6 added some threading and event debugging 2014-04-20 19:48:17 -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
Brad Hefta-Gaub
4c46c3652d Merge pull request #2697 from Atlante45/placement_tool 
Placement tool + other editVoxels features
 2014-04-18 21:20:36 -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
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
178f845ad0 Rescale import when using keys +/- 2014-04-18 16:40:13 -07:00
Atlante45
7782e53363 Restored scale copy 2014-04-18 16:26:10 -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
c4102e3af0 Improved scale selector, changed first swatch behaviours, improved placement tool 2014-04-18 16:04:20 -07:00
Atlante45
d6e7caa4db Removed Debug 2014-04-18 16:02:01 -07:00
Atlante45
61981b9470 Added getter for tree scale in js 2014-04-18 16:00:44 -07:00
Atlante45
b098a7a294 Fixed wire cube overlay not drawn with right line width 2014-04-18 15:59:37 -07:00
Atlante45
aa73527157 Some code cleaning 2014-04-18 15:58:56 -07:00
Brad Hefta-Gaub
16cd2ca5c3 Merge pull request #2680 from SydoxX/master 
URL scheme to go to location
 2014-04-18 15:34:12 -07:00
ZappoMan
c2bcb32804 add support for sending unverified datagrams to nodes 2014-04-18 15:33:27 -07:00
ZappoMan
334f688e4e add support for sending unverified datagrams to nodes 2014-04-18 15:30:45 -07:00
AndrewMeadows
9f0f0f17df Merge pull request #2696 from birarda/master 
change Sound property for JS to hasDownloaded, fix geometry crash
 2014-04-18 15:18:12 -07:00
Stephen Birarda
0a7ea17d43 fix a geometry race condition crash 2014-04-18 15:10:15 -07:00
ZappoMan
0e124eca3c Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 2014-04-18 15:05:54 -07:00
ZappoMan
50f7db8fe1 quiet some debugging 2014-04-18 15:02:10 -07:00
Stephen Birarda
21672bbdc7 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-18 15:01:23 -07:00
Konstantin
d489e9dcd4 Fix format 2014-04-18 23:55:45 +02:00
Stephen Birarda
72fe9b94b1 fix property in sound 2014-04-18 14:48:26 -07:00
Stephen Birarda
c1e54d370c change Sound property to hasDownloaded 2014-04-18 14:46:56 -07:00
AndrewMeadows
b356e3903d Merge pull request #2695 from birarda/master 
changes to smooth JS dynamic bot demo
 2014-04-18 14:36:00 -07:00
ZappoMan
2c02178802 Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 
Conflicts:
	assignment-client/src/AssignmentClient.cpp
	assignment-client/src/AssignmentClient.h
	libraries/shared/src/NodeList.cpp
 2014-04-18 14:28:54 -07:00
Stephen Birarda
92f2794ea8 add a property to Sound to tell if empty 2014-04-18 14:26:56 -07:00
Stephen Birarda
1a895b9342 add property for display name to JS 2014-04-18 14:24:50 -07:00
Brad Hefta-Gaub
57a221f343 Merge pull request #2689 from AndrewMeadows/inertia 
improved collision shapes for head models
 2014-04-18 14:06:45 -07:00
Stephen Birarda
aa5d7aa0b1 fix incorrectly named slot in Sound 2014-04-18 13:58:33 -07:00
Stephen Birarda
3b8cf8c172 fix mixed signal and slot 2014-04-18 13:55:22 -07:00