xonotic/xonotic-maps.pk3dir.git
7 years agoARGH, this file really must not be in git xonotic-v0.6.0
Rudolf Polzer [Tue, 6 Mar 2012 19:04:31 +0000 (20:04 +0100)]
ARGH, this file really must not be in git

7 years agoSquashed commit of the following:
Rudolf Polzer [Tue, 6 Mar 2012 18:00:42 +0000 (19:00 +0100)]
Squashed commit of the following:

commit 6ff24d61102aa3fa153442afda84b472ca5c3581
Author: Rudolf Polzer <divverent@xonotic.org>
Date:   Tue Mar 6 15:28:13 2012 +0100

    rebuild please

commit ab6ce7f2b6c5397253423b9d195a3a50ee6cb178
Author: Rudolf Polzer <divverent@xonotic.org>
Date:   Tue Mar 6 15:27:25 2012 +0100

    fix broken qer_editorimage

commit 5d1ee3a351aa5e6e4c5bd73dd5afde11d020bd2c
Author: Rudolf Polzer <divverent@xonotic.org>
Date:   Tue Mar 6 15:24:42 2012 +0100

    remove unused shader file

commit 13ffa009e975ad9aa003c756d1a8b1ad66684dab
Merge: cc99f35 86c2509
Author: Rudolf Polzer <divverent@xonotic.org>
Date:   Tue Mar 6 15:20:58 2012 +0100

    Merge branch 'theshadow/solarium' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into theshadow/solarium

commit cc99f3563ef56dd15269840f3e70e1bf5b02d736
Author: Rudolf Polzer <divverent@xonotic.org>
Date:   Tue Mar 6 15:20:21 2012 +0100

    remove .DS_Store files

commit d23dda55e38e9fa6439187921e45ec98e3e98d3c
Merge: 857db67 4978686
Author: Rudolf Polzer <divverent@xonotic.org>
Date:   Tue Mar 6 15:15:34 2012 +0100

    Merge branch 'master' into theshadow/solarium

commit 86c250950606a45bde11b4f82189b4cd7b718821
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Mon Mar 5 16:16:57 2012 -0500

    new soundtrack! traveler.

commit 857db67b00032640fdbec186ee07ed1a43be5f3f
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sun Mar 4 18:10:28 2012 -0500

    add a speaker for the new sound.

commit 17ccca1260116f58ad2d8005a0262db8c87f32ad
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sun Mar 4 17:28:06 2012 -0500

    replaced waterfall sound with one that is GPL compatible, thanks CuBe0wL!

commit 14086c03fb36964f5a1f0b00ea7556cbaa79a324
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Thu Mar 1 14:20:40 2012 -0500

    ok, I lied. This is the last version, for real this time.

commit ae897849783e84d8268cc1e568275b94d7403722
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Thu Mar 1 12:33:13 2012 -0500

    final version, ready for merging with master.

commit 91bcdb892539e042eff0458fbb434fc751b2214b
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Tue Feb 28 18:28:21 2012 -0500

    morpheds texture fix, and a few tweaks.

commit 85dc9ef15c90ea14ddd0ef3400412691efb22ca3
Merge: 1eff284 0f640a4
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Tue Feb 28 17:53:35 2012 -0500

    Merge remote-tracking branch 'origin/master' into theshadow/solarium

commit 1eff284ac22738ef56be173e19e126432bd7ba02
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Tue Feb 28 16:44:49 2012 -0500

    BALANCE UPDATE! removed some ammo spawns. I could still use some input fmr playtesting though.

    I was going to highlight Samual just to be a jerk, but I didn't. you're welcome.

commit eec03f9886af37b8dd3600fa779b513dee807d00
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Tue Feb 28 12:21:14 2012 -0500

    added some stuff, and cleaned up some degenerate patches.

commit 9375092d8bb1aa4b209e87be0fcf5632c47b63b7
Merge: 1eab788 10abbd7
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Tue Feb 28 11:46:34 2012 -0500

    Merge remote-tracking branch 'origin/master' into theshadow/solarium

commit 1eab7887ba3c5cd9836348b72ae2ca1af9cc0d2b
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Mon Feb 27 13:22:34 2012 -0500

    some bug fixes from cubeowl, and some texture consistency fixes.

commit a4d15a860071ab4a50d86d5c1b483b0135ade5f7
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Fri Feb 24 21:54:27 2012 -0500

    new stairs textures.

commit 455b67cf151d6ee69836a73056e5fec2727deab6
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Wed Feb 22 13:59:41 2012 -0500

    some texture changes and such

commit 74187d66dabc1296932804760a6e63f697fdeaa0
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Tue Feb 21 18:35:59 2012 -0500

    fixed some odd textures, and added a few more details. also added a compromize that might make matthiaskrgr happy ;)

commit 490c09a78ce39b485727aeb789de77f5d6681887
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Tue Feb 21 14:20:33 2012 -0500

    retextured lots of stuff. just expirimenting at this point.

commit 0488dd69c8a74a9ef25b9557d8d9eea9eec269d8
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Mon Feb 20 22:41:22 2012 -0500

    lots of changes to the map. fixed some bugs, cleaned up some caulk, and added a few broken tiles.

commit cd4ebea3322c9b8ad6032447972263847e5f3aed
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Mon Feb 20 15:31:01 2012 -0500

    fixed compile options, so it looks good again.

commit 850c4bd0a247a20e93de60535c805d3162a26c6d
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Mon Feb 20 14:01:25 2012 -0500

    changed somethings around in map options and map.

commit 63525264f46c3922a17acc3da0c46230c95dbf67
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sun Feb 19 17:42:20 2012 -0500

    fixed sound file so it's no longer 100mb. everything should work fine now.

commit 31e8f8aedf2d2aa23c5a15fc63241b72247ee532
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sun Feb 19 10:13:14 2012 -0500

    push again, maybe server's fixed?

commit 3a166f0f94424d156f01da17bfd350dec60e4daf
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sat Feb 18 19:27:50 2012 -0500

    fix the model, and hopefully compile works now.

commit 1fa1f8448bcf404c22668ff4ac8c435722662e60
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sat Feb 18 18:42:40 2012 -0500

    more cleanup

commit b15173644d320e6570b82f50c4289d5c54a33252
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sat Feb 18 16:54:52 2012 -0500

    some changes to the radar model, and some mroe fixes.

commit 4a949b958721d65317ccddc1ad96741e5d1ddbdc
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sat Feb 18 16:45:53 2012 -0500

    cleanup

commit 5c87d370b0f7c91cce094b8497e610ab2ff71ac0
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sat Feb 18 15:48:30 2012 -0500

     lots of new stuff. added radar model thing, changed some terrain around, added more underwater grass, added sound for waterfall. gonna have to double check to make sure I can use it. also moved some item spawns around.

commit 686edcddcc42e1a6691f4a1307113bc229c3adca
Merge: f9bd946 8b6b565
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sat Feb 18 12:25:09 2012 -0500

    Merge remote-tracking branch 'origin/master' into theshadow/solarium

commit f9bd946b77258a712abdb841e579c37271c19a2c
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sat Feb 4 16:03:31 2012 -0500

    add skybox. shut up matthiaskrgr

commit fa407a74fd34735f73fdf38a2840e5de50e72976
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sat Feb 4 15:54:55 2012 -0500

    some details, and a huge brush cleanup.

commit a39182af38288e254be25a5beb1427031a776396
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sat Feb 4 12:50:34 2012 -0500

    fixd broken reflections, and also modified some textures a bit

commit 8fc222ec76c5ddeabde0d9ca49f683e7d9775d8e
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Mon Jan 30 09:35:11 2012 -0500

    fix reflections, maybe? also update to fix 404 error

commit c9fee13014212f7c57b6ace6e6718ab79ea54777
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sun Jan 29 16:04:44 2012 -0500

    fixed water, and deleting unused files

commit 07c5d7ba1db7ed234ba84b341dab6d7afc4cdcaa
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sun Jan 29 15:15:18 2012 -0500

    added gloss and reflect maps for water and waterfall textures, and removed savageX's fix, I want to try some different sollutions first.

commit 6d1ee877ce1db282269e9ae512b00126a4187cbf
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sun Jan 29 13:19:41 2012 -0500

    fix by savagex, correcting reflections. I would really like to find a better way of doing this though.

commit a0fb9d3181c82d0223e6402e8d570ba3edfae8e6
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sat Jan 28 17:10:19 2012 -0500

    lots of changes here. fixed borked water reflections in the central room, added a cubemap effect to the waterfall, and some more texture fixes.)

commit d6798b124cdc5f1359f047a33469334445a01f35
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sat Jan 28 00:14:48 2012 -0500

    redid the environment map for glass. looks super cool now. also started trying to add an environment map for the waterfallm but I havn't managed to get it working yet. I'll work on that later.

commit 7c7b1d25e4fa4c5f6c9564a6856f41c0c58636bf
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Fri Jan 27 17:59:27 2012 -0500

    some small changes to the map, to make it actualy compile

commit 78232d32e10f93b07300da58d3bd6d2f7a485a81
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Fri Jan 27 13:51:40 2012 -0500

    ok, finally got some basica cubemaps working. they aren't very strong though, and I would like to make them a bit more noticeable.

commit 6eaa056d6a1b2806ca55d2aab08e48e15ca34332
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Thu Jan 26 21:53:06 2012 -0500

    seriously. cubemaps. i really really mean it this time

commit 31886fa1ab360dbedc3068955afe048b64e921da
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Thu Jan 26 18:29:36 2012 -0500

    ok, cubemaps for serious this time.

commit 7aa90ce4fbb5da76afc666bee8a007e21d1f3975
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Thu Jan 26 16:41:06 2012 -0500

    migrated texture folder to map_solarium to match other maps. hopefully I have all the files uploaded this time

commit 75d43ca92cb8322a63f0acb9bc0ffbc338991d1a
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Wed Jan 25 23:16:58 2012 -0500

    cubemaps! cubmaops all around!

commit 1a70d48e8c45f1d8a9914fa9faf16f03057ec53b
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Wed Jan 25 23:14:33 2012 -0500

    forgot to delete some files

commit 6f127baa533bd0305d95273d667fae8c05cc424b
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Wed Jan 25 13:26:18 2012 -0500

    bugfixes, details, and initial cubemap test.

commit 7e23842739731995dfb092c5be5228d565f59ac6
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Tue Jan 24 20:57:17 2012 -0500

    more changes, new attempt to fix water, and some more details. also removed somepoint lights.

commit be2e107ebb42cd89e039a2d6ad7519635db1cb7d
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Tue Jan 24 18:16:39 2012 -0500

    more changes to archetecture, and possibly fixed water? we shall see.

commit d604acf9e3c437fae75c3e06cd0ba9191916ead0
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Mon Jan 23 21:57:06 2012 -0500

    lots of changes. details, lighting, removed the particle effect, retextured. all around bug fixes. you know the drill

commit 8a56f92908a9ac3026376ede1c72ade7c1b93126
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Date:   Sat Jan 21 19:24:26 2012 -0500

    ugh this makes no sense

commit 937e5b7f0a715e265f1727bdc33d2d01ed15c2f8
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sat Jan 21 18:47:37 2012 -0500

    more changes to map options, and some syntax corections.

commit a7ec07329a9443a4d770768a610c8406d2299f26
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sat Jan 21 17:21:09 2012 -0500

    fix typo.

commit ff781625cb6c1ebfd7caf867223d572261f2c468
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sat Jan 21 16:31:05 2012 -0500

    more options tweaks.

commit 31f3241fe10d1ba54fe975a28db1babbd5b8e761
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sat Jan 21 01:32:46 2012 -0500

    JUST KIDDING LOL just a few more tweaks, and changes to mapinfo. removed gametypes map doesn't have support for.

commit 59af0ed99abe0770e82a982f4f2980b3d3ec2657
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sat Jan 21 00:22:57 2012 -0500

    nope

commit 2b1af9f98352fc09c985d740a7186a912fcfbb3b
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Jan 20 23:48:45 2012 -0500

    I think I've figured out the right direction...

commit 64d7b0ac0e49de16d09c5146b02af7de2853e18f
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Jan 20 23:01:00 2012 -0500

    btw I would be doing local compiles for this, but I screwed up netradiant. just fyi

commit 65fdf8ff171679540059a030491a0a00afe7ab00
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Jan 20 21:40:53 2012 -0500

    more testing

commit eb59cc89e1a847f36c488e8c9f6666af30c3b4c3
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Jan 20 21:24:06 2012 -0500

    this is going to take awhile. more messing about, and added -fast so it's quicker to test.

commit 6e34c22d53ccca5f225f204d340e1aca78a16ce2
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Jan 20 19:46:39 2012 -0500

    compile settings, looked some stuff up, so now I actually know what these do :p

commit 829195789f20cf2a07a6f244139418136d5b5bf1
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Jan 20 18:31:28 2012 -0500

    more options tweaking.

commit b6aeaef737be5d0e3849b3dd3e098dfcced78381
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Jan 20 13:38:17 2012 -0500

    changes to compile options. expirimentation time!

commit 340152536145289fe6d0a29b06d6966bcd83dd21
Merge: f6702d6 912fd73
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Jan 20 12:22:38 2012 -0500

    Merge branch 'master', remote-tracking branch 'origin' into theshadow/solarium

commit f6702d665cd84081f41866a2c432f64378be76af
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Thu Jan 5 18:26:39 2012 -0500

    added particle effect to waterfall, and some more plants around. also replaced some more ramps with actual stairs.

commit 64765054820fe836dc53baec4fa9800cc931334d
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Wed Jan 4 13:00:16 2012 -0500

    fixes broken shaders, and tweaked compile settings more

commit 67767082af71b284e48e4fd7daa68d9770dc2676
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Wed Jan 4 12:16:19 2012 -0500

    let's see if -a does anything

commit 98ab31cd78a1645c72b26d11b945edeb024b8114
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Wed Jan 4 12:15:00 2012 -0500

    reverted watwerfall for now. It will look cool once I get it working, but that is for a later day. also fixes for water, hoping the files actually upload this time

commit dd9ffa6215b9480e51e38d95a37cdad9b6a3e0dc
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Wed Jan 4 00:05:03 2012 -0500

    lots of changes, edits of compile options, map tweaks and a new original water shader, made by yours truly.

commit 705c7a710a77bd9a1fb9d04e6cbe0c99c43bcb3d
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Tue Jan 3 22:47:54 2012 -0500

    more more tweaks, and I added some refraction to the waterfall just to see how it looks. I may remove it later.

commit fcfa802f15d5302c2b0ae39eaf8b1fd0130404f8
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Tue Jan 3 21:58:03 2012 -0500

    more tweaks, hopefull this will give me something useable

commit 6facb05698b02f6fb3064accbdf8233b4cc467ef
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Tue Jan 3 21:21:57 2012 -0500

    changes to mapinfo

commit fe188810260dd5b849dbc23249b2138265caa04b
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Tue Jan 3 20:43:25 2012 -0500

    YET MORE TWEAKS

commit 49b01fbab2d90e16787a09d9ea30f1168d3a5170
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Tue Jan 3 19:50:34 2012 -0500

    some fixes for sRGB lighting

commit b40cea20b8f0e48434b1ac52d6d5acaf9c597e58
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Tue Jan 3 17:41:05 2012 -0500

    srgb lighting test

commit 3f1aa410eba2405d47d478f35d2c1bf8f2b9381a
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Mon Jan 2 21:08:45 2012 -0500

    moved some item spawns around, and added some brush detailing.

commit f7a244a3c2234350e9c716148f78d6fee83d45ba
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Mon Jan 2 17:19:22 2012 -0500

    changed around some textures and removed another rendered for performance.

commit 2e657f390173450674eb43dfdd1bf3cfdaf039a0
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sun Jan 1 21:48:48 2012 -0500

    fix balance issue (nex had 3 times as much ammo everything as everything else) and some more tweaks

commit 55566c3e994092ae6ca3fccd73969247bedc169e
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sun Jan 1 20:16:01 2012 -0500

    more fixes

commit 74e7c6e1d66f0dce1569173c6b6a57a6743f95df
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sun Jan 1 18:53:28 2012 -0500

    fix waterfall

commit 4e8f580d015677e437e4b1e89aebdce242c5f366
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sun Jan 1 18:09:27 2012 -0500

    changes to waterfall and some patch tweaks

commit e60167f165c2ab1dd0b9d21cad9606b09e7e7a17
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sun Jan 1 17:04:09 2012 -0500

    added waterfall, and moved rocketlauncher spawn

commit e7ad64e71c1aee1f8b80af5e347acdaeb5c2a71c
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sun Jan 1 15:51:49 2012 -0500

    playing around with alphamod. also removed waterfall for no until i have a better solution

commit 3fd71b6dab094d6f421d5e617af3bda3b23ffb0c
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sun Jan 1 14:45:20 2012 -0500

    expiriments with water

commit 723c69a1b3d01cd381e89a2345a36d9d29aa68dc
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sun Jan 1 12:46:42 2012 -0500

    more lights, some minor details.

commit 4c578c4ecc1ee32ce875282089f2391f6b4e3b2c
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sat Dec 31 12:04:24 2011 -0500

    moved some weapon spawnsa round, and redid some brushwork

commit e85b2fca5aa40a05e2f777bf8f0a715bef06cb0a
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Dec 30 21:49:26 2011 -0500

    more fixess

commit 5e18bc608d52b458367efb8ca4f50599eea59524
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Dec 30 20:42:48 2011 -0500

    added more lights, more items and moved nex spawn.

commit a6a12d2242430cef21a6e62c1792db33a902d6d9
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Dec 30 15:48:53 2011 -0500

    added lights, changed arund sound and fixed some texturing issues.

commit d21e66b19551ea2442b0ac7b808d79005ae1141e
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Thu Dec 29 23:47:25 2011 -0500

    some changes to the layout, replaced the jumpad with a ramp. also messed with sound more.

commit e92361da5558a30dfd11c01758a584517d43b3f6
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Thu Dec 29 17:09:57 2011 -0500

    added bot waypoints

commit 47952ec7f430615bfe0470ce8e9832554b1b61c5
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Thu Dec 29 17:04:17 2011 -0500

    added lights, and fixed sound.

commit 66d97a02cef80d6c41f873ece826a55cf7686b1a
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Thu Dec 29 14:53:08 2011 -0500

    started retexturing solarium, and working towards official inclusion. also added some sounds as a test.

commit 24eaa23d8b5a042f7743c7909e2fc2c03e367144
Merge: 54b250f 911a18a
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Thu Dec 29 11:34:20 2011 -0500

    Merge remote-tracking branch 'origin/master' into theshadow/solarium

commit 54b250f3c5e883a384082ad2dc78e84334688e55
Merge: 280453d 4e8c62e
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Mon Sep 12 13:00:26 2011 -0400

    Merge branch 'master' into theShadow/solarium

commit 280453d9257f9ad2266f703441b4b9cc869c56b8
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sat Sep 10 16:17:26 2011 -0400

    more texture changes and an updated mapimage

commit cdc4da5ab2c8fdad9e9742271929b5eb3b18d08b
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Mon Sep 5 17:12:13 2011 -0400

    some more changes, and expirimenting with texture.

commit 7ed54c06f4824f5d186100f2bd2694cf23fe62fa
Merge: 2fc72e4 a9fbecd
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sun Sep 4 14:29:49 2011 -0400

    Merge remote-tracking branch 'origin/master' into theshadow/solarium

commit 2fc72e4598fd2d9571141b2cb62aa3b5e7718be9
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sun Sep 4 14:26:47 2011 -0400

    AN UPDATE! added more spawn points, and begun work on a texture overhaul of the map.

commit 3e982321b72774204f68074c095687cec60600f3
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Mon Jun 13 21:53:55 2011 -0400

    some changes I made to git, that I can't remember oO

commit 33b69ae05d32eec65b6ec214cfd9347d3fe0f7ef
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sat Jun 4 23:26:12 2011 -0400

    storms getting bad. time to call it a day. also added breakable glass!

commit 6ebc685000cf000adf8f28fc56bcb3921782b3eb
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sat Jun 4 21:19:59 2011 -0400

    some tweaks to the grass models

commit c5fa078b9f5bc2cceb96a26595abd4032ddb9608
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sat Jun 4 19:34:21 2011 -0400

    removed grass form solarium, for FPS reasons. also added more detail, and playing around with layout modifications.

commit 58e4d3e19963d8ba9fea7e923185d8084e780bc0
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sat Jun 4 00:32:33 2011 -0400

    DETAILS. lots of them, and still more to come. also fixed glass.

commit 49a2dc6fc1b80ed4648cefed6f54f3e402a80f97
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Jun 3 01:29:55 2011 -0400

    IT IS TIME, for the great completion. from now, I will begin the process of finalizing this map for official inclusion.

commit 488061567f32656e77edb54d3025149fc77e07c0
Author: Pearce Michal <yodaalmighty2000@gmail.com>
Date:   Wed Mar 30 16:37:12 2011 -0400

    hopefully commit works this time.

commit 9e6892cd87911b885ff0a95383b88a51856b6e0f
Author: Pearce Michal <yodaalmighty2000@gmail.com>
Date:   Wed Mar 30 11:19:22 2011 -0400

    removed fireball from solarium.

commit 59ca5ec7a44e57bd4a54a9b1f4e3ef44f4f52712
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Tue Mar 29 14:01:49 2011 -0400

    some final tweaks for solarium. also messing with the compile options a bit.

commit 735203f324c12504e3101366af0828ca73d31768
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Thu Mar 10 15:15:42 2011 -0500

    ok, im calling grass done from here. also added map image

commit 53934d49c0ae83d14b29457e51f25c5ac2f4665d
Author: Pearce Michal <pearcemichal@pearcemichal-pc.urg.edu>
Date:   Wed Mar 9 15:05:15 2011 -0500

    more grass

commit 6d469baff9db12c49a542d687b1e6bca63deb91b
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Wed Mar 9 00:12:11 2011 -0500

    more messing about with grass shader. I think I finally have it this time.

commit 2ba15d5282ffdaf75ee9e11d1d1ac64b02395938
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Tue Mar 8 10:24:07 2011 -0500

    aha. problems solved.

commit ef73a80a2b3a8a5aeea935d06203a9c6fc28ca9b
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Tue Mar 8 09:42:57 2011 -0500

    hopefully kick autocompile into gear

commit fefb9933cc1cfc0a31d3fb3c0f54f3cf27af4908
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Tue Mar 8 09:40:08 2011 -0500

    max map draw surfs??? derp

commit cd1247edbb7bd21f35b3befbef1a940da2aefffd
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Tue Mar 8 09:34:36 2011 -0500

    messing with grass shader. this should too me how to use some of the values properly.

commit 56e90f9101b0710a636e8be58a66d4db2e6385f0
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Mon Mar 7 21:23:43 2011 -0500

    messing with grass shader

commit a91505d2cd2a63c53e16983c007255b4572a0f9c
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Mon Mar 7 01:16:32 2011 -0500

    huh. so making the number smaller makes the grass MORE dense. lets try a larger number

commit 85a12143e8c5585f444252d0f528eec7f2927f20
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Mon Mar 7 00:13:26 2011 -0500

    redueced the density of the grass to hopefully improve performance a bit. also added a frw detail things.

commit 6232dd261c3eadb60b456ced99637da256096f89
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sun Feb 27 23:35:12 2011 -0500

    again, more changes to solarium.

commit 5a238eef82d47dacf15557ee831c10befeadbd75
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sun Feb 27 18:44:52 2011 -0500

    fixed a missing texture (hopefully)

commit dca3e3a09cfa6376687a617ee044562f70f387eb
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Sun Feb 27 17:16:38 2011 -0500

    more changes to solarium. hopefully improve preformance of grass a bit.

commit 1f57c1ac66cedef69475b94ca3f509fd670063c6
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Feb 25 21:32:42 2011 -0500

    some changes to the mapoptions and grass shader for solarium

commit fd421f4dc97a07234029de9d79e22ba65f328389
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date:   Fri Feb 25 20:35:32 2011 -0500

    new map solarium

7 years agofix some mapinfo stuff
Rudolf Polzer [Thu, 1 Mar 2012 13:44:20 +0000 (14:44 +0100)]
fix some mapinfo stuff

7 years agofix some shader naming bugs
Rudolf Polzer [Wed, 29 Feb 2012 10:00:17 +0000 (11:00 +0100)]
fix some shader naming bugs

7 years agoapply rename of sound files to other map files too
Rudolf Polzer [Wed, 29 Feb 2012 09:50:55 +0000 (10:50 +0100)]
apply rename of sound files to other map files too

7 years agoMerge remote-tracking branch 'origin/cbrutail/darkzone'
Rudolf Polzer [Wed, 29 Feb 2012 09:46:55 +0000 (10:46 +0100)]
Merge remote-tracking branch 'origin/cbrutail/darkzone'

7 years agoMerge remote branch 'origin/morphed/exomorphx-alphashadowfix'
Samual [Tue, 28 Feb 2012 21:51:49 +0000 (16:51 -0500)]
Merge remote branch 'origin/morphed/exomorphx-alphashadowfix'

7 years agoadd alphashadow to grate textures in exomorphx set
Morphed [Mon, 27 Feb 2012 23:02:08 +0000 (00:02 +0100)]
add alphashadow to grate textures in exomorphx set

7 years agoNewer campaign by Mirio
Samual [Sun, 26 Feb 2012 05:04:41 +0000 (00:04 -0500)]
Newer campaign by Mirio

7 years ago*bump
cbrutail [Mon, 13 Feb 2012 20:09:24 +0000 (21:09 +0100)]
*bump

7 years agoMerged new textures, and fixed in map.
cbrutail [Mon, 13 Feb 2012 19:42:38 +0000 (20:42 +0100)]
Merged new textures, and fixed in map.

7 years agoMerge branch 'cbrutail/texture-exx_wall-metal01c' into cbrutail/darkzone
cbrutail [Mon, 13 Feb 2012 19:40:28 +0000 (20:40 +0100)]
Merge branch 'cbrutail/texture-exx_wall-metal01c' into cbrutail/darkzone

7 years agoA new texture and modified shader for darkzone
cbrutail [Mon, 13 Feb 2012 19:39:17 +0000 (20:39 +0100)]
A new texture and modified shader for darkzone

7 years agoChanges to textures
cbrutail [Mon, 13 Feb 2012 19:10:19 +0000 (20:10 +0100)]
Changes to textures

7 years agoMerge branch 'master' into cbrutail/darkzone
cbrutail [Sat, 11 Feb 2012 20:53:46 +0000 (21:53 +0100)]
Merge branch 'master' into cbrutail/darkzone

7 years agoMerge remote-tracking branch 'origin/cbrutail/map-lightspeed_domereplace'
Rudolf Polzer [Sat, 11 Feb 2012 20:23:57 +0000 (21:23 +0100)]
Merge remote-tracking branch 'origin/cbrutail/map-lightspeed_domereplace'

7 years agoVines were not 1 qu thick. Also, new mapimage.
cbrutail [Fri, 10 Feb 2012 23:30:36 +0000 (00:30 +0100)]
Vines were not 1 qu thick. Also, new mapimage.

7 years agoMerge branch 'master' into cbrutail/map-lightspeed_domereplace
cbrutail [Fri, 10 Feb 2012 22:11:29 +0000 (23:11 +0100)]
Merge branch 'master' into cbrutail/map-lightspeed_domereplace

7 years agoSome fixes here and there, plus adding some little bugs ;)
cbrutail [Fri, 10 Feb 2012 22:05:11 +0000 (23:05 +0100)]
Some fixes here and there, plus adding some little bugs ;)

7 years agorecompile courtfun and g-23 due to sRGB -fast bug
Rudolf Polzer [Thu, 9 Feb 2012 10:22:49 +0000 (11:22 +0100)]
recompile courtfun and g-23 due to sRGB -fast bug

7 years ago*bump
cbrutail [Mon, 6 Feb 2012 17:51:37 +0000 (18:51 +0100)]
*bump

7 years agoNew map image, and fixing some textures here and there... I hope.
cbrutail [Mon, 6 Feb 2012 17:42:17 +0000 (18:42 +0100)]
New map image, and fixing some textures here and there... I hope.

7 years agoAdding samplesize 4, and bounce 6
cbrutail [Mon, 6 Feb 2012 10:19:23 +0000 (11:19 +0100)]
Adding samplesize 4, and bounce 6

7 years agoFixing the screen, it was never ok.
cbrutail [Sun, 5 Feb 2012 19:10:57 +0000 (20:10 +0100)]
Fixing the screen, it was never ok.

7 years agoIntroducing sRGB, also fixing lights inside the bsp for it (arealights are halfed...
cbrutail [Sun, 5 Feb 2012 12:48:48 +0000 (13:48 +0100)]
Introducing sRGB, also fixing lights inside the bsp for it (arealights are halfed, targetted 1,5x scale). Fixing some texture problems here and there.

7 years agoReplaced the ugly patch domes with models from THEFTBOT (very big thank you). TODO...
cbrutail [Sun, 5 Feb 2012 00:33:25 +0000 (01:33 +0100)]
Replaced the ugly patch domes with models from THEFTBOT (very big thank you). TODO: sRGB lighting, fixing it, and fixing envmap images.

7 years agoapply the game type renames
Rudolf Polzer [Thu, 2 Feb 2012 18:09:11 +0000 (19:09 +0100)]
apply the game type renames

7 years agofix a few more bad uses of tcmod scroll
Rudolf Polzer [Fri, 27 Jan 2012 17:11:58 +0000 (18:11 +0100)]
fix a few more bad uses of tcmod scroll

7 years agoreverse order of scroll/scale because scroll snaps to 0..1 range
Rudolf Polzer [Thu, 26 Jan 2012 21:54:17 +0000 (22:54 +0100)]
reverse order of scroll/scale because scroll snaps to 0..1 range

7 years agoAdd keepaway to afterslime, and also add clan arena to g-23 (uses round based gamepla...
Samual [Tue, 24 Jan 2012 20:10:30 +0000 (15:10 -0500)]
Add keepaway to afterslime, and also add clan arena to g-23 (uses round based gameplay just like freezetag, so it's justified here)

7 years agoDirtscale -> 1.5
cbrutail [Sat, 21 Jan 2012 12:02:25 +0000 (13:02 +0100)]
Dirtscale -> 1.5

7 years agoMerge branch 'master' into cbrutail/darkzone
cbrutail [Sat, 21 Jan 2012 12:01:20 +0000 (13:01 +0100)]
Merge branch 'master' into cbrutail/darkzone

7 years agobump g-23
Rudolf Polzer [Sat, 21 Jan 2012 11:48:45 +0000 (12:48 +0100)]
bump g-23

7 years agoredo courtfun autoscreenshots please :P
Rudolf Polzer [Sat, 21 Jan 2012 09:49:20 +0000 (10:49 +0100)]
redo courtfun autoscreenshots please :P

7 years agoMapshot for courtfun
Samual [Fri, 20 Jan 2012 22:08:50 +0000 (17:08 -0500)]
Mapshot for courtfun

7 years agowhoops, afterslime already had 91 of these haha
Samual [Fri, 20 Jan 2012 21:36:53 +0000 (16:36 -0500)]
whoops, afterslime already had 91 of these haha

7 years agoReplace weapon_hlac with various other solutions for the different maps. Now, HLAC...
Samual [Fri, 20 Jan 2012 21:25:10 +0000 (16:25 -0500)]
Replace weapon_hlac with various other solutions for the different maps. Now, HLAC is not on any default map.

7 years agoTry info_autoscreenshot positions on afterslime
Samual [Fri, 20 Jan 2012 20:49:44 +0000 (15:49 -0500)]
Try info_autoscreenshot positions on afterslime

7 years agocourtfun: fix cvar name g_powerups
Rudolf Polzer [Fri, 20 Jan 2012 18:35:51 +0000 (19:35 +0100)]
courtfun: fix cvar name g_powerups

7 years agoautoscreenshot locations for glowplant
Rudolf Polzer [Fri, 20 Jan 2012 17:03:17 +0000 (18:03 +0100)]
autoscreenshot locations for glowplant

7 years agoalso support "target" in info_autoscreenshot (not implemented yet)
Rudolf Polzer [Fri, 20 Jan 2012 16:18:51 +0000 (17:18 +0100)]
also support "target" in info_autoscreenshot (not implemented yet)

7 years agoMerge remote-tracking branch 'origin/savagex/courtfun-sRGB'
Rudolf Polzer [Mon, 16 Jan 2012 19:48:38 +0000 (20:48 +0100)]
Merge remote-tracking branch 'origin/savagex/courtfun-sRGB'

7 years agoanother recompile please, Y U no make good screenshots
Rudolf Polzer [Mon, 16 Jan 2012 15:46:38 +0000 (16:46 +0100)]
another recompile please, Y U no make good screenshots

7 years agonew compile and screenshot run please to test info_autoscreenshot
Rudolf Polzer [Mon, 16 Jan 2012 14:49:14 +0000 (15:49 +0100)]
new compile and screenshot run please to test info_autoscreenshot

7 years agodefine the first autoscreenshot point for g-23
Rudolf Polzer [Mon, 16 Jan 2012 10:57:09 +0000 (11:57 +0100)]
define the first autoscreenshot point for g-23

7 years agoautoscreenshot location
Rudolf Polzer [Mon, 16 Jan 2012 09:49:00 +0000 (10:49 +0100)]
autoscreenshot location

7 years agoadd some lighting detail (grate shadows, yeah!) and fix some ceiling height proportio...
Maik Merten [Sun, 15 Jan 2012 14:06:26 +0000 (15:06 +0100)]
add some lighting detail (grate shadows, yeah!) and fix some ceiling height proportions (no change in navigatable area/gameplay)
search/replace some NULL textures, replace with common/caulk

7 years agomerge some brushes that originate from the original "clone, rotate" origin of the...
Maik Merten [Sun, 15 Jan 2012 12:29:41 +0000 (13:29 +0100)]
merge some brushes that originate from the original "clone, rotate" origin of the second base

7 years agomoar smoke
Maik Merten [Sat, 14 Jan 2012 17:31:31 +0000 (18:31 +0100)]
moar smoke

7 years agoslightly tweak floodlight
Maik Merten [Sat, 14 Jan 2012 10:03:44 +0000 (11:03 +0100)]
slightly tweak floodlight

7 years agoadd -sRGB to map options, just to be sure
Maik Merten [Fri, 13 Jan 2012 21:10:28 +0000 (22:10 +0100)]
add -sRGB to map options, just to be sure

7 years agoadjust to sRGB
Maik Merten [Fri, 13 Jan 2012 21:00:58 +0000 (22:00 +0100)]
adjust to sRGB

7 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
Rudolf Polzer [Fri, 13 Jan 2012 19:54:42 +0000 (20:54 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir

7 years agoscreenshot for drain was missing
Rudolf Polzer [Fri, 13 Jan 2012 19:54:31 +0000 (20:54 +0100)]
screenshot for drain was missing

7 years agowaypoints for drain
Rudolf Polzer [Mon, 9 Jan 2012 20:29:49 +0000 (21:29 +0100)]
waypoints for drain

7 years agoslightly darker darkzone
Rudolf Polzer [Sat, 7 Jan 2012 20:12:56 +0000 (21:12 +0100)]
slightly darker darkzone

7 years agoMerge branch 'cbrutail/darkzone' of git://de.git.xonotic.org/xonotic/xonotic-maps...
cbrutail [Fri, 6 Jan 2012 15:59:24 +0000 (16:59 +0100)]
Merge branch 'cbrutail/darkzone' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into cbrutail/darkzone

7 years agoAdding said textures and shaders.
cbrutail [Fri, 6 Jan 2012 15:57:14 +0000 (16:57 +0100)]
Adding said textures and shaders.

7 years agoModified a shader, it doesn't have a glowmap anymore. Also, fixed the rather odd...
cbrutail [Fri, 6 Jan 2012 15:50:36 +0000 (16:50 +0100)]
Modified a shader, it doesn't have a glowmap anymore. Also, fixed the rather odd patch in that alcove. Thx for matthiaskrgr for poking me about it.

7 years agoanother recompile, this time it's good
Rudolf Polzer [Fri, 6 Jan 2012 14:45:59 +0000 (15:45 +0100)]
another recompile, this time it's good

7 years agoMerge branch 'master' into cbrutail/darkzone
Rudolf Polzer [Fri, 6 Jan 2012 14:44:32 +0000 (15:44 +0100)]
Merge branch 'master' into cbrutail/darkzone

7 years agobump version to cause a new compile
Rudolf Polzer [Fri, 6 Jan 2012 13:59:45 +0000 (14:59 +0100)]
bump version to cause a new compile

7 years agorename of the map
Rudolf Polzer [Thu, 5 Jan 2012 09:59:06 +0000 (10:59 +0100)]
rename of the map

7 years agoRevert "try randomized dirtmapping - for this amount that may look better (to be...
Rudolf Polzer [Thu, 5 Jan 2012 09:46:27 +0000 (10:46 +0100)]
Revert "try randomized dirtmapping - for this amount that may look better (to be reverted if fail)" because it WAS fail

This reverts commit bee625c48be7fc7e259a2bd3ddaa07c4f30a3a9d.

7 years agoMerge remote-tracking branch 'origin/savagex/courfun-nexball'
Rudolf Polzer [Thu, 5 Jan 2012 09:29:46 +0000 (10:29 +0100)]
Merge remote-tracking branch 'origin/savagex/courfun-nexball'

7 years agoMerge remote-tracking branch 'origin/cbrutail/map-leave_em_behind_soundfix'
Rudolf Polzer [Thu, 5 Jan 2012 09:28:17 +0000 (10:28 +0100)]
Merge remote-tracking branch 'origin/cbrutail/map-leave_em_behind_soundfix'

7 years agoMerge remote-tracking branch 'origin/cbrutail/reorganise_sounds1'
Rudolf Polzer [Thu, 5 Jan 2012 09:27:32 +0000 (10:27 +0100)]
Merge remote-tracking branch 'origin/cbrutail/reorganise_sounds1'

7 years agotry randomized dirtmapping - for this amount that may look better (to be reverted...
Rudolf Polzer [Thu, 5 Jan 2012 09:21:48 +0000 (10:21 +0100)]
try randomized dirtmapping - for this amount that may look better (to be reverted if fail)

7 years agowrite the .options file using new style -sRGB option (no lighting change)
Rudolf Polzer [Thu, 5 Jan 2012 09:19:17 +0000 (10:19 +0100)]
write the .options file using new style -sRGB option (no lighting change)

7 years agoMerge branch 'master' into cbrutail/darkzone
Rudolf Polzer [Thu, 5 Jan 2012 09:15:10 +0000 (10:15 +0100)]
Merge branch 'master' into cbrutail/darkzone

7 years agoshader audit: more strict
Rudolf Polzer [Thu, 5 Jan 2012 09:14:51 +0000 (10:14 +0100)]
shader audit: more strict

7 years agoAdded proper description, authors, bot waypoints and preview image.
cbrutail [Wed, 4 Jan 2012 18:40:18 +0000 (19:40 +0100)]
Added proper description, authors, bot waypoints and preview image.

7 years agoMerge branch 'master' into cbrutail/darkzone
cbrutail [Wed, 4 Jan 2012 18:34:28 +0000 (19:34 +0100)]
Merge branch 'master' into cbrutail/darkzone

7 years agoIt is DONE.
cbrutail [Wed, 4 Jan 2012 17:46:11 +0000 (18:46 +0100)]
It is DONE.

7 years agoMerge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone
cbrutail [Wed, 4 Jan 2012 17:17:07 +0000 (18:17 +0100)]
Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone

7 years agowave 4 -> wave 2
cbrutail [Wed, 4 Jan 2012 17:16:41 +0000 (18:16 +0100)]
wave 4 -> wave 2

7 years agoMerge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone
cbrutail [Wed, 4 Jan 2012 17:09:03 +0000 (18:09 +0100)]
Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone

7 years agoWrong values here and there :D Copy paste fail.
cbrutail [Wed, 4 Jan 2012 17:08:29 +0000 (18:08 +0100)]
Wrong values here and there :D Copy paste fail.

7 years agotrying to get flowy stuff to be wavy too...
cbrutail [Wed, 4 Jan 2012 17:05:12 +0000 (18:05 +0100)]
trying to get flowy stuff to be wavy too...

7 years agoMerge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone
cbrutail [Wed, 4 Jan 2012 15:41:48 +0000 (16:41 +0100)]
Merge branch 'cbrutail/newshader_pipelava' into cbrutail/darkzone

7 years agoSome new shaders for lava with deformvertex wave, so it looks like a bit wavy when...
cbrutail [Wed, 4 Jan 2012 15:40:11 +0000 (16:40 +0100)]
Some new shaders for lava with deformvertex wave, so it looks like a bit wavy when exiting from a pipe.

7 years agoFinally managed to get all sounds working. Some fixes here and there happened too.
cbrutail [Wed, 4 Jan 2012 15:32:12 +0000 (16:32 +0100)]
Finally managed to get all sounds working. Some fixes here and there happened too.

7 years agomention default speed of func_rotating
Rudolf Polzer [Wed, 4 Jan 2012 10:52:32 +0000 (11:52 +0100)]
mention default speed of func_rotating

7 years agoMerge branch 'cbrutail/reorganise_sounds1' into cbrutail/darkzone
cbrutail [Tue, 3 Jan 2012 23:46:24 +0000 (00:46 +0100)]
Merge branch 'cbrutail/reorganise_sounds1' into cbrutail/darkzone

7 years agoMerged new sound locations, and fixed sounds for map.
cbrutail [Tue, 3 Jan 2012 23:44:39 +0000 (00:44 +0100)]
Merged new sound locations, and fixed sounds for map.

7 years agoMoved these two sound files, so they can be reused later. Also, added LOOPED_START...
cbrutail [Tue, 3 Jan 2012 23:31:23 +0000 (00:31 +0100)]
Moved these two sound files, so they can be reused later. Also, added LOOPED_START vorbiscomment.

7 years agoAdded some ambient sounds, more to come.
cbrutail [Tue, 3 Jan 2012 23:10:17 +0000 (00:10 +0100)]
Added some ambient sounds, more to come.

7 years agoForgot to include renamed files.
cbrutail [Mon, 2 Jan 2012 22:00:41 +0000 (23:00 +0100)]
Forgot to include renamed files.

7 years agoRenaming map name back to normal. Trying shadeangle 45 in meta compile as tZork sugge...
cbrutail [Mon, 2 Jan 2012 21:59:36 +0000 (22:59 +0100)]
Renaming map name back to normal. Trying shadeangle 45 in meta compile as tZork suggested.

7 years agoMerge branch 'master' into cbrutail/darkzone
cbrutail [Sat, 31 Dec 2011 12:59:10 +0000 (13:59 +0100)]
Merge branch 'master' into cbrutail/darkzone

7 years agoyou spin me right round baby right round! Fixed cogheel lighting problems, added...
cbrutail [Sat, 31 Dec 2011 12:48:06 +0000 (13:48 +0100)]
you spin me right round baby right round! Fixed cogheel lighting problems, added new models for them, and tow more playerclips.

7 years agoadd nexball support in courtfun. Also change map picture. And yes, this branch name...
Maik Merten [Sat, 31 Dec 2011 11:38:31 +0000 (12:38 +0100)]
add nexball support in courtfun. Also change map picture. And yes, this branch name has a typo in it.

7 years agono decals on conveyor belt please
Rudolf Polzer [Fri, 30 Dec 2011 20:12:37 +0000 (21:12 +0100)]
no decals on conveyor belt please

7 years agoMerge branch 'master' into cbrutail/darkzone
cbrutail [Fri, 30 Dec 2011 19:57:24 +0000 (20:57 +0100)]
Merge branch 'master' into cbrutail/darkzone

7 years agoMerge branch 'cbrutail/g-23_cant_take_it_anymore'
Rudolf Polzer [Fri, 30 Dec 2011 19:10:54 +0000 (20:10 +0100)]
Merge branch 'cbrutail/g-23_cant_take_it_anymore'

7 years agouse trigger_conveyor! Now they work PERFECTLY.
Rudolf Polzer [Fri, 30 Dec 2011 18:47:08 +0000 (19:47 +0100)]
use trigger_conveyor! Now they work PERFECTLY.

7 years agoMerge branch 'master' into cbrutail/g-23_cant_take_it_anymore
Rudolf Polzer [Fri, 30 Dec 2011 17:59:22 +0000 (18:59 +0100)]
Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore

Conflicts:
maps/g-23.map

7 years agoReverted the lift to finally work the way it should.
cbrutail [Fri, 30 Dec 2011 14:43:05 +0000 (15:43 +0100)]
Reverted the lift to finally work the way it should.

7 years agoMerge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir
Rudolf Polzer [Fri, 30 Dec 2011 14:34:33 +0000 (15:34 +0100)]
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir

7 years agoexplicitly set "lip" on all func_plats
Rudolf Polzer [Fri, 30 Dec 2011 14:34:07 +0000 (15:34 +0100)]
explicitly set "lip" on all func_plats