Commit Graph

3579 Commits

Author SHA1 Message Date
Lynix 9a7767867b Push the current work on the Physics2D module 2016-10-14 17:07:13 +02:00
Jérôme Leclercq 080db76ac1 Merge pull request #84 from DigitalPulseSoftware/physics-refactor
Physics refactor to prepare Physics2D module
2016-10-13 08:54:33 +02:00
Lynix 634b67be56 Fix merge fail 2016-10-13 08:33:15 +02:00
Lynix 1fdda6b07c Merge remote-tracking branch 'refs/remotes/origin/master' into physics-refactor 2016-10-13 08:32:36 +02:00
Lynix 01cd9b220f Sdk/PhysicsSystem: Fix GetWorld() not initializing the internal world 2016-10-13 08:30:33 +02:00
Lynix be44a89a85 Sdk: Rename [Collision|Physics]Component to [Collision|Physics]Component3D 2016-10-13 08:23:25 +02:00
Lynix b52c7c57bf Physics3D: Rename PhysWorld to PhysWorld3D 2016-10-13 08:13:56 +02:00
Lynix 3765cba046 Physics3D: Rename PhysObject to RigidBody3D 2016-10-13 08:06:14 +02:00
Lynix 3c4d084b27 Physics3D: Rename Physics module class to Physics3D 2016-10-13 07:40:12 +02:00
Lynix 49f4df6496 Physics: Fix linking 2016-10-13 07:30:04 +02:00
Lynix b7a383d68c Physics3D: Rename all *Geom to Collider3D 2016-10-13 07:29:34 +02:00
Lynix 8781a628e0 Physics: Rename PhysGeom to Collider3D 2016-10-13 06:08:17 +02:00
Lynix 24f1859ec2 Physics: Change includes to Physics3D 2016-10-13 06:03:22 +02:00
Lynix eae8847bd1 Physics: Move files to Physics3D 2016-10-13 06:01:32 +02:00
Lynix debf87e739 Sdk/PhysicsSystem: Create PhysWorld only if required by entities 2016-10-13 05:29:48 +02:00
Lynix 9f771f8c01 UnitTests: Convert some REQUIRE to CHECK 2016-10-13 05:13:39 +02:00
Lynix fd652f1931 UnitTests: Include .hpp in the project 2016-10-13 05:08:57 +02:00
Lynix 584cb858ef UnitTests: Reduce text size from 72 to 36 2016-10-13 05:08:40 +02:00
Jérôme Leclercq 5a3077a3ad Merge pull request #83 from Gawaboumga/Console-Fix
Console fix
2016-10-13 04:54:45 +02:00
Lynix 4de37bf9fa Merge branch 'pr/82' 2016-10-13 04:49:27 +02:00
Lynix 5d5c7b4284 PR-82: Fix indent 2016-10-13 04:48:19 +02:00
Gawaboumga eb1416f48d Fix comment 2016-10-12 21:38:33 +02:00
Gawaboumga d4e569c09e Add tests for event handling, use NazaraUnitTests [EventHandler] 2016-10-12 21:08:02 +02:00
Gawaboumga f19100d179 Fix event: text entered (still broken with some key combinations and non printable characters) 2016-10-12 21:07:04 +02:00
S6066 5ea3eab8fc Oops, added an indent 2016-10-12 18:24:51 +02:00
S6066 e5300da933 Same 2016-10-12 18:23:28 +02:00
S6066 c5c4ef2c09 Fix + indent, again 2016-10-12 18:22:57 +02:00
S6066 255b1cce07 Fix + indent 2016-10-12 18:22:53 +02:00
S6066 e1d948c348 Fixing an oopsie (2) 2016-10-12 18:11:56 +02:00
S6066 d69166991a Fixing an oopsie (1) 2016-10-12 18:11:51 +02:00
S6066 59b2e55ed5 Added hash for Vectors 2016-10-12 17:56:46 +02:00
Lynix 4ba744c1bc Fix merge fails 2016-10-12 17:29:08 +02:00
Lynix 561c0cf51f Merge remote-tracking branch 'refs/remotes/origin/master' into culling 2016-10-12 16:51:18 +02:00
Lynix b24e37bb4f Fix merge rollback with Newton library
Former-commit-id: 0c988ecef2cda234f46e24edcbc4eb9bfae08314 [formerly 481c87435e6ea2d46ebd3f5be0d91a7192f39b32] [formerly e32545f3d372d649b5bf1cb64475087e552bce22 [formerly d9764ce0db83f5aa27d58ab478f5cd03cfdd7f49]]
Former-commit-id: d4dfccf825216daded7e8fd88adc70fe2e354c98 [formerly 368c70116daf082782df6018ddf7b3fcfda3e8b9]
Former-commit-id: df04e9b8758f9e5d57b024884255a7441099b0c5
2016-10-11 16:18:27 +02:00
Lynix c4b99fb0df Sdk/ButtonWidget: Remove debug code on mouse move
Former-commit-id: f36553828d8f212b1a837a121876945b7dceb7fb [formerly eb5492d8d1c5d752028b3e7f34be4ecbc4444b03] [formerly c5eb946d4d8e2505a07e74a474dd12d5cc5a71c7 [formerly 29aa56ee96517fa23dfea73a428de67a97f58fe3]]
Former-commit-id: ea67903befcf6d70ecb0735cbc20f5c1cb744486 [formerly ec59646b433a1eb3bccf4516dbdda52f2e23a127]
Former-commit-id: e2589b30389918af8c1f579c22d711542fcff43a
2016-10-11 15:41:33 +02:00
Lynix 7cab7cacaa Sdk/BaseWidget: Add Center() method
Former-commit-id: 337837199f8909bd39dd10129b379331e9344dd7 [formerly e29dfa72869a7e4831cdf1880db92a7f96cb7755] [formerly fef5a65af9b6bc7b12813a79db818aa6f8034c5f [formerly 5e38bf5eda4f96df7bb2f13d406830a48f293bb9]]
Former-commit-id: b06665741f29f91b9e26fe270e6addd699c5111b [formerly aaf5e62dbdda284ec70dae55b7c37c5e86b75ebc]
Former-commit-id: a9c1a3dc6df30f1688ad9143ba56912d02285c19
2016-10-11 15:41:19 +02:00
Lynix 2fdc7a8878 Sdk/BaseWidget: Add shortcut to create children widgets
Former-commit-id: 5d5ca1d1097086c33133440c08806aec9e478b09 [formerly ca22426131332606a26dc3f33fcda615c7c03d81] [formerly 38913198afa19aa2f5f2ee0f90f99d3780cb3333 [formerly b592a482e9f71b01a3b068276c3bbdcf8dcdda49]]
Former-commit-id: f464592f3d951614bc333bab9e0662fc1f8ad18e [formerly dd7f97b064a63188d227577e5f1f8dcc1526c2a3]
Former-commit-id: 6463d207bbf06bcfb811abb249fe257ee5336c85
2016-10-11 15:40:56 +02:00
Lynix f10ed46035 Fix merge error
Former-commit-id: a608db04b5bf3f90567c87ef7fd709f71633b276 [formerly 74ea59dd0272dec9654a9545f019158a7ed1356c] [formerly a335e611a60e5dbc9331711433760ebe9fea9fc8 [formerly 4b23e4dc222a578292bc57b390438c6affe2145b]]
Former-commit-id: 45c8278e5496526640f9dc380ff9753dda6db0cb [formerly 6b2c2790026867f1870991200ac9bbe546b99a62]
Former-commit-id: 2fb15f949bf0fa1d20c222aeb64fe88a738132d5
2016-10-10 22:15:12 +02:00
Lynix 05dd93c549 Merge branch 'master' into gui
Former-commit-id: b5a6eba7494e7595000e3c7e1f3c77077485519f [formerly 74e8b34c50d86cea8be86dcc5d9b82e112db9277] [formerly 07e6a0bd2e00dcb9517c6ddc1d9ca7d3326707ae [formerly 59878811e379ef9bfd66e6fd0a0f32eaa39dcc6b]]
Former-commit-id: b7a83377bc61d378410ce33748ab63357ee53abb [formerly d789d8762086eb0dd43e0cef08f1edfbd8d346f2]
Former-commit-id: 7aa71e252bf91965f8f488dd9396e6287607edf9
2016-10-10 22:10:36 +02:00
Lynix d59fd12824 UnitTests: Try to fix AcceptClient error
Former-commit-id: 2545ccc482b0726c23b85e12a3aaa294837676c1 [formerly eda50f108c9d8a4991b59346f47be1850b690f26] [formerly 8b467d645f61cc8b2fcb20318f5c8d792d3fe247 [formerly 287e1abaacb666890183535fc62fa33499f96e83]]
Former-commit-id: 40325f685aa612016580d887e8fec111a0845594 [formerly 37695b3f6793e947d79c37b023b9f388b6d888d3]
Former-commit-id: 7c6a7d60223733a253d05b52592146ddb51705b8
2016-10-09 14:05:07 +02:00
Lynix e0bae16564 Bump version to 0.1.1
Former-commit-id: 6a360efed4517a669aff64bd7beb0d3a07c71b88 [formerly 8fecaa13b82bce353b40bba4fb90b8c4a15d3963] [formerly bff0adcb24ddbe3f63109340c04ad44d9831f1e1 [formerly 930549ee2e196d9079908b00726117da477b032a]]
Former-commit-id: 5752c3dffc3bb17417c6b5bffb0c3c313dbd8f24 [formerly 693708bd55e361e88189ac3da63c5efafbd7a9e1]
Former-commit-id: b6a424e146dc6c43bfec4471f8996df94b8c0c7d
2016-10-09 13:05:27 +02:00
Lynix cd94520f26 Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
Former-commit-id: 6f80ecce36f54f38e21b284322b78da21e2ad7e8 [formerly cc1739a84c500d411d75142ee040c30e014528a8] [formerly f6a9fd8e4e695574a2e102641fb35706f5c88c80 [formerly b8bef5e10b7fb0698532db1e532ec212d56f004f]]
Former-commit-id: b781bde9bb61d77ce5b93b835aa5968bcbe564a9 [formerly 188733c992ea6c1c9f91ab7a151f9e4f67a581d4]
Former-commit-id: 1fa486c6257f066aff4810f3ae33e0f67f397807
2016-10-09 12:56:47 +02:00
Lynix 5c3e29c750 Graphics/ForwardRenderTechnique: Fix sending uniforms when shadows are disabled
Former-commit-id: a1c74d1c8e90fb0c9fd00342cd9688b7987c8229 [formerly 30588634d7283d3afa190d45672955631cd275be] [formerly 5f006c4db2f43bf5a167e2c2f02559d5d7c01275 [formerly 43b03cfc6e1255d5ebd86d0af8e49d19087e7ce0]]
Former-commit-id: 1717577f8523b12489ad79b4f525a3059d11915d [formerly d0b9210e3c6acf35885b4d22717ce660756ef181]
Former-commit-id: f175b9ca43fe11cc11050d7c13f2e8df35e4888a
2016-10-09 12:56:42 +02:00
Jérôme Leclercq 96a886260e Network: Fix compilation on Linux x86 (Fixes #81)
Former-commit-id: b9ee4a38914e101751907a0afd5bc4387c4cc595 [formerly fbd619850d74c3264eead6456950549a00445a48] [formerly 38aa0d99632748baef4bdbed948e97d3348fd7c3 [formerly 24dc3d90f246b8a437a6fc1ace1b3091fd0e8df9]]
Former-commit-id: 37cfa200c8effe1822e9e2c8dd3224f8d4138c9d [formerly 5a4fdb8f93bcef49702e73d3ca8c7f5a1be56716]
Former-commit-id: 3e444884880bb866d4b66b5d4531272a02ac4125
2016-10-08 20:55:00 +02:00
Lynix 1788cd0735 Core/Bitset: Fix compile error
Former-commit-id: f9e4fc7547f9b741d9830ca96c552595b49b218d [formerly d8e832f8f8307a5af8c54a073fb7105e956dc91f] [formerly da3ca4c03e8c4f26023530a3150c99fe0bd8f060 [formerly 454daac75baf19c15612509e8505417dd1f194b6]]
Former-commit-id: e6c44555476b6b8f2648895493736d6018dd9ce5 [formerly 8e816f8b6a1366583000aa5e35b10b5bd6f82019]
Former-commit-id: 8d470b2679af9464001d3239738ab8d5bc7d6d67
2016-10-08 07:19:41 +02:00
Lynix 42240afb7c Utility/PixelFormat: Fix RGB32 and RGBA32 formats (Fix #80)
Former-commit-id: dceb517cec5aeb1202c9725c62248ca182310528 [formerly 4ac3d4cacf5217c85027f3895a5673c8827cc0c5] [formerly ae697fbfacc90215483a431a3d3377ddf5814a98 [formerly cc43ad0eb6a7793b17e582d4bf9ce2812d47ca2b]]
Former-commit-id: 6bd38f6ccb14944d7dcf5b69cda173c1b3c4f02e [formerly c32c42d98d003c181ee0ae1f5e97037d24497a07]
Former-commit-id: d87a202835b7929db20c46a05a0dadb0f497c306
2016-10-07 19:17:07 +02:00
Lynix 2b28b217d1 Core/Bitset: Add bit shifting functions
Former-commit-id: a5d9aa0da769a1f5b70e5db8eed5c370e1e9b076 [formerly c8338571cedad83c557ffa9210f8e11a928157f2] [formerly 47e36d22755f77c878f5277a99f61388f096a449 [formerly 12f27f9470c490160deb869f83736c000bb18d93]]
Former-commit-id: bc971c681a184ac7d340fa1d5b053f2e4a8cd156 [formerly 2a84c48ec1ab8970fb768dc5d925e7712cb193ea]
Former-commit-id: 728cccf49da4bb48416aa91e3687fa7fad8035ef
2016-10-07 19:16:25 +02:00
Lynix d99cfa5181 AppVeyor: Don't fail if unit test fail
[skip ci]


Former-commit-id: 6fc41d258de67e7fcfd698d285dae6b9880086cb [formerly 2cc89518336952148ea428d3fbf2274ee06e9a5e] [formerly 9d5486eac5727ff2725a25571befcc2fcd47d0ec [formerly 655b9a3acf9010f61c4ff21fec785fadd1872356]]
Former-commit-id: aa2a672863be6251000bdcdd222155ef12a40e06 [formerly bee382ae42a659660d5ad20c8719292e1d32e7ec]
Former-commit-id: 082f76abf282a37e7a54aeb60a2df76178e3ee13
2016-10-07 16:26:23 +02:00
Lynix 03e31af828 UnitTests: Choose a random port when testing
Former-commit-id: ce4e1c4b2b65327917bd0cf14b91102bfdab6327 [formerly e4390f995cb6ccb2c5e3b81a56acf0563d8d2679] [formerly a813d71a45dc17042129a31a8537b35ffaf93120 [formerly 683e75adf03f84ce2dc2454b4c22c2a20ca31668]]
Former-commit-id: 65fe6b63137fc3a55439d3ec777147ab51ed259a [formerly 310169d28ca078fdf76307bbf9f0a653c3c85d42]
Former-commit-id: fc03da2c66e08f6d349b5eedae057c5ab371ad9e
2016-10-07 15:23:08 +02:00
Lynix 3027a00c90 Merge branch 'gui' of https://github.com/DigitalPulseSoftware/NazaraEngine into gui
Former-commit-id: 12b9c8e8e47077679297aeb88d60f4d7978b28dc [formerly 4bc97065de9c4b3d4116b8cf0132d1b8035516ac] [formerly a90d49999c95301206c5a4512b64432c2d39fe2b [formerly 470ac1372706c823908e81cac1a9ff524a79e744]]
Former-commit-id: 8efb7106ba0431df62490f4ab647d0a11944ce21 [formerly 9f35eb2ef107779144b4a487fa0583ef181f9568]
Former-commit-id: 53cfd725142b3dacc0ecc8d79f09269ad47eedaf
2016-10-06 16:03:14 +02:00