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

38522 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
f551ea9f76 fixing compilation on mac and a glsl error on mac 2016-01-31 17:19:47 -08:00
samcake
b2f6360020 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-29 20:57:21 -08:00
Brad Davis
ffe7a0eaf1 Merge pull request #6978 from PhilipRosedale/flocking 
Fish Tank flocking example - FlockOfFish.js
 2016-01-29 21:37:09 -05:00
samcake
59434e1ea9 DDisplay of the octree cells is working, added the Brick empty / full per cell 2016-01-29 18:16:45 -08:00
Philip Rosedale
1766f3fc23 remove debug 2016-01-29 17:20:22 -08:00
Philip Rosedale
ca459e0bd6 Merge branch 'master' of https://github.com/highfidelity/hifi into flocking 2016-01-29 17:18:35 -08:00
Philip Rosedale
11890badd8 Changes per PR suggestions 2016-01-29 17:16:48 -08:00
James B. Pollack
16f353719b Merge pull request #6969 from ericrius1/textEntityProps 
Moves text properties to top of Entity Properties panel
 2016-01-29 17:02:31 -08:00
ericrius1
559fb9cbde fixed merge conflicts 2016-01-29 16:42:10 -08:00
ericrius1
c54711614e Merge remote-tracking branch 'upstream/master' 2016-01-29 16:33:51 -08:00
Ryan Huffman
4ed38c4104 Merge pull request #6986 from birarda/injector-restart 
fix for injector restart not restarting
 2016-01-29 16:27:34 -08:00
Ryan Huffman
bab27e6b79 Merge pull request #6957 from birarda/audio-mixer-coma 
force AC assignment stop during DOS, process events for rapid injectors
 2016-01-29 15:56:58 -08:00
Stephen Birarda
d7990bf88a reset hasSentFirstFrame to false for double frame on first send 2016-01-29 14:55:08 -08:00
Stephen Birarda
d3028606c5 retart the nextFrame and frameTimer on injector restart 2016-01-29 14:47:27 -08:00
samcake
7b50a4d05f clening up the BRick insert item interface and the shaders 2016-01-29 14:30:53 -08:00
Stephen Birarda
20cfe80036 use a vector instead of priority queue to avoid double sort 2016-01-29 14:04:45 -08:00
Stephen Birarda
8d17df338b allow AIM event processing during repeated injection 2016-01-29 14:04:45 -08:00
Stephen Birarda
c91f8c7685 add debug for DDOS AC drop 2016-01-29 14:04:45 -08:00
Stephen Birarda
5551a05261 removed debug for queued check-ins 2016-01-29 14:04:45 -08:00
Stephen Birarda
e50e75cba7 drop assignment even if DDOS locks NL thread 2016-01-29 14:04:45 -08:00
Stephen Birarda
0e016838b4 tweak size of values in AudioMixer 2016-01-29 14:04:45 -08:00
Brad Hefta-Gaub
6db8239d8a Merge pull request #6983 from jherico/entityProperties 
Fix entity properties HTML
 2016-01-29 13:42:28 -08:00
Brad Davis
c4794dd0d5 Fix entity properties HTML 2016-01-29 13:41:43 -08:00
Philip Rosedale
a72c49793e speedups per code review 2016-01-29 10:57:17 -08:00
samcake
2a5aab6dc8 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-01-29 10:11:16 -08:00
Brad Hefta-Gaub
721a911cf1 Merge pull request #6972 from jherico/qml 
Small QML Fixes
 2016-01-29 09:57:15 -08:00
James B. Pollack
43f3b6409a Merge pull request #6966 from ericrius1/zoneEntityProps 
Moves zone props to top of entity properties panel
 2016-01-29 09:34:04 -08:00
ericrius1
2cd7c4a648 Merge remote-tracking branch 'upstream/master' 2016-01-29 09:15:05 -08:00
Andrew Meadows
5bae01485e Merge pull request #6975 from hyperlogic/tony/update-standard-anims 
Update animations to use standard joint orientations
 2016-01-29 08:58:06 -08:00
Philip Rosedale
ee95f7906b Fish flocking example 2016-01-29 00:59:06 -08:00
Philip Rosedale
9f95a9de89 Limits on distance and mass for far grabbing 2016-01-29 00:52:59 -08:00
Brad Hefta-Gaub
8efe15cb21 Merge pull request #6963 from jherico/qmlOverlays 
Make all 2D overlays QML-based
 2016-01-28 23:33:30 -08:00
Brad Davis
5b1971907c Move bookmarks to QML only dialogs 2016-01-28 21:20:43 -08:00
Brad Davis
c80193635b Update input dialog to support choice selection 2016-01-28 21:19:21 -08:00
Brad Davis
35211b7475 Add titles to modal dialogs, move z-order debug display to bottom of window 2016-01-28 21:18:14 -08:00
Brad Davis
afd3ddf534 Cleaning up message box 2016-01-28 21:17:05 -08:00
samcake
71e6c6e443 Starting to add the Items on the Octree 2016-01-28 17:57:21 -08:00
Brad Davis
ab56765ebd Add titles to windows 2016-01-28 17:52:22 -08:00
Brad Davis
e97850dd26 Merge pull request #6965 from ctrlaltdavid/20793 
Warn user if OpenGL version is too low (< 4.1)
 2016-01-28 20:39:56 -05:00
ericrius1
6be550a144 resolved conflicts 2016-01-28 17:08:24 -08:00
ericrius1
f7185342df Merge branch 'ericrius1-zoneEntityProps' 2016-01-28 17:05:04 -08:00
Brad Davis
5b2e739ef3 Fixing warning 2016-01-28 16:39:40 -08:00
Ryan Huffman
c67f39a6c0 Merge pull request #6976 from birarda/injector-dos 
fix for overflow on injector playNextFrameAt
 2016-01-28 16:37:12 -08:00
Brad Davis
8c19b95ea2 Fix oversized text, invalid color handling 2016-01-28 16:36:28 -08:00
David Rowe
6232a83f43 Specify minimum OpenGL version in gl library's config 
Note: Defines minimum OpenGL version as 4.1 in anticipation of Interface
soon properly supporting both 4.1 and 4.3 on Windows.
 2016-01-29 13:03:54 +13:00
Brad Davis
72b264dcde Ensure toolbar z-order is always below windows 2016-01-28 16:03:27 -08:00
Brad Davis
06071c6493 Fixing build errors 2016-01-28 16:03:26 -08:00
Brad Davis
5b817ccc21 Make all 2D overlays QML 2016-01-28 16:03:26 -08:00
James B. Pollack
96ddb9febb Merge pull request #6970 from ericrius1/webEntityURL 
Moved source URL up to top of entity properties panel
 2016-01-28 16:02:21 -08:00
James B. Pollack
78d06ed32a Merge pull request #6952 from howard-stearns/avatar-preferences-chooser 
avatar preferences chooser modal web
 2016-01-28 16:01:53 -08:00