 William Moberg
|
d1b6fb1259
|
Tiny logic alteration so we don't get false warnings in debug.
|
2016-01-19 16:59:02 +01:00 |
|
 Joachim Pettersson
|
dfa96f74e1
|
Merge pull request #39 from teamfisk/Forward+
Forward+
|
2016-01-19 16:53:07 +01:00 |
|
 Tleety
|
5d6d0f82b9
|
Removed some debug code
|
2016-01-19 16:48:59 +01:00 |
|
|
Tleety
|
a124ab2400
|
Some asset shit.
Fixed testworld to use the right model.
|
2016-01-19 16:11:56 +01:00 |
|
|
Tleety
|
d2263b0c90
|
Assets added
|
2016-01-19 16:09:30 +01:00 |
|
|
Tleety
|
a8ffb24040
|
latest commit fix
|
2016-01-19 16:08:09 +01:00 |
|
|
Tleety
|
893ef38237
|
Removed world from renderer and moved depth-calculation code to modeljob
|
2016-01-19 15:41:17 +01:00 |
|
 verysecrethero
|
f197993beb
|
Changed CapturePointSystem in light of new enums in the components and a teamcomponent. Half the tests are currently working
|
2016-01-19 15:31:15 +01:00 |
|
|
William Moberg
|
017ad96bbe
|
Fixed some errors in Tests.
|
2016-01-19 15:20:29 +01:00 |
|
 stiffly
|
ad9bb5fba4
|
Added an extra interpolation point.
|
2016-01-19 15:03:10 +01:00 |
|
|
William Moberg
|
713ebbe18c
|
Can add any objects that inherit from AABB into the Octree.
|
2016-01-19 14:50:46 +01:00 |
|
|
Tleety
|
982837052a
|
DirectionalLight now correctly getting directions
|
2016-01-19 14:44:17 +01:00 |
|
 Jace
|
8854794cbc
|
fixup! Editor widget selection and creation
|
2016-01-19 14:31:56 +01:00 |
|
|
stiffly
|
e0c4394f20
|
Merge. Also fixed interpolation for scale and rotation.
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# include/Game/Game.h
# src/Game/CMakeLists.txt
# src/Game/Game.cpp
|
2016-01-19 14:04:25 +01:00 |
|
|
Jace
|
260203fa4d
|
Annotation on physics component
|
2016-01-19 13:28:16 +01:00 |
|
|
Jace
|
d030e8f699
|
Editor widget selection and creation
|
2016-01-19 13:28:02 +01:00 |
|
|
Jace
|
61984d2c4a
|
Removed lots of slowing debug output from entity parsing pipeline
|
2016-01-19 13:27:29 +01:00 |
|
|
Jace
|
cfe023cc1d
|
Created ComponentInfo::EnumType which defines which native type to use for enums.
|
2016-01-19 12:33:53 +01:00 |
|
|
Tleety
|
4cafb2fc4c
|
Merge remote-tracking branch 'origin/master' into Forward+
|
2016-01-19 12:33:08 +01:00 |
|
|
Tleety
|
46e17b7e0d
|
Working directional light
|
2016-01-19 12:32:34 +01:00 |
|
|
Jace
|
a6445c65aa
|
Fixed EntityParser to handle string enums properly.
|
2016-01-19 12:15:20 +01:00 |
|
|
Jace
|
162523d3ca
|
Made EntityFileWriter store enums as strings instead of integer values to be resistant to enum value changes!
|
2016-01-19 11:55:27 +01:00 |
|
 viktorljung
|
dbe56280a6
|
Resolution fixed and Centered text
|
2016-01-19 11:45:34 +01:00 |
|
|
Jace
|
3fb975a8d9
|
Editor widget entities
|
2016-01-19 11:44:03 +01:00 |
|
|
Jace
|
267a60ef30
|
Better loading of editor toolbox icons
|
2016-01-19 11:43:38 +01:00 |
|
|
Jace
|
68af853a03
|
Editor entity naming
|
2016-01-19 11:43:03 +01:00 |
|
|
stiffly
|
3142c701e3
|
WIP interpolating scale and orientation
|
2016-01-19 11:42:30 +01:00 |
|
|
Jace
|
b62e42567c
|
Fixed editor enum selection
|
2016-01-19 11:35:31 +01:00 |
|
 Ayumiwii
|
77e1dacb6f
|
Merge
|
2016-01-19 09:58:52 +01:00 |
|
|
Jace
|
9e3dfff7b6
|
WIP world pausing
|
2016-01-19 00:52:17 +01:00 |
|
|
Jace
|
79eaa7364c
|
Editor toolbox buttons
|
2016-01-18 23:59:46 +01:00 |
|
|
Jace
|
51979d7f0c
|
Changed System to take World through constructor and store it instead, cause it makes more sense.
|
2016-01-18 23:59:33 +01:00 |
|
|
Jace
|
3fc44e944c
|
Editor entity reparenting.
|
2016-01-18 21:20:20 +01:00 |
|
|
Jace
|
1760f9dfb1
|
Added inequality operator to EntityWrapper
|
2016-01-18 21:17:52 +01:00 |
|
 antc13
|
2a3009212a
|
Importing custom mesh without material.
|
2016-01-18 19:37:55 +01:00 |
|
|
Jace
|
d4242bbead
|
Editor entity create and delete.
|
2016-01-18 19:26:00 +01:00 |
|
|
Jace
|
631dd57eeb
|
Editor entity import, save, delete, component attach, component delete.
|
2016-01-18 18:55:19 +01:00 |
|
|
Jace
|
9cb5f4bd2f
|
Added a stats window
|
2016-01-18 18:54:57 +01:00 |
|
|
William Moberg
|
621d935d7a
|
Octree returns correct boxes when testing along an axis by searching through the correct child subtrees.
|
2016-01-18 18:24:11 +01:00 |
|
|
William Moberg
|
b2358a1854
|
Added bool in Physics to toggle gravity for entities.
|
2016-01-18 18:16:24 +01:00 |
|
|
stiffly
|
a6425160fd
|
Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking
# Conflicts:
# include/Game/InterpolationSystem.h
# src/Game/InterpolationSystem.cpp
|
2016-01-18 18:13:19 +01:00 |
|
|
stiffly
|
88eb3ca2db
|
Scraping queues for interpolation
|
2016-01-18 18:07:59 +01:00 |
|
|
Jocke
|
3e90ed564c
|
Moved Struct in InterpolationSystem.h and fixed bug.
|
2016-01-18 18:07:39 +01:00 |
|
|
Tleety
|
4b29d48f27
|
WIP
|
2016-01-18 17:57:45 +01:00 |
|
|
viktorljung
|
c4594524da
|
Better default values and documentation
|
2016-01-18 17:51:17 +01:00 |
|
|
viktorljung
|
2a93e2ae7f
|
Merge remote-tracking branch 'origin/master' into TextRendering
# Conflicts:
# include/Engine/Rendering/RenderQueue.h
# include/Engine/Rendering/RenderSystem.h
# include/Game/Game.h
# resources/Schema/Types/Entity.xsd
# src/Engine/Rendering/RenderSystem.cpp
|
2016-01-18 17:44:26 +01:00 |
|
|
Jocke
|
14b1d541dc
|
Merge remote-tracking branch 'origin/Networking' into Networking
|
2016-01-18 17:34:32 +01:00 |
|
|
stiffly
|
765509b510
|
Added interpolationsystem to pipeline.
|
2016-01-18 17:34:17 +01:00 |
|
|
Jocke
|
8952c1a7e4
|
Merge remote-tracking branch 'origin/Networking' into Networking
|
2016-01-18 17:28:09 +01:00 |
|
|
Jocke
|
fc305f8bf4
|
Merge remote-tracking branch 'origin/Networking' into Networking
|
2016-01-18 17:27:55 +01:00 |
|