Commit graph

70 commits

Author SHA1 Message Date
Denis Golubev
cf393d5b7f Update all piston dependencies to the latest stable version and fix compilation errors 2016-09-03 16:58:08 +02:00
Coeuvre Wong
f19868c71f Merge pull request #17 from phideg/master
correct build errors
2016-01-11 21:56:07 +00:00
phideg
7242a9c866 correct build errors 2016-01-10 17:31:49 +01:00
Coeuvre Wong
aebd34ec31 Generate more 2 tiles 2015-07-04 00:53:08 +08:00
Coeuvre Wong
c05adb499e Removed old Makefile and build.sh 2015-07-04 00:46:48 +08:00
Coeuvre Wong
0ed962fae9 Randomly generate 2 or 4 tile 2015-07-04 00:45:58 +08:00
Coeuvre Wong
73dc7ca756 Merge pull request #13 from PifyZ/master
Format code
2015-06-02 09:28:36 +08:00
Yannick Armand (PifyZ)
c1984f4e16 Format code 2015-05-25 20:05:51 +02:00
Coeuvre Wong
97d3ed94ff Merge pull request #12 from Andi-K/master
compiles with Rust 1.0 stable
2015-05-16 09:00:40 +08:00
Andi-K
3bae715c93 Upgrade to lastes Piston and made it compile with Rust 1.0.0 2015-05-16 01:12:39 +02:00
Andi-K
e335fc1f2e lock dependencies 2015-05-16 00:53:09 +02:00
Andi-K
796fe1f45b Upgraded to latest Piston and Rust 1.0.0
removed use of unstabel features
Gl => GlGraphics
2015-05-16 00:50:13 +02:00
Andi-K
9513582832 don't use path.exists()
It's usefull but unstable
2015-05-16 00:41:04 +02:00
Andi-K
17fddeee6c update for new Piston
Gl => GlGraphics
fix for new Piston:Graphics
2015-05-14 04:20:54 +02:00
Andi-K
df3d3e5fcb update for new GlGraphics
Gl => GlGraphics
2015-05-14 04:16:30 +02:00
Andi-K
6e11f7f74c Added Dependencies 2015-05-13 17:30:17 +02:00
Pavel Potocek
330bf6b078 Updated instructions in README.md.
.
2015-04-09 19:26:32 +02:00
Pavel Potocek
77e16e3573 Repaired the default settings file being generated in a wrong location. 2015-04-09 19:19:50 +02:00
Pavel Potocek
4faf3b05aa Upgraded to latest Rust Nightly 2015-04-09 17:04:19 +02:00
Coeuvre Wong
b1a63d8d86 Merge pull request #10 from PifyZ/master
Fixes for the version "1.0.0 - nightly" (with a remaining error)
2015-03-22 18:20:18 +08:00
Yannick Armand (PifyZ)
25553529ff Correction pour la version rustc 1.0.0-nightly de Rust (une erreur restante) 2015-03-21 22:07:51 +01:00
Coeuvre Wong
ae34d5c5a0 Merge pull request #9 from yuripourre/patch-1
Update sdl2_window URL
2014-12-07 23:51:51 +08:00
Yuri Pourre
2281876135 Update sdl2_window URL 2014-12-04 22:49:59 -02:00
Coeuvre
a758b2efd4 Merge branch 'master' of https://github.com/Coeuvre/rust-2048
Conflicts:
	src/app.rs
2014-08-18 09:45:48 +08:00
Coeuvre
d889cc44a3 Upgraded to latest Piston 2014-08-18 08:42:00 +08:00
Coeuvre Wong
f52a6a7e1f Merge pull request #7 from globin/compat-update
update for new piston changes
2014-08-02 00:00:16 +08:00
Robin Gloster
8030403638 update for new piston changes 2014-07-31 21:26:20 +02:00
Coeuvre
d58d71a56f Updated README.md 2014-07-30 09:36:34 +08:00
Coeuvre
51da5b9a9c Upgraded to latest rust 2014-07-30 09:30:44 +08:00
Coeuvre Wong
d1b0cf14e2 Merge pull request #6 from bvssvni/master
Upgraded to latest Rust + Cargo + Rust-Empty
2014-07-03 16:13:51 +08:00
Sven Nilsen
83ea9ca6b4 Upgraded to latest Rust + Cargo + Rust-Empty 2014-06-28 13:10:47 +02:00
Coeuvre
847a52a19a Upgraded to latest Piston 2014-06-26 20:30:04 +08:00
Coeuvre Wong
f70dde3ca5 Merge pull request #5 from Potpourri/master
Draw comments and replace 'fill', 'clear' with 'draw'
2014-06-26 17:54:16 +08:00
john
590a5a76a2 Draw comments and replace 'fill', 'clear' with 'draw' 2014-06-25 20:44:47 +04:00
Coeuvre
fe3932b8b6 Fixed a bug that the background color was not drawn 2014-06-24 23:44:11 +08:00
Coeuvre
edbb0cb38d Upgraded to latest Piston 2014-06-24 18:30:36 +08:00
Coeuvre
030873ee50 Upgraded to latest rust 2014-06-19 13:38:37 +08:00
Coeuvre
b13c50adb2 Upgraded to latest Piston 2014-06-17 09:46:30 +08:00
Coeuvre
775cc91f4d Updated 'README.md' 2014-06-09 08:37:12 +08:00
Coeuvre
0a75b3dfc9 Upgraded to latest Piston 2014-06-09 08:36:12 +08:00
Coeuvre
b12e3c751e Upgraded to latest Piston 2014-06-04 08:41:43 +08:00
Coeuvre
6f9cbae0a8 Updated screenshot 2014-05-27 14:19:38 +08:00
Coeuvre
2bea9504f5 Updated screenshot 2014-05-27 14:14:56 +08:00
Coeuvre
8b2a972202 Rendering UI 2014-05-27 13:26:12 +08:00
Coeuvre
5bf12185a8 Upgraded to latest rust 2014-05-26 15:47:36 +08:00
Coeuvre
359f197e52 Cleanup code 2014-05-26 11:34:52 +08:00
Coeuvre
8e72c0f1a7 Using .json to configure the whole game 2014-05-26 10:22:06 +08:00
Coeuvre
9e61f10fc7 JSON encoder 2014-05-25 21:32:19 +08:00
Coeuvre
3bbb4c628a Updated screenshot 2014-05-22 17:28:36 +08:00
Coeuvre
9a07457565 Display current score 2014-05-22 17:28:10 +08:00