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

4846 commits

This branch
This branch
All branches
Author SHA1 Message Date
tluqo
fc3b698587 Merge remote-tracking branch 'remotes/origin/master' into fs_refactor 
Conflicts:
	projects/core/core.vcxproj.filters
	src/core/pc/spin_mutex.cpp
 2014-01-06 23:22:09 +01:00
tluqo
4071a53fc8 - SpinMutex fix 
- static_array -> clean up
- tcp file device -> MT fix
 2014-01-06 23:17:14 +01:00
tluqo
48b1ab2f0d fixed some of the review comments. 2014-01-06 17:15:37 +01:00
Mikulas Florek
7fc549b1d2 string::operator +=: memory allocation fixed; GUI textbox: text is inserted at the position of the cursor; edit script button in the native editor 2014-01-05 11:34:23 +01:00
Mikulas Florek
1cffcc5e4d divider in dockable keeps relative position when parent block is resized 2014-01-04 23:21:50 +01:00
Mikulas Florek
d271bbd39f editor_native/main.cpp refactored 2014-01-04 16:07:30 +01:00
tluqo
0486cd4f8e Merge pull request #71 from nem0/gui 
additional GUI features and redirected error stream of script compiler
 2014-01-04 04:07:15 -08:00
Mikulas Florek
6449b7c5f8 Merge pull request #76 from nem0/multithread_refactor 
destructors for: Event, Mutex, Semaphore, SpinMutex are now private/prot...
 2014-01-03 16:50:44 -08:00
tluqo
28b81294e0 destructors for: Event, Mutex, Semaphore, SpinMutex are now private/protected. (closes #59) 2014-01-03 23:29:12 +01:00
tluqo
4cc580a38e fixed merged stuff. 2014-01-03 23:01:05 +01:00
tluqo
68dadc27c1 Merge remote-tracking branch 'remotes/origin/master' into fs_refactor 
Conflicts:
	src/core/tcp_file_server.cpp
	src/graphics/renderer.cpp
	src/gui/atlas.cpp
	src/gui/opengl_renderer.cpp
 2014-01-03 22:23:48 +01:00
tluqo
54bdad130c FileSystem uses delegate instead of call back. (closes #70); 2014-01-03 21:58:36 +01:00
Mikulas Florek
b8465e682a GUI: cursor in textbox 2014-01-03 18:52:25 +01:00
Mikulas Florek
7ab45ce6ba GUI: multiline textbox; redirected error stream of script compiler 2014-01-03 01:14:27 +01:00
tluqo
53230754ff - file system can handle unlimited amount of the async operations (close #69) 
- file system closes all completed transactions (close #68)
 2014-01-03 00:36:31 +01:00
tluqo
889351e1e8 - queue fix 2014-01-03 00:34:11 +01:00
tluqo
1eb3214b1e - tcp file device is now multithread safe (close #31) 
- FS::IFile::pos is not const now (because of blob in the tcp file)
- blob => char* specialization
 2014-01-02 22:27:30 +01:00
Mikulas Florek
4cc4fb47f4 macro for new and delete 2014-01-02 18:57:32 +01:00
tluqo
0f55dd9097 Merge remote-tracking branch 'remotes/origin/master' into fs_refactor 
Conflicts:
	projects/core/core.vcxproj
	projects/core/core.vcxproj.filters
 2014-01-02 18:26:24 +01:00
Mikulas Florek
58305484cb removed unused files - closes #47 2014-01-02 17:58:09 +01:00
Mikulas Florek
9e059f5965 source in script ui 2014-01-02 17:30:50 +01:00
tluqo
d70f93552d - tcp file server can handle 32k files per connection 
- array => wrapper for c++ style array
- free list => int32_t specialization
- queue
 2014-01-02 17:02:40 +01:00
Mikulas Florek
864e9e2e2d animable ui, script ui; DelegateList as Block::EventCallback 2014-01-02 13:20:41 +01:00
Mikulas Florek
887f96534c gui renderer: fopen -> FileSystem::OpenAsync - closes #51 2014-01-02 11:56:23 +01:00
Mikulas Florek
a03827a06c explicit array constructors - code review update 2014-01-02 11:16:49 +01:00
Mikulas Florek
803ecd5a98 fopen -> FileSystem::OpenAsync 2014-01-01 20:03:19 +01:00
Mikulas Florek
c849b3d443 PODArray::erase fixed 2014-01-01 19:46:37 +01:00
Mikulas Florek
ce3089d62e map::operator[] does not need copy assignment 2014-01-01 18:52:45 +01:00
Mikulas Florek
2e57747b0a release build fixed 2014-01-01 17:26:39 +01:00
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