]> git.leopard-lacewing.eu Git - cgue_weave.git/log
cgue_weave.git
9 years agoboars added to level
LockedLunatic [Fri, 24 Jun 2016 22:27:51 +0000 (00:27 +0200)]
boars added to level

9 years agolight angle changed
LockedLunatic [Fri, 24 Jun 2016 16:34:06 +0000 (18:34 +0200)]
light angle changed

9 years agolevel improved
LockedLunatic [Fri, 24 Jun 2016 16:26:29 +0000 (18:26 +0200)]
level improved

9 years agolevel added
LockedLunatic [Fri, 24 Jun 2016 15:45:05 +0000 (17:45 +0200)]
level added

9 years agoupdate
Peter Schaefer [Fri, 24 Jun 2016 13:34:58 +0000 (15:34 +0200)]
update

9 years agonew Boar UV & Texture
Peter Schaefer [Fri, 24 Jun 2016 13:32:10 +0000 (15:32 +0200)]
new Boar UV & Texture
new Door UV

9 years agoDoor collides with Marvin & Enemy
Peter Schaefer [Fri, 24 Jun 2016 11:38:50 +0000 (13:38 +0200)]
Door collides with Marvin & Enemy
BUG: CollisionMesh dont rotate

9 years agojump ontop of Boars
Peter Schaefer [Fri, 24 Jun 2016 11:19:26 +0000 (13:19 +0200)]
jump ontop of Boars
optimized lvl Collision

9 years agoMerge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Fri, 24 Jun 2016 02:58:52 +0000 (04:58 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave

# Conflicts:
# Weave/Scene/Scene.cpp

9 years agoexperimented with glClear
Peter Schaefer [Fri, 24 Jun 2016 02:56:07 +0000 (04:56 +0200)]
experimented with glClear
renamed clearBuffer -> leaveBuffer
GlitchFix BasixTexture Shader
added Glow to Persistent Objects (only if Bloom Enabled)

9 years agoshould've been in previous commit
LockedLunatic [Fri, 24 Jun 2016 00:18:59 +0000 (02:18 +0200)]
should've been in previous commit

9 years agobug fix
LockedLunatic [Fri, 24 Jun 2016 00:05:05 +0000 (02:05 +0200)]
bug fix
timeresistant object still sent events that were reverted

9 years agoHebel gefixed
LockedLunatic [Fri, 24 Jun 2016 00:00:09 +0000 (02:00 +0200)]
Hebel gefixed

9 years agoMerge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Thu, 23 Jun 2016 23:45:18 +0000 (01:45 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave

9 years agojumpFix
Peter Schaefer [Thu, 23 Jun 2016 23:44:08 +0000 (01:44 +0200)]
jumpFix

9 years agoMerge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Thu, 23 Jun 2016 23:17:34 +0000 (01:17 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave

9 years agowrong Char FIX
Peter Schaefer [Thu, 23 Jun 2016 23:17:04 +0000 (01:17 +0200)]
wrong Char FIX

9 years agoMerge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Thu, 23 Jun 2016 22:44:10 +0000 (00:44 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave

9 years agolevel changes
LockedLunatic [Thu, 23 Jun 2016 22:43:27 +0000 (00:43 +0200)]
level changes

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

10 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

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

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

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

10 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

10 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

10 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)

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

10 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)

10 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

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

10 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

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

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

10 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

10 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

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

10 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
<(^^<) <(^^)> (>^^)>

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

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

10 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

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

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

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

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

10 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

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

10 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

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

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

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

10 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

10 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 :)

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

10 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)

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

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

10 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

10 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

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

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

10 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...

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

10 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

10 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

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

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

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

10 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

10 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)

10 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)

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

10 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)

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

10 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

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

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

10 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

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

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