7df732b927
Sdk/Canvas: Add basic keyboard handler
2016-10-28 17:46:02 +02:00
a4eccc9fac
SDK: Add widget global header
2016-10-27 21:38:46 +02:00
df24519230
Merge remote-tracking branch 'refs/remotes/origin/master' into gui
2016-10-27 18:36:47 +02:00
6b1d1a1d64
Sdk/Lua: Bind TextureLibrary and TextureManager
2016-10-27 11:29:02 +02:00
1d7e1b46ff
Sdk/Lua: Bind more Matrix4 methods
2016-10-27 11:23:24 +02:00
5ffc5a8784
Lua/LuaClass: Don't remove instance from the Lua stack
...
The instance Lua entry now remains as the first index, shifting all the
parameters indexes by 1
2016-10-27 11:22:35 +02:00
b27cfd30af
Sdk/VelocityComponent: Cleanup
2016-10-25 12:22:57 +02:00
2a08e19e77
Sdk/Lua: Bind Material class
2016-10-25 12:22:46 +02:00
034f5cc8d7
Sdk/Lua: Bind SpriteLibrary
2016-10-21 17:32:40 +02:00
373b8a7069
SDKServer: Fix compilation
2016-10-21 02:29:09 +02:00
b1abe2aac8
SDK: Fix compilation²
2016-10-21 02:22:12 +02:00
b062b496cf
Fix compilation
2016-10-21 02:12:35 +02:00
8f84700628
Sdk/LuaAPI: Make GetBinding() initialize the binding in case it wasn't initialized
2016-10-21 02:12:23 +02:00
6b6608eccc
Sdk/LuaBinding: Remove "class" suffix from classes instances
2016-10-21 02:03:31 +02:00
350c7dad59
Sdk/Lua: Bind Sprite class
2016-10-21 02:00:51 +02:00
4cd6bdd14a
Sdk/Lua: Bind Texture class
2016-10-21 02:00:35 +02:00
6885e99ee7
SDK/Lua: Bind Matrix4
2016-10-20 17:24:22 +02:00
5a07bbd001
Fix a lot of warnings from Clang/GCC
2016-10-17 14:46:53 +02:00
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
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
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
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
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
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
c653d4c4f2
SDK/Prerequesites: Remove version informations
...
Since the SDK has the same version as Nazara for now
Former-commit-id: 98a11ff3f51208317502bcf4b66a92402f98b780 [formerly 15a3ec197fe5b709829f267eb66a72f1748ba2bd] [formerly 6568140a3c675568f914035350faf840ee215005 [formerly 76ec756093abdd84d386eee843eb2cc70e206222]]
Former-commit-id: 54c6ff374c0e64abbc6e7161ce517ddb568b1972 [formerly 164feb548e2974dcb562f8991f7ded2fa5364fe9]
Former-commit-id: 1c03591596f56e7607ae6abd0daacc2c11d6f2bf
2016-10-04 17:58:17 +02:00
bdc49b1eb3
SDK: Fix compilation with Clang
...
Former-commit-id: bbe7ec821304dd13ac6640a1c1c7b654914cbf2e [formerly 67a6dba7a47490a3f39ac6c9c4a0bf853da63f60] [formerly d116a4c3af3782462a1305bd76a1a410a0075027 [formerly 418e3fc7090ada085deb039eb79b9c74df694666]]
Former-commit-id: 813f866bfcfd81cff799a2bd7b26ec71ada8e9ca [formerly 5cea6c36cbe5b8a73f1e4aecf86042be331ba424]
Former-commit-id: e04eb838630232088ba6f93ad1896228b86f949d
2016-10-04 17:57:47 +02:00
3875d2abe2
Build: Make some fixes in order to prepare static building
...
Still not linking though
Former-commit-id: 3962a663c9368ea78c4703cc860beef8c440bb4b [formerly b9575a870528ef6712500a94c5223a74d5c6dbec] [formerly bf2ab7b17b25479d6a8fda660e8d9055ffce38de [formerly 3db6f9cbf4cedd9f91ef8f7f1bcc99a4e84027a4]]
Former-commit-id: 0c292fec84d1963f377d16d5e9a15337bef4620f [formerly 93c016fa10c60bf11e4b0b1e17d8c98a66dfa028]
Former-commit-id: 712b1bf14355a82be4cc2c37912f87039b3d9616
2016-09-27 18:10:13 +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
061261b911
Sdk/ButtonWidget: Make buttons clickable
...
Former-commit-id: a2a018254f6f6ebc36f402e6cec12b5ab048d4c3 [formerly d3a5c72ac4b0df83cb1100ea0f58b2c03e029d18] [formerly 404765b9f0bac1b2b41e594783ae730c15c7dfc0 [formerly e0628754a233a7cde8ffa60e02e4614dc3d9961e]]
Former-commit-id: 127c9d5cd50790a3003fd4a6ea4c21b17526c7ae [formerly 545310c49f5a4e118cf089480e7c7321f09719a0]
Former-commit-id: 217ef14e8265f3bb469e859e61c1a18e5f8e5c14
2016-09-16 16:56:10 +02:00
8ad2f05abd
Sdk/Widgets: Add OnMouseButtonPressed/OnMouseButtonRelease events
...
Former-commit-id: 6991c60426c0a41d88174fbe404dee49fc13dc2b [formerly 662192d79c314e08128b196cd352188eff903fb0] [formerly d238c31726f70ecf078d8e8cc3dc3032cf1529ca [formerly 5caa1f462aed257779cfe5e8413729062f026bf5]]
Former-commit-id: 296fe5698e0bf5d8b058de032a8549df1c4891eb [formerly 20dfabc83b4eb8c2cc89138a05c29d53e17c952a]
Former-commit-id: 44b7f726bc84056071b9e577357a736e78436767
2016-09-16 16:55:55 +02:00
72206a3ca3
Sdk/Widget: Add Canvas system, mouse movement event for widgets (buttons react to hovering)
...
Former-commit-id: 685295853d1f0edf28c36b2f698eca881da25ea2 [formerly f65f951ed3d2edfd9c12d390837cd13e5691eaa3] [formerly 5e239f37c28bf5e93a71cba29a94f0de680a79a2 [formerly 38346fa5d68c7bf79ddebc1990959e7c56617640]]
Former-commit-id: 92da4ed40fb63fe0b02c7543ea64cebda0575623 [formerly 2db1fe5fca87a1461ceb8314709d764af079a7be]
Former-commit-id: 77d61a99fd5a2bb21701fbe4a4b4451c3655663a
2016-09-15 13:16:37 +02:00
136fb65a6d
SDK/Widgets: Add buttons (not clickable atm)
...
Former-commit-id: 8c37250acd7bf5123674f1d83d4d55d7125f080e [formerly 6705a2a453bb8c1e441a5008beb9a4ac60847fa2] [formerly a391c49c98f003cfcb8409d67052ce7998329f9b [formerly a8440703ccade130b116dc51246cd3ec0e16e6ae]]
Former-commit-id: 7f0f4bd7353768e7e0440ef41ce24c8035d7ee83 [formerly 6d3310e1488bbea850e17257da5588f9f0d0ec03]
Former-commit-id: 1ef3f72963ba3df19e789aae2a2e263e104a2e94
2016-09-13 18:22:40 +02:00
06a3280599
Merge branch 'master' into gui
...
Former-commit-id: ab617839e9da6d7576bb2ee260aa5a53691042a0 [formerly 0b7b354ef529ca3b9795f8042772890125942701] [formerly 1390383adba6cfc347d513cc290927a6d254d733 [formerly 6a6a1a4f56d26a6601d8a5e53a6fc99dbcc187be]]
Former-commit-id: 1b19d5fda60c06437b1c874c424258a83dad0f77 [formerly 2423a7b5c83f99d5097c3cf5dc647033161ad78a]
Former-commit-id: 744ec2d55571319ba6266ac69b6a51ba8deb0b4a
2016-09-06 13:57:25 +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
f2aa4e0e19
Sdk/GraphicsComponent: Allows to setup an offset to renderables
...
Former-commit-id: fd1f70010f950dd4a4194e049ddff317c0d8b4b9 [formerly 8fee96f11b7bef08351110bef74643fa0be8b17d] [formerly ec5d6ad819cf325dac0ae61d983003cf99c78aac [formerly 2610a17ba67d61080254ce4bc3e9176e315dfbe5]]
Former-commit-id: 7683be7fa9a565dc3fb59be401ecff5580a6de15 [formerly 80ac7628f5119f58cf4518b5b1a44aff5b6d6b20]
Former-commit-id: d1604af612715688e7b1fc451d8561f79e100541
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
1dec4ca86a
Sdk/Application: Fix compilation in server mode
...
Former-commit-id: 67093963bcad8d36febd467c1aba51d497d8e5c5 [formerly 4bf223f6b8388f973e3be44178dc4762bd8bec24] [formerly f5ec0e444d9ad87dc39bf3d85f2679046bdc8385 [formerly 3c50590603c468b2e97417785db9f571b40bc790]]
Former-commit-id: 0bcbfdb95712215eb44014102b7dc95272620d90 [formerly 0708473fe71ae8f8f477a1a3e9984fd06e0b3b1f]
Former-commit-id: 9f9478b6dff900d10dfdaaedddfb206087d0c49b
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
79db960a89
SDK: Fix console layer having trouble with late constructed windows
...
Former-commit-id: e5882089bc09649b545da8ea8a222b89417851a0 [formerly 1a114b80d1a97b96e764a2732ce8200244389283] [formerly f36d163b9d5a52c2958468dd26d9086b86c6710b [formerly 71b9edd9938eb30860da96234605a001173eaa23]]
Former-commit-id: 8fd9120c8333c10f95d66d859eef2c64c58efc28 [formerly 423c0088ec020881cbf207470787d86929f34fd4]
Former-commit-id: e283df698adfb17f2d40156ad411e9a6acac1f7a
2016-08-29 02:33:57 +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
d9d2347688
Sdk/Application: Add command-line arguments handling
...
Former-commit-id: efe6c5a1d911bb78314f8819575699874f5101e8 [formerly a9b33eea0b4b261d3e3a63d8949512f737dbe1e1] [formerly bd00d4e8009ff0efa74e6a27d78960f6d3d72c17 [formerly 17b26899d0c158c77ea0ab4cfa243e92c2145b6b]]
Former-commit-id: 4caea7e656e3718e1d462c5ed280aa6353368166 [formerly b82d884df55141a10251e84e54e0a40f84db2a5e]
Former-commit-id: 3798d603338416b18a4d427cf8b3cb87bac12ff6
2016-08-28 21:47:29 +02:00
8caeba0a48
Sdk/Application: Fix AddWindow<Window>
...
Former-commit-id: 16b652d622e895dbb89dce0ce1a7cc4a4b19746c [formerly d34c513b12324c63a27d4baedb36e8ac41985710] [formerly 3f16d8cf446b553c3a4667efee3229c36c19f402 [formerly 0be44914271824bb2550ba775568c7efca8f9894]]
Former-commit-id: b4ae45478a325782a2e7965e4f8115f4fd93ad90 [formerly 2c4f33beaa320b216274c325c87cdb7b0fa5e1d4]
Former-commit-id: f68b68712b97356d50f76f3b444a81dddedbe210
2016-08-28 19:53:38 +02:00
cba0190f03
Sdk/Application: Fix AddWindow<Window>
...
Former-commit-id: fcd114b7edb92a74d0d646d0f758bde8f40a045d [formerly b6a240aac5a470cd151fcf6b30c65e117bdcc03a] [formerly c44cc9a535703ddb7c64e32fa7f7dedbf1c043c3 [formerly c0d51f049a1df8908dbbf4390d8ecc7d14ae0e79]]
Former-commit-id: 951f1d7658aa40e12efa41056f087c1968e19bb5 [formerly 54703326cf2c80ab154610149a2d26fc8e484444]
Former-commit-id: 72a5ac27a30818ab77281d3219d0e954958c294a
2016-08-28 19:53:38 +02:00
Lynix