Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 16:03:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
26957 commits 75 branches 59 tags 1.2 GiB
Commit graph

12478 commits

Author SHA1 Message Date
Seth Alves
bce8b0cc1b Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-22 07:19:55 -07:00
samcake
be8ae9580d Merge pull request #5177 from bwent/doubleClickEvent 
Expose mouseDoublePressEvents to js
 2015-06-22 11:13:05 +02:00
Seth Alves
3afdcfd6d1 quiet compiler 2015-06-21 18:12:58 -07:00
Seth Alves
746033f3bd Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-21 07:34:48 -07:00
Brad Hefta-Gaub
13c5c830d7 Merge pull request #5173 from huffman/fix-line-bounds 
Add correct line3doverlay bounds
 2015-06-20 11:39:08 -07:00
Seth Alves
5381e6e9bb entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion 2015-06-19 16:20:07 -07:00
Niraj Venkat
482f12be8c Returning ref to stack to view controller 2015-06-19 16:05:45 -07:00
bwent
c315bcec24 Expose mouseDoublePressEvents to js 2015-06-19 15:52:27 -07:00
Niraj Venkat
03c10d15e6 Adding lambdas and removing dead code 2015-06-19 14:37:21 -07:00
Niraj Venkat
054e12a315 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-19 11:22:50 -07:00
Niraj Venkat
1494aa4faa Adding new icon and getters 2015-06-19 11:18:16 -07:00
Niraj Venkat
b15e7cec21 Back and forward are red if not possible 2015-06-19 11:17:56 -07:00
Ryan Huffman
ff66eb584d Add correct line3doverlay bounds 2015-06-19 10:48:07 -07:00
Seth Alves
89ec3c21b4 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-19 09:36:11 -07:00
Clément Brisset
5192796851 Merge pull request #5168 from samcake/daft 
Improving the rendering job architecture
 2015-06-19 18:00:39 +02:00
Sam Gateau
598d0a5375 Just remove these changes on SkeletonModel.cpp 2015-06-19 17:44:56 +02:00
Atlante45
9c7f24eeb6 Add culled option for simple programs 2015-06-19 16:50:38 +02:00
Atlante45
67473ac254 Fix rotation handle crash 2015-06-19 16:40:42 +02:00
Sam Gateau
9adfdb06fe undo local modif to SKeletonModel.cpp 2015-06-19 11:00:27 +02:00
Sam Gateau
31633eca10 IMproving the probe system and cleaning the engine script 2015-06-19 10:41:40 +02:00
Sam Gateau
b09991d75b Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-06-19 09:35:40 +02:00
Niraj Venkat
afc2db6c6a address bar commit 2015-06-18 18:25:48 -07:00
Brad Hefta-Gaub
a7a53d8be7 Merge pull request #5148 from SamGondelman/rotationModes 
center player in view mode
 2015-06-18 18:02:47 -07:00
Seth Alves
32cf669d8b moving toward sending actions over wire 2015-06-18 17:51:41 -07:00
Brad Hefta-Gaub
750ce250fa Merge pull request #5150 from SamGondelman/mouseLook 
mouse look script
 2015-06-18 17:41:20 -07:00
Niraj Venkat
894a245318 Further changes to address bar 2015-06-18 17:35:50 -07:00
Philip Rosedale
2f080a8e29 Merge pull request #5147 from sethalves/more-actions 
offset action
 2015-06-18 17:35:50 -07:00
Niraj Venkat
55b6efb1e9 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-18 15:48:37 -07:00
Seth Alves
816726efdc Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-18 15:33:46 -07:00
Niraj Venkat
5645491170 Further changes to address bar 2015-06-18 15:09:13 -07:00
Niraj Venkat
1be303e3ed Address bar polish 2015-06-18 15:07:27 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Seth Alves
3c90c851e9 start on code to de/serialize actions 2015-06-18 15:01:34 -07:00
Seth Alves
99afd07395 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-18 12:45:40 -07:00
Seth Alves
53b5c8e6e7 more merge fallout 2015-06-18 10:19:12 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
Atlante45
d0f27f1648 Change display names size 2015-06-18 15:23:53 +02:00
Atlante45
c38fa46eb1 Increase anti z-fighting value 2015-06-18 15:23:53 +02:00
Atlante45
045a6a6ad9 Use render args frustum 2015-06-18 15:23:52 +02:00
Atlante45
be261cd038 Increase anti z-fighting value 2015-06-18 15:23:52 +02:00
Atlante45
fb6de91cbe HACK Prevent head hight value explosion 2015-06-18 15:23:51 +02:00
Atlante45
3b41a8f209 Cancel display names roll 
This is annoying in HMD
 2015-06-18 15:23:51 +02:00
Atlante45
e1b5a3c204 Fix display name transform 
They now have a fixed pixel size and ar pixel aligned
 2015-06-18 15:23:51 +02:00
Atlante45
d7b9a1b032 Cleanup TextRenderer3D methods args 2015-06-18 15:23:49 +02:00
Atlante45
47634a48a6 Make renderDisplayName const 2015-06-18 15:22:49 +02:00
samcake
89fe1c47be preping for debug the jobs 2015-06-18 13:02:06 +02:00
Seth Alves
c6a0630aa5 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 19:10:37 -07:00
Bradley Austin Davis
4633cabcec Merge remote-tracking branch 'upstream/master' into ovr6 2015-06-17 17:07:43 -07:00
Brad Davis
2ab3f42c6a Merge pull request #5124 from venkatn93/master 
New address bar with forward and back buttons
 2015-06-17 15:33:10 -07:00
Seth Alves
fbfa73af2d Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-17 15:18:17 -07:00