 Tleety
|
45a48bbbe5
|
Merge remote-tracking branch 'origin/master' into Rendering
|
2015-12-03 18:15:56 +01:00 |
|
|
Tleety
|
1c06c06816
|
Added a ScreenCoords class with some util functions to clean up the Renderer class.
|
2015-12-03 18:14:52 +01:00 |
|
|
Tleety
|
e950dd9206
|
Merge pull request #2 from teamfisk/ecs
Barebones Entity Component System
|
2015-12-03 18:05:20 +01:00 |
|
 sippeangelo
|
9fb8af8491
|
Merge branch 'master' into ecs
|
2015-12-03 16:55:32 +01:00 |
|
|
sippeangelo
|
032b384f3f
|
Created framework for a hardcoded world for TESTING PURPOSES
|
2015-12-03 16:45:03 +01:00 |
|
 viktorljung
|
6a24ed534a
|
fixup! fixup! Added 3D picking of models to renderer
|
2015-12-03 16:43:08 +01:00 |
|
|
viktorljung
|
4dc658ff65
|
fixup! Added 3D picking of models to renderer
|
2015-12-03 16:36:08 +01:00 |
|
|
sippeangelo
|
d3d2e594fe
|
Basic and working entity system with a really ugly test case
|
2015-12-03 15:07:35 +01:00 |
|
|
viktorljung
|
9654140fb2
|
Merge branch 'Rendering' of github.com:teamfisk/TacticalZ into Rendering
# Conflicts:
# src/Engine/CMakeLists.txt
|
2015-12-03 15:03:52 +01:00 |
|
|
Tleety
|
64aa3a1064
|
rendering/util now added to CMakeLists.txt
|
2015-12-03 15:02:14 +01:00 |
|
|
viktorljung
|
0f33089039
|
Merge remote-tracking branch 'origin/master' into Rendering
|
2015-12-03 14:59:45 +01:00 |
|
|
viktorljung
|
983ca485f5
|
Picking now returning world position
|
2015-12-03 14:50:14 +01:00 |
|
|
viktorljung
|
18b63c7ef3
|
Added 3D picking of models to renderer
|
2015-12-02 18:00:11 +01:00 |
|
|
viktorljung
|
eb50a747fa
|
Added Hash for Vec2 Unordered_Map
|
2015-12-02 17:59:21 +01:00 |
|
|
sippeangelo
|
c7430a9338
|
Fixed ComponentWrapper string scope error
|
2015-12-02 15:37:20 +01:00 |
|
|
sippeangelo
|
91f8b4359b
|
Fixed Tests not including dependencies properly
|
2015-12-02 15:25:27 +01:00 |
|
|
sippeangelo
|
61b7aa6b3d
|
Merge branch 'master' into ecs
|
2015-12-02 15:07:55 +01:00 |
|
|
sippeangelo
|
b3e68c6c34
|
Implemented ComponentPool and initial tests for it
|
2015-12-02 15:07:48 +01:00 |
|
|
sippeangelo
|
f65b7d591c
|
Fixed Tests running the game when it really shouldn't.
|
2015-12-02 15:03:18 +01:00 |
|
|
sippeangelo
|
5a0a60821f
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
|
2015-12-02 15:03:01 +01:00 |
|
|
sippeangelo
|
8aa72735e7
|
Fixed Tests running the game when it really shouldn't.
|
2015-12-02 15:02:18 +01:00 |
|
|
viktorljung
|
1a963e823e
|
Scale, Rotate and Translate widgets up and working
|
2015-12-01 17:46:09 +01:00 |
|
 William Moberg
|
75dcea40f2
|
Log warning when memory is exceeded in MemoryPool.
|
2015-12-01 17:29:26 +01:00 |
|
|
sippeangelo
|
a5affd2dc2
|
Added barebones ECS prototype
|
2015-12-01 17:04:03 +01:00 |
|
|
sippeangelo
|
6ca1977e78
|
Added Xerces dependency
|
2015-12-01 17:04:03 +01:00 |
|
|
sippeangelo
|
521de59286
|
Made deploy create a bin folder so it doesn't fail if it's missing
|
2015-12-01 17:04:03 +01:00 |
|
|
sippeangelo
|
24ef915248
|
Simplified CMake for Game
|
2015-12-01 17:04:03 +01:00 |
|
|
sippeangelo
|
6ded34d160
|
Made Rendering/Util visible to CMake project
|
2015-12-01 17:04:03 +01:00 |
|
|
William Moberg
|
c147f17c11
|
Added MemoryPool and ObjectPool to project.
|
2015-12-01 16:03:07 +01:00 |
|
|
viktorljung
|
07d037ae57
|
Added Fly Camera and Vertex Colors
|
2015-12-01 15:56:26 +01:00 |
|
|
viktorljung
|
04d10bf7af
|
Functioning basic renderer for models
|
2015-12-01 14:07:10 +01:00 |
|
|
sippeangelo
|
ae759654c1
|
Made deploy create a bin folder so it doesn't fail if it's missing
|
2015-12-01 11:21:33 +01:00 |
|
|
sippeangelo
|
cf349870de
|
Simplified CMake for Game
|
2015-12-01 10:40:33 +01:00 |
|
|
viktorljung
|
1fdf312af4
|
Set up Renderer base and shader compilation
|
2015-12-01 10:35:59 +01:00 |
|
|
viktorljung
|
798e42999d
|
Deploy now linking Shaders correctly
|
2015-12-01 10:34:53 +01:00 |
|
|
sippeangelo
|
b4b64abc1e
|
Made Rendering/Util visible to CMake project
|
2015-12-01 09:51:15 +01:00 |
|
|
sippeangelo
|
793b2f44cc
|
Proper GLFW message handling and pinkness!
|
2015-11-30 17:28:24 +01:00 |
|
|
sippeangelo
|
872879c013
|
Engine puzzle completed
|
2015-11-30 17:02:24 +01:00 |
|
|
sippeangelo
|
52278d7bc2
|
More CMake bullshit
|
2015-11-30 11:16:43 +01:00 |
|
|
sippeangelo
|
8419d2e7b9
|
Updated schema with custom type names to better match their C++ counterparts
|
2015-11-26 16:09:11 +01:00 |
|
|
sippeangelo
|
ac05975fd5
|
Updated schema
|
2015-11-25 18:04:11 +01:00 |
|
|
sippeangelo
|
55276c0bd2
|
Made path to json file relative
|
2015-11-25 12:53:50 +01:00 |
|
 antc13
|
a854570bce
|
Edit the path to the json_key in the script!
Once you've edited that, you should be able to just run the script.
|
2015-11-25 09:54:37 +01:00 |
|
|
sippeangelo
|
6cb4a47b19
|
Added libraries required for model import
|
2015-11-24 11:35:38 +01:00 |
|
|
sippeangelo
|
16eb70dd59
|
Added Model and related classes
|
2015-11-24 10:55:54 +01:00 |
|
|
sippeangelo
|
34e095b54b
|
Added Config File resource
|
2015-11-24 10:38:10 +01:00 |
|
|
sippeangelo
|
b61642e4e8
|
Added Resource Manager
|
2015-11-24 10:37:58 +01:00 |
|
|
sippeangelo
|
5f9dce4303
|
Added Input
|
2015-11-24 10:37:50 +01:00 |
|
|
sippeangelo
|
0a1f0d96db
|
Added Event Broker
|
2015-11-24 10:37:21 +01:00 |
|
|
sippeangelo
|
059dee76ed
|
Initial CMake bullshit
|
2015-11-24 10:36:49 +01:00 |
|