Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 21:10:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13894 commits 76 branches 59 tags 1.2 GiB
Commit graph

13894 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
db1031144b fix passing of unattenuated zones to buffers 2014-06-18 13:46:03 -07:00
Stephen Birarda
5878b4af59 setup listener unattenuated zones for source ring buffers 2014-06-18 12:50:16 -07:00
Brad Hefta-Gaub
c49ff59725 Merge pull request #3037 from wangyix/edit_nack_pull 
Edit nack pull
 2014-06-18 11:43:25 -07:00
wangyix
d78ed66616 removed spaces before comments in OctreeInboundPacketProcessor 2014-06-18 11:37:54 -07:00
Brad Hefta-Gaub
f04e5c0a73 Merge pull request #3041 from kitely/vs2013 
Allow the project to compile in Visual Studio 2013
 2014-06-18 11:33:06 -07:00
Andrzej Kapolka
2513716c5b Merge pull request #3043 from ey6es/master 
Add virtual destructor to get rid of Xcode warning.
 2014-06-18 11:32:55 -07:00
Andrzej Kapolka
52de729d60 Add virtual destructor to get rid of Xcode warning. 2014-06-18 11:31:58 -07:00
wangyix
7cef5eeeec replaced UINT16_MAX at 2 other places 2014-06-18 10:27:02 -07:00
wangyix
54f32d331e replaced UINT16_MAX with std::numeric_limits<uint16_t>::max 2014-06-18 10:20:19 -07:00
wangyix
b63c88f42c removed more spaces 2014-06-18 09:38:39 -07:00
wangyix
8c4e365958 added forgotten i++ in sendNackPackets() 
plus minor style fixes
 2014-06-18 09:28:42 -07:00
Oren Hurvitz
32c97bb6a2 Update Windows build instructions 2014-06-18 10:52:02 +01:00
Oren Hurvitz
98b4d6f697 Allow the project to compile using Visual Studio 2013 2014-06-18 10:27:57 +03:00
Brad Hefta-Gaub
d6f1cea1f5 Merge pull request #3040 from Atlante45/dont_select_models_too_big 
if model takes too much angular size, don't select it
 2014-06-17 19:12:20 -07:00
Atlante45
97dd695213 if model takes too much angular size, don't select it 2014-06-17 18:32:45 -07:00
Brad Hefta-Gaub
a51d2deec6 Merge pull request #3039 from Atlante45/snapping_model_rotation 
Added snapped/smoothed rotation for models + tooltip
 2014-06-17 17:42:25 -07:00
Brad Hefta-Gaub
dead474e6b Merge pull request #3034 from Barnold1953/OculusOverlay 
New Oculus Magnification Windows
 2014-06-17 17:29:09 -07:00
Brad Hefta-Gaub
cee6f1be6a Merge pull request #3031 from stojce/19755 
Code Review for Job #19755
 2014-06-17 17:28:55 -07:00
Atlante45
4467ee266d Added snapped/smoothed rotation for models + tooltip 2014-06-17 17:19:16 -07:00
barnold1953
64725dd21b Unneeded comment 2014-06-17 17:15:43 -07:00
barnold1953
fa32ad5b11 De-janked code by removing magic numbers 2014-06-17 17:14:26 -07:00
barnold1953
9f66eeb37f Added a const variable for readability 2014-06-17 16:48:06 -07:00
wangyix
7f4cf3719e added rollover handling to OctreeSceneStats 2014-06-17 16:40:08 -07:00
barnold1953
7cbb19551a Switched time query method and fixed horrifying bug 2014-06-17 16:38:19 -07:00
Brad Hefta-Gaub
df27de3c73 Merge pull request #3036 from huffman/19788 
Code Review for Job #19788
 2014-06-17 16:28:03 -07:00
Brad Hefta-Gaub
ba72410add Merge pull request #3029 from thoys/interface-balance-display-fix 
interface balance display fix
 2014-06-17 16:25:07 -07:00
Brad Hefta-Gaub
41b3e3e4ea Merge pull request #3023 from ey6es/metavoxels 
Refactored type/object streaming, added support for reading into/writing from "generic" containers that don't require the original classes/types.
 2014-06-17 16:24:22 -07:00
Brad Hefta-Gaub
6fc05d66c8 Merge pull request #3030 from AndrewMeadows/inertia 
raycasts against Shapes
 2014-06-17 16:10:36 -07:00
AndrewMeadows
5587d03c12 Merge pull request #3035 from ZappoMan/raypickbug 
fixed a bug in inside out ray casting returning the wrong face
 2014-06-17 15:49:17 -07:00
barnold1953
6c74650552 Attempt to fix build errors 2014-06-17 15:40:11 -07:00
Stojce Slavkovski
591ab448a1 remove unused variable 2014-06-17 23:54:55 +02:00
Stojce Slavkovski
9824072300 remove unused parameter in AccountScriptingInterface::updateBalance 2014-06-17 23:51:02 +02:00
wangyix
604b17185b call writeUnverifiedDatagram for sending edit nacks 2014-06-17 14:43:13 -07:00
Stojce Slavkovski
8b5e3486a3 Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-17 23:22:03 +02:00
Ryan Huffman
89fbeb0b6d Fix invalid remote scripts being loaded 2014-06-17 13:09:48 -07:00
ZappoMan
4413049302 fixed a bug in inside out ray casting returning the wrong face 2014-06-17 13:05:35 -07:00
Andrew Meadows
b6cecf3cfd Add SphereShape.cpp to project 2014-06-17 12:50:49 -07:00
AndrewMeadows
c5bd3df046 Merge pull request #3033 from ZappoMan/raypickbug 
add support for inside out ray intersection on AACube and AABox
 2014-06-17 12:48:44 -07:00
barnold1953
bee84a064c Dont render red border for mouse magnifier 2014-06-17 12:41:53 -07:00
Andrew Meadows
f18864bd72 Moved findRayIntersection() to the Shape classes 2014-06-17 12:36:36 -07:00
barnold1953
2eda35ff1d Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 
Conflicts:
	interface/src/ui/ApplicationOverlay.cpp
 2014-06-17 12:25:09 -07:00
barnold1953
e775d645a7 Fixed NAN error with magnification windows 2014-06-17 12:19:15 -07:00
Brad Hefta-Gaub
7362404aa2 Merge pull request #3032 from AndrewMeadows/say-no-to-warnings 
remove build warnings
 2014-06-17 12:17:44 -07:00
Brad Hefta-Gaub
9c27554f8a Merge pull request #3028 from Atlante45/detached_mode_in_inspect_js 
Added a detached mode by default in inpect.js
 2014-06-17 12:15:00 -07:00
wangyix
5f62b43ba6 added edit nack types to non-verified list 2014-06-17 12:14:44 -07:00
ZappoMan
9a3f8508cf add support for inside out ray intersection on AACube and AABox 2014-06-17 12:12:53 -07:00
Andrew Meadows
3f36325642 remove warnings about signed/unsigned comparison 2014-06-17 11:59:37 -07:00
Andrew Meadows
b37b9fb097 remove warnings about unused variables 2014-06-17 11:59:26 -07:00
wangyix
011e7c2de2 removed debug code 2014-06-17 11:53:09 -07:00
wangyix
8187912384 added qDebug() check in SentPacketHistory for seq numbers 
used (unsigned short int)1 instead of 1 when calculating
expectedSequence
 2014-06-17 11:34:35 -07:00