 antc13
|
f1835fd89c
|
Animations PROBABLY works fine if all joints got keyframes.
|
2016-01-23 18:02:42 +01:00 |
|
|
antc13
|
16c39df439
|
Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer
# Conflicts:
# include/Engine/Collision/Collision.h
# src/Engine/Rendering/Model.cpp
# src/Engine/Rendering/RawModelAssimp.cpp
|
2016-01-15 18:00:30 +01:00 |
|
|
antc13
|
8437b9c734
|
Commit for Pull
|
2016-01-15 17:58:26 +01:00 |
|
 William Moberg
|
f5ea4d513c
|
ResourceManager::Load never returns null, throws exceptions instead.
|
2016-01-15 15:25:01 +01:00 |
|
|
William Moberg
|
76f90ab031
|
The main thread is not mutex blocked while child threads load anymore.
|
2016-01-15 11:29:46 +01:00 |
|
|
William Moberg
|
71047b08ec
|
Async load works, using exceptions for special resources.
|
2016-01-14 16:27:45 +01:00 |
|
|
William Moberg
|
9f185a1e35
|
Wrecked the last commit. Async loading works now.
|
2016-01-13 18:51:45 +01:00 |
|
 sippeangelo
|
872879c013
|
Engine puzzle completed
|
2015-11-30 17:02:24 +01:00 |
|
|
sippeangelo
|
16eb70dd59
|
Added Model and related classes
|
2015-11-24 10:55:54 +01:00 |
|