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

12196 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
f3fd81ca59 use glm::modf() for less code 2014-04-22 14:26:52 -07: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
Andrew Meadows
62121b1232 remove include of StreamUtils.h again 2014-04-22 11:46:15 -07:00
Andrew Meadows
65d3b4dc39 fix penetration direction for sphere-vs-AACube 2014-04-22 11:43:23 -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
Andrew Meadows
a45bc6c110 remove const from CollisionList subscript operator 2014-04-22 10:48:05 -07:00
Andrew Meadows
7cb6856415 Adding some collision tests for sphere-vs-AACube 2014-04-22 10:44:41 -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
Brad Hefta-Gaub
1dc4a61013 Merge pull request #2702 from thoys/19561 
Code Review for Job #19561
 2014-04-22 10:00:34 -07: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
Andrew Meadows
06794f33f3 add accessor for Model::_boundingShape 2014-04-21 18:23:19 -07:00
Andrew Meadows
63c02f2b04 add subscript operator for CollisionList 2014-04-21 18:22:34 -07:00
Andrew Meadows
1782e803c9 remove include StreamUtils.h 2014-04-21 18:21:39 -07:00
Andrew Meadows
8d6fa8f904 fix sphere-vs-axis-aligned-cube logic 2014-04-21 18:19:59 -07:00
AndrewMeadows
95ccea7df7 Merge pull request #2708 from Atlante45/replace_printf 
Replace printf
 2014-04-21 18:14:36 -07:00
ZappoMan
60b8ab0de5 CR feedback 2014-04-21 17:45:38 -07:00
ZappoMan
91d8e11393 return the bytes sent in writeDatagram() and writeUnverifiedDatagram() 2014-04-21 17:34:01 -07:00
ZappoMan
a64d3ffc32 more cleanup 2014-04-21 16:38:45 -07:00
ZappoMan
7d18dbdfb8 more cleanup 2014-04-21 16:35:42 -07:00
Atlante45
cfc778d10c Fix regexp fail 2014-04-21 16:32:17 -07:00
ZappoMan
e55c488964 clean up some old debugging 2014-04-21 16:17:59 -07:00
Atlante45
681aab5bf0 Remove printf and replace them by qDebug() 2014-04-21 16:17:45 -07:00
ZappoMan
003e3ae507 properly unhook delete notifications 2014-04-21 16:01:37 -07:00
ZappoMan
f3aa9d3b8f unhook node bag from element notifications on shutdown to speed up cleanup 2014-04-21 15:45:12 -07:00
ZappoMan
779b5a6827 debug 2014-04-21 15:32:44 -07:00
ZappoMan
a473fe3aee fix header 2014-04-21 15:14:14 -07:00
ZappoMan
7a8a8e2fac delete tree on server shutdown 2014-04-21 15:14:06 -07:00
ZappoMan
75f079e2b3 tweak debugging 2014-04-21 14:15:13 -07:00
Andrew Meadows
06784aa960 move AABox back to octree lib 
Fleshing out ShapeCollider::collideShapeWithAACube()
 2014-04-21 14:07:40 -07:00
ZappoMan
9a63fa7550 some cleanup 2014-04-21 13:36:13 -07:00
ZappoMan
14e1fa269a cleanup 2014-04-21 13:28:03 -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
Thijs Wenker
c1ed38f4de Style 2014-04-21 21:23:39 +02:00
ZappoMan
7798c6eb09 some debugging 2014-04-21 11:48:58 -07:00
ZappoMan
ffc73e04eb added new load testing example script 2014-04-21 11:48:42 -07:00
Andrew Meadows
241df7a767 Move AABox from octree lib to shared lib 
Stubbed out Shape vs Octree collisions
 2014-04-21 10:27:20 -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
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