Merge lp:~lielft-deactivatedaccount/ubiquity-slideshow-ubuntu/games-slide into lp:ubiquity-slideshow-ubuntu

Proposed by Liel Fridman
Status: Rejected
Rejected by: Sebastien Bacher
Proposed branch: lp:~lielft-deactivatedaccount/ubiquity-slideshow-ubuntu/games-slide
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 422 lines (+402/-0)
3 files modified
icons-source/games.svg (+388/-0)
slides/games.html (+13/-0)
slides/index.html (+1/-0)
To merge this branch: bzr merge lp:~lielft-deactivatedaccount/ubiquity-slideshow-ubuntu/games-slide
Reviewer Review Type Date Requested Status
Dylan McCall Pending
Review via email: mp+15545@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Liel Fridman (lielft-deactivatedaccount) wrote :

This branch contains a new slideshow about games in Ubuntu.

179. By Liel Fridman <liel@liel-desktop>

Some fixes related to the games slide

180. By Liel Fridman <liel@liel-desktop>

Forgot to changee 'Repositories to 'Software Center'

Revision history for this message
Martin Erik Werner (arand) wrote :

I glanced by here and noticed the "Run your Windows games using Wine" string on the slide.
With the extremely varied success rate of Wine, is it really prudent to put such an optimistic statement in such an "official" spot as the installer?

Would not something like "Many/Several Windows games can be run using Wine" be a bit less "works flawlessly!", but still keeping an optimistic tone?

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Good idea. Fast forward 3 years, should we have steam on linux slide?

Unmerged revisions

180. By Liel Fridman <liel@liel-desktop>

Forgot to changee 'Repositories to 'Software Center'

179. By Liel Fridman <liel@liel-desktop>

Some fixes related to the games slide

178. By Liel Fridman <liel@liel-desktop>

New slide - games - added

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'icons-source/games.svg'
2--- icons-source/games.svg 1970-01-01 00:00:00 +0000
3+++ icons-source/games.svg 2009-12-04 15:44:10 +0000
4@@ -0,0 +1,388 @@
5+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
6+<!-- Created with Inkscape (http://www.inkscape.org/) -->
7+
8+<svg
9+ xmlns:svg="http://www.w3.org/2000/svg"
10+ xmlns="http://www.w3.org/2000/svg"
11+ xmlns:xlink="http://www.w3.org/1999/xlink"
12+ version="1.0"
13+ width="48"
14+ height="48"
15+ id="svg11300">
16+ <defs
17+ id="defs3">
18+ <linearGradient
19+ id="linearGradient5460">
20+ <stop
21+ id="stop5462"
22+ style="stop-color:#e5e5e5;stop-opacity:1"
23+ offset="0" />
24+ <stop
25+ id="stop5464"
26+ style="stop-color:#c8c8c8;stop-opacity:1"
27+ offset="1" />
28+ </linearGradient>
29+ <linearGradient
30+ id="linearGradient2296">
31+ <stop
32+ id="stop2298"
33+ style="stop-color:white;stop-opacity:1"
34+ offset="0" />
35+ <stop
36+ id="stop2300"
37+ style="stop-color:white;stop-opacity:0"
38+ offset="1" />
39+ </linearGradient>
40+ <linearGradient
41+ id="linearGradient3116">
42+ <stop
43+ id="stop3118"
44+ style="stop-color:#e5e5e5;stop-opacity:1"
45+ offset="0" />
46+ <stop
47+ id="stop3120"
48+ style="stop-color:#dfdfdf;stop-opacity:1"
49+ offset="1" />
50+ </linearGradient>
51+ <linearGradient
52+ id="linearGradient3702">
53+ <stop
54+ id="stop3704"
55+ style="stop-color:black;stop-opacity:0"
56+ offset="0" />
57+ <stop
58+ id="stop3710"
59+ style="stop-color:black;stop-opacity:1"
60+ offset="0.5" />
61+ <stop
62+ id="stop3706"
63+ style="stop-color:black;stop-opacity:0"
64+ offset="1" />
65+ </linearGradient>
66+ <linearGradient
67+ id="linearGradient3688">
68+ <stop
69+ id="stop3690"
70+ style="stop-color:black;stop-opacity:1"
71+ offset="0" />
72+ <stop
73+ id="stop3692"
74+ style="stop-color:black;stop-opacity:0"
75+ offset="1" />
76+ </linearGradient>
77+ <linearGradient
78+ x1="48"
79+ y1="18.534204"
80+ x2="78"
81+ y2="18.534204"
82+ id="linearGradient6424"
83+ xlink:href="#linearGradient2296"
84+ gradientUnits="userSpaceOnUse"
85+ gradientTransform="matrix(0.969324,0.303467,-0.313034,0.999884,-26.51354,-28.87764)" />
86+ <linearGradient
87+ x1="54.287079"
88+ y1="9.1136208"
89+ x2="68.843483"
90+ y2="38.118332"
91+ id="linearGradient6436"
92+ xlink:href="#linearGradient2296"
93+ gradientUnits="userSpaceOnUse"
94+ gradientTransform="matrix(0.869923,-0.01268995,0.0134065,0.8761486,-36.670258,2.5190229)" />
95+ <linearGradient
96+ x1="34.561821"
97+ y1="17.249048"
98+ x2="50.808903"
99+ y2="44.769524"
100+ id="linearGradient6441"
101+ xlink:href="#linearGradient3116"
102+ gradientUnits="userSpaceOnUse"
103+ gradientTransform="matrix(0.7594396,0,0,0.9967147,-10.445355,1.1420554)" />
104+ <radialGradient
105+ cx="10.185099"
106+ cy="20.631657"
107+ r="12.97739"
108+ fx="10.185099"
109+ fy="20.631657"
110+ id="radialGradient6443"
111+ xlink:href="#linearGradient2296"
112+ gradientUnits="userSpaceOnUse"
113+ gradientTransform="matrix(1,0,0,1.3086506,-5.0101896,-15.856636)" />
114+ <linearGradient
115+ x1="35.321308"
116+ y1="24.984463"
117+ x2="51.861248"
118+ y2="41.370472"
119+ id="linearGradient6446"
120+ xlink:href="#linearGradient5460"
121+ gradientUnits="userSpaceOnUse"
122+ gradientTransform="matrix(0.7782624,0,0,1.0030321,-10.791192,0.790029)" />
123+ <linearGradient
124+ x1="48"
125+ y1="18.534204"
126+ x2="78"
127+ y2="18.534204"
128+ id="linearGradient6462"
129+ xlink:href="#linearGradient2296"
130+ gradientUnits="userSpaceOnUse"
131+ gradientTransform="matrix(0.969324,0.303467,-0.313034,0.999884,-26.51354,-28.87764)" />
132+ <linearGradient
133+ x1="54.287079"
134+ y1="9.1136208"
135+ x2="68.843483"
136+ y2="38.118332"
137+ id="linearGradient6475"
138+ xlink:href="#linearGradient2296"
139+ gradientUnits="userSpaceOnUse"
140+ gradientTransform="matrix(0.869923,-0.01268995,0.0134065,0.8761486,-22.672053,-3.4827791)" />
141+ <linearGradient
142+ x1="34.561821"
143+ y1="17.249048"
144+ x2="50.808903"
145+ y2="44.769524"
146+ id="linearGradient6479"
147+ xlink:href="#linearGradient3116"
148+ gradientUnits="userSpaceOnUse"
149+ gradientTransform="matrix(0.7594396,0,0,0.9967147,3.5426311,-4.8841207)" />
150+ <radialGradient
151+ cx="24.260418"
152+ cy="14.132573"
153+ r="12.97739"
154+ fx="24.260418"
155+ fy="14.132573"
156+ id="radialGradient6481"
157+ xlink:href="#linearGradient2296"
158+ gradientUnits="userSpaceOnUse"
159+ gradientTransform="matrix(1,0,0,1.3086506,-5.0101896,-13.996654)" />
160+ <linearGradient
161+ x1="35.321308"
162+ y1="24.984463"
163+ x2="51.861248"
164+ y2="41.370472"
165+ id="linearGradient6484"
166+ xlink:href="#linearGradient5460"
167+ gradientUnits="userSpaceOnUse"
168+ gradientTransform="matrix(0.7782624,0,0,1.0030321,3.1969407,-5.2365324)" />
169+ <radialGradient
170+ cx="4.9929786"
171+ cy="43.5"
172+ r="2.5"
173+ fx="4.9929786"
174+ fy="43.5"
175+ id="radialGradient6494"
176+ xlink:href="#linearGradient3688"
177+ gradientUnits="userSpaceOnUse"
178+ gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
179+ <radialGradient
180+ cx="4.9929786"
181+ cy="43.5"
182+ r="2.5"
183+ fx="4.9929786"
184+ fy="43.5"
185+ id="radialGradient6496"
186+ xlink:href="#linearGradient3688"
187+ gradientUnits="userSpaceOnUse"
188+ gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
189+ <linearGradient
190+ x1="25.058096"
191+ y1="47.027729"
192+ x2="25.058096"
193+ y2="39.999443"
194+ id="linearGradient6498"
195+ xlink:href="#linearGradient3702"
196+ gradientUnits="userSpaceOnUse" />
197+ <radialGradient
198+ cx="4.9929786"
199+ cy="43.5"
200+ r="2.5"
201+ fx="4.9929786"
202+ fy="43.5"
203+ id="radialGradient6500"
204+ xlink:href="#linearGradient3688"
205+ gradientUnits="userSpaceOnUse"
206+ gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
207+ <radialGradient
208+ cx="4.9929786"
209+ cy="43.5"
210+ r="2.5"
211+ fx="4.9929786"
212+ fy="43.5"
213+ id="radialGradient6502"
214+ xlink:href="#linearGradient3688"
215+ gradientUnits="userSpaceOnUse"
216+ gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
217+ <linearGradient
218+ x1="25.058096"
219+ y1="47.027729"
220+ x2="25.058096"
221+ y2="39.999443"
222+ id="linearGradient6504"
223+ xlink:href="#linearGradient3702"
224+ gradientUnits="userSpaceOnUse" />
225+ </defs>
226+ <g
227+ id="g6506">
228+ <g
229+ transform="matrix(0.7499997,0,0,0.7777785,13.000001,3.4444095)"
230+ id="g7130"
231+ style="display:inline;enable-background:new">
232+ <g
233+ transform="translate(-2e-6,2.838692e-5)"
234+ id="g7132"
235+ style="display:inline">
236+ <g
237+ transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
238+ id="g7134"
239+ style="opacity:0.4">
240+ <rect
241+ width="5"
242+ height="7"
243+ x="38"
244+ y="40"
245+ id="rect7136"
246+ style="fill:url(#radialGradient6500);fill-opacity:1;stroke:none" />
247+ <rect
248+ width="5"
249+ height="7"
250+ x="-10"
251+ y="-47"
252+ transform="scale(-1,-1)"
253+ id="rect7138"
254+ style="fill:url(#radialGradient6502);fill-opacity:1;stroke:none" />
255+ <rect
256+ width="28"
257+ height="7.0000005"
258+ x="10"
259+ y="40"
260+ id="rect7140"
261+ style="fill:url(#linearGradient6504);fill-opacity:1;stroke:none" />
262+ </g>
263+ </g>
264+ </g>
265+ <g
266+ transform="matrix(0.8008931,-0.1965967,0.211334,0.7450423,5.495629,12.05506)"
267+ id="g6536"
268+ style="stroke-width:1.25171566;stroke-miterlimit:4;stroke-dasharray:none;display:inline;enable-background:new">
269+ <path
270+ d="m 11.249051,13.68551 c 11.018461,7.81637 20.073808,0.268022 29.079725,9.104008 L 45.504535,4.7780871 44.31062,2.2533867 19.506897,-5.5996203 16.789787,-4.2944189 11.249051,13.68551 z"
271+ id="path6538"
272+ style="opacity:0.51648356;fill:url(#linearGradient6462);fill-opacity:1;fill-rule:evenodd;stroke:none" />
273+ </g>
274+ <rect
275+ width="26.953573"
276+ height="34.965298"
277+ rx="2.6408303"
278+ ry="2.5337005"
279+ x="17.554857"
280+ y="2.4606693"
281+ transform="matrix(0.9999984,0.00176942,-0.00167447,0.9999986,0,0)"
282+ id="rect6540"
283+ style="fill:url(#linearGradient6484);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new" />
284+ <rect
285+ width="24.954815"
286+ height="32.965771"
287+ rx="1.9233968"
288+ ry="1.7255259"
289+ x="18.554743"
290+ y="3.4625199"
291+ transform="matrix(0.9999985,0.00174183,-0.00169947,0.9999986,0,0)"
292+ id="rect6542"
293+ style="fill:url(#linearGradient6479);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient6481);stroke-width:0.99996448;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new" />
294+ <path
295+ d="m 21.951161,5 c -1.394519,1.252397 -1.959054,1.600817 -1.951078,2.291735 0.0078,0.671645 0.944971,1.243343 1.743486,0.808143 0.09197,0.300782 0.117758,0.637925 -0.31445,0.902343 0.03536,-5.88e-4 1.142614,0 1.142614,0 C 22.179445,8.731151 22.156895,8.382123 22.267649,8.045277 23.162657,8.541166 24.009817,7.972511 23.999914,7.190715 23.989796,6.370975 23.463736,6.118291 21.951161,5 z"
296+ id="path6605"
297+ style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new" />
298+ <path
299+ d="m 19.162723,20.21094 c 11.059278,3.324311 14.140092,-5.299829 23.835482,-0.638828 L 42.977788,4.674206 C 42.984918,3.831408 42.582244,3.270255 41.333713,3.286119 L 20.860821,2.998205 c -1.175326,-0.003 -1.90726,0.995496 -1.860501,1.74796 l 0.162403,15.464775 z"
300+ id="path6546"
301+ style="opacity:0.51648356;fill:url(#linearGradient6475);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new" />
302+ <path
303+ d="m 30.830522,14 c -4.88186,4.38165 -6.858151,5.60064 -6.830231,8.017892 0.02715,2.349826 3.308101,4.349977 6.103501,2.827382 0.32197,1.052316 0.41224,2.231852 -1.10081,3.156947 0.12379,-0.0021 4,0 4,0 -1.3733,-0.948368 -1.45224,-2.169484 -1.06452,-3.347976 3.1332,1.734923 6.09889,-0.254581 6.06422,-2.989781 -0.03542,-2.867952 -1.87702,-3.752 -7.17216,-7.664464 z"
304+ id="path3059"
305+ style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none" />
306+ <path
307+ d="m 39.951161,35 c -1.394519,-1.252397 -1.959054,-1.600817 -1.951078,-2.291735 0.0078,-0.671645 0.944971,-1.243343 1.743486,-0.808143 0.09197,-0.300782 0.117758,-0.637925 -0.31445,-0.902343 0.03536,5.88e-4 1.142614,0 1.142614,0 -0.392288,0.27107 -0.414838,0.620098 -0.304084,0.956944 0.895008,-0.495889 1.742168,0.07277 1.732265,0.854562 -0.01012,0.81974 -0.536178,1.072424 -2.048753,2.190715 z"
308+ id="path6607"
309+ style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new" />
310+ <g
311+ transform="matrix(0.7499997,0,0,0.7777787,-0.9999988,9.4444028)"
312+ id="g7056">
313+ <g
314+ transform="translate(-2e-6,2.838692e-5)"
315+ id="g2033"
316+ style="display:inline">
317+ <g
318+ transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
319+ id="g3712"
320+ style="opacity:0.4">
321+ <rect
322+ width="5"
323+ height="7"
324+ x="38"
325+ y="40"
326+ id="rect2801"
327+ style="fill:url(#radialGradient6494);fill-opacity:1;stroke:none" />
328+ <rect
329+ width="5"
330+ height="7"
331+ x="-10"
332+ y="-47"
333+ transform="scale(-1,-1)"
334+ id="rect3696"
335+ style="fill:url(#radialGradient6496);fill-opacity:1;stroke:none" />
336+ <rect
337+ width="28"
338+ height="7.0000005"
339+ x="10"
340+ y="40"
341+ id="rect3700"
342+ style="fill:url(#linearGradient6498);fill-opacity:1;stroke:none" />
343+ </g>
344+ </g>
345+ </g>
346+ <g
347+ transform="matrix(0.8008931,-0.1965967,0.211334,0.7450423,-8.5025753,18.056862)"
348+ id="g3042"
349+ style="stroke-width:1.25171566;stroke-miterlimit:4;stroke-dasharray:none">
350+ <path
351+ d="m 11.249051,13.68551 c 11.018461,7.81637 20.073808,0.268022 29.079725,9.104008 L 45.504535,4.7780871 44.31062,2.2533867 19.506897,-5.5996203 16.789787,-4.2944189 11.249051,13.68551 z"
352+ id="path3055"
353+ style="opacity:0.51648356;fill:url(#linearGradient6424);fill-opacity:1;fill-rule:evenodd;stroke:none" />
354+ </g>
355+ <rect
356+ width="26.953573"
357+ height="34.965298"
358+ rx="2.6408303"
359+ ry="2.5337005"
360+ x="3.5667241"
361+ y="8.4872303"
362+ transform="matrix(0.9999984,0.00176942,-0.00167447,0.9999986,0,0)"
363+ id="rect7756"
364+ style="fill:url(#linearGradient6446);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
365+ <rect
366+ width="24.954815"
367+ height="32.965771"
368+ rx="1.9233968"
369+ ry="1.7255256"
370+ x="4.5667577"
371+ y="9.4886971"
372+ transform="matrix(0.9999985,0.00174183,-0.00169947,0.9999986,0,0)"
373+ id="rect7758"
374+ style="fill:url(#linearGradient6441);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient6443);stroke-width:0.99996436;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
375+ <path
376+ d="m 16.919494,22.373916 c 3.009357,-3.135065 7.118326,-0.218362 7.080243,2.765938 C 23.964923,27.868024 21.9793,29.166823 16.9851,34 11.792986,29.465022 9.961597,28.416744 10.000609,25.179852 c 0.03943,-3.350675 3.57545,-5.851566 6.918885,-2.805936 z"
377+ id="path920"
378+ style="fill:#c00;fill-opacity:1;fill-rule:evenodd;stroke:none" />
379+ <path
380+ d="m 7.976998,11.422743 c 0.859817,-0.964635 2.033808,-0.06719 2.022927,0.851058 C 9.989978,13.113238 9.422657,13.512869 7.995743,15 6.512282,13.604622 5.989028,13.282075 6.000174,12.286108 6.011441,11.255131 7.021731,10.485627 7.976998,11.422743 z"
381+ id="path6639"
382+ style="fill:#c00;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new" />
383+ <path
384+ d="M 5.164518,26.212742 C 16.223796,29.537053 19.30461,20.912913 29,25.573914 L 28.979583,10.676008 C 28.986713,9.83321 28.584039,9.272057 27.335508,9.287921 L 6.862616,9.000007 c -1.175326,-0.003 -1.9072592,0.995496 -1.860501,1.74796 l 0.162403,15.464775 z"
385+ id="path3820"
386+ style="opacity:0.51648356;fill:url(#linearGradient6436);fill-opacity:1;fill-rule:evenodd;stroke:none" />
387+ <path
388+ d="m 25.976998,40.577257 c 0.859817,0.964635 2.033808,0.06719 2.022927,-0.851058 C 27.989978,38.886762 27.422657,38.487131 25.995743,37 c -1.483461,1.395378 -2.006715,1.717925 -1.995569,2.713892 0.01127,1.030977 1.021557,1.800481 1.976824,0.863365 z"
389+ id="path6641"
390+ style="fill:#c00;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;enable-background:new" />
391+ </g>
392+</svg>
393
394=== added file 'slides/games.html'
395--- slides/games.html 1970-01-01 00:00:00 +0000
396+++ slides/games.html 2009-12-04 15:44:10 +0000
397@@ -0,0 +1,13 @@
398+<h1 class="title">Many games for Ubuntu</h1>
399+
400+<div class="main">
401+
402+<div class="content"><ul>
403+<li>Spend your free time witch many games bundled with Ubuntu: Solitaire, Tetris, For-in-a-row and more!</li>
404+<li>Many games are avilable in the Software Center</li>
405+<li>Run your Windows games using Wine</li>
406+
407+</div>
408+
409+<img class="icon" src="icons/games.png" alt="" />
410+
411
412=== modified file 'slides/index.html'
413--- slides/index.html 2009-10-24 15:54:37 +0000
414+++ slides/index.html 2009-12-04 15:44:11 +0000
415@@ -36,6 +36,7 @@
416 <div><a href="openoffice.html" class="load"></a></div>
417 <div><a href="accessibility.html" class="load"></a></div>
418 <div><a href="installing-software.html" class="load"></a></div>
419+ <div><a href="games.html" class="load"></a></div>
420 <div><a href="ubuntuone.html" class="load"></a></div>
421 <div><a href="documentation.html" class="load"></a></div>
422 </div>

Subscribers

People subscribed via source and target branches