Skip to content

Commit a023c19

Browse files
committed
Merge branch 'dev'
2 parents a813b60 + 6d2bf90 commit a023c19

File tree

413 files changed

+395308
-18018
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

413 files changed

+395308
-18018
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Thumbs.db
2626
/obj/debug/*
2727
!log4javascript.js
2828
!gl-matrix-min.js
29+
!/docs/assets/*
2930
*.map
3031
*.config
3132
[Bb]in
@@ -34,4 +35,5 @@ Thumbs.db
3435
_ReSharper*/
3536
[Tt]est[Rr]esult*
3637
!gruntfile.js
38+
!/build/*.js
3739
/node_modules

README.md

+14-8
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,20 @@ Kiwi.js (BETA)
66
###HTML5 game library written in TypeScript/Javascript
77
-----------------------------------------------------------------
88

9-
version 0.4.9
9+
version 0.5
1010

1111
See [Kiwijs.org](http://kiwijs.org) for more information about using Kiwi.js to build games, including some getting started examples. Note: this release is a beta and is not intended as a preview only and not for building production games at this stage.
1212

13+
[Getting Started Tutorials](http://www.kiwijs.org/documentation/getting-started/)
14+
[Code Examples](http://www.kiwijs.org/examples/)
15+
[API Documentation](http://api.kiwijs.org/)
16+
[Contact](http://www.kiwijs.org/help/)
17+
1318
###Aim
1419

1520
* An opensource TypeScript/Javascript library for game creation
16-
* Targeting native mobile apps as well as both desktop and mobile browsers
17-
* Future focussed
21+
* Targeting native mobile apps as well as both desktop and mobile browsers
22+
* Future focused
1823
* WebGL and 2D Canvas rendering
1924
* Support for Cocoon.js as a native mobile app deployment solution
2025

@@ -29,7 +34,8 @@ These features are either currently supported or very close to being supported.
2934
* State Management
3035
* Extensible game objects (such as sprites)
3136
* Entity/Component system
32-
* 2D Canvas and WebGL rendering (experimental)
37+
* 2D Canvas
38+
* 2D WebGL rendering (experimental)
3339
* Target Cocoon.js (experimental)
3440
* Full nested display list
3541
* HTML5 HUD
@@ -74,8 +80,8 @@ We'd love you to get involved in making the Kiwi.js library. If you'd like to co
7480

7581
###Main Contributors
7682

77-
Ben Harding
78-
Richard Davey
79-
Ross Kettle
83+
Ben Harding
84+
Richard Davey
85+
Ross Kettle
8086

81-
Kiwi.js also uses code from a number of open source projects. Authors are clearly identified in the code comments.
87+
Kiwi.js also uses code from a number of open source projects. Effort has been made to clearly identify authors in the code comments. If you notice and missing or incorrect attribution please let us know.

0 commit comments

Comments
 (0)