Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 05:01:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32776 commits 25 branches 0 tags 1.1 GiB
Commit graph

32776 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
34dc8bdbcb fix possible crash in agent 2015-09-30 15:34:35 -07:00
Brad Hefta-Gaub
497cb89abd Merge pull request #5959 from huffman/fix-octree-inbound 
Fix OctreeInboundPacketProcessor std_list crash
 2015-09-30 15:16:38 -07:00
Ryan Huffman
b7cfc07748 Merge pull request #5957 from ZappoMan/fixSentPacketHistoryCrash 
fix possible crash from null coming from _sentPackets
 2015-09-30 15:12:09 -07:00
Brad Hefta-Gaub
5f7442f78d Merge pull request #5955 from sethalves/debug-grab 
fix grabbing
 2015-09-30 15:09:20 -07:00
Ryan Huffman
0063eee4a0 Fix issue with nackPacketList being accessed after being moved 2015-09-30 15:02:45 -07:00
James Pollack
3cdb4e7186 importing 2015-09-30 14:23:11 -07:00
Seth Alves
dd0a16df04 don't leave search state if we intersect something that someone else is already grabbing 2015-09-30 14:19:59 -07:00
Brad Hefta-Gaub
9cf49597a6 fix possible crash from null coming from _sentPackets 2015-09-30 14:16:41 -07:00
Seth Alves
b417abc3de try again on string startswith 2015-09-30 14:16:07 -07:00
Seth Alves
c27766facb move string startswith to utils.js 2015-09-30 14:07:23 -07:00
Seth Alves
f746a970de don't grab something if someone else is already grabbing it 2015-09-30 14:03:10 -07:00
Seth Alves
b34ea6ded4 store action lifetime as an expires integer 2015-09-30 13:46:23 -07:00
Seth Alves
06f7f92951 Merge branch 'master' of github.com:highfidelity/hifi into debug-grab 2015-09-30 13:09:47 -07:00
Seth Alves
7c6846c260 add lifetime and tag arguments to actions 2015-09-30 13:09:41 -07:00
James Pollack
8fc696c5f8 add ability to explort particle settings in nice format for interface 2015-09-30 12:41:08 -07:00
Brad Hefta-Gaub
88f0c7017e Merge pull request #5953 from hyperlogic/tony/avatar-mixer-crash-fix 
Prevent taking a reference to a QUrl rvalue.
 2015-09-30 12:36:45 -07:00
Brad Hefta-Gaub
46e1a298c8 Merge pull request #5951 from huffman/cc-rng-fix 
Fix infinite recursion error with CC rng
 2015-09-30 12:36:35 -07:00
Brad Hefta-Gaub
4480b60321 Merge pull request #5950 from birarda/guard-sph 
guard for insert/get in SentPacketHistory
 2015-09-30 12:33:29 -07:00
James Pollack
57d5418231 export just particle settings in interface compatible format 2015-09-30 12:27:51 -07:00
David Rowe
c56ac24602 Improve particle property interpolation 
Use Bezier interpolation instead of cubic so that values don't overshoot.
 2015-09-30 11:37:22 -07:00
Anthony J. Thibault
83c3f65b1f Prevent taking a reference to a QUrl rvalue. 2015-09-30 11:34:38 -07:00
Ryan Huffman
1e9593029c Fix infinite recursion error with CC rng 
On some std::random implementations tryin get a range [low, high) where
high < low will cause infinite recursion.
 2015-09-30 11:34:11 -07:00
James Pollack
0865f94106 magic numbers 2015-09-30 11:31:33 -07:00
Stephen Birarda
82ac0b1a27 use a mutable mutex to keep const-ness 2015-09-30 14:23:18 -04:00
James Pollack
8bdf428f41 First version of ping pong gun 2015-09-30 11:21:51 -07:00
Stephen Birarda
f7e7b07441 fix constness of SentPacketHistory in OEPS 2015-09-30 14:15:22 -04:00
Stephen Birarda
cc6b0adb7d guard insert/get in SentPacketHistory 2015-09-30 14:15:04 -04:00
ericrius1
c03a9ddd58 Added fire to master script 2015-09-30 11:14:18 -07:00
Brad Hefta-Gaub
1f1eb00c63 Merge pull request #5949 from sethalves/debug-grab 
improve actionInspector.js
 2015-09-30 11:01:09 -07:00
James Pollack
ecad7f34f6 moar 2015-09-30 10:58:21 -07:00
Seth Alves
ba317a0511 Merge branch 'debug-grab' of github.com:sethalves/hifi into debug-grab 2015-09-30 10:58:05 -07:00
Seth Alves
898e3917e3 improve actionInspector.js 2015-09-30 10:57:52 -07:00
James Pollack
99fbed6143 mostly working 2015-09-30 10:49:47 -07:00
Brad Hefta-Gaub
94b0e36f0e Merge pull request #5948 from sethalves/debug-grab 
script to display entity-action details in an overlay
 2015-09-30 10:43:05 -07:00
Seth Alves
96d0df49e4 script to display entity-action details in an overlay 2015-09-30 10:41:39 -07:00
James Pollack
c3dfea4712 initial files 2015-09-30 10:26:24 -07:00
ericrius1
2b84c90f9d merged master hand controller 2015-09-30 10:18:13 -07:00
Brad Davis
9453e5cb1b Merge pull request #5947 from ZappoMan/hideHandCursors 
only show hand cursors when menu is enabled
 2015-09-30 09:43:40 -07:00
Sam Gateau
e78f1521ab getting the stencil buffer in place 2015-09-30 09:24:36 -07:00
Brad Hefta-Gaub
76825c2be7 only show hand cursors when menu is enabled 2015-09-30 09:06:45 -07:00
Leonardo Murillo
054a3728de Merge pull request #5945 from kencooke/master 
Create symbol files on Windows release builds
 2015-09-30 09:46:16 -06:00
Ken Cooke
de8848f7bc Fix to only pass --release to windeployqt on release builds 2015-09-30 08:11:16 -07:00
James B. Pollack
cbeeb62c32 Merge remote-tracking branch 'upstream/master' 2015-09-29 21:34:39 -07:00
James B. Pollack
402fd44cff header file cleanup 2015-09-29 21:27:55 -07:00
James B. Pollack
80a457eb14 cleanup the main.js file for distribution 2015-09-29 19:47:00 -07:00
James B. Pollack
47b410df93 version 0.1 of particle explorer for distribution 2015-09-29 19:44:15 -07:00
Ken Cooke
4dc2c9a58f Create symbol files on Windows release builds. Added --release to windeployqt.exe, otherwise it gets confused and copies debug DLLs instead of release. 2015-09-29 18:42:52 -07:00
ericrius1
00cab85a11 Removed whiteboard from reset script 2015-09-29 18:33:31 -07:00
ericrius1
259391a40b Merge branch 'toybox' of https://github.com/ericrius1/hifi into toybox 2015-09-29 18:32:56 -07:00
ericrius1
ba17225c19 Remove hand control script from PR 2015-09-29 18:32:52 -07:00