LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6667 commits 29 branches 32 tags 740 MiB
Commit graph

6667 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mikulas Florek
f5818b771d copy constructor and assignement operator in Array and PODArray 2014-01-01 17:21:39 +01:00
Mikulas Florek
17fe50dd34 removed unused file; typo; do not link platform.lib to native editor 2014-01-01 17:07:28 +01:00
Mikulas Florek
9ffbdefced Array, PODArray 2014-01-01 15:55:32 +01:00
Mikulas Florek
b0155c3d8a Allocator in map - closes #19 2014-01-01 14:50:03 +01:00
Mikulas Florek
32430a7f8e Allocator in string 2014-01-01 14:39:39 +01:00
Mikulas Florek
89e2bfcd22 core and platform merged - closes #45; Allocator in vector 2014-01-01 14:22:36 +01:00
Mikulas Florek
3bf136fd23 fixed vector - call destructors when necessary 2014-01-01 13:48:42 +01:00
Mikulas Florek
8fff5a7606 show script compilation errors in the log 2014-01-01 12:45:38 +01:00
Mikulas Florek
077740e922 renderer can handle loading more than one resource at once - closes #20 2014-01-01 11:21:16 +01:00
Mikulas Florek
eedf215590 native editor notifications and a script compiler 2013-12-31 18:32:14 +01:00
Mikulas Florek
ee9ad10816 Merge pull request #53 from nem0/gui 
scrollbars, tab block, log ui, docking
 2013-12-31 03:45:09 -08:00
Mikulas Florek
70dc7d86b2 Merge branch 'master' of https://github.com/nem0/LuxEngine into gui 
Conflicts:
	src/gui/gui.cpp
 2013-12-31 12:37:35 +01:00
Mikulas Florek
dd3be80651 dockable decorator - shows where dockable can be docked 2013-12-31 12:26:14 +01:00
Mikulas Florek
fb3ce758f0 scrollbars in a scrollable are properly shown / hidden 2013-12-31 01:30:04 +01:00
Mikulas Florek
f2b6a2c80a Engine and plugins are destructed when the editor is closed - closes #22 2013-12-30 17:54:48 +01:00
Mikulas Florek
e4b92402a5 Placeholder struct S in PropertyDescriptor removed - closes #43; gizmo does not cast shadows 2013-12-30 17:00:47 +01:00
Mikulas Florek
88da77f9d4 Merge pull request #56 from nem0/multithread_refactor 
Multithread refactor
 2013-12-29 08:50:36 -08:00
Mikulas Florek
9a8e99208e docked blocks can be resized 2013-12-29 17:44:36 +01:00
tluqo
505aa56479 Merge remote-tracking branch 'remotes/origin/master' into fs_refactor 
Conflicts:
	src/core/tcp_file_server.cpp
 2013-12-27 11:11:18 +01:00
Mikulas Florek
c76f42b675 Merge branch 'master' of https://github.com/nem0/LuxEngine into gui 2013-12-24 17:09:38 +01:00
Mikulas Florek
594eec52db docking 2013-12-24 17:08:19 +01:00
tluqo
43f0d84fd6 tcp file system can handle more than one file. (WIP) 2013-12-24 15:01:47 +01:00
tluqo
ab0495a6c6 Merge remote-tracking branch 'remotes/origin/master' into multithread_refactor 2013-12-23 23:53:24 +01:00
tluqo
c25cbcc171 - finished task implementation. 2013-12-23 23:41:34 +01:00
Mikulas Florek
3a56275be1 Merge pull request #55 from nem0/net_refactor 
Net refactor
 2013-12-23 11:08:17 -08:00
tluqo
d1bd7fbc1c Merge remote-tracking branch 'remotes/origin/master' into multithread_refactor 2013-12-23 19:18:45 +01:00
tluqo
b1a770fd06 Merge remote-tracking branch 'remotes/origin/master' into multithread_refactor 2013-12-23 19:18:12 +01:00
Mikulas Florek
d2bca6d865 made compilable after master had been merged 2013-12-23 19:06:46 +01:00
tluqo
4c59c70806 - removed unused file from project 2013-12-23 19:04:11 +01:00
tluqo
7a6168c257 - merged master 
- fixed build
 2013-12-23 19:00:35 +01:00
tluqo
cce05c9f17 Merge remote-tracking branch 'remotes/origin/master' into net_refactor 
Conflicts:
	projects/core/core.vcxproj
	projects/core/core.vcxproj.filters
	src/editor/editor_server.cpp
	src/platform/pc/socket.cpp
 2013-12-23 18:51:45 +01:00
Mikulas Florek
1d41e84b74 Merge branch 'master' of https://github.com/nem0/LuxEngine into gui 2013-12-23 18:48:07 +01:00
Mikulas Florek
9924a8af70 delegate in eventmanager - closes #44 2013-12-23 18:46:25 +01:00
Mikulas Florek
5330772897 removed unused files 2013-12-23 18:13:53 +01:00
Mikulas Florek
e0e2ea9256 tab block 2013-12-23 17:00:55 +01:00
Mikulas Florek
6262ba4e32 UI to display log messages in the editor 2013-12-23 15:51:59 +01:00
Mikulas Florek
b802f9bc6b scrollable block 2013-12-23 12:27:40 +01:00
tluqo
9ce3a149e5 - removed socket.cpp and socket.h 
- implementation from this files moved to tcp_acceptor, tcp_connector, tcp_stream.
- moved this files to platform.
 2013-12-23 00:04:17 +01:00
Mikulas Florek
53760637e6 gui scrollbars 2013-12-22 00:43:57 +01:00
Mikulas Florek
70a0146c74 release build fix 2013-12-21 17:41:24 +01:00
Mikulas Florek
026adee662 Merge pull request #40 from nem0/issues 
MemoryStream -> Blob
fixed possible stack corruption in JSON serialization
 2013-12-21 08:33:34 -08:00
Mikulas Florek
87f214a001 mend 2013-12-21 17:31:12 +01:00
Mikulas Florek
3f82ad696f MemoryStream -> Blob 2013-12-21 17:30:54 +01:00
Mikulas Florek
022ff988a5 fixed possible stack corruption in JSON serialization - closes #24 2013-12-21 17:16:49 +01:00
Mikulas Florek
ae32a4dfeb Merge pull request #39 from nem0/gui 
Gui
 2013-12-21 08:01:50 -08:00
Mikulas Florek
1f5fe2e48f *.orig files removed; *.orig added to .gitignore 2013-12-21 16:02:13 +01:00
Mikulas Florek
26cb39b687 gui controls 2013-12-21 15:58:19 +01:00
Mikulas Florek
d9839b1845 Merge branch 'master' of https://github.com/nem0/LuxEngine into gui 
Conflicts:
	src/core/functor.h
 2013-12-20 17:56:30 +01:00
Mikulas Florek
36a8b35c76 new native editor using gui system partially implemented 2013-12-20 17:51:37 +01:00
Mikulas Florek
78fe565aa8 functor replaced with delegate; unused editor project removed 2013-12-20 17:49:12 +01:00