]>
git.leopard-lacewing.eu Git - cgue_weave.git/log
LockedLunatic [Tue, 28 Jun 2016 05:17:35 +0000 (07:17 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Tue, 28 Jun 2016 05:17:24 +0000 (07:17 +0200)]
level loader
Peter Schaefer [Tue, 28 Jun 2016 05:04:26 +0000 (07:04 +0200)]
fixed Frustum Activation Bug
Peter Schaefer [Tue, 28 Jun 2016 04:55:19 +0000 (06:55 +0200)]
Lever new UV's and Texture
Peter Schaefer [Tue, 28 Jun 2016 04:31:04 +0000 (06:31 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
LockedLunatic [Tue, 28 Jun 2016 04:30:24 +0000 (06:30 +0200)]
Boar revives when time reverted
Peter Schaefer [Tue, 28 Jun 2016 04:29:12 +0000 (06:29 +0200)]
enable DEAD Texture for Boar
LockedLunatic [Tue, 28 Jun 2016 04:24:33 +0000 (06:24 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Tue, 28 Jun 2016 04:24:29 +0000 (06:24 +0200)]
compiling again
Peter Schaefer [Tue, 28 Jun 2016 04:23:41 +0000 (06:23 +0200)]
BlackWhite by Death
LockedLunatic [Tue, 28 Jun 2016 04:14:51 +0000 (06:14 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Tue, 28 Jun 2016 04:14:47 +0000 (06:14 +0200)]
level 3 started
Peter Schaefer [Tue, 28 Jun 2016 04:09:15 +0000 (06:09 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Tue, 28 Jun 2016 04:09:05 +0000 (06:09 +0200)]
Time Stops at Death
Fall to deep Death
new Player Collisions
Peter Schaefer [Tue, 28 Jun 2016 03:45:58 +0000 (05:45 +0200)]
optimize culling (not Perfect)
Door Texture
Peter Schaefer [Tue, 28 Jun 2016 03:21:14 +0000 (05:21 +0200)]
added DeadTextur for BOAR
deaktivated DEAD Animations for BOAR (cant undo timeshift)
Peter Schaefer [Tue, 28 Jun 2016 02:57:14 +0000 (04:57 +0200)]
LVL loads _col too
Peter Schaefer [Tue, 28 Jun 2016 02:40:57 +0000 (04:40 +0200)]
Boar ungefährlich nach draufspringen
+ sinkt etwas ab
Peter Schaefer [Tue, 28 Jun 2016 02:20:21 +0000 (04:20 +0200)]
Springen auf Schwein tötet es
LockedLunatic [Tue, 28 Jun 2016 01:51:44 +0000 (03:51 +0200)]
player interaction mesh gelöscht
LockedLunatic [Tue, 28 Jun 2016 01:42:36 +0000 (03:42 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Tue, 28 Jun 2016 01:42:28 +0000 (03:42 +0200)]
stop animation when jumping
Peter Schaefer [Tue, 28 Jun 2016 01:36:40 +0000 (03:36 +0200)]
better Eyes (Boar)
Peter Schaefer [Tue, 28 Jun 2016 01:36:04 +0000 (03:36 +0200)]
MipMap and Sampling Qualities
LockedLunatic [Tue, 28 Jun 2016 00:36:33 +0000 (02:36 +0200)]
walking animation only plays when walking
LockedLunatic [Mon, 27 Jun 2016 20:43:51 +0000 (22:43 +0200)]
player model updated
player move animation added
LockedLunatic [Sat, 25 Jun 2016 21:57:43 +0000 (23:57 +0200)]
levers, doors and time revinding now work together properly
LockedLunatic [Sat, 25 Jun 2016 09:17:59 +0000 (11:17 +0200)]
Levers and reverting time is now less buggy, but still not perfect
LockedLunatic [Sat, 25 Jun 2016 01:57:53 +0000 (03:57 +0200)]
Level objects have colliders
backface culling for shadows
doors
lever doesn't throw exceptions anymore
LockedLunatic [Fri, 24 Jun 2016 22:27:51 +0000 (00:27 +0200)]
boars added to level
LockedLunatic [Fri, 24 Jun 2016 16:34:06 +0000 (18:34 +0200)]
light angle changed
LockedLunatic [Fri, 24 Jun 2016 16:26:29 +0000 (18:26 +0200)]
level improved
LockedLunatic [Fri, 24 Jun 2016 15:45:05 +0000 (17:45 +0200)]
level added
Peter Schaefer [Fri, 24 Jun 2016 13:34:58 +0000 (15:34 +0200)]
update
Peter Schaefer [Fri, 24 Jun 2016 13:32:10 +0000 (15:32 +0200)]
new Boar UV & Texture
new Door UV
Peter Schaefer [Fri, 24 Jun 2016 11:38:50 +0000 (13:38 +0200)]
Door collides with Marvin & Enemy
BUG: CollisionMesh dont rotate
Peter Schaefer [Fri, 24 Jun 2016 11:19:26 +0000 (13:19 +0200)]
jump ontop of Boars
optimized lvl Collision
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
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)
LockedLunatic [Fri, 24 Jun 2016 00:18:59 +0000 (02:18 +0200)]
should've been in previous commit
LockedLunatic [Fri, 24 Jun 2016 00:05:05 +0000 (02:05 +0200)]
bug fix
timeresistant object still sent events that were reverted
LockedLunatic [Fri, 24 Jun 2016 00:00:09 +0000 (02:00 +0200)]
Hebel gefixed
LockedLunatic [Thu, 23 Jun 2016 23:45:18 +0000 (01:45 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Thu, 23 Jun 2016 23:44:08 +0000 (01:44 +0200)]
jumpFix
LockedLunatic [Thu, 23 Jun 2016 23:17:34 +0000 (01:17 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Thu, 23 Jun 2016 23:17:04 +0000 (01:17 +0200)]
wrong Char FIX
LockedLunatic [Thu, 23 Jun 2016 22:44:10 +0000 (00:44 +0200)]
Merge branch 'master' of git-cgue@lva.cg.tuwien.ac.at:Weave
LockedLunatic [Thu, 23 Jun 2016 22:43:27 +0000 (00:43 +0200)]
level changes
Peter Schaefer [Thu, 23 Jun 2016 22:40:48 +0000 (00:40 +0200)]
new blur Shader
added MotionBlur (only for TimeRewind)
Peter Schaefer [Thu, 23 Jun 2016 18:46:55 +0000 (20:46 +0200)]
new Shaders
Bloom optimized
Peter Schaefer [Tue, 21 Jun 2016 16:01:34 +0000 (18:01 +0200)]
fixed Shadows Resized Bug
Peter Schaefer [Tue, 21 Jun 2016 11:20:04 +0000 (13:20 +0200)]
E Triggers LEVER
if hold, only once per second
Peter Schaefer [Tue, 21 Jun 2016 10:20:24 +0000 (12:20 +0200)]
Trigger in front of player...
Peter Schaefer [Tue, 21 Jun 2016 09:28:48 +0000 (11:28 +0200)]
Events trigger only once
Peter Schaefer [Mon, 20 Jun 2016 22:12:23 +0000 (00:12 +0200)]
Merged
Added SubMission 2 [in Progress]
Peter Schaefer [Mon, 20 Jun 2016 22:01:11 +0000 (00:01 +0200)]
Resize Bloom Bug
LockedLunatic [Mon, 20 Jun 2016 21:49:22 +0000 (23:49 +0200)]
levers and doors placed properly in level 1 (the tmp lvl)
Peter Schaefer [Mon, 20 Jun 2016 21:44:03 +0000 (23:44 +0200)]
Trigger Eventbox
Peter Schaefer [Mon, 20 Jun 2016 21:03:48 +0000 (23:03 +0200)]
modified Boar Mesh
Peter Schaefer [Mon, 20 Jun 2016 20:58:46 +0000 (22:58 +0200)]
Boar position fixed
Peter Schaefer [Mon, 20 Jun 2016 20:40:22 +0000 (22:40 +0200)]
Boar missplaced
LockedLunatic [Mon, 20 Jun 2016 12:43:27 +0000 (14:43 +0200)]
collision meshes fixed
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
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
LockedLunatic [Sun, 19 Jun 2016 23:55:59 +0000 (01:55 +0200)]
Lever - Door started
Animations get reverted properly when reversing time
green objects
Peter Schaefer [Sun, 19 Jun 2016 21:29:56 +0000 (23:29 +0200)]
convex Boar Mesh
Peter Schaefer [Sun, 19 Jun 2016 20:59:21 +0000 (22:59 +0200)]
neues Boar Mesh
berühren beendet auch das Spiel
Peter Schaefer [Fri, 17 Jun 2016 10:33:05 +0000 (12:33 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
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
Peter Schaefer [Thu, 16 Jun 2016 18:01:14 +0000 (20:01 +0200)]
moved FPS to Graphix
first Shader adjustments
LockedLunatic [Wed, 15 Jun 2016 21:25:06 +0000 (23:25 +0200)]
Animationen!!!
Peter Schaefer [Wed, 15 Jun 2016 10:59:55 +0000 (12:59 +0200)]
funktions to push new->old
Peter Schaefer [Wed, 15 Jun 2016 09:52:32 +0000 (11:52 +0200)]
save old Model&ProjView
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
Peter Schaefer [Tue, 7 Jun 2016 06:51:38 +0000 (08:51 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Tue, 7 Jun 2016 06:26:30 +0000 (08:26 +0200)]
Event (FKey) Messages,
FPS&ObjectCount im WindowTitle (Frustum sieht man jetzt)
Peter Schaefer [Tue, 7 Jun 2016 05:50:20 +0000 (07:50 +0200)]
Bloom with downsampling
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)
Peter Schaefer [Fri, 20 May 2016 15:47:58 +0000 (17:47 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Fri, 20 May 2016 15:47:38 +0000 (17:47 +0200)]
optional culling (light calculation without)
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
Peter Schaefer [Thu, 19 May 2016 14:19:58 +0000 (16:19 +0200)]
enabled F8 -> Frustum
Peter Schaefer [Thu, 19 May 2016 11:46:34 +0000 (13:46 +0200)]
frustum Fixed
Peter Schaefer [Thu, 19 May 2016 10:55:35 +0000 (12:55 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
Peter Schaefer [Thu, 19 May 2016 10:55:22 +0000 (12:55 +0200)]
point Frustum geht doch nicht
Kugel Frustum ... damit auch nicht
Peter Schaefer [Wed, 18 May 2016 15:32:01 +0000 (17:32 +0200)]
Point Frustum funktioniert
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
<(^^<) <(^^)> (>^^)>
LockedLunatic [Tue, 3 May 2016 20:47:31 +0000 (22:47 +0200)]
updated the tex again
Peter Schaefer [Tue, 3 May 2016 20:38:40 +0000 (22:38 +0200)]
updated CGUE_SUB1
Peter Schaefer [Tue, 3 May 2016 20:36:45 +0000 (22:36 +0200)]
Merge branch 'master' of lva.cg.tuwien.ac.at:Weave
LockedLunatic [Tue, 3 May 2016 20:36:16 +0000 (22:36 +0200)]
tex document updated
Peter Schaefer [Tue, 3 May 2016 20:35:02 +0000 (22:35 +0200)]
added Revert LOST
LockedLunatic [Tue, 3 May 2016 19:51:21 +0000 (21:51 +0200)]
minor changes
Peter Schaefer [Tue, 3 May 2016 19:50:23 +0000 (21:50 +0200)]
more Frustum Preps
Enable Bloom
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
Peter Schaefer [Thu, 28 Apr 2016 07:00:21 +0000 (09:00 +0200)]
loadMesh normals corrected
Peter Schaefer [Wed, 27 Apr 2016 15:38:21 +0000 (17:38 +0200)]
MeshLoader ignoriert fehlende Normals & UV's
Peter Schaefer [Wed, 27 Apr 2016 06:08:00 +0000 (08:08 +0200)]
bugFix
clearBuffer -> static
Peter Schaefer [Tue, 26 Apr 2016 19:02:15 +0000 (21:02 +0200)]
disable Bloom
disable Light Classes (noch nicht fertig)
Peter Schaefer [Tue, 26 Apr 2016 12:09:13 +0000 (14:09 +0200)]
added LightClasses
projects / cgue_weave.git / log