BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
927 Commits 116 Branches 0 Tags
cb77c1ff974fcb1f031f9fc3a6d1e12714533917
Commit Graph

613 Commits

Author SHA1 Message Date
FakeShemp cb77c1ff97 Working pcf, not optimized 2016-02-10 16:16:41 +01:00
FakeShemp 69db32337d Shado wip 2016-02-10 15:16:58 +01:00
Ayumiwii 6af167675d Shadow WIP stage 2 
- fix cel-shading
 2016-02-10 11:48:44 +01:00
Ayumiwii ecd823cb9f Shadow WIP stage 2 
-  Soft shadow
 2016-02-09 16:15:11 +01:00
FakeShemp 847c539373 Fix viewport 2016-02-09 14:44:12 +01:00
Ayumiwii cb7f06573f Shadows stage 2 WIP 2016-02-09 14:08:57 +01:00
Ayumiwii 6542d1b444 Shadow WIP 
- DepthTexture working
 2016-02-05 17:29:53 +01:00
Ayumiwii bbf6058c17 Shadow WIP 
- fixed file placing of ShadowPass.cpp
 2016-02-05 16:13:46 +01:00
Ayumiwii 7f1016476b Shadows WIP 
- create 2D texture (depthmap)
 2016-02-05 15:08:56 +01:00
Jace 2cbeef4c69 Merge pull request #74 from teamfisk/Warnings-Jocke 
Fixed warnings associated with Network
 2016-02-03 10:37:10 +01:00
Tleety 73716c28e2 pickpass fix 2016-02-02 17:40:22 +01:00
Tleety a3b7bd7df5 Fix in picking pass, QA map fix. Blue and red ray change. Player weapon change. 2016-02-02 17:39:57 +01:00
Tleety 55854f5c0d Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 2016-02-02 16:30:57 +01:00
Tleety b131f56f5e Made a quality assurance world that will need to be used before creating a pull request 2016-02-02 16:06:42 +01:00
Jocke 6a3f585fb9 Fixed warnings associated with Network.cpp, Client.cpp, Server.cpp and Packet.cpp. 
BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT': macro redefinition was fixed by https://svn.boost.org/trac/boost/ticket/11539
 2016-02-02 13:26:15 +01:00
Tleety 7b4826cb44 Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 2016-02-02 13:24:31 +01:00
Jace 0e5f6da9a9 Merge pull request #73 from teamfisk/CapturePointFixBranch 
Several changes/fixes based on the latest broken refactoring in master
 2016-02-02 13:22:03 +01:00
verysecrethero 42b52a6766 Several changes/fixes based on the latest broken refactoring. 
Fixed Simon's mistake in CapturePointLogic. William fixed so TriggerSystem works again with CapturePoints.
 2016-02-02 11:37:22 +01:00
Tleety 8299b99e2f Test world changes and some other small fixes 2016-02-01 19:08:46 +01:00
Tleety c708f1582c Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 2016-02-01 18:30:30 +01:00
Tleety 782c1a388a Comment 2016-02-01 18:23:40 +01:00
Tleety a188a3f7fa Removed widget pointlight since it is now redundant 2016-02-01 18:22:36 +01:00
Tleety ed7d00c1d8 Bug where widgets did not get their ambient light now fixed. 2016-02-01 18:19:38 +01:00
Jace 9090be8acf Merge branch 'Warnings-Simon' 2016-02-01 17:53:55 +01:00
Jace a3d4eb65d5 Fixes #66 warnings 2016-02-01 17:53:01 +01:00
stiffly 5474a18753 #68 Fixed warning in SoundSystem.cpp 2016-02-01 17:15:51 +01:00
Tleety 53cae25eb2 WIP on widget fuckery 2016-02-01 16:56:55 +01:00
Jace be3cfef65f Merge remote-tracking branch 'origin/master' into EditorUsefulness 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
 2016-02-01 16:00:46 +01:00
Jace 65f5bc673f Functional translation widget in global and local space 2016-02-01 15:47:56 +01:00
Jace a22bc00d46 *cough* 2016-02-01 13:37:51 +01:00
Jace 5bfcffc142 Fixed widget movement calculations going weird when world origin wasn't on screen 2016-02-01 11:56:21 +01:00
Tleety 7054822be2 SceneLight component now working 2016-02-01 11:12:03 +01:00
Jace ee92200300 Improved editor pause logic. Editor now pauses when it's enabled and makes sure UI is up to date with the current state. 2016-02-01 10:45:37 +01:00
Jace d3b1053f21 Fixes #59 2016-02-01 10:29:59 +01:00
Jace 13f020ddf5 Fixed #49 being able to parent an entity to itself, which resulted in infinite infinite loops everywhere! D: 2016-01-27 18:37:43 +01:00
Tleety 8bcafc1151 WIP 2016-01-27 18:07:05 +01:00
Jace 65da634c71 File dropping into resource paths in the editor 2016-01-27 17:51:47 +01:00
Tleety 97cbc55223 Some debug features for color corrections and glow strength fix. 2016-01-27 17:21:00 +01:00
Jace c519ba2536 Component fields in the editor are now sorted in the order they're defined 2016-01-27 17:12:07 +01:00
Jace 4b7613a659 Sorted editor component dropdown and made it always be fully expanded to show as many components as possible 2016-01-27 17:07:48 +01:00
Jace 7408da401b Merge pull request #56 from teamfisk/NormalSpecularMapping 
Transparency fix and support for Normal and Specular maps
 2016-01-27 16:44:10 +01:00
Tleety a63ecb8133 Some wierd shader faults and merge error fixe 2016-01-27 15:54:36 +01:00
Jace 788407b709 Made CollisionSystem aware of entities 2016-01-27 15:42:50 +01:00
Tleety 0e70dc6fa3 Merge remote-tracking branch 'origin/master' into NormalSpecularMapping 
# Conflicts:
#	include/Engine/Rendering/RenderSystem.h
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/RenderSystem.cpp
 2016-01-27 15:41:31 +01:00
Tleety 44302bb0f3 Specular support. Some edits to EditorTestWorld.xml aswell as some debugmodes for textures in the model component 2016-01-27 15:38:54 +01:00
Jace 181017313d Made entity parser give more useful errors and fixed the errors that were while I was at it 2016-01-27 15:16:59 +01:00
Tleety a954cbbf50 Normal map support 2016-01-27 13:52:27 +01:00
Jace dec2234019 Merge branch 'Cleanup' 
# Conflicts:
#	src/Engine/Rendering/RenderSystem.cpp
 2016-01-27 13:44:15 +01:00
Jace 0334ec3fa7 Merge remote-tracking branch 'origin/Animations' 
# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Game/Systems/WeaponSystem.cpp
 2016-01-27 13:36:49 +01:00
Jace 5fcd26cd3e Made TriggerSystem make use of Octree 2016-01-27 13:35:16 +01:00