|
|
1be61d665e
|
Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/sparrowengine
|
2017-01-19 15:47:04 +01:00 |
|
Anselme
|
7400ace40c
|
config file now uses the SparrowSerializer
|
2017-01-19 15:13:09 +01:00 |
|
|
|
006b6fdb01
|
Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/sparrowengine
|
2017-01-19 14:18:30 +01:00 |
|
|
|
aef66df0d7
|
removed config.ini from repo
|
2017-01-19 14:16:09 +01:00 |
|
|
|
b66247ebca
|
added button and menu
|
2017-01-19 14:12:55 +01:00 |
|
HatjigeorgiouDimitri
|
d71250fab0
|
ScriptNode and print function added to console
|
2017-01-17 11:21:04 +01:00 |
|
Anselme
|
ca797bf3f2
|
added config finle to gitignore
|
2016-12-21 16:53:41 +01:00 |
|
Anselme
|
1262f6417d
|
added config file loader, changed mouse sensitivity, changed player speed, and objects throwing force
|
2016-12-21 16:53:03 +01:00 |
|
Anselme
|
f7c2609da4
|
oops, fixed remaining test settings
|
2016-12-19 15:14:03 +01:00 |
|
Anselme
|
9cfc6d581a
|
fixed plenty of bugs, added sponza, added jumping
|
2016-12-19 15:11:50 +01:00 |
|
Anselme
|
b81630c28c
|
updated keybinding to add mmiddle ckick as tertiary action, added argument to main
|
2016-12-18 14:58:06 +01:00 |
|
Anselme
|
9c62efeb67
|
fixed incorrect camera ratio, added coumpound shape for sword throwing
|
2016-12-18 14:38:31 +01:00 |
|
|
|
4d5c352f4c
|
Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/sparrowengine
|
2016-12-16 19:26:35 +01:00 |
|
|
|
d2f5465f93
|
added folder for gui node
|
2016-12-16 19:26:11 +01:00 |
|
Anselme
|
ca1133dcd4
|
Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/SparrowEngine
|
2016-12-14 22:08:07 +01:00 |
|
Anselme
|
aeb8ac26ea
|
fixed mesh loading, added sword mesh
|
2016-12-14 22:08:03 +01:00 |
|
Anselme
|
438a0162e4
|
fixed mesh loading, added random utils static class
|
2016-12-14 21:58:15 +01:00 |
|
|
|
fa03256a48
|
added defaultKeysMap instead of myKeysMap
|
2016-12-14 21:55:39 +01:00 |
|
|
|
ebb77b7470
|
text input in shell working
|
2016-12-14 12:47:35 +01:00 |
|
|
|
80a01cef2f
|
Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/sparrowengine
|
2016-12-14 12:25:16 +01:00 |
|
|
|
cf6da07bbe
|
preparation for merge
|
2016-12-14 12:24:09 +01:00 |
|
Anselme
|
e8bb8c0b64
|
add escape key for quitting, fixed shell input toggle key, fixel no de-indexing when removeChild is called on a GraphicalContainerNode
|
2016-12-14 12:22:36 +01:00 |
|
Anselme
|
80b213a062
|
Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/SparrowEngine
|
2016-12-14 11:42:10 +01:00 |
|
Anselme
|
673fa408f2
|
little fixes
|
2016-12-14 11:42:05 +01:00 |
|
|
|
f09b8438a9
|
Toggle for shell working
|
2016-12-13 14:45:11 +01:00 |
|
|
|
2a32596873
|
Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/sparrowengine
|
2016-12-13 00:42:20 +01:00 |
|
|
|
2c451a8892
|
toggle working for textnode (TODO: check relative positioning)
|
2016-12-13 00:42:07 +01:00 |
|
Anselme
|
24d3ba1b40
|
fixed player movement (still a little slippery, but the speed and direction are correct)
|
2016-12-13 00:00:32 +01:00 |
|
|
|
c105feeee9
|
Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/sparrowengine
|
2016-12-12 23:20:28 +01:00 |
|
|
|
5985875232
|
toggle for background and scrollbar working
|
2016-12-12 22:55:45 +01:00 |
|
Anselme
|
01135262a7
|
added lots of features : debugged meshCollider, added gibGenerator, added physicsDebugDraw mode
|
2016-12-12 22:51:40 +01:00 |
|
Anselme
|
e42e1f3543
|
merging
|
2016-12-10 16:04:11 +01:00 |
|
Anselme
|
0e609cdac7
|
fixed setting rigidbody's matrix with opengl matrix
|
2016-12-10 16:02:17 +01:00 |
|
|
|
d237d57203
|
Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/sparrowengine
|
2016-12-10 15:39:04 +01:00 |
|
|
|
e98aaa9100
|
added function isVisible() to graphicalnode
|
2016-12-10 15:24:08 +01:00 |
|
Anselme
|
5b36296c1d
|
added transform inheritance for graphical objects
|
2016-12-10 15:21:14 +01:00 |
|
|
|
4372c11720
|
sparrowshell disabled when starting engine
|
2016-12-09 17:38:36 +01:00 |
|
|
|
7c710b1656
|
set m_parent to nullptr when removing child from a container
|
2016-12-09 15:47:45 +01:00 |
|
Anselme
|
93f7facea9
|
fixed uninitialized m_scene in scene node causing segfaults, added player node and fps camera
|
2016-12-09 01:16:34 +01:00 |
|
|
|
47e1273a0f
|
temp commit before the end of the world
|
2016-12-07 20:25:24 +01:00 |
|
|
|
d5ecf17302
|
Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/sparrowengine
|
2016-12-07 19:44:48 +01:00 |
|
Anselme
|
eb1e8d12de
|
fixed some graphical node issues
|
2016-12-07 19:42:58 +01:00 |
|
|
|
834d7f6676
|
switch shellbuffer to graphicalcontainernode
|
2016-12-07 19:27:17 +01:00 |
|
|
|
f0cd0fbace
|
Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/sparrowengine
|
2016-12-07 19:16:10 +01:00 |
|
|
|
aed140ca5c
|
added addChild/removeChild to GraphicalContainerNode
|
2016-12-07 19:15:38 +01:00 |
|
Anselme
|
9abb185ea5
|
Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/SparrowEngine
|
2016-12-07 18:36:06 +01:00 |
|
Anselme
|
adda0d477b
|
fixed camera inputs
|
2016-12-07 18:36:01 +01:00 |
|
|
|
4026283f1c
|
Merge branch 'master' of https://git.epicsparrow.com/epicsparrow/sparrowengine
|
2016-12-07 18:35:31 +01:00 |
|
|
|
e4dcab14d9
|
added implementation of graphicalnode
|
2016-12-07 18:35:19 +01:00 |
|
Anselme
|
ef7d2ff0a2
|
added URML graph of scene classes inheritance
|
2016-12-07 18:16:43 +01:00 |
|
