634b67be56
Fix merge fail
2016-10-13 08:33:15 +02:00
1fdda6b07c
Merge remote-tracking branch 'refs/remotes/origin/master' into physics-refactor
2016-10-13 08:32:36 +02:00
01cd9b220f
Sdk/PhysicsSystem: Fix GetWorld() not initializing the internal world
2016-10-13 08:30:33 +02:00
be44a89a85
Sdk: Rename [Collision|Physics]Component to [Collision|Physics]Component3D
2016-10-13 08:23:25 +02:00
b52c7c57bf
Physics3D: Rename PhysWorld to PhysWorld3D
2016-10-13 08:13:56 +02:00
3765cba046
Physics3D: Rename PhysObject to RigidBody3D
2016-10-13 08:06:14 +02:00
3c4d084b27
Physics3D: Rename Physics module class to Physics3D
2016-10-13 07:40:12 +02:00
b7a383d68c
Physics3D: Rename all *Geom to Collider3D
2016-10-13 07:29:34 +02:00
24f1859ec2
Physics: Change includes to Physics3D
2016-10-13 06:03:22 +02:00
debf87e739
Sdk/PhysicsSystem: Create PhysWorld only if required by entities
2016-10-13 05:29:48 +02:00
05f7c52378
Fix some warnings pointed by Clang
...
Former-commit-id: 2e2e0a23d3b4115b584743f100ca05fa404a4e9a [formerly 02f505dd5b7c70682e035ddabaa7731fe09d8452] [formerly bccc66f75a5ad50f88043a502c3cae1395889740 [formerly 294134ecf2220589b85d6950054591ce02e596ec]]
Former-commit-id: 9d8d7699eaf4128b3519b3d33b6f5a20bf16f30f [formerly d84e10bdcb4faf5cd48d639bab06544b6fc7bda1]
Former-commit-id: d73659592f82b0416b2ca6f2b406f744e68c4d45
2016-10-05 00:38:52 +02:00
fc3fb062e0
Utility: Add Parameters and NoWindowSystem option
...
Temporary fix until Utility module has been split.
Former-commit-id: 702929f41c8f1dd4015b64e9b331c150ad6fd953 [formerly f113bd948da6a8c5399aab48f53b6cb5ca272081] [formerly 593365938d7e3a835b94727ec6dc744a7a113822 [formerly e43d02e4e221e5c1d85320d71d1a258db44768d1]]
Former-commit-id: 29e2dd7ff9ee608847e3f78a7474e3286343b152 [formerly cf10e1a9dd5ca6df0bdf39730e2b38e9ea0d673a]
Former-commit-id: a479d4eb078b30d6e7b34bd53dba6366fad643de
2016-10-05 00:26:06 +02:00
d7b7135e27
Lua/LuaClass: Fix argument count via GetStackTop ( Close #75 )
...
Former-commit-id: 3a0e60a6e7ec7c85ff5f179cc84a468d8c0682f4 [formerly f0712658e69c7ced1fa46f8878f96776d6b36567] [formerly 3035b072473d17863c3c0f6950451ccf582c107e [formerly fe3cbf8a2cf87cf6cc3d3e8577011159bff04387]]
Former-commit-id: df8812d712d28efc2bc83258df53dcb21bbb4b2d [formerly 6d2d8773c96d406690bd5cfc19cef7d1706ff6fc]
Former-commit-id: 461fec0cc2dd99690a3de10436730514712beb73
2016-10-03 19:49:43 +02:00
29ac52770e
SDK/CameraComponent: Moved virtual functions to source file
...
Former-commit-id: 633046a6f599ce9f8712e11b8195509d9704bfc0 [formerly 080ea253a37d683c72372b406148372f9c1b92d2] [formerly 528dbe2f2c9dcac7b48c11feafb24a12afd43652 [formerly af9843c5eae928fb2f03c0ec1550e7ef95f69108]]
Former-commit-id: f17eed57cd271cfc55ef380bde44917ea26deac7 [formerly 30667bf567620cc339c96388303582b8b8601f68]
Former-commit-id: 66843984b23bee78fdbcefebbf56febddcdb4bb2
2016-09-27 18:09:25 +02:00
f3eaadcd8b
Sdk/Application: Fix wrong inline constructor
...
Thanks Travis-CI !
Former-commit-id: 40bde8de004459e30e45b45005d8a7680ae321ca [formerly 94921ad26e3e4d8d8980a2002618b1b8bc134d23] [formerly abfe68167af6aee324ec64a1d55114c63f364ceb [formerly 79ab743755f65fd23200091380187675b2af7281]]
Former-commit-id: 487d2ae56048c786e08f9b6b69d34483cabd6517 [formerly 28cef4f85f78fa47fb28430b75c0c7550b79c8a5]
Former-commit-id: 3ce94333b5d83df940384dddac64e41cf3b5a5d2
2016-09-22 00:26:34 +02:00
1ce64258d8
Sdk/Entity: Fix component cleaning on destruction
...
Former-commit-id: 16ede7dcd3b58da549656d02a00296f3310184a0 [formerly 4375abfedc741682c2f36eb73a1b4445b1cbda8f] [formerly 3d53a5ff990895c025a130f1f6e7103425c316c9 [formerly 8896228a838acbaf2e4149b198e013392b5bac0c]]
Former-commit-id: 46717838dc1ace6352a3c3d98f85c586d971972e [formerly 87607fba567be467e78f47972c80fbe500cec4a8]
Former-commit-id: 30d8a37c62cec76c1dde27f15daf1dbff8e8317f
2016-09-09 23:17:36 +02:00
fb64f052dc
SDK/Binding: Fix compilation
...
Former-commit-id: 16a69ef5de792f9093fc27ddafaa8e5677d9f66d [formerly 72c2eca09f8e48b414956056cbf16b40cd96b2e5] [formerly a73d622403c9a746ac5f39b3d45178bb21006a17 [formerly 095a0737f1aa42b7d4ba9e09fd897c5ab173b75b]]
Former-commit-id: 0373630192183dd80d1250d6132ae676be0b7267 [formerly 4eee844b3dcec8789cd990f6f42fe9ac2e57c3fe]
Former-commit-id: b50dd40211e104f15eba529b434c74e9151bb78e
2016-09-06 13:30:53 +02:00
ba6c562367
Sdk/GraphicsComponent: Allows to setup an offset to renderables
...
Former-commit-id: a5e9ceb3f30e79a0d3b96b6866a06441cbc0b463 [formerly 8af071cedec0a6aca00ff9c12d66e8a0817049c6] [formerly cd7e7040fd68dd5a74a0b458a3a305c251257b51 [formerly 0f9382c169a260d5fa34fe9b1ab64c3d19dbd385]]
Former-commit-id: 774af2326cb64824f85835c83464bc19884005e1 [formerly 4b676844f6dd56940b4f503c6a943905ea8a54c3]
Former-commit-id: 0673e4d4cd88c99d24e0e153a61d2726e2e2c039
2016-09-04 20:02:23 +02:00
3abaa6e508
Sdk/Application: Fix compilation in server mode
...
Former-commit-id: a7dbe8b6e7c6b37c77b7fac62eaed60031d55f3c [formerly dfdc15e7fc150b930dbbff78aa50977cfb8a4721] [formerly 0829205432c0038facb131e46eb985253af9fb53 [formerly d651dccd41733fd467a0fbc21217baa1aa8c632c]]
Former-commit-id: e1b114ffabe598f6eeb57671de06c7323b764aa1 [formerly ba92c6a3ae9c0851ace35830ac03d2b70f5dcca2]
Former-commit-id: 4e8dc732d05a1f7d11b0b9b78c8b425ac59fa2f8
2016-08-29 18:16:33 +02:00
11f4464d90
SDK: Fix console layer having trouble with late constructed windows
...
Former-commit-id: 1af4cce1d920401963c3693661c19f0af5d23641 [formerly c5fb7cf9da6dd18a887b5d67fc2f43c135d5bee2] [formerly 9718a9b7c1bf161b46c085a82ab1bce46c045d6d [formerly cb26a07e6ce48b30727195e8f26e6fc6670ff86a]]
Former-commit-id: ccd4866237e7d9d6cd3a83ff6a030d8acd053010 [formerly 9745165a6b024df81317dc96126e8209bee4bd32]
Former-commit-id: 43b65ae9fb7793e9a9e79d1e8e9a718e4c3edce3
2016-08-29 02:33:57 +02:00
88b54cb43e
Sdk/Application: Fix crash when debug overlay are not used
...
Former-commit-id: 25880e8ab32685946949a482537c85bd7ecc6225 [formerly 4c63a6c83734c26a1cd5741df796b2f5c43315e1] [formerly 6ecf816f9e269a958a0e6ac73e9b8f19ef00c51e [formerly feebf9391f65fcd2cb97fcc8992186ce83902a90]]
Former-commit-id: 81fe40e209049bac74ad4bf694260e5ea19fdad0 [formerly 9f7291baf0f2d8c4e4668058dfb5a411c6bb3f2a]
Former-commit-id: 26d073e246b875b4c6e0fe64f9562106e3239dbd
2016-08-28 21:47:46 +02:00
f0787cb505
Sdk/Application: Add command-line arguments handling
...
Former-commit-id: 9f98c2fea531e23540c213d3c1e4c85391fc9e1a [formerly b3cb8fff86ac0a754b72baf9e6278f20b407ef17] [formerly 8665dec44d98961698bdeaa63e670e2e15de7d1d [formerly d8dfeaae490b2efd430599f2b1fa02c531aa4de6]]
Former-commit-id: 51c00f9263c4c7e193bf2ca8de860e03e9d0f402 [formerly d09b90f14e62f85c0056bf4ba872d9975efde1eb]
Former-commit-id: f82b2332083d6d6099ebece01e239c99d15f3b5f
2016-08-28 21:47:29 +02:00
11baa02ec3
SdkServer: Fix compilation
...
Former-commit-id: ea7163d5af56b3e08b865d0fb6ac5aacc5ec9ab4 [formerly 3fcbe74d2738776bc3f92f59a572931f82aacf5a] [formerly 1f83d4bc4e639999892376bd7328536878b36ff4 [formerly d1617dde160d6b1415758f57759581b537f241ff]]
Former-commit-id: b44ee9651c91d2362e61cb661479849d03a09e82 [formerly 34a3c0fb2093a9de6130b5d0d784e6dd76ae22c8]
Former-commit-id: 6a87eec688dd737da6ec80ef882c9ce1fd168933
2016-08-28 18:16:35 +02:00
07fe2f560e
Sdk/Application: Add Console and FPSCounter overlays
...
This allows any Nazara-powered application to enable a ready-to-use
console or a working FPS counter
Former-commit-id: 2b1c7ae5a7c72ea1c102734841f4e25742c2b42b [formerly f1fece5295a0a43147396752b3c61d84e0d7fc74] [formerly 40eff1e79a68fb5e0b7e1d4d6528fec318fed74c [formerly b17ee1558babcd4ed89525e447fb9c4e58b67033]]
Former-commit-id: 1e1297789e402d25e7b5324dceebbbe8021a2217 [formerly 1c62735c3ff7f53efbef3e45c2284739fc22ec32]
Former-commit-id: 3d331aae0e7db884e36d07b095a9d25a1dbe7926
2016-08-28 18:10:09 +02:00
618449c13a
Utility/Window: Add new event system, based on signals
...
Old pooling-based system remains for now but is now deprecated
Former-commit-id: 803c6f51e8287613610ede8433bef8112bc70352 [formerly 9f60f0fabea7fa0d0d62feba217e28c421522e36] [formerly f05d3dededee17402669ec9e4060c95d77c74bb4 [formerly 5b96073b92c3a10a5c485abcc7c33ecedb819fca]]
Former-commit-id: 4280c668fb5ec67c0b765a80516b9b4fe466135d [formerly c8ce15aa230bf2f1040b00153ec81aa1f39ef48d]
Former-commit-id: 71893d639b5e1628776d8a4577b0309437865c16
2016-08-28 01:08:38 +02:00
de274b632d
Sdk/Console: Remove debug error
...
Former-commit-id: d1ea434fd474fc66e7c7b751d656c88f7d782ddc [formerly 1c7a1aff7717bdd946cbd3b48d0ed6b7d2f326e3] [formerly c6877dcd98758602be9d2378cec991bb0e2e91c5 [formerly d114ffd6832788fecd0f167c11e8796b7cb2bf3a]]
Former-commit-id: 1c163946a75f63bcf71acb39dda8674c82508a94 [formerly d8dd26e5087771e7d83ab97d6075594236c501f1]
Former-commit-id: 30aa3c22d308ce012631f5c58d03f4843702a4f3
2016-08-23 18:25:10 +02:00
2a0fb4ffdc
Sdk/Binding: Fix Entity::Enable default argument
...
Former-commit-id: 82181122fca24b99e78ba927c71ce9237b1b3674 [formerly ef758ac2d0aac925dbcd6e72effc21b9effa83c0] [formerly 2555ac6b28f36b220aea76f2aeb0012536665058 [formerly b28da55971c4db17ddbf7fd6bacd8c03d02ffcbd]]
Former-commit-id: 8a84469ff40d37e114fbdee8c3fa16a3748ca010 [formerly 3f3cfc52071d469150feeaf2f7cdff8c33a8f46f]
Former-commit-id: 8f522f2357b7564229ebdea1e8d4a2b3cc223366
2016-08-23 18:22:09 +02:00
9eba331f34
Documentation for module 'NDK'
...
Former-commit-id: 63e1cac538c577a1f1aafa71fa7eef69a6d4daab [formerly b2d8769fd02a0e7d9c476d4ad7be1988a1fd6789] [formerly 636b5cb79bcb8da44d9aa45ba1023565bcf29f0d [formerly a2361ec2b8679d4d4ba096e543b5d4b91825dd62]]
Former-commit-id: d402d35477f9db0135c553d55c401939426bf62d [formerly 607336ea0f42731e4604f3a8c2df06f3aecfc401]
Former-commit-id: 69e23cd6c06723486de5e4641ce810012dac66da
2016-08-21 13:48:52 +02:00
5fa172e7f5
SDK/Entity: Add entity cloning
...
Former-commit-id: e855800df2110a15bbe808673549baed12c0a80d [formerly eee65fd713e594fbcb76b74bcee243ad7d670113] [formerly 00cab4a7320aacceeeddceeffba4475e48ee7c2e [formerly 256bcefb089172041e2a21c28e8486e70b288884]]
Former-commit-id: 78fa9291af60f0b02858a9b0127d60fec6a96521 [formerly ae13e29e620506aa1921b0faecc54b1a63609097]
Former-commit-id: ae1a27340b2b21f4d04e2df8f7a5aea3c50f6e3b
2016-08-11 22:00:05 +02:00
1fc0d564ce
SDK/Entity: Delay component removal until world update
...
Allows system to freely remove components while updating
Former-commit-id: db5877bc20e6a0dfadd69f81a339f0a57d8404df [formerly 74327b8f1429855625613f258894b37d026041fe] [formerly 65b8f2ba78d2690b7a469d4b9818b189524633db [formerly 71be95adb46b7183261a8038352c4d8bd17cacc3]]
Former-commit-id: ba91d5abad60792e648d47e646ae49d43a1c94b5 [formerly 8d0667574ff665e151e7fda5f854fc11a16c854d]
Former-commit-id: eb7b06c2739ef698a153a6221870a8d0956dc875
2016-08-11 01:02:40 +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
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
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
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
70ee053f3f
Sdk: Integrate particles
...
Former-commit-id: fa4474b434340d15363ff2ffc91b58d2df3a62fc [formerly 8a52795fc49a847e7b558425fc03915b21139521]
Former-commit-id: ac159c0cf652699400f720ef6fdad0fbf649308f
2016-07-30 15:51:46 +02:00
f9a02f36d4
Sdk/State: Make destructor virtual
...
Former-commit-id: 160f97ed46bebe76c8d74ebd2b0ee609052d1182 [formerly 422657a7e1576bc590e66c9d26c9dda68988c37c]
Former-commit-id: 459cf63dfe7225687ce7f6e6373273ff7d8c24c5
2016-07-26 21:07:20 +02:00
108a6af39f
Fix some more warnings
...
Former-commit-id: d5a845b6a2c468c08e1c40ccbcfc87b2a49f67be [formerly 8829226909d7280607fcdf6bba6b2b79ca0eec1d]
Former-commit-id: af76bbeec9543055d14ec142726cc4b85afa1985
2016-06-17 22:30:29 +02:00
819b46f5fc
Fix a shitload of warnings in 64 bits mode
...
Former-commit-id: c7792a7d5b1f85ab934da25324831b9daa3f47ff [formerly 3469974c48432be1f65808bff0ea39d9e22f5b50]
Former-commit-id: 5080815e9e1a3aebe237ff9a291b908ce0292eca
2016-06-13 21:09:55 +02:00
d5b354c379
Sdk: Fix uninitialization of components and systems
...
Former-commit-id: 84f6ce6c6801dc3f4df528781892fa54783115bf [formerly 34e78a610a036478be9fff2fcb28b7d5cd17c13f]
Former-commit-id: da5197094f56618eb065223c0c128f14e2a0f3f5
2016-06-01 08:34:44 +02:00
3e78dd40ad
Fix some GCC warnings
...
Former-commit-id: b3292fcfd4d029793cb70f97ab608aeb7d0579ef
2016-05-25 13:52:10 +02:00
a1644edf45
Merge branch 'NDK-ShadowMapping'
...
Former-commit-id: e77949168073f06d52d10785afb41bad2f7f86c0
2016-05-13 13:06:23 +02:00
51549f8526
Sdk/Binding: Add component access by name
...
Former-commit-id: dd2e5d76254e8ce5e60db62e606c8129d784f528
2016-05-05 20:40:25 +02:00
98867fee19
Sdk/Binding: Bind Rect
...
As requested
Former-commit-id: 97fcb06de0505341f39418147c57d240e4210159
2016-04-24 21:14:10 +02:00
1bdcdb36fa
Sdk/LuaBinding: Fix issues with optimisation
...
Former-commit-id: 5bc419c9e35055810f162501cb3f465e737739c2
2016-04-24 20:04:43 +02:00
24a8fcee01
Optimize Lua binding
...
Optimize binding by removing a useless extra indirection and allowing to
move replying variables
Former-commit-id: 76728df1c3ab9a38a4304ae2b9f2fc6a000e0ebb
2016-04-24 19:54:46 +02:00
d1e12a6d2e
Sdk/Binding: Bind Font::GetDefault
...
Former-commit-id: 5245ada09cd376dfaf69f06ca982c89dc438fae8
2016-04-23 22:48:14 +02:00
823a6f70e6
Sdk/Console: Fix SetTextFont
...
Former-commit-id: de1790fbadff6fec592f875dc9f6b24a3037dc45
2016-04-23 22:47:44 +02:00
346e9d7081
Sdk/Binding: Fix binding initialization
...
Former-commit-id: e9dde83bcd950bf3a8f3665f88d253ef6e71ffc2
2016-04-23 22:38:47 +02:00
0df824517a
Sdk/Binding: Fix File methods
...
Former-commit-id: 66ac34c0cc54105fc31eace9a31ab57644dca00b
2016-04-23 22:24:27 +02:00
cfef9988ae
Sdk/Binding: Bind Font class
...
Former-commit-id: 63726c649af7b95f01d283bfd08206cf214172da
2016-04-23 22:24:00 +02:00
Lynix
Gawaboumga