]> git.leopard-lacewing.eu Git - cgue_weave.git/log
cgue_weave.git
9 years agowrong Char FIX
Peter Schaefer [Thu, 23 Jun 2016 23:17:04 +0000 (01:17 +0200)]
wrong Char FIX

9 years agonew blur Shader motionBlur
Peter Schaefer [Thu, 23 Jun 2016 22:40:48 +0000 (00:40 +0200)]
new blur Shader
added MotionBlur (only for TimeRewind)

9 years agonew Shaders
Peter Schaefer [Thu, 23 Jun 2016 18:46:55 +0000 (20:46 +0200)]
new Shaders
Bloom optimized

9 years agofixed Shadows Resized Bug
Peter Schaefer [Tue, 21 Jun 2016 16:01:34 +0000 (18:01 +0200)]
fixed Shadows Resized Bug

9 years agoE Triggers LEVER
Peter Schaefer [Tue, 21 Jun 2016 11:20:04 +0000 (13:20 +0200)]
E Triggers LEVER
if hold, only once per second

9 years agoTrigger in front of player...
Peter Schaefer [Tue, 21 Jun 2016 10:20:24 +0000 (12:20 +0200)]
Trigger in front of player...

9 years agoEvents trigger only once
Peter Schaefer [Tue, 21 Jun 2016 09:28:48 +0000 (11:28 +0200)]
Events trigger only once

9 years agoMerged
Peter Schaefer [Mon, 20 Jun 2016 22:12:23 +0000 (00:12 +0200)]
Merged
Added SubMission 2 [in Progress]

9 years agoResize Bloom Bug
Peter Schaefer [Mon, 20 Jun 2016 22:01:11 +0000 (00:01 +0200)]
Resize Bloom Bug

9 years agolevers and doors placed properly in level 1 (the tmp lvl)
LockedLunatic [Mon, 20 Jun 2016 21:49:22 +0000 (23:49 +0200)]
levers and doors placed properly in level 1 (the tmp lvl)

9 years agoTrigger Eventbox
Peter Schaefer [Mon, 20 Jun 2016 21:44:03 +0000 (23:44 +0200)]
Trigger Eventbox

9 years agomodified Boar Mesh
Peter Schaefer [Mon, 20 Jun 2016 21:03:48 +0000 (23:03 +0200)]
modified Boar Mesh

9 years agoBoar position fixed
Peter Schaefer [Mon, 20 Jun 2016 20:58:46 +0000 (22:58 +0200)]
Boar position fixed

9 years agoBoar missplaced
Peter Schaefer [Mon, 20 Jun 2016 20:40:22 +0000 (22:40 +0200)]
Boar missplaced

9 years agocollision meshes fixed
LockedLunatic [Mon, 20 Jun 2016 12:43:27 +0000 (14:43 +0200)]
collision meshes fixed

9 years agoLever should now work properly
LockedLunatic [Mon, 20 Jun 2016 09:30:06 +0000 (11:30 +0200)]
Lever should now work properly
the only thing left is to actually call the trigger() function

9 years agoMerge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Mon, 20 Jun 2016 00:03:02 +0000 (02:03 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave

# Conflicts:
# Weave/Weave.vcxproj.filters

9 years agoLever - Door started
LockedLunatic [Sun, 19 Jun 2016 23:55:59 +0000 (01:55 +0200)]
Lever - Door started
Animations get reverted properly when reversing time
green objects

9 years agoconvex Boar Mesh
Peter Schaefer [Sun, 19 Jun 2016 21:29:56 +0000 (23:29 +0200)]
convex Boar Mesh

9 years agoneues Boar Mesh
Peter Schaefer [Sun, 19 Jun 2016 20:59:21 +0000 (22:59 +0200)]
neues Boar Mesh
berühren beendet auch das Spiel

9 years agoMerge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Fri, 17 Jun 2016 10:33:05 +0000 (12:33 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave

9 years agodoor added (not yet linked to lever)
LockedLunatic [Thu, 16 Jun 2016 23:09:11 +0000 (01:09 +0200)]
door added (not yet linked to lever)

time-independent objects are possible now

9 years agomoved FPS to Graphix
Peter Schaefer [Thu, 16 Jun 2016 18:01:14 +0000 (20:01 +0200)]
moved FPS to Graphix
first Shader adjustments

9 years agoAnimationen!!!
LockedLunatic [Wed, 15 Jun 2016 21:25:06 +0000 (23:25 +0200)]
Animationen!!!

9 years agofunktions to push new->old
Peter Schaefer [Wed, 15 Jun 2016 10:59:55 +0000 (12:59 +0200)]
funktions to push new->old

9 years agosave old Model&ProjView
Peter Schaefer [Wed, 15 Jun 2016 09:52:32 +0000 (11:52 +0200)]
save old Model&ProjView

9 years agoMerge branch 'shadows' of lva.cg.tuwien.ac.at:Weave into shadows shadows
Peter Schaefer [Tue, 7 Jun 2016 07:07:01 +0000 (09:07 +0200)]
Merge branch 'shadows' of lva.cg.tuwien.ac.at:Weave into shadows

9 years agoMerge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Tue, 7 Jun 2016 06:51:38 +0000 (08:51 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave

9 years agoEvent (FKey) Messages,
Peter Schaefer [Tue, 7 Jun 2016 06:26:30 +0000 (08:26 +0200)]
Event (FKey) Messages,
FPS&ObjectCount im WindowTitle (Frustum sieht man jetzt)

9 years agoBloom with downsampling
Peter Schaefer [Tue, 7 Jun 2016 05:50:20 +0000 (07:50 +0200)]
Bloom with downsampling

9 years agoDirectional Lights sind jetzt fertig:
LockedLunatic [Tue, 7 Jun 2016 01:23:49 +0000 (03:23 +0200)]
Directional Lights sind jetzt fertig:
PCF fertig
frontface culling für Schatten hinzugefügt
Directional Light bewegt sich mit dem player mit

point lights halb fertig (derzeit auskommentiert, damit es kompiliert)

9 years agoMerge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Fri, 20 May 2016 15:47:58 +0000 (17:47 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave

9 years agooptional culling (light calculation without)
Peter Schaefer [Fri, 20 May 2016 15:47:38 +0000 (17:47 +0200)]
optional culling (light calculation without)

9 years agoparameter changes for directional and ambient light
LockedLunatic [Thu, 19 May 2016 18:17:20 +0000 (20:17 +0200)]
parameter changes for directional and ambient light
ambient light moved out of the shader

9 years agoenabled F8 -> Frustum
Peter Schaefer [Thu, 19 May 2016 14:19:58 +0000 (16:19 +0200)]
enabled F8 -> Frustum

9 years agofrustum Fixed
Peter Schaefer [Thu, 19 May 2016 11:46:34 +0000 (13:46 +0200)]
frustum Fixed

9 years agoMerge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Thu, 19 May 2016 10:55:35 +0000 (12:55 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave

9 years agopoint Frustum geht doch nicht
Peter Schaefer [Thu, 19 May 2016 10:55:22 +0000 (12:55 +0200)]
point Frustum geht doch nicht
Kugel Frustum ... damit auch nicht

9 years agoPoint Frustum funktioniert
Peter Schaefer [Wed, 18 May 2016 15:32:01 +0000 (17:32 +0200)]
Point Frustum funktioniert

9 years agoDirectional Light Shadows
LockedLunatic [Mon, 16 May 2016 01:29:31 +0000 (03:29 +0200)]
Directional Light Shadows
Shadow Volume doesn't move yet (and is rather small)

...finally
<(^^<) <(^^)> (>^^)>

9 years agoupdated the tex again
LockedLunatic [Tue, 3 May 2016 20:47:31 +0000 (22:47 +0200)]
updated the tex again

9 years agoupdated CGUE_SUB1
Peter Schaefer [Tue, 3 May 2016 20:38:40 +0000 (22:38 +0200)]
updated CGUE_SUB1

9 years agoMerge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Tue, 3 May 2016 20:36:45 +0000 (22:36 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave

9 years agotex document updated
LockedLunatic [Tue, 3 May 2016 20:36:16 +0000 (22:36 +0200)]
tex document updated

9 years agoadded Revert LOST
Peter Schaefer [Tue, 3 May 2016 20:35:02 +0000 (22:35 +0200)]
added Revert LOST

9 years agominor changes
LockedLunatic [Tue, 3 May 2016 19:51:21 +0000 (21:51 +0200)]
minor changes

9 years agomore Frustum Preps
Peter Schaefer [Tue, 3 May 2016 19:50:23 +0000 (21:50 +0200)]
more Frustum Preps
Enable Bloom

9 years agoremoved ViewPort
Peter Schaefer [Mon, 2 May 2016 10:13:17 +0000 (12:13 +0200)]
removed ViewPort
new Camera Class
bugFix (Rotierende Kamera bei Fenster Änderungen)
Projection only updated after change

preps for Frustum Culling

9 years agoloadMesh normals corrected
Peter Schaefer [Thu, 28 Apr 2016 07:00:21 +0000 (09:00 +0200)]
loadMesh normals corrected

9 years agoMeshLoader ignoriert fehlende Normals & UV's
Peter Schaefer [Wed, 27 Apr 2016 15:38:21 +0000 (17:38 +0200)]
MeshLoader ignoriert fehlende Normals & UV's

9 years agobugFix
Peter Schaefer [Wed, 27 Apr 2016 06:08:00 +0000 (08:08 +0200)]
bugFix
clearBuffer -> static

9 years agodisable Bloom
Peter Schaefer [Tue, 26 Apr 2016 19:02:15 +0000 (21:02 +0200)]
disable Bloom
disable Light Classes (noch nicht fertig)

9 years agoadded LightClasses
Peter Schaefer [Tue, 26 Apr 2016 12:09:13 +0000 (14:09 +0200)]
added LightClasses

9 years agouseTexture ENUM
Peter Schaefer [Tue, 26 Apr 2016 11:14:56 +0000 (13:14 +0200)]
useTexture ENUM
empty ShadowFS Shader
correct Scene is drawn

9 years agodBuffer Object hinzugefügt
Peter Schaefer [Sun, 24 Apr 2016 19:28:18 +0000 (21:28 +0200)]
dBuffer Object hinzugefügt
Texture vereinfacht

aktuell wird der dBuffer + Bloom gezeichnet :)

9 years agocurrent status
LockedLunatic [Fri, 22 Apr 2016 18:35:06 +0000 (20:35 +0200)]
current status

9 years agovereinfache Draw Befehl (verschiedene DRAW Typen/Target)
Peter Schaefer [Thu, 21 Apr 2016 09:27:17 +0000 (11:27 +0200)]
vereinfache Draw Befehl (verschiedene DRAW Typen/Target)
BugFix (F3&F6 Draw Wireframe)

removed drawWire(...) -> drawModel(mat,dr_Wire)
removed drawBBox(...) -> drawModel(mat,dr_BBox)

9 years agomoved Shader out from SceneObj
Peter Schaefer [Thu, 21 Apr 2016 08:21:36 +0000 (10:21 +0200)]
moved Shader out from SceneObj

9 years agoderzeitiger Stand
LockedLunatic [Thu, 21 Apr 2016 00:28:32 +0000 (02:28 +0200)]
derzeitiger Stand

9 years agoMerge branch 'bloom' of lva.cg.tuwien.ac.at:Weave into bloom bloom
Peter Schaefer [Mon, 18 Apr 2016 11:07:39 +0000 (13:07 +0200)]
Merge branch 'bloom' of lva.cg.tuwien.ac.at:Weave into bloom

9 years agogetShader Methode geändert,
Peter Schaefer [Mon, 18 Apr 2016 11:05:49 +0000 (13:05 +0200)]
getShader Methode geändert,
Bloom läuft
Window Resize -> Buffer läuft

9 years agoconvex duck hit meshes
LockedLunatic [Sun, 17 Apr 2016 00:00:33 +0000 (02:00 +0200)]
convex duck hit meshes

9 years agofixed fBO (disabled MipMap)
Peter Schaefer [Sat, 16 Apr 2016 08:44:31 +0000 (10:44 +0200)]
fixed fBO (disabled MipMap)

9 years agoTexture kann schon Gezeichnet werden,
Peter Schaefer [Thu, 14 Apr 2016 17:39:25 +0000 (19:39 +0200)]
Texture kann schon Gezeichnet werden,
aber entweder wird der Buffer nicht richtig geschrieben oder gelesen...

9 years agomore BufferClasses
Peter Schaefer [Thu, 14 Apr 2016 17:21:10 +0000 (19:21 +0200)]
more BufferClasses

9 years agoEffect Blur(AccBuffer) umbenannt
Peter Schaefer [Thu, 14 Apr 2016 10:20:10 +0000 (12:20 +0200)]
Effect Blur(AccBuffer) umbenannt
Texturen aufgeteilt in Buffer & Image

9 years agomoved bind/gen/deleteBuffer ->Shader
Peter Schaefer [Wed, 13 Apr 2016 18:00:03 +0000 (20:00 +0200)]
moved bind/gen/deleteBuffer ->Shader
CollisionShapes statt BBox

9 years agostatic setUniformLocation
Peter Schaefer [Wed, 13 Apr 2016 16:01:42 +0000 (18:01 +0200)]
static setUniformLocation
removed plane&skybox VS

9 years agopointlights (hopefully) almost done
LockedLunatic [Wed, 13 Apr 2016 15:44:35 +0000 (17:44 +0200)]
pointlights (hopefully) almost done

9 years agoPlane
Peter Schaefer [Wed, 13 Apr 2016 14:39:16 +0000 (16:39 +0200)]
Plane
BasicShader

9 years agodefined static Shaders (Basic,Lighting,Blur)
Peter Schaefer [Wed, 13 Apr 2016 11:29:46 +0000 (13:29 +0200)]
defined static Shaders (Basic,Lighting,Blur)
corrected const for Shader

9 years agoremoved Texture from Model (no longer needed)
Peter Schaefer [Tue, 12 Apr 2016 14:32:15 +0000 (16:32 +0200)]
removed Texture from Model (no longer needed)

9 years agoShader::Active (_shader braucht nicht mehr übergeben werden)
Peter Schaefer [Tue, 12 Apr 2016 13:54:55 +0000 (15:54 +0200)]
Shader::Active (_shader braucht nicht mehr übergeben werden)
useShader (Model -> SceneObject)
useTexture -> Texture Class (Model -> SceneObject)

9 years agoSDL Profile CORE
Peter Schaefer [Mon, 11 Apr 2016 12:46:01 +0000 (14:46 +0200)]
SDL Profile CORE

9 years agomoved bullet to include&lib (Version Debug/Release)
Peter Schaefer [Wed, 6 Apr 2016 09:05:42 +0000 (11:05 +0200)]
moved bullet to include&lib (Version Debug/Release)

9 years agominor fixes
Peter Schaefer [Tue, 5 Apr 2016 21:33:07 +0000 (23:33 +0200)]
minor fixes
Release LIBS

9 years agohopefully fixed bullet path and Builds
Peter Schaefer [Tue, 5 Apr 2016 20:59:42 +0000 (22:59 +0200)]
hopefully fixed bullet path and Builds

9 years agoPlayer Hitboxes
LockedLunatic [Wed, 30 Mar 2016 11:17:59 +0000 (13:17 +0200)]
Player Hitboxes

9 years agomerged Lights
Peter Schaefer [Tue, 5 Apr 2016 18:56:30 +0000 (20:56 +0200)]
merged Lights

9 years agofixed some MemoryLeaks
Peter Schaefer [Tue, 5 Apr 2016 11:16:19 +0000 (13:16 +0200)]
fixed some MemoryLeaks
optimized bind and draw
collMesh (_col.dae) will be loaded as mesh if exist
GL Warning disabled

9 years agofixed missing BBox
Peter Schaefer [Wed, 30 Mar 2016 11:26:43 +0000 (13:26 +0200)]
fixed missing BBox

9 years agosome fixes
Peter Schaefer [Wed, 30 Mar 2016 11:12:01 +0000 (13:12 +0200)]
some fixes
BBox unsichtbar????

9 years agomoved Collision Mesh into SceneObject
Peter Schaefer [Wed, 30 Mar 2016 10:57:16 +0000 (12:57 +0200)]
moved Collision Mesh into SceneObject
badhack use Same Mesh for collision

9 years agodefined a Name for Meshes
Peter Schaefer [Mon, 28 Mar 2016 13:38:16 +0000 (15:38 +0200)]
defined a Name for Meshes
added bind for Model, unbind for Model and Shader

9 years agoadded Debug Entries
Peter Schaefer [Sun, 27 Mar 2016 13:35:33 +0000 (15:35 +0200)]
added Debug Entries

9 years agoupdated bullet
Peter Schaefer [Sat, 23 Jan 2016 07:24:50 +0000 (08:24 +0100)]
updated bullet
fixed bullet linking

9 years agoupdated libs
Peter Schaefer [Fri, 22 Jan 2016 16:44:41 +0000 (17:44 +0100)]
updated libs

10 years agolever added; animations are imported and almost usable
LockedLunatic [Mon, 29 Jun 2015 22:26:27 +0000 (00:26 +0200)]
lever added; animations are imported and almost usable

10 years agoshow FPS -> F2
Peter Schaefer [Mon, 29 Jun 2015 21:01:28 +0000 (23:01 +0200)]
show FPS -> F2

10 years agoadded Margin -> doesnt fix glitches
Peter Schaefer [Thu, 25 Jun 2015 20:01:42 +0000 (22:01 +0200)]
added Margin -> doesnt fix glitches

10 years agoadded switch for Transparency -> F9
Peter Schaefer [Thu, 25 Jun 2015 19:21:47 +0000 (21:21 +0200)]
added switch for Transparency -> F9

10 years agoadded real FULLSCREEN -> F10
Peter Schaefer [Thu, 25 Jun 2015 18:49:49 +0000 (20:49 +0200)]
added real FULLSCREEN -> F10

10 years agoWindow is now resizeable
Peter Schaefer [Thu, 25 Jun 2015 18:02:20 +0000 (20:02 +0200)]
Window is now resizeable

10 years agoFPS capped
Peter Schaefer [Wed, 24 Jun 2015 15:36:21 +0000 (17:36 +0200)]
FPS capped
small modifications for falling

10 years agoMerge branch 'bullet' of lva.cg.tuwien.ac.at:Weave bullet
Peter Schaefer [Wed, 24 Jun 2015 14:44:59 +0000 (16:44 +0200)]
Merge branch 'bullet' of lva.cg.tuwien.ac.at:Weave

10 years agosmall jump fix
Peter Schaefer [Wed, 24 Jun 2015 13:24:13 +0000 (15:24 +0200)]
small jump fix
replaced Fragmentcolor with gl_FragColor (shader)

10 years agolevel is a tiny bit farther (but doesn't have UVs fixed yet)
LockedLunatic [Mon, 22 Jun 2015 22:00:57 +0000 (00:00 +0200)]
level is a tiny bit farther (but doesn't have UVs fixed yet)

10 years agolevel half done
LockedLunatic [Mon, 22 Jun 2015 13:40:14 +0000 (15:40 +0200)]
level half done

10 years agosmall fix
Peter Schaefer [Mon, 22 Jun 2015 12:36:29 +0000 (14:36 +0200)]
small fix

10 years agoeventBoxen working again
Peter Schaefer [Mon, 22 Jun 2015 12:34:24 +0000 (14:34 +0200)]
eventBoxen working again