Skip to content

Commit 111eb6b

Browse files
DaanVanYperenDaanVanYperen
committed
Merge pull request #103 from DaanVanYperen/develop
Release 1.1.0
2 parents eb5d1a8 + 439715e commit 111eb6b

File tree

70 files changed

+513
-1340
lines changed

Some content is hidden

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

70 files changed

+513
-1340
lines changed

‎CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
# Changelog
22

3+
## Version: 1.1.0
4+
5+
- Upgraded for Artemis-odb 1.0.0, LibGDX 1.7.0.
6+
- Now using version ranges for odb and libGDX dependencies.
7+
- Plugin API and `WorldConfigurationBuilder` now integrated with odb itself!
8+
- Moved to MIT license.
9+
310
## Version: 1.0.0
411

5-
- Build against artemis-odb 0.13.0, LibGDX 1.6.5
12+
- Tested with artemis-odb 0.13.0, LibGDX 1.6.5
613
- [ODB plugin API](https://github.com/DaanVanYperen/artemis-odb-contrib/wiki/Plugin)
714
- [Smart Component Mapper Plugin](https://github.com/DaanVanYperen/artemis-odb-contrib/wiki/Extended-Component-Mappers) - Alter components with less code. `all platforms`
815
- [Profiler Plugin](https://github.com/DaanVanYperen/artemis-odb-contrib/wiki/Profiler-Plugin) - profile system performance. `all platforms` `requires libgdx`

‎LICENSE

Lines changed: 21 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,21 @@
1-
CC0 1.0 Universal
2-
3-
Statement of Purpose
4-
5-
The laws of most jurisdictions throughout the world automatically confer
6-
exclusive Copyright and Related Rights (defined below) upon the creator and
7-
subsequent owner(s) (each and all, an "owner") of an original work of
8-
authorship and/or a database (each, a "Work").
9-
10-
Certain owners wish to permanently relinquish those rights to a Work for the
11-
purpose of contributing to a commons of creative, cultural and scientific
12-
works ("Commons") that the public can reliably and without fear of later
13-
claims of infringement build upon, modify, incorporate in other works, reuse
14-
and redistribute as freely as possible in any form whatsoever and for any
15-
purposes, including without limitation commercial purposes. These owners may
16-
contribute to the Commons to promote the ideal of a free culture and the
17-
further production of creative, cultural and scientific works, or to gain
18-
reputation or greater distribution for their Work in part through the use and
19-
efforts of others.
20-
21-
For these and/or other purposes and motivations, and without any expectation
22-
of additional consideration or compensation, the person associating CC0 with a
23-
Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
24-
and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
25-
and publicly distribute the Work under its terms, with knowledge of his or her
26-
Copyright and Related Rights in the Work and the meaning and intended legal
27-
effect of CC0 on those rights.
28-
29-
1. Copyright and Related Rights. A Work made available under CC0 may be
30-
protected by copyright and related or neighboring rights ("Copyright and
31-
Related Rights"). Copyright and Related Rights include, but are not limited
32-
to, the following:
33-
34-
i. the right to reproduce, adapt, distribute, perform, display, communicate,
35-
and translate a Work;
36-
37-
ii. moral rights retained by the original author(s) and/or performer(s);
38-
39-
iii. publicity and privacy rights pertaining to a person's image or likeness
40-
depicted in a Work;
41-
42-
iv. rights protecting against unfair competition in regards to a Work,
43-
subject to the limitations in paragraph 4(a), below;
44-
45-
v. rights protecting the extraction, dissemination, use and reuse of data in
46-
a Work;
47-
48-
vi. database rights (such as those arising under Directive 96/9/EC of the
49-
European Parliament and of the Council of 11 March 1996 on the legal
50-
protection of databases, and under any national implementation thereof,
51-
including any amended or successor version of such directive); and
52-
53-
vii. other similar, equivalent or corresponding rights throughout the world
54-
based on applicable law or treaty, and any national implementations thereof.
55-
56-
2. Waiver. To the greatest extent permitted by, but not in contravention of,
57-
applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
58-
unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
59-
and Related Rights and associated claims and causes of action, whether now
60-
known or unknown (including existing as well as future claims and causes of
61-
action), in the Work (i) in all territories worldwide, (ii) for the maximum
62-
duration provided by applicable law or treaty (including future time
63-
extensions), (iii) in any current or future medium and for any number of
64-
copies, and (iv) for any purpose whatsoever, including without limitation
65-
commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
66-
the Waiver for the benefit of each member of the public at large and to the
67-
detriment of Affirmer's heirs and successors, fully intending that such Waiver
68-
shall not be subject to revocation, rescission, cancellation, termination, or
69-
any other legal or equitable action to disrupt the quiet enjoyment of the Work
70-
by the public as contemplated by Affirmer's express Statement of Purpose.
71-
72-
3. Public License Fallback. Should any part of the Waiver for any reason be
73-
judged legally invalid or ineffective under applicable law, then the Waiver
74-
shall be preserved to the maximum extent permitted taking into account
75-
Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
76-
is so judged Affirmer hereby grants to each affected person a royalty-free,
77-
non transferable, non sublicensable, non exclusive, irrevocable and
78-
unconditional license to exercise Affirmer's Copyright and Related Rights in
79-
the Work (i) in all territories worldwide, (ii) for the maximum duration
80-
provided by applicable law or treaty (including future time extensions), (iii)
81-
in any current or future medium and for any number of copies, and (iv) for any
82-
purpose whatsoever, including without limitation commercial, advertising or
83-
promotional purposes (the "License"). The License shall be deemed effective as
84-
of the date CC0 was applied by Affirmer to the Work. Should any part of the
85-
License for any reason be judged legally invalid or ineffective under
86-
applicable law, such partial invalidity or ineffectiveness shall not
87-
invalidate the remainder of the License, and in such case Affirmer hereby
88-
affirms that he or she will not (i) exercise any of his or her remaining
89-
Copyright and Related Rights in the Work or (ii) assert any associated claims
90-
and causes of action with respect to the Work, in either case contrary to
91-
Affirmer's express Statement of Purpose.
92-
93-
4. Limitations and Disclaimers.
94-
95-
a. No trademark or patent rights held by Affirmer are waived, abandoned,
96-
surrendered, licensed or otherwise affected by this document.
97-
98-
b. Affirmer offers the Work as-is and makes no representations or warranties
99-
of any kind concerning the Work, express, implied, statutory or otherwise,
100-
including without limitation warranties of title, merchantability, fitness
101-
for a particular purpose, non infringement, or the absence of latent or
102-
other defects, accuracy, or the present or absence of errors, whether or not
103-
discoverable, all to the greatest extent permissible under applicable law.
104-
105-
c. Affirmer disclaims responsibility for clearing rights of other persons
106-
that may apply to the Work or any use thereof, including without limitation
107-
any person's Copyright and Related Rights in the Work. Further, Affirmer
108-
disclaims responsibility for obtaining any necessary consents, permissions
109-
or other rights required for any use of the Work.
110-
111-
d. Affirmer understands and acknowledges that Creative Commons is not a
112-
party to this document and has no duty or obligation with respect to this
113-
CC0 or use of the Work.
114-
115-
For more information, please see
116-
<http://creativecommons.org/publicdomain/zero/1.0/>
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015 Daan van Yperen
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

‎LICENSE.libgdx

Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS

0 commit comments

Comments
 (0)