0668988a0f
SDK/ParticleGroupComponent: Add [Add|Remove]Emitter methods taking an entity
...
The entity must have a ParticleEmitterComponent
Former-commit-id: 4b6398f047dfee8d04d94f15634b9038078a609f [formerly 36b19eaef4fea6c2d16268c03a369c4797328693] [formerly c8a88f2feb4f80f88899d0ec8c3c0ff1bfad7723 [formerly dd95678311adfaa838dec8a31582f034e6321912]]
Former-commit-id: 11cd0fb53279a586f39bafcf205289a945e4c568 [formerly f698d4deae6a0a0a06759acef864af778b7967ca]
Former-commit-id: 660b25d6021b2f770d8d2c94240dbdacfa41f48a
2016-08-10 22:52:29 +02:00
e0fa458f40
Fix compilation with GCC/Clang
...
Thanks to @Gawaboumga
Former-commit-id: b8cc59cab55fd7d3b286dda28e70ee0ddb753230 [formerly c734175c33bf84226eedb76953e773f5bb91f631] [formerly 01b6b7b89bffccf217e38ed8431e2b2921facc51 [formerly 03c3cd902be4a0a104db22a2831adeb675998929]]
Former-commit-id: 89ce26d806f8b750854af1704aa6af899b7779b3 [formerly 782dbee06d75ba2f555632713b44f1c25666e3ab]
Former-commit-id: 30ba1aff3bc8a8de9510fb6e4f417526fb31e125
2016-08-10 22:17:55 +02:00
5ebff77ef0
Fix compilation with GCC/Clang
...
Thanks to @Gawaboumga
Former-commit-id: c2ecad3d8c0bad06cb47b906829585c8d0b910c0 [formerly 7790b792e730ed65c3e8b8dddbd91b1527631e2e] [formerly ae62fe532d14dd33bfc88cf7bca1d19e63487a3f [formerly 41b273ee595cc56c6145651fb4caa1ceca0b2bf6]]
Former-commit-id: 7d4c3b3d0b48235a6c3534154c5787738440b2ae [formerly 96dcb709ba81c5696ba633b06e887007d5d9caf5]
Former-commit-id: 2a2013af6d26bb64362d1edd2e6aacaac000708f
2016-08-10 22:17:55 +02:00
50a0603046
SDK/RenderSystem: Fix an oopsie
...
Former-commit-id: 08c14494557ddac011302fc0659d4b2fbc1847eb [formerly bcff6463582c59fd5ecb8e05f9722e005851de6e] [formerly 90134bee9e2e855740cb8b72bf1907adec985b1c [formerly 820af27e6e3af55ff3316c5cb946272c09b7e0f4]]
Former-commit-id: a92198f8334b3d6cf693bf27e598f1988e0a7add [formerly 96ecbbaefad563dec8ef32c9016defc210062ef4]
Former-commit-id: 6b24f10a63b0f4669bd509bc4f92f4c19969e0e1
2016-08-10 19:10:40 +02:00
6129689573
SDK/RenderSystem: Fix an oopsie
...
Former-commit-id: 39097f37160d65977afeb1a77d0f97240d0de4bc [formerly d023ce4e3fc8c5bee4de41aad0ada0d097dcdce9] [formerly b56d291eb2f1fd7aafe41d4e06ef26f972749a2d [formerly 6cf79a55ce9f0bd38e71632d2bdbc6f184663644]]
Former-commit-id: 182bb95387da9d7a458cc66c54fbbfb129e2981c [formerly e1a59dc5dd4c5613a65b3432dd87f6b0d45d93a2]
Former-commit-id: a32ac33b30934f7ff6b483fe31d4a17608861e0d
2016-08-10 19:10:40 +02:00
228fd188eb
Vulkan/RenderWindow: Use subpass dependency to transition the images
...
Former-commit-id: a0697c40a8581247158305edde55d56d1a3c7cb0 [formerly 50518f219a62d481ef76089c230de676f31a0d17] [formerly a8ec5a353213682c6661ac7e86b57d33ec0a32ba [formerly 3e58492aef5c12563357f9018f916b90db5887c1]]
Former-commit-id: 35b547457fc0d040fb3d0dd10c959b38167c6406 [formerly 209ed1941bcde967533f49125078687f89ed004f]
Former-commit-id: 53baf8d840c60141ccd3d01c6fa91d300e067bd1
2016-08-10 19:05:15 +02:00
767a0feda0
Sdk/RenderSystem: Make ChangeRenderTechnique return a reference to the render technique
...
Former-commit-id: f97e9d4a3048c0dfd934b263fd2e3facdec1f839 [formerly 856e89966d172f0cc55a6b7d6dbe0f33f0dad493] [formerly 2c537c041b5c32831d034e5de8a9b738597c5ee8 [formerly 6c47f159c502de0b37d8c0847dd6b6ece1df321b]]
Former-commit-id: 820d117c97286893c9ec7b4b611546e09a7bfd24 [formerly 44daa92d72f776fa879a957e814496882190d302]
Former-commit-id: ca11c6fe9726d380a77650dd4dff26049ac07386
2016-08-10 14:09:48 +02:00
89a0911cd0
Sdk/RenderSystem: Make ChangeRenderTechnique return a reference to the render technique
...
Former-commit-id: b491fa7480d8eda1602f23b3bb0a08b6c09d28f8 [formerly 1ac08e917aaed955f46b16f5d29b6c2ef5797ea6] [formerly 0b3796950799529a3e617835549fddcae98e18c8 [formerly f75af99a07fadfe5f9d45f3937678d1d8bf355e1]]
Former-commit-id: 49e03a24eae8c76cbf8c00309dccce87c8c70546 [formerly 977a6167a3dd4081e2820eb4b2de497775b63796]
Former-commit-id: db6c41ed94022aeda37a44fd039b4c98613c2d8f
2016-08-10 14:09:48 +02:00
021ddffdea
Graphics: Deferred Shading is back!
...
Former-commit-id: b231aa4a5c13be870e334ab7b780317b3fb5e94e [formerly f155bbf9fab223b7f6a931f70361ddde63ef5d46] [formerly 002dcb36444c752d9cdbaf70b255008073a8670f [formerly b37e872dcca19c3607e318f2032f7842a7698d6d]]
Former-commit-id: eee04dd3b14e7b1049e1662156de19683e5c2b14 [formerly ccd0956ed19b806581237aef58416e8338544875]
Former-commit-id: 09c603760da3c4edc512e3fd311f2702a2ebe180
2016-08-10 14:08:20 +02:00
3438d0105a
Graphics: Deferred Shading is back!
...
Former-commit-id: 72a1a2d31d0d0b54b596e2ed0e007acc0e206a37 [formerly 87ebaf36f4df323e992833e94ec9628cd5ebc1ad] [formerly 6be175c77c11ffa090106fdc20cf0eaf6dd33159 [formerly d721d20ae53ba078e856c6b968205ebaf71e0151]]
Former-commit-id: ab55c5ced8dec7cdc65da9a706bcae1c01a7d0d4 [formerly fd71d68a674972c542387d3342f4c3d61fc4e4da]
Former-commit-id: dc7cfadb8b7df4c78919af939380289a6b167354
2016-08-10 14:08:20 +02:00
8776ffe953
Vulkan/RenderWindow: Add support for depth buffer
...
Former-commit-id: 42f113fcb7463c0f010fdc325b9024b08de3c667 [formerly 95040d268ff328f2d54459bf11c269dd5f042f73] [formerly 77c2d1139585cbf31f881ffddfb43b23284a7073 [formerly d235ff32fae4612d95d25524410bf1b43974d520]]
Former-commit-id: bab56f18d034bade640bf023c97810adf2c717ff [formerly c62041abb56103d6c7aeac2b55f7bf66acd8882b]
Former-commit-id: cef0ac55f6eaa54f17d3d0cc2030a4b9de7b166c
2016-08-09 13:53:12 +02:00
16818fa7a3
Vulkan: Simplify GetPhysicalDevice* functions if possible
...
Former-commit-id: b988fa0aa44cd6a4901f2c3a186be36f7af4fa5b [formerly 078ffb29db688a5be9073a878c9097c1dd8d5b90] [formerly 4ec47c87662b2a5e9ce6552a136028fd38926137 [formerly 608a8dfadf1d4a28c83eaf7e8c7f1d68367ed311]]
Former-commit-id: a648892c9de765f4ad831502650389ab134e932c [formerly 40666003fc56c12591937aae0de884904fe0a6cb]
Former-commit-id: 6517c78c107dcded7b5a3dbcec860f1a3d74936d
2016-08-09 13:51:56 +02:00
634c146038
SDK/VelocitySystem: Make VelocitySystem move the node in the global space
...
Former-commit-id: 08ebdc2f27d0db5593bdc8015f5a015b8f0c00d1 [formerly ce4757ee938c9650369249cbfe5ebbafa913e23b] [formerly 9a39f1cef2d4c8b84b606a0f09a06b10e0a0a4e6 [formerly b76eea176c029afc16ce82441b495f15c6336223]]
Former-commit-id: a22651c5e792ef56ab07faf41f6915dfd06987f4 [formerly 0b739de8689d6718e123915d5b4f78d8c96a96dc]
Former-commit-id: 4630834309173de5f659a14fe98d7eaedd0430bd
2016-08-09 00:08:57 +02:00
f130b84176
SDK/VelocitySystem: Make VelocitySystem move the node in the global space
...
Former-commit-id: 0d4fcd5d387bca9f8be8267951dfd7e862abc1b2 [formerly fe1a2fe36aaa79e5ae8aadb35dad9ead040dec95] [formerly f4c9472b944a37b42510b8c54eb9daed6d2c254b [formerly 3ed39592efc153cd2ca03e30408b7ec510ee3470]]
Former-commit-id: f6c52aee5578ff849f8d9e771eb593a65beec43a [formerly 828ff673ee84618e011d92613d94b81b0b71abb1]
Former-commit-id: bc722f914f5362c2b4bb514d0a638db48c5c51db
2016-08-09 00:08:57 +02:00
77e822b954
Utility/OBJParser: Fix failure to load some OBJ because of their "high error rate"
...
Former-commit-id: 000e1e453f889ef686e2cc988e335c6e17d72224 [formerly d2e54a6c3a0ae7576b1ead3b9a5842d1cd75391e] [formerly c7e66ca673942b97a798fb60ddb900e74a2b5de1 [formerly 310b53ffe51db23112d2d1ed645515f48f51145f]]
Former-commit-id: 1b33bf9ddaa0054a69b05fac297c0457b1125e53 [formerly c1928b6f285b4c255f8746671175733b954e99f9]
Former-commit-id: 10c0e65d6e983909e70a66349bb6e688b2557512
2016-08-09 00:08:31 +02:00
7fe5710dd3
Utility/OBJParser: Fix failure to load some OBJ because of their "high error rate"
...
Former-commit-id: f9041ec52283dc0bdc83869c1d032303a1e200e8 [formerly be218c9edb44bf7e4bd075a60694febaff823c03] [formerly 7f7d145fd94379ba2ad3a853ccb2fe9f7d940397 [formerly 92ee9fda6879f5e85f6106bc30af475cebc3f78f]]
Former-commit-id: 75d958c182fd859499881bde919f57e3baa1db0f [formerly a4d130067033e98e00904ebce6ba5ae372717bd3]
Former-commit-id: a59ed77ae02e7d05de12c4d5d90755c8aef08af0
2016-08-09 00:08:31 +02:00
e9f888b550
Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan
...
Former-commit-id: 2d7b8f2258dcb13272482a886aa88e780bffd307 [formerly ffaa87cb5564013addc8749dff6589f732ffe599] [formerly 6792cc9d7a87711eab92875da19bc4200e4463d6 [formerly 0a51ed831d274b1e325cc2efc57016094a7aee83]]
Former-commit-id: b16416186770928262bc982969e9dbf10308d121 [formerly 92dc66185439cf46dcd3fb4672061d75d003d508]
Former-commit-id: 34072644c9bf88918998070201d9b131ea5b3731
2016-08-08 08:54:09 +02:00
cae38ffbac
Sdk/LuaBinding: Fix Vector3 constructor
...
Former-commit-id: 7f0539d0465ba9309c69bf80a14351f7dee63ec5 [formerly 8f24db083650581423ba6535051778d7497313d0] [formerly 8fdec67a71994305b5ea876e3e0a35cecd2d8917 [formerly c549961cb2597c6adca61c257c731b8ac7037953]]
Former-commit-id: 949ad572fb7f2f9a5b80a98a13d6bbd202b04853 [formerly a056600b068abcca888951aa950021f968f7fd00]
Former-commit-id: 3bb8567bf2e99db24f1cb307778938237c1cc91b
2016-08-06 01:11:05 +02:00
7edbbf2e8c
Sdk/LuaBinding: Fix Vector3 constructor
...
Former-commit-id: 63937c7bf56fdba5c8110fd6f9933c1e2b80a694 [formerly f1ad76d6b00a36651f6e1a5ad552d57e08e66076] [formerly fece1db56138b83df1103a3f5734a6f1e815e5c6 [formerly 363175ca2e012187d2c2ee2e784544d52d4489aa]]
Former-commit-id: abea614206ce31a06edfa92b379925435587ac78 [formerly f2d23bf3b7dce3c6916dc013b400c65fd95f3ada]
Former-commit-id: 96062b0207c426b008f5cc5d74e603f4bccf3298
2016-08-06 01:11:05 +02:00
715355628e
Sdk/ParticleEmitterComponent: Update emitter (they are no longer attached to groups)
...
They are no longer attached to groups, groups attach emitters
Former-commit-id: c3a9f015dd46be1a4344c034ea2a191f0328acae [formerly 8e342bc0982853cf376535bf196e7ab8876301eb] [formerly b7c3afed37877838e2e7caefa28d7c1b4bf654a9 [formerly 886646b5d5f90b63b7af6942d693bdaab4db441d]]
Former-commit-id: 85cb514f954ba68699022e73f7fbe1ad4cfd036e [formerly 6247fbfeb86c09464b27bfc11fa4a5e059d63065]
Former-commit-id: 1d8badfef268dbdecdeda8ad91e988b3f936b865
2016-08-06 01:09:13 +02:00
8f61e2f278
Sdk/ParticleEmitterComponent: Update emitter (they are no longer attached to groups)
...
They are no longer attached to groups, groups attach emitters
Former-commit-id: 9a586151ac4ce932cda5d6c36c3e40718aef7f2c [formerly 830dd96bb020bec7dc7b652acca43fdef2d01971] [formerly 26cf67777c40ca4a6bcc0643a8dea76d46debd30 [formerly d4d7e62390be2a4d44b5a67c5fbabc11aa080de5]]
Former-commit-id: 653b321e01aa182a3dcb0531319cb9a053aadfa8 [formerly c4e742f3aab61f0941729a5739a80a838c6163cd]
Former-commit-id: 6572d614b19d85cbc0844745c45c3bc92deef051
2016-08-06 01:09:13 +02:00
55d14a8b88
Graphics/ParticleGroup: Emitters are now updated in case of move and removed in case of release
...
Former-commit-id: ade351eb66716c1870de6450e6e499a927cd40b5 [formerly 0fa763b512136b5eea96269b7d60dffd350ec990] [formerly 8d17f072fb762cc7ff17752ed63d87613d69584e [formerly f5df4cfe375057859d62096fd01c20b5f3cdefba]]
Former-commit-id: 1e248d44ea1aaf65711c033e0a716220d22ee3f8 [formerly db200dbdbd6c8a12c0445476477061ad6bd26323]
Former-commit-id: c3d6857dac1325bc9b62bbc1503987253c3cad68
2016-08-06 01:07:09 +02:00
218dfc9bb1
Graphics/ParticleGroup: Emitters are now updated in case of move and removed in case of release
...
Former-commit-id: 2aeee76d912fe28845cf3654374a70f6035f115b [formerly e5bc7e35688b44ed78e6b76cd2a448ec0f1bb89e] [formerly e2924ddad7955a7b4aa0b11932a4019bddfdf19e [formerly 30651b18c45b8da9bcfda621a6b21d42520e85a1]]
Former-commit-id: 205e52c5da9e9da01a48285f71f9b9dc7603f29b [formerly a4040aaacf0c0eb7625ab739123116e18a4a07a8]
Former-commit-id: abb37a852646924793a2cfd00b74a05c00479cb3
2016-08-06 01:07:09 +02:00
465801836d
Graphics: Fix build
...
Former-commit-id: f90f824361033d6accd56e6f11262c7f7bbc72d0 [formerly 7578444e26141f23e5f501d2f0deb1e60fc9e0fa] [formerly 94496fe3569ab91a47b46b9c5190f8e713df1bcd [formerly b5229f1ec2d406c8c6dee27b49664ce06784f649]]
Former-commit-id: 1b1a32242c7b6db509cf0a042974ccd8f60e6b46 [formerly 4bc3be4a64b03d166c685164a80ca332dc52ae56]
Former-commit-id: 1089d9778bd3060c453eb1b64c0c1259bb290ca8
2016-08-05 22:58:14 +02:00
dda41dbd8a
Graphics: Fix build
...
Former-commit-id: f9ff831dc3b5f09e829a949ff213020998a4fd82 [formerly 64dd5b86643363bc6a07d36c666d7f8172e21535] [formerly 288bc4600c43227953960f0ad59633aaa01fa598 [formerly f6a908db55d46775566395b11f719a05a1e9e7e2]]
Former-commit-id: 6cf4ad619557497865bee10757bf41eeeddc73e0 [formerly 19c535c963d5240de50733b1593fb201171f0c93]
Former-commit-id: fb64e1f4f1dfdd34d6431ec99f7a78a2c33e53ed
2016-08-05 22:58:14 +02:00
87b5047b14
Graphics: Separate pipeline state from Material into a new class, MaterialPipeline
...
This allows much more efficient batching, along with pipeline reusage and preparation for the Vulkan API
Former-commit-id: 4ed2f66567f7da6b6b6ee073e4d855b9a935000d [formerly b540f468fc700a16d5136d4dbb8632e23882fd3d] [formerly 37fff624ec65cc387130875410b6ea35c1a5bcfb [formerly ab9a88f514f46f6596499e285981fa6da588bb03]]
Former-commit-id: a2e8859196c0f72b7d7ffd8764a887e6c8173743 [formerly c886cdade14769db243ff993a1741f6052a2eb2a]
Former-commit-id: e1d02662fb1ac165c7e888380afee7601350060f
2016-08-05 22:11:13 +02:00
ac25df0126
Graphics: Separate pipeline state from Material into a new class, MaterialPipeline
...
This allows much more efficient batching, along with pipeline reusage and preparation for the Vulkan API
Former-commit-id: fd2de2f0e9612ea275ee69c5578c68e7169cd05b [formerly 53bd8a5ed5695311b7543ad717df63f93fad2da6] [formerly 171740929652ac9fe30e84983709388859cedd6b [formerly 25096a76678f1052e76f67d26b458077a0632cc3]]
Former-commit-id: 7978dbeb87af2eac9e5501a97afa83849648bf6e [formerly 81b6cce1ee81a2ca8873d3c70d468b2c71510c95]
Former-commit-id: 6663e2721c3f79d5f1e3f33c6183174378b502f4
2016-08-05 22:11:13 +02:00
8fbe279a50
Graphics/AbstractRenderQueue: Remove AddBillboard method
...
Former-commit-id: 454c84a97accb0cddddadbe48a2e08225b9cc98b [formerly a4e5d1e4511e5c1f02b8fd4e129192f88adf315f] [formerly d10b981f4e27d0dc6afc76b2c8dc60ab860cebbd [formerly 0e8c9cea9e8f06e82597924e608d0881d6735433]]
Former-commit-id: 43f5b9d50bd672aa347f00ed2f87c54e9c9148ee [formerly 3ce48d5f0e61153fdf0cc957e06d6a5985e40577]
Former-commit-id: d6def9dd70839c5caa8cc8a7d84d714321e81b88
2016-08-05 21:55:26 +02:00
3cf4cd3d53
Graphics/AbstractRenderQueue: Remove AddBillboard method
...
Former-commit-id: 9429c5e127d9c4d2172d5ae224b60338d62a58ce [formerly 8e723fad4893f182a3d7b7735e5a156973ca6e59] [formerly d961c2da7c6989cd861d4a703608466dede9ba40 [formerly 20783627678843cb2f1c414862193c079d81e168]]
Former-commit-id: b019c83ab483922120a9d37c16e8294694a16aa3 [formerly a651bc66c4cb96962a34ef3f2ade62d91ce1d6b7]
Former-commit-id: 820dcb4d787709600d9306025c34b9feb1ced7b2
2016-08-05 21:55:26 +02:00
b79cb84b09
Graphics/InstancedRenderable: Take a const reference to the matrix instead of a non-const one
...
Former-commit-id: 7b2476238be361818cfb02cb4a0e425097854027 [formerly f6551951502fa86158ccba1e3e5e6ff4c5c6bcc3] [formerly ee7a6ccecb0e572be66b5ddc0fb3ebb3be4d9f37 [formerly 9417bcb7a725bff89f21af518de9634942afcd4e]]
Former-commit-id: 3f8556fba2a463a9ad170d3e9bcd5d6681c6b211 [formerly 6e7a249b442e1d3dd7f03fa1736bbbfd9c3ea532]
Former-commit-id: 6ee9e742d25a71962953557137c6e9bdf9be669b
2016-08-05 09:09:14 +02:00
1d758d370c
Graphics/InstancedRenderable: Take a const reference to the matrix instead of a non-const one
...
Former-commit-id: 148f4367351f79994f51699a656a938c6784af8f [formerly 27ef2f23da51c156f615bb33e6b3138b44f77498] [formerly 120334bc6e2bd3fcff30fde0febc901d83cdeb9b [formerly 9f4d16e134fb009ce021f4720ffc6d410cc5bd3c]]
Former-commit-id: 55595b1a006dfa313e7f088f76ff6880971530c4 [formerly 7e3a37de6c217d1b7734be14df74c174f6e0b4d6]
Former-commit-id: 0ebdab2df6d218a51c5ee425482bff7c660fddd8
2016-08-05 09:09:14 +02:00
3ed7990319
Graphics/Model: Add AddToRenderQueue(renderQueue, matrix, order) overload
...
Former-commit-id: 73ed5be4b011b26e651172e2384f0c2b24d04e52 [formerly ea024fbb0f25d22c4f63e3a0f75f87f1ee27ef22] [formerly 09b28b026cc770840151e431e5c417dea8d60da6 [formerly 22fcaf3aa60bbeaa3bbcf8cce34ff8fd29de0945]]
Former-commit-id: b54b0b8ff0c4ba1c266179069ca81750c08d07ca [formerly a784f77e7bd901e98a60d50e71a84dc14789725f]
Former-commit-id: 700465d059adaa119e6ab0b6051253825a495258
2016-08-05 09:08:56 +02:00
3a18c4bb98
Graphics/Model: Add AddToRenderQueue(renderQueue, matrix, order) overload
...
Former-commit-id: 51b2eb160cee64341f659cb9233f7323648196ff [formerly eed84804d642972f3952ed5ea5c3991afb6c9657] [formerly 9eb1f9d149bf3eb9beeea950d780e713acbd34b1 [formerly eec842ec8bcebc5e04f2b48c18ec608ae5a82014]]
Former-commit-id: 82dee95422af697ba8319c53a60f32bf98ff31da [formerly c797b9f8a5964390dcdd2a55271e7a18896a8d8f]
Former-commit-id: 8c5e34da6e3686be332a84613230a6734b58966a
2016-08-05 09:08:56 +02:00
812a41a4b2
Core/String: Consider tabspace as separator
...
Former-commit-id: 83188efd0af64eb3cbc683fd1ddb73ea3fa1adcc [formerly d0d8a4870433c3791ac38c9f2aa4e513ecf473f9] [formerly 6f9a95341216bb79e5a964900f76621b25b03b6c [formerly 6c51f4af08d55ca09da4a801f01cbe4c82e8b097]]
Former-commit-id: 6ee9a65c18432d62c60222e19a364f015a98e046 [formerly 7a2dce7db255019b5bcb547938a30765520b8062]
Former-commit-id: 2fac38a14d3e6ab16816e837d45847e084a6bb40
2016-08-05 09:08:45 +02:00
850f8d78c0
Core/String: Consider tabspace as separator
...
Former-commit-id: c8bfab3e1a921f077c58f61479ddbf2e6bf747ef [formerly 145b8a1c022c4858adf924ce4951c1838507455e] [formerly c55fb22de534afc7d5cadaddac8d0c28c2eb85a6 [formerly 14128b77407ad492722db34dbd9a0f8b5d24a6a3]]
Former-commit-id: 1c100c34e020dcbc0a85318e2799b09bb97b7ab5 [formerly 3d89e9bbbb3b71ddc520600edce8be74f4c9889a]
Former-commit-id: ba244fd2eb84da614f84795fb2e01030fe7455b5
2016-08-05 09:08:45 +02:00
c8f759c14d
Plugins/Assimp: Handle assimp errors
...
Former-commit-id: 00deff57456a3ad24252c0184d836cdc58dd2f0c [formerly 44d87e7a002c4096a19d8023d4f7de0c8817a6bf] [formerly 9c53c4d2fbf328d92d1a2760d8205cb1a3249674 [formerly 941b8f3855ca200cd9936d4f62ad4c89d61c8e63]]
Former-commit-id: 3018201ef2111ced094c0f0318e80cd9bdada436 [formerly 649dc357ee2b9202e81305ca09a29b4b87333368]
Former-commit-id: 8004da412aca6ed948162b3b231bed2f2756d0ac
2016-08-04 01:12:17 +02:00
72b8c93aa6
Plugins/Assimp: Handle assimp errors
...
Former-commit-id: 598c4142c600d7a2a55cbb1d0dddb8ad5efb1115 [formerly c8c37bb4ed9420adff14f342058599b162f5a10c] [formerly 32e948d67abc4ade4362448c655837c5082dfc61 [formerly 6d131b24546e91376d8b2a9495b2be2a67b75cb6]]
Former-commit-id: 0c94a403d0bd22654b38778211523f07a1f90b76 [formerly 83cf78c103454e517f4e6729283d7c2d1fb478d9]
Former-commit-id: 7292865595966a925f49ff7ef432a05d97549c83
2016-08-04 01:12:17 +02:00
af01e7242c
Utility/MaterialData: Remove CustomDefined
...
Former-commit-id: 4c3c2012ae06bdc4679fed40ee6ad50027664a8f [formerly d0454f47bbecdbb2513d7afc629b00b53543f671] [formerly 07f50ad9e366215fc51280232c26cc8cdbf8236d [formerly 27fbbc6106dc22f72d3ddb382049672e82833cd8]]
Former-commit-id: e45fd2e87fcadbdf0a56c410d6c1ff36d9ea4b4a [formerly 0453e3ba57d326859fc78105b741cd7f1cb97bd6]
Former-commit-id: 9f7082ef9da8e8baefaef5c141e630ba99b32a83
2016-08-04 01:12:06 +02:00
00fb383f70
Utility/MaterialData: Remove CustomDefined
...
Former-commit-id: a3051df8a12d596901043b142ee1fa55a2481644 [formerly 97b1364fc5ba7f22bb28479f0edb351db8e7cfff] [formerly 49730b561eda3f1350e87b2c99c48c04f45c849a [formerly e20bc09b46ea5a6555ef887b1db3a6f7f2b7cb3a]]
Former-commit-id: 78f2eff516042ec38f0f61ab9b4263d968c0488a [formerly c6e7d6d63628402d8a58cf8e95dbb0509d07ff03]
Former-commit-id: b269a6e53c5205aa27ef921f348367f1affde02e
2016-08-04 01:12:06 +02:00
cf8224b9e1
Graphics: Change ParticleStruct_Sprite position and velocity type from Vector2f to Vector3f
...
Former-commit-id: 3e608a9622d6c759ca0d9cc42d5f5460a6e4488a [formerly b31994657a126489c141ca6bbd4f7745876b0fb3] [formerly 833df21d1208e31b5141dca3d9777c4822556ddd [formerly 638d3aa5c15845fc49c97727aa00aca2d670bedf]]
Former-commit-id: bb2418f3523c525691ebedf044b47314fcdec6bb [formerly 43c4cae99f5b0a20431e6118f2b134e0a930633f]
Former-commit-id: ffb8160b1574acd1063dab4ca151f420ff0940e8
2016-08-03 13:47:17 +02:00
66bc8a5dde
Graphics: Change ParticleStruct_Sprite position and velocity type from Vector2f to Vector3f
...
Former-commit-id: 8697752459c0f8a99c545ae41eedf6e0382c366e [formerly a855bebde268850fba035f3981e3e907acf33232] [formerly 2894f133ef2b92b49a0642df95393939269ee50b [formerly 348a5a1f8745537e3fb20a0aeac5e89a6f831c19]]
Former-commit-id: 50a4cef7ee7ac3be85cc9ccc6a6b194c4beb79f2 [formerly 49fdda2e6a597ed6251d822ff4b189442c5a9296]
Former-commit-id: ee48615b811e902841ff29529c15a6910fc8e1c1
2016-08-03 13:47:17 +02:00
e7b940c6cf
SDK/StateMachine: Add GetCurrentState function
...
Former-commit-id: 3fb462b92a8b1190c974f16079458fccbcc0135a [formerly 4092a64ff127dd696ea0f824687670a18367e28f] [formerly 926df48c28edb7db9682e4a16613f5a6e12e8f26 [formerly 2cff9c75a1b974b6407fd0ff577dd50d620f18e2]]
Former-commit-id: 3555eea4a1e89a4c6e750349c55e603b6d4dc237 [formerly b60dbd584782aafc339acaa666cd45508ef9891d]
Former-commit-id: 0ddbe91d5bab84c65429e651ed8585d7129e04f0
2016-08-03 13:46:42 +02:00
ee1bd866ab
SDK/StateMachine: Add GetCurrentState function
...
Former-commit-id: 20b8c0d81deb5d5c6aafc1c8d4d261b046f260c3 [formerly 37762eaaf8bd7c0b2434b65dfc62d95d4ae2db15] [formerly 5606a74447be6048ce12a502722a75c726cbf9ef [formerly cc437974e34587cf7f63d8fb7f5447473826ee1c]]
Former-commit-id: 677c22d4ebcfa8bf22a85210712fea061dedc0da [formerly 3979a42d5a2ed3c2635ed654bf6f25b88c32a00e]
Former-commit-id: 0d31a924eead5ed4f384fcbdde6411054c3a9b27
2016-08-03 13:46:42 +02:00
ca1b9c1988
Improved declarations
...
Former-commit-id: 567f98b44eada10ffb797cc19cfcdbca584a2461 [formerly 01826c3bfd8385abd6a47f770c7eba7980ae9199] [formerly 6c54c8e8e6a8515387fc61f665bfa5d2cc2d8cdf [formerly f507b9604c2395a4d1eec0f12a07e3cd8b47e4f6]]
Former-commit-id: 1723f76155d68f5aac2006f5ebf5bd96b4ac81e7 [formerly 04f3ed2688c3519923edbb0693e259ee3653256b]
Former-commit-id: e37a8744e6756f5eb331881b422d491171adb362
2016-08-02 13:31:09 +02:00
a2fbd9f2d0
Improved declarations
...
Former-commit-id: fae51c9344fd88a35b6c6ebb825ba71e6ca33f1a [formerly 75901e046e5bbe5732846eed7ba7cdc3ebcc7bb2] [formerly c14ba82b5e7849ff610789fc4dca09aa67907200 [formerly f9dd4fd281c9b68aff9affef037d5ce1a3802fd7]]
Former-commit-id: 88f4d343858f42b06420f593efa6a481018e05fb [formerly 09a6ba61ac09ded89c59612aec2ab7263eb75e36]
Former-commit-id: 6268a2a01d13a27f79f18f6282023cac1a8579d4
2016-08-02 13:31:09 +02:00
5fa5186480
Revert "Core/RefCounted: Remove persistent boolean"
...
This reverts commit db2ef3e90c3871290d114a9e6437b412e96c65aa [formerly a3f6ff88a25e63374eb6ce5b18269da2ba743b06] [formerly cfa12604fbb0da76fc27288b210ee1254a8b3a38 [formerly dee6ce858398e2de38ef1af00c1c630fd0126e09]] [formerly 1a23f0fddcd80ac33030061b7a00a3cfd43cb7fe [formerly d3cb17069c71449ae3f1cba6de55ea70f509e7a4] [formerly b2f8f82e9f3427310204f2e8a61d7bdfd96202d2 [formerly 5d117720d08d6d6243b3428d4b3f8aea1abef845]]].
Former-commit-id: 13a54266823fed88610753b1a90f4ef2c6fe932d [formerly 508d1a01cceee4a577063c684244fcf598ff6cb5] [formerly 2c99faae4d65dc222d05d2f98913a380b38d58ef [formerly 0117f7aec15e3db31cacdd0ef874064907c41ba8]]
Former-commit-id: 140d69126443b821a232a1a8b012712fc2e74b0f [formerly 501a63bd435f64d9da932279c90400ed95d0c1be]
Former-commit-id: d2d74a42d070eae9c1f158a59238c5f1ac40edb3
2016-08-02 13:20:34 +02:00
6f265a1cb3
Revert "Core/RefCounted: Remove persistent boolean"
...
This reverts commit db2ef3e90c3871290d114a9e6437b412e96c65aa [formerly a3f6ff88a25e63374eb6ce5b18269da2ba743b06] [formerly cfa12604fbb0da76fc27288b210ee1254a8b3a38 [formerly dee6ce858398e2de38ef1af00c1c630fd0126e09]] [formerly 1a23f0fddcd80ac33030061b7a00a3cfd43cb7fe [formerly d3cb17069c71449ae3f1cba6de55ea70f509e7a4] [formerly b2f8f82e9f3427310204f2e8a61d7bdfd96202d2 [formerly 5d117720d08d6d6243b3428d4b3f8aea1abef845]]].
Former-commit-id: a7af09faec974d268de6680f2c0c16d531048935 [formerly 37761044d13cf2e2041c9eed9ff113a41efd87f8] [formerly ae05b7afb5f43daf90cd8182bf24c98067be4d16 [formerly 6633982a51ba117a749f08efda338455eabe59b3]]
Former-commit-id: a4c99f7c8c26a0c1276eb5262871a1964d470bfb [formerly 741d46a0838a64e92aaa46fe563493da10d62c98]
Former-commit-id: fe30e63aeb19e56fa64447bdd884766f84f305dd
2016-08-02 13:20:34 +02:00
0e44e0eb15
Revert "Fix compile"
...
This reverts commit df4e466ee49accc9c19b2fe6da3c14e2779ca12b [formerly 752e14ea33208e0a1298a21b2be1c6aee56dfde1] [formerly a3eb1f7d2f090e0a63f64b3451198631e8d2c47e [formerly 4b89c5fafdc15330f909c62fd75a23885c7364e1]] [formerly 0b09aea025e4d8df0bdf33917571e81f1fe5c6a2 [formerly e192bf206e80f55897d26faf541bcc5afa0437fc] [formerly e9f0b2cd7d7dd709f6a0419b3ea4f6a599cbb823 [formerly 273f4a73bfed75ebec68969db3ae235ccec8600c]]].
Former-commit-id: ac8998b1a9ee363bcacfc3c9163e805cb1cbd93e [formerly 00d103e705e266c89cc508f3c4b06bab2b20bd4f] [formerly ba1b3fa7a77eb7e258234d5c12e89f0e883870cd [formerly cc0071350fc26ac76a1a49b2705b59871ac6c6f2]]
Former-commit-id: 6f83e8ded662a4ba85ab379f41809f541f83a628 [formerly 1ecb471c3812b741f0edd43e27ab0a1e567d8c18]
Former-commit-id: 4b0bd20ee74057669cce771c7a66520698980aa0
2016-08-02 13:20:31 +02:00
b058819b9d
Revert "Fix compile"
...
This reverts commit df4e466ee49accc9c19b2fe6da3c14e2779ca12b [formerly 752e14ea33208e0a1298a21b2be1c6aee56dfde1] [formerly a3eb1f7d2f090e0a63f64b3451198631e8d2c47e [formerly 4b89c5fafdc15330f909c62fd75a23885c7364e1]] [formerly 0b09aea025e4d8df0bdf33917571e81f1fe5c6a2 [formerly e192bf206e80f55897d26faf541bcc5afa0437fc] [formerly e9f0b2cd7d7dd709f6a0419b3ea4f6a599cbb823 [formerly 273f4a73bfed75ebec68969db3ae235ccec8600c]]].
Former-commit-id: c4f7092c80aaa52267789cffec29cd4bdd0890f5 [formerly d91460f5134fdca761c6152f72663cc8cdab7b88] [formerly 355bca8ae9dc9966992d43c2ebcdf693f1003af8 [formerly 8554f03b5f74c04ff6a7bb6c08de41eaf9cf0423]]
Former-commit-id: bd6254953c20e7971e70880d8598b6063ba21395 [formerly 43e67367ed1724862e9983598e843998688e46c0]
Former-commit-id: 11c10b5115995c7e96e0396032eeece6c301b90b
2016-08-02 13:20:31 +02:00
f41bbfbf79
Fix compile
...
Former-commit-id: 7ae323d1a7816fdea1634325c5edf3a468089495 [formerly 51214a2f11742919093c73a60dc74910d2610be1]
Former-commit-id: 2b787569abc0dc73637dc5ecb43018b1766e2c28
2016-08-02 12:56:03 +02:00
Lynix