Skip to content

[merge] dev to master for alpha release #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 110 commits into from
Mar 24, 2022
Merged

[merge] dev to master for alpha release #19

merged 110 commits into from
Mar 24, 2022

Conversation

@0xmemorygrinder
Copy link
Collaborator

@0xmemorygrinder 0xmemorygrinder commented Mar 24, 2022

No description provided.

0xmemorygrinder and others added 30 commits March 11, 2022 16:22
@0xmemorygrinder
Squashed 'lib/myxmlpp/' content from commit 84111ab
d2d6df6 
git-subtree-dir: lib/myxmlpp
git-subtree-split: 84111abec0c1cc89da37d70bd658d465e842dc9f
@0xmemorygrinder
Merge commit 'd2d6df6c581d97c5a96024ae816c927b01d5e3ca' as 'lib/myxmlpp'
9f4f95f
@0xmemorygrinder
Merge pull request #2 from PolymorphEngine/feature/libXML
9e35375 
[add] xml library
@0xSwapFeeder
[add] _logFile implementation
8c6f6e8
@0xSwapFeeder
[add] _logFile implementation
0140264
@0xSwapFeeder
[add] _consoleLog implementation
1d5c08e
@0xSwapFeeder
[add] setLogDir && setLogInstance implementation
e49a42c
@0xSwapFeeder
[fix] members name
170f907
@0xSwapFeeder
[add] console colorization based on severity
6bd08fe
@0xSwapFeeder
[fix] removed todo
5e50860
@0xSwapFeeder
[add] documentation (and call to console log in Log
dcd5662
@0xSwapFeeder
Merge pull request #3 from PolymorphEngine/feature/logger
e310b97 
[Feature] Logger
@0xSwapFeeder
[add] Definitions of the data initialization
87e8931
@0xmemorygrinder @0xSwapFeeder
Squashed 'lib/myxmlpp/' changes from 84111ab..f67a2ae
7017881 
f67a2ae Merge pull request #20 from PolymorphEngine/dev
04f551f Merge pull request #19 from PolymorphEngine/feature/nodeAsIterator
6988e00 [fix && add] documentation summary tags to details tags and added iteration logic to node

git-subtree-dir: lib/myxmlpp
git-subtree-split: f67a2ae4c33e2c55d6cfee703b41be684f172a22
@0xSwapFeeder
[add] some initalisation and exceptions implementation
4d5dcfe
@0xmemorygrinder
[del] remove unecessary file
8367558
@0xSwapFeeder
[add] Scene/Entity and xml interfaces initialisation (still need XmlC…
82d464e 
…omponent)
@0xSwapFeeder
[add] XmlComponent initialisation
4b85dff
@0xmemorygrinder
[del] workspace .xml
d97c20e
@0xSwapFeeder
[add] test build target cmakelist
0fc5e9a
@0xSwapFeeder
[rework && refactor] XmlComponent and template functions which needed…
c7d34c6 
… to refactor all the include system
@0xSwapFeeder
[fix] Transform component SetSiblingIndex and RemoveChild
74415a7
@0xmemorygrinder
[add] SceneManager implementation
018bab1
@0xmemorygrinder
[fix] doxyfile generation
a4136e6
@0xmemorygrinder
[add] setParent with offset in TransformComponent
51b2946
@0xmemorygrinder
Merge branch 'feature/dataInitialisation' into feature/sceneManager
0a0394a
@0xmemorygrinder
[merge] necessary merging finalization
875d77c
@0xmemorygrinder
Merge branch 'feature/sceneManager' into feature/dataInitialisation
f23d4eb
@0xmemorygrinder
[add] PhysicsSettings initialization
0a03841
@0xmemorygrinder
[add] AudioSettings initialization
faee1ae
Alexandre jublot and others added 25 commits March 23, 2022 11:56
Squashed 'lib/myxmlpp/' changes from f67a2ae..bf9002a
12afdd2 
bf9002a Merge pull request #22 from PolymorphEngine/dev
e25c81c Merge pull request #21 from PolymorphEngine/feature/cmakeRefactoring
9e71c91 [fix] excluded targets myxmlppexec and unit-tests from all

git-subtree-dir: lib/myxmlpp
git-subtree-split: bf9002aa18bd292c613f182f80b06edb88dde632
[update] myxmlpp lib from repository
ee53acc
@0xSwapFeeder
[add] Input
d2645e8
@0xSwapFeeder
[fix] input mouse taking now an enum and added log to display module
13413d7
@0xmemorygrinder
Merge pull request #12 from PolymorphEngine/feature/Input
35fe0ba 
[feature] GraphicalAPI : Input
[fix] cmake buiild properties for PolymorphEngine targets
fa5927f
@0xSwapFeeder
[fix] input mouse taking now an enum and added log to display module
870a45b
@0xSwapFeeder
[fix] quitting method
d9192ca
@0xSwapFeeder
Merge remote-tracking branch 'PolymorphEngine/feature/QuittingApplica…
3921ad1 
…tion' into feature/QuittingApplication
@0xmemorygrinder
Merge pull request #13 from PolymorphEngine/feature/cmakeRefactoring
c4fc1a7 
[merge] feature/cmakeRefactoring to dev
@0xmemorygrinder
Merge pull request #14 from PolymorphEngine/feature/QuittingApplication
6012480 
[fix] quitting method now static in engine
@0xSwapFeeder
Merge branch 'dev' into feature/GraphicalAPI
6ede426
@0xSwapFeeder
[add] handlerPath getter
cd85065
@0xSwapFeeder
Merge branch 'dev' into feature/GraphicalAPI
a64d484
@0xSwapFeeder
[add] throw when creating several GraphicalAPI objects
1ff220f
@0xmemorygrinder
Merge pull request #15 from PolymorphEngine/feature/GraphicalAPI
98ef55a 
[feature] added method to get last lib used in Graphical API
@0xSwapFeeder
[refactor]
c53b445 
Easy header access / includes in project
@0xSwapFeeder
[refactor] Engine error management
9873801
[refactor] XmlComponent
567162e
Merge remote-tracking branch 'origin/feature/headersManagement' into …
ba741e6 
…feature/headersManagement
@0xtekgrinder
[add] ColliderRect2d and ColliderCircle2d with initializers
69e424d
Merge branch 'feature/refactoringMerging' into feature/headersManagement
3905395
@0xmemorygrinder
Merge pull request #17 from PolymorphEngine/feature/headersManagement
e86f98b 
[merge] feature/headersManagement to dev
[update] arcade interfaces
f7fcf3e
@0xmemorygrinder
Merge pull request #18 from PolymorphEngine/feature/updateModule
6cb9136 
[merge] feature/updateModule to dev
@0xmemorygrinder 0xmemorygrinder self-assigned this Mar 24, 2022
0xSwapFeeder
0xSwapFeeder approved these changes Mar 24, 2022
View reviewed changes
Copy link
Member

@0xSwapFeeder 0xSwapFeeder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

YATA !

@0xmemorygrinder 0xmemorygrinder merged commit 3b7c09b into master Mar 24, 2022
@0xSwapFeeder
Copy link
Member

0xSwapFeeder commented Mar 24, 2022

OMEDETO SENPAI !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@0xSwapFeeder 0xSwapFeeder 0xSwapFeeder approved these changes

Assignees

@0xmemorygrinder 0xmemorygrinder

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@0xmemorygrinder @0xSwapFeeder @0xtekgrinder @EnergyCube