• Rudolf Polzer's avatar
    Squashed commit of the following: · 502bcf30
    Rudolf Polzer authored
    commit 4725fdca9bdceec1d7b94650e2b49bfa918a06af
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Wed Oct 27 20:48:15 2010 +0300
    
        argh of course i had to forget these jumppads...
    
    commit fc0f26735ef7dad53effe76daf80b5970003236a
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Wed Oct 27 19:36:34 2010 +0300
    
        fix flipped jumppad effect, swap out nex for a camping rifle
    
    commit 675006ab4f2dfccf2acd522bc3a93d755fc9468f
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Wed Oct 27 17:12:03 2010 +0300
    
        jumppad effect
    
    commit 738c156a650dbd58cf3e0a6fc730e844ee39ecf7
    Merge: ddfae64 431497d2
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Wed Oct 27 16:52:14 2010 +0300
    
        Merge remote branch 'origin/master' into fruitiex/space_elevator
    
    commit ddfae649829c68bbbefd655f8823661d2a6fc456
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Wed Oct 20 20:47:11 2010 +0300
    
        add a little detail
    
    commit d093f9da1bf8f624ca812a80b6ae2ed03fbf2f06
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Wed Oct 20 20:44:55 2010 +0300
    
        fix the target_speaker paths on space-elevator
    
    commit 4b8c57643d03972bb1f61eee86472351949a15d8
    Merge: ed9a0f4 9e609a78
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Wed Oct 20 20:41:21 2010 +0300
    
        Merge branch 'master' into fruitiex/space_elevator
    
    commit ed9a0f401a9b59f72c4d18c78656a89d02273642
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Wed Oct 13 20:34:56 2010 +0300
    
        warpzone start fade at 800, end at 1200. Don't allow jumping off the fail VIS obstructions.
    
    commit de5c2ba1c284878d4e548d3c1c0c78918535f380
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Tue Oct 12 14:35:30 2010 +0300
    
        cdtrack jumpinginspace
    
    commit 37698de59059d9173b5b5058bf41b0dc2d03e885
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sun Oct 10 11:41:43 2010 +0300
    
        this commit may or may not help performance on space-elevator
    
    commit 425c9fdb1b503f473d05233d285d5660a12ec2b3
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sun Oct 10 03:07:50 2010 +0300
    
        another attempt at vis. This time, also add some obstacles to help VIS, and do other various fixes
    
    commit 04142d2bec2a612c8da927fd50ecfd8bfa4f9d7c
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 9 22:12:26 2010 +0300
    
        fade the warpzones, now it should be theoretically impossible for more than 2 renders to take place in any position of the map :)
    
    commit 017215a8adbf0d5020fa14668d1e9d7463f33e43
    Merge: aedb481 200db72
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 9 16:51:18 2010 +0300
    
        Merge remote branch 'origin/fruitiex/space_elevator' into fruitiex/space_elevator
    
    commit aedb481f1963aa5f7d97842ac0c5af973e5f103d
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 9 16:50:21 2010 +0300
    
        try improving culling of warpzones with hint brushes + small misc tweaks
    
    commit 067758da0abb1538fe7af51aa20b0b4cdc447373
    Merge: 7682df0 4a4b2aaf
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 9 16:07:24 2010 +0300
    
        Merge remote branch 'origin/master' into fruitiex/space_elevator
    
        Conflicts:
        	scripts/proceduralx.shader
    
    commit 200db727fc6e7afc4f8b3e0c0ed5a850b96fb159
    Merge: 7682df0 9475daca
    Author: Rudolf Polzer <divverent@alientrap.org>
    Date:   Sat Oct 2 21:46:15 2010 +0200
    
        Merge branch 'master' into fruitiex/space_elevator
    
        Conflicts:
        	scripts/proceduralx.shader
    
    commit 7682df0a01fe5cf7b4d1fd9f33b56e3191e89bf3
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 2 16:54:07 2010 +0300
    
        try to improve performance by the addition of hint brushes
    
    commit 234e2e27fea0a0d238032e4cff1d96580a656282
    Merge: caa9b1b 2cde167b
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 2 16:26:46 2010 +0300
    
        Merge remote branch 'origin/master' into fruitiex/space_elevator
    
    commit caa9b1b43cc03807811011ecc62be9803ac24bdc
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 2 15:36:40 2010 +0300
    
        move the solar panels to the other side, where the sun is :P, take use of the -surfacelight shaders that someone (I?) had apparently created in the past
    
    commit fd1b54f24afd23aadeb6d67027807d8fb850e03f
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 2 15:03:32 2010 +0300
    
        add a _cubemap variant for the purple gelslime, use this on space-elevator
    
    commit e303230308aa1ba1b28dd66f3225f1c4cf7f137f
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 2 13:48:20 2010 +0300
    
        new solarpanels, hope i placed them on the correct side ;). warpzone glowy shader removed for now, it needs to be combined with the fuzzy shader somehow... in a better way
    
    commit 40819310306a5db571b32ede9915fb8c0d250e8e
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 2 13:22:11 2010 +0300
    
        fix almost everything, now the only missing things should be a couple of models.
    
    commit 7819fb095e0b45bf1984aff891963b3885eb4e54
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 2 12:57:07 2010 +0300
    
        some renames
    
    commit 23ee3193e1b4ee47cc9aa6dcae5c573640ff6d9a
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 2 12:54:16 2010 +0300
    
        map specific textures
    
    commit 34fe9d1766592b3151bf640b33a51515648ebd78
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 2 12:31:54 2010 +0300
    
        fruitiex-textures
    
    commit 64ff2fe779b35b4d5e7ff216fdee1bbdf2bf3d43
    Merge: 4d07aa9 a06213d5
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 2 12:18:40 2010 +0300
    
        Merge remote branch 'origin/divVerent/fruitiex-textures' into fruitiex/space_elevator
    
    commit 4d07aa933bac973e776f44f3d322f368639fb907
    Author: FruitieX <rasse@rasse-laptop.(none)>
    Date:   Sat Oct 2 12:16:00 2010 +0300
    
        start fixing space_elevator
    
    commit a06213d5
    Author: Rudolf Polzer <divverent@alientrap.org>
    Date:   Wed Sep 29 18:51:04 2010 +0200
    
        they all have _reflect
    
    commit 7ed5ff66
    Author: Rudolf Polzer <divverent@alientrap.org>
    Date:   Wed Sep 29 18:49:25 2010 +0200
    
        add a shader for floor05
    
    commit cc9c2425
    Merge: 4b635fbe 085e323b
    Author: Rudolf Polzer <divverent@alientrap.org>
    Date:   Wed Sep 29 18:47:25 2010 +0200
    
        Merge remote branch 'origin/morphed/fruitiex-textures' into divVerent/fruitiex-textures
    
    commit 085e323b
    Author: Morphed <Morphed@o2.pl>
    Date:   Wed Sep 29 17:09:23 2010 +0200
    
        new floor textures
    
    commit 4b635fbe
    Merge: ec581689 4dc230f9
    Author: Rudolf Polzer <divverent@alientrap.org>
    Date:   Wed Sep 29 10:52:21 2010 +0200
    
        Merge branch 'master' into divVerent/fruitiex-textures
    
    commit ec581689
    Author: Rudolf Polzer <divverent@alientrap.org>
    Date:   Tue Sep 28 17:31:10 2010 +0200
    
        also better offsetmapping scale for the crete
    
    commit 93559399
    Author: Rudolf Polzer <divverent@alientrap.org>
    Date:   Tue Sep 28 17:29:08 2010 +0200
    
        reduce offsetmapping scale and THIS IS 'CRETE
    
    commit b5d44d87
    Author: Rudolf Polzer <divverent@alientrap.org>
    Date:   Tue Sep 28 16:55:58 2010 +0200
    
        adapt to shader naming convention
    
    commit 1df528a9
    Author: Rudolf Polzer <divverent@alientrap.org>
    Date:   Tue Sep 28 16:50:46 2010 +0200
    
        also give height to the floor normalmaps
    
    commit 8e923fa2
    Author: Rudolf Polzer <divverent@alientrap.org>
    Date:   Tue Sep 28 16:45:56 2010 +0200
    
        make better normalmaps for fruitconcrete (now with height info)
    
    commit 9501ca17
    Merge: aab33b91 ac62d274
    Author: Rudolf Polzer <divverent@alientrap.org>
    Date:   Tue Sep 28 16:35:04 2010 +0200
    
        Merge branch 'master' into divVerent/archived/fruitiex/textures
    
    commit aab33b91
    Author: FruitieX <rasse@rasse-lappy.localdomain>
    Date:   Sun Jul 25 01:35:43 2010 +0300
    
        purple pipe color
    
    commit eba2f289
    Author: FruitieX <rasse@rasse-lappy.localdomain>
    Date:   Sat Jul 24 23:18:50 2010 +0300
    
        gloss texture
    
    commit d0d5e2ef
    Author: FruitieX <rasse@rasse-lappy.localdomain>
    Date:   Sat Jul 24 23:17:21 2010 +0300
    
        grate texture
    
    commit d9ab860e
    Author: FruitieX <rasse@rasse-lappy.localdomain>
    Date:   Sat Jul 24 22:52:53 2010 +0300
    
        shader
    
    commit 3dcf16c1
    Author: FruitieX <rasse@rasse-lappy.localdomain>
    Date:   Sat Jul 24 22:50:26 2010 +0300
    
        wrn01 colors
    
    commit 8f10cfc9
    Author: FruitieX <rasse@rasse-lappy.localdomain>
    Date:   Sat Jul 24 22:38:32 2010 +0300
    
        morphed's procedural textures
    502bcf30
Name
Last commit
Last update
..
gelslime-purple.tga Loading commit data...
gelslime-purple_gloss.tga Loading commit data...
gelslime-purple_glow.tga Loading commit data...
gelslime-purple_norm.tga Loading commit data...
slime0.tga Loading commit data...
slime0_norm.tga Loading commit data...
slime1.tga Loading commit data...
slime1_norm.tga Loading commit data...