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

36321 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
2c02e7ad63 grabbing works with left hand for ping pong gun now 2015-12-18 15:22:23 -08:00
ericrius1
2dbb3bd84a Added grab offsets to createPingPongGun.js 2015-12-18 15:12:46 -08:00
ericrius1
77264b3f99 Ping pong gun lines up with hand 2015-12-18 14:52:39 -08:00
ericrius1
17af34a3be fixed spelling error 2015-12-17 15:48:05 -08:00
ericrius1
aa1f77ab1c adding ravestick to toybox demo room 2015-12-17 15:42:52 -08:00
ericrius1
3e6ae7c571 added lightball back 2015-12-17 15:02:25 -08:00
ericrius1
035ca25b48 arc ball finds other balls 2015-12-17 13:31:27 -08:00
ericrius1
92f96cbb2f Removed un-needed libraries from particle effect entity 2015-12-17 12:49:30 -08:00
ericrius1
6f82d680b9 removed unwanted file 2015-12-17 12:38:25 -08:00
ericrius1
5b52b5e5e7 Merge branch 'master' into polylineOptimizations 2015-12-17 11:41:34 -08:00
ericrius1
8d25a666d1 fixed bug where trail would remain after user released rave stick 2015-12-17 11:40:06 -08:00
ericrius1
2aaefbcfcb refactoring, adding headers 2015-12-17 11:32:48 -08:00
Ryan Huffman
3da5cf1fe5 Merge pull request #6684 from birarda/read-type-assert 
fix reading of empty or malformed packets
 2015-12-17 11:26:47 -08:00
Stephen Birarda
06e9731fe4 don't attempt to read an empty or malformed packet 2015-12-17 11:07:36 -08:00
Seth Alves
aabc544d6c Merge pull request #6683 from birarda/shtml-content-type 
serve SHTML files with HTML MIME type
 2015-12-17 11:05:34 -08:00
Stephen Birarda
08f42c08d9 use a ternary for single assignment 2015-12-17 10:54:32 -08:00
ericrius1
d4481818b2 lightsaber oriented right 2015-12-17 10:50:58 -08:00
Stephen Birarda
286b984d6f serve SHTML files with HTML MIME type 2015-12-17 10:48:33 -08:00
ericrius1
57e51afd46 light stick 2015-12-17 10:35:20 -08:00
ericrius1
f7811cf5dc light trails from rave stick 2015-12-17 10:25:51 -08:00
ericrius1
064c05e98c light trails 2015-12-17 10:04:51 -08:00
Clément Brisset
40272faa3f Merge pull request #6679 from hyperlogic/tony/particle-system-invalidated-iterator-fix 
ParticleEffectEntityItem: fix for invalid iterator increment
 2015-12-17 09:43:39 -08:00
ericrius1
b127b6a9e8 separating out rave stick 2015-12-17 08:55:57 -08:00
Brad Hefta-Gaub
0db0ef89d7 Merge pull request #6674 from murillodigital/master 
Unifying Windows PR and Release installer pipeline
 2015-12-16 20:42:13 -08:00
Brad Hefta-Gaub
275b35ef60 Merge pull request #6670 from Atlante45/ac-race 
Fix entity server race
 2015-12-16 20:21:56 -08:00
Brad Davis
343d31b38f Merge pull request #6677 from AlessandroSigna/overlays 
Fix to remove a VS warning
 2015-12-16 20:12:27 -08:00
Anthony J. Thibault
2eecb61da5 Prefer erase over repeated pop_front calls 2015-12-16 19:08:31 -08:00
ericrius1
bb67ca87e2 lightsabers 2015-12-16 17:52:39 -08:00
ericrius1
f9f496ef5a adding beam effect 2015-12-16 17:32:30 -08:00
Anthony J. Thibault
1b08563079 ParticleEffectEntityItem: fix for invalid iterator increment 
Was causing an assert in debug, due to calling ++ on an invalid iterator.
In release this might lead to memory corruption.
 2015-12-16 16:56:49 -08:00
ericrius1
d8c8778316 rave stick in right orientation 2015-12-16 16:50:27 -08:00
ericrius1
263557cc1a setting dimensions for rave stick 2015-12-16 16:18:57 -08:00
Atlante45
2c8be15e66 Unnecessary shutdown (Already shutting down) 2015-12-16 15:56:22 -08:00
ericrius1
6a77ae5db2 adding rave stick 2015-12-16 15:47:34 -08:00
AlessandroSigna
364a70bb46 Fix to avoid MVS warning 2015-12-16 15:41:27 -08:00
ericrius1
4155e3af71 refactoring 2015-12-16 15:22:56 -08:00
ericrius1
b29a6b16a9 modularizing flow art tools 2015-12-16 14:40:56 -08:00
Leonardo Murillo
bbe444ffc1 Forgot to add file 2015-12-16 16:40:51 -06:00
Leonardo Murillo
a7b61cf791 Couple of fixes 2015-12-16 16:39:09 -06:00
Atlante45
b709c8162c Fix node flapping race 2015-12-16 14:27:26 -08:00
Atlante45
6bda8d3f18 CR logging category 2015-12-16 14:27:26 -08:00
Atlante45
b55d8f750f CR 2015-12-16 14:27:26 -08:00
Atlante45
0f7093bed7 Whitespace 2015-12-16 14:27:26 -08:00
Atlante45
df24fafe49 CR feedback 2015-12-16 14:27:26 -08:00
Atlante45
a655557af0 Make variable name more obvious 2015-12-16 14:27:26 -08:00
Atlante45
b4dc3b1b47 Fix windows compile error. 2015-12-16 14:27:26 -08:00
Atlante45
a541fdd2df Move OctreeSendThread to the OctreeServer 2015-12-16 14:27:26 -08:00
Atlante45
51ec7ae2ed Keep UUID of node in send thread 2015-12-16 14:27:26 -08:00
Atlante45
3cd1eea1dc Use weak pointer to the Node instead of strong ownership 2015-12-16 14:27:26 -08:00
Atlante45
95da71b19c Assignment don't inherit from NodeData 
This is an artefact from an old design that stuck around
 2015-12-16 14:27:26 -08:00