Patches #1035

Merge in xonotic/xonotic-maps.pk3dir.git: theshadow/solarium

Added by git-manager over 2 years ago. Updated over 2 years ago.

Status:ClosedStart date:01/23/2012
Priority:NormalDue date:
Assignee:-% Done:

100%

Category:-
Target version:-

Description

Purpose of the branch:

New map: Solarium. medium sized DM map with an open layout.

I am willing to maintain this map, and fix any issues found after merging. 

Repository: xonotic/xonotic-maps.pk3dir.git
Commit: 8a56f92908a9ac3026376ede1c72ade7c1b93126
Branch: theshadow/solarium

Merge commands:

cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '8a56f92908a9ac3026376ede1c72ade7c1b93126'..'origin/theshadow/solarium'

# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes

git merge --no-ff 'origin/theshadow/solarium'

# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out

git push && git push --delete origin 'theshadow/solarium'

Warning:
Long diff has been truncated. Use
git diff 'refs/heads/master'..'8a56f92908a9ac3026376ede1c72ade7c1b93126'
to view the full diff.

Diffstat:

 .DS_Store                                   |  Bin 0 -> 6148 bytes
 gfx/.DS_Store                               |  Bin 0 -> 6148 bytes
 maps/.DS_Store                              |  Bin 0 -> 6148 bytes
 maps/solarium.map                           |22206 +++++++++++++++++++++++++++
 maps/solarium.map.options                   |    7 +
 maps/solarium.mapinfo                       |   10 +
 maps/solarium.tga                           |  Bin 0 -> 1000044 bytes
 maps/solarium.waypoints                     |  165 +
 maps/solarium.waypoints.cache               | 1065 ++
 models/grass/grass.blend                    |  Bin 0 -> 39736 bytes
 models/grass/grass.obj                      |   59 +
 models/grass/grass.tga                      |  Bin 0 -> 3116 bytes
 scripts/.DS_Store                           |  Bin 0 -> 6148 bytes
 scripts/grass.shader                        |   61 +
 scripts/shaderlist.txt                      |    3 +
 scripts/solarium.shader                     |   45 +
 textures/.DS_Store                          |  Bin 0 -> 6148 bytes
 textures/grass/grass2.tga                   |  Bin 0 -> 3145772 bytes
 textures/solarium/.DS_Store                 |  Bin 0 -> 6148 bytes
 textures/solarium/water4/.DS_Store          |  Bin 0 -> 6148 bytes
 textures/solarium/water4/water4.tga         |  Bin 0 -> 1048594 bytes
 textures/solarium/water4/water4_norm.tga    |  Bin 0 -> 1048620 bytes
 textures/solarium/waterfall/water2.tga      |  Bin 0 -> 1048594 bytes
 textures/solarium/waterfall/water2_norm.tga |  Bin 0 -> 786476 bytes
 24 files changed, 23621 insertions(+), 0 deletions(-)

Revision log:

commit 8a56f92908a9ac3026376ede1c72ade7c1b93126
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

    ugh this makes no sense

commit 937e5b7f0a715e265f1727bdc33d2d01ed15c2f8
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    more changes to map options, and some syntax corections.

commit a7ec07329a9443a4d770768a610c8406d2299f26
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    fix typo.

commit ff781625cb6c1ebfd7caf867223d572261f2c468
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    more options tweaks.

commit 31f3241fe10d1ba54fe975a28db1babbd5b8e761
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    nope

commit 2b1af9f98352fc09c985d740a7186a912fcfbb3b
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

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

commit 64d7b0ac0e49de16d09c5146b02af7de2853e18f
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    more testing

commit eb59cc89e1a847f36c488e8c9f6666af30c3b4c3
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    more options tweaking.

commit b6aeaef737be5d0e3849b3dd3e098dfcced78381
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    changes to compile options. expirimentation time!

commit 340152536145289fe6d0a29b06d6966bcd83dd21
Merge: f6702d6 912fd73
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

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

commit f6702d665cd84081f41866a2c432f64378be76af
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    fixes broken shaders, and tweaked compile settings more

commit 67767082af71b284e48e4fd7daa68d9770dc2676
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    let's see if -a does anything

commit 98ab31cd78a1645c72b26d11b945edeb024b8114
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    more tweaks, hopefull this will give me something useable

commit 6facb05698b02f6fb3064accbdf8233b4cc467ef
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    changes to mapinfo

commit fe188810260dd5b849dbc23249b2138265caa04b
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    YET MORE TWEAKS

commit 49b01fbab2d90e16787a09d9ea30f1168d3a5170
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    some fixes for sRGB lighting

commit b40cea20b8f0e48434b1ac52d6d5acaf9c597e58
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    srgb lighting test

commit 3f1aa410eba2405d47d478f35d2c1bf8f2b9381a
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

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

commit f7a244a3c2234350e9c716148f78d6fee83d45ba
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    changed around some textures and removed another rendered for performance.

commit 2e657f390173450674eb43dfdd1bf3cfdaf039a0
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    more fixes

commit 74e7c6e1d66f0dce1569173c6b6a57a6743f95df
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    fix waterfall

commit 4e8f580d015677e437e4b1e89aebdce242c5f366
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    changes to waterfall and some patch tweaks

commit e60167f165c2ab1dd0b9d21cad9606b09e7e7a17
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    added waterfall, and moved rocketlauncher spawn

commit e7ad64e71c1aee1f8b80af5e347acdaeb5c2a71c
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    expiriments with water

commit 723c69a1b3d01cd381e89a2345a36d9d29aa68dc
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    more lights, some minor details.

commit 4c578c4ecc1ee32ce875282089f2391f6b4e3b2c
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    moved some weapon spawnsa round, and redid some brushwork

commit e85b2fca5aa40a05e2f777bf8f0a715bef06cb0a
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    more fixess

commit 5e18bc608d52b458367efb8ca4f50599eea59524
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    added more lights, more items and moved nex spawn.

commit a6a12d2242430cef21a6e62c1792db33a902d6d9
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

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

commit d21e66b19551ea2442b0ac7b808d79005ae1141e
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    added bot waypoints

commit 47952ec7f430615bfe0470ce8e9832554b1b61c5
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    added lights, and fixed sound.

commit 66d97a02cef80d6c41f873ece826a55cf7686b1a
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

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

commit 54b250f3c5e883a384082ad2dc78e84334688e55
Merge: 280453d 4e8c62e
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    Merge branch 'master' into theShadow/solarium

commit 280453d9257f9ad2266f703441b4b9cc869c56b8
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    more texture changes and an updated mapimage

commit cdc4da5ab2c8fdad9e9742271929b5eb3b18d08b
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    some more changes, and expirimenting with texture.

commit 7ed54c06f4824f5d186100f2bd2694cf23fe62fa
Merge: 2fc72e4 a9fbecd
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

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

commit 2fc72e4598fd2d9571141b2cb62aa3b5e7718be9
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

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

commit 33b69ae05d32eec65b6ec214cfd9347d3fe0f7ef
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

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

commit 6ebc685000cf000adf8f28fc56bcb3921782b3eb
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    some tweaks to the grass models

commit c5fa078b9f5bc2cceb96a26595abd4032ddb9608
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

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

commit 49a2dc6fc1b80ed4648cefed6f54f3e402a80f97
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <yodaalmighty2000@gmail.com>

    hopefully commit works this time.

commit 9e6892cd87911b885ff0a95383b88a51856b6e0f
Author: Pearce Michal <yodaalmighty2000@gmail.com>
Commit: Pearce Michal <yodaalmighty2000@gmail.com>

    removed fireball from solarium.

commit 59ca5ec7a44e57bd4a54a9b1f4e3ef44f4f52712
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

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

commit 735203f324c12504e3101366af0828ca73d31768
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

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

commit 53934d49c0ae83d14b29457e51f25c5ac2f4665d
Author: Pearce Michal <pearcemichal@pearcemichal-pc.urg.edu>
Commit: Pearce Michal <pearcemichal@pearcemichal-pc.urg.edu>

    more grass

commit 6d469baff9db12c49a542d687b1e6bca63deb91b
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    aha. problems solved.

commit ef73a80a2b3a8a5aeea935d06203a9c6fc28ca9b
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    hopefully kick autocompile into gear

commit fefb9933cc1cfc0a31d3fb3c0f54f3cf27af4908
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    max map draw surfs??? derp

commit cd1247edbb7bd21f35b3befbef1a940da2aefffd
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    messing with grass shader

commit a91505d2cd2a63c53e16983c007255b4572a0f9c
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    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>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    again, more changes to solarium.

commit 5a238eef82d47dacf15557ee831c10befeadbd75
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    fixed a missing texture (hopefully)

commit dca3e3a09cfa6376687a617ee044562f70f387eb
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

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

commit 1f57c1ac66cedef69475b94ca3f509fd670063c6
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    some changes to the mapoptions and grass shader for solarium

commit fd421f4dc97a07234029de9d79e22ba65f328389
Author: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Commit: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>

    new map solarium

User agreed to the GPLv2+.

Diff:

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/.DS_Store differ
diff --git a/gfx/.DS_Store b/gfx/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/gfx/.DS_Store differ
diff --git a/maps/.DS_Store b/maps/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/maps/.DS_Store differ
diff --git a/maps/solarium.map b/maps/solarium.map
new file mode 100644
index 0000000..a465c5d
--- /dev/null
+++ b/maps/solarium.map
@@ -0,0 +1,22206 @@
*** LONG HUNK SKIPPED ***
*** TO VIEW, USE git diff 'refs/heads/master'..'8a56f92908a9ac3026376ede1c72ade7c1b93126' ***
diff --git a/maps/solarium.map.options b/maps/solarium.map.options
new file mode 100644
index 0000000..911ae02
--- /dev/null
+++ b/maps/solarium.map.options
@@ -0,0 +1,7 @@
+-bsp + -samplesize 6
+-vis +
+-light + -bounce 1 -dirty -dirtscale 1 -bouncescale 1 -exposure 1 -areascale 0.10
+
+-sRGB
+
+version: 4
\ No newline at end of file
diff --git a/maps/solarium.mapinfo b/maps/solarium.mapinfo
new file mode 100644
index 0000000..b7123d2
--- /dev/null
+++ b/maps/solarium.mapinfo
@@ -0,0 +1,10 @@
+title Solarium
+description Deep in the mountains, this Paradise of light and life has become a battleground, with the bodies of the dead fertilizing the plants that grow here. Medium sized open map, good for 3 to 6 players.
+author theShadow
+cdtrack 5
+has weapons
+gametype dm
+gametype lms
+gametype arena
+gametype rc
+gametype ca
diff --git a/maps/solarium.tga b/maps/solarium.tga
new file mode 100644
index 0000000..2ef6446
Binary files /dev/null and b/maps/solarium.tga differ
diff --git a/maps/solarium.waypoints b/maps/solarium.waypoints
new file mode 100644
index 0000000..03b04bb
--- /dev/null
+++ b/maps/solarium.waypoints
@@ -0,0 +1,165 @@
+'-163.0 -181.3  24.1'
+'-163.0 -181.3  24.1'
+0
+'-2067.8 250.8 -103.9'
+'-2067.8 250.8 -103.9'
+0
+'-1546.0 -800.7 176.1'
+'-1546.0 -800.7 176.1'
+0
+'-1848.4 -976.0  64.1'
+'-1848.4 -976.0  64.1'
+0
+'-1856.6 -1248.1 -39.9'
+'-1856.6 -1248.1 -39.9'
+0
+'-2067.3 -1250.6 -47.9'
+'-2067.3 -1250.6 -47.9'
+0
+'-2305.4 -1242.8 -103.9'
+'-2305.4 -1242.8 -103.9'
+0
+'-2262.1 -259.6 -103.9'
+'-2262.1 -259.6 -103.9'
+0
+'-2279.4  20.4 -103.9'
+'-2279.4  20.4 -103.9'
+0
+'-2046.7 -268.9 -39.9'
+'-2046.7 -268.9 -39.9'
+0
+'-1821.7 -247.4 -39.9'
+'-1821.7 -247.4 -39.9'
+0
+'-1595.6  57.5 -39.9'
+'-1595.6  57.5 -39.9'
+0
+'-1618.8 -380.3 -39.9'
+'-1618.8 -380.3 -39.9'
+0
+'-1265.7 -410.0 -39.9'
+'-1265.7 -410.0 -39.9'
+0
+'-1286.9  16.9 -39.9'
+'-1286.9  16.9 -39.9'
+0
+'-1012.1 -186.2 -39.9'
+'-1012.1 -186.2 -39.9'
+0
+'-857.6 -178.3  24.1'
+'-857.6 -178.3  24.1'
+0
+'-144.3 110.4  24.1'
+'-144.3 110.4  24.1'
+0
+'-770.5  96.5 176.6'
+'-770.5  96.5 176.6'
+0
+'292.2  91.2  24.1'
+'292.2  91.2  24.1'
+0
+'274.2 -202.9  24.1'
+'274.2 -202.9  24.1'
+0
+'725.2  71.1  24.1'
+'725.2  71.1  24.1'
+0
+'703.8 -222.7  24.1'
+'703.8 -222.7  24.1'
+0
+'683.4 -730.5 176.1'
+'683.4 -730.5 176.1'
+0
+'424.8 -479.1  88.1'
+'424.8 -479.1  88.1'
+0
+'414.8 -812.7 176.1'
+'414.8 -812.7 176.1'
+0
+'565.2 -1018.0 176.1'
+'565.2 -1018.0 176.1'
+0
+' 81.5 -1234.4 176.1'
+' 81.5 -1234.4 176.1'
+0
+' 29.4 -1582.8 112.1'
+' 29.4 -1582.8 112.1'
+0
+'594.1 -1623.8 112.1'
+'594.1 -1623.8 112.1'
+0
+'681.6 -2101.9 112.1'
+'681.6 -2101.9 112.1'
+0
+'580.5 -2861.8 208.1'
+'580.5 -2861.8 208.1'
+0
+'-222.7 -2999.4 190.3'
+'-222.7 -2999.4 190.3'
+0
+'-381.0 -2843.4 136.2'
+'-381.0 -2843.4 136.2'
+0
+'-607.4 -2439.5  96.1'
+'-607.4 -2439.5  96.1'
+0
+'-573.7 -2223.5 112.1'
+'-573.7 -2223.5 112.1'
+0
+'-989.1 -2145.4 112.1'
+'-989.1 -2145.4 112.1'
+0
+'-1385.3 -1894.9 112.1'
+'-1385.3 -1894.9 112.1'
+0
+'-1140.1 -1659.3 112.1'
+'-1140.1 -1659.3 112.1'
+0
+'-1405.9 -1643.5 -39.9'
+'-1405.9 -1643.5 -39.9'
+0
+'-795.7 -1737.1 112.1'
+'-795.7 -1737.1 112.1'
+0
+'-804.3 -1115.8 112.1'
+'-804.3 -1115.8 112.1'
+0
+'-799.5 -827.7 176.1'
+'-799.5 -827.7 176.1'
+0
+'-1221.8 -642.6 200.1'
+'-1221.8 -642.6 200.1'
+0
+'-719.7 -628.7 176.1'
+'-719.7 -628.7 176.1'
+0
+'-1159.6 -1325.9 -39.9'
+'-1159.6 -1325.9 -39.9'
+0
+'-715.3 -1591.4 112.1'
+'-715.3 -1591.4 112.1'
+0
+'-464.7 -1587.3 112.1'
+'-464.7 -1587.3 112.1'
+0
+'-455.1 -1094.7 176.1'
+'-455.1 -1094.7 176.1'
+0
+' 12.8 -1098.3 176.1'
+' 12.8 -1098.3 176.1'
+0
+' 74.7 -656.0 176.1'
+' 74.7 -656.0 176.1'
+0
+'666.1 -531.7  88.1'
+'666.1 -531.7  88.1'
+0
+'-305.9 -2548.1  72.0'
+'-305.9 -2548.1  72.0'
+0
+'-1144.7 -30.1 200.1'
+'-1144.7 -30.1 200.1'
+0
+'-1520.7 -1334.2 -39.9'
+'-1520.7 -1334.2 -39.9'
+0
diff --git a/maps/solarium.waypoints.cache b/maps/solarium.waypoints.cache
new file mode 100644
index 0000000..b455bb0
--- /dev/null
+++ b/maps/solarium.waypoints.cache
@@ -0,0 +1,1065 @@
*** LONG HUNK SKIPPED ***
*** TO VIEW, USE git diff 'refs/heads/master'..'8a56f92908a9ac3026376ede1c72ade7c1b93126' ***
diff --git a/models/grass/grass.blend b/models/grass/grass.blend
new file mode 100644
index 0000000..2fc27dc
Binary files /dev/null and b/models/grass/grass.blend differ
diff --git a/models/grass/grass.obj b/models/grass/grass.obj
new file mode 100644
index 0000000..40b1a12
--- /dev/null
+++ b/models/grass/grass.obj
@@ -0,0 +1,59 @@
+# Blender3D v249 OBJ File: grass.blend
+# www.blender3d.org
+v -1.227663 -0.967747 0.735489
+v 0.572877 -0.602830 -0.056592
+v 0.595462 -0.699351 -0.043408
+v 2.039121 1.500714 0.773655
+v 0.578951 0.438406 -0.087684
+v 0.518743 0.464760 -0.012315
+v -0.998626 0.069618 0.701318
+v 0.858514 -0.127764 -0.016018
+v 0.822762 -0.191817 -0.083982
+v 1.079529 -0.947190 1.004498
+v 0.159314 0.481822 -0.050789
+v 0.228849 0.546396 -0.019242
+v 0.350668 2.112728 0.382225
+v -0.263403 0.257595 -0.046611
+v -0.356770 0.292762 -0.053389
+v -1.652065 1.051277 0.980540
+v -0.734967 -0.401843 -0.044095
+v -0.804954 -0.465465 -0.011628
+v -2.138498 0.589515 0.745755
+v -0.312048 0.819598 -0.037600
+v -0.313220 0.722730 -0.062400
+v -1.194888 -1.615944 0.735489
+v -0.235978 -0.048909 -0.056592
+v -0.149917 -0.098099 -0.043408
+vt 0.500000 0.500000
+vt 0.750000 1.000000
+vt 0.750000 0.000000
+vt 0.375000 0.500000
+vt 0.625000 1.000000
+vt 0.625000 0.000000
+vt 0.250000 0.500000
+vt 0.500000 0.000000
+vt 0.500000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.000000
+vt 0.750000 0.500000
+vt 1.000000 0.000000
+vt 1.000000 1.000000
+vt 0.625000 0.500000
+vt 0.875000 1.000000
+vt 0.875000 0.000000
+vt 0.000000 0.500000
+vt 0.250000 0.000000
+vt 0.250000 1.000000
+vt 0.125000 0.500000
+vt 0.375000 1.000000
+vt 0.375000 0.000000
+usemtl models/grass/grass
+s off
+f 1/1 3/2 2/3
+f 4/4 6/5 5/6
+f 7/7 9/8 8/9
+f 10/7 12/10 11/11
+f 13/12 15/13 14/14
+f 16/15 18/16 17/17
+f 19/18 21/19 20/20
+f 22/21 24/22 23/23
diff --git a/models/grass/grass.tga b/models/grass/grass.tga
new file mode 100644
index 0000000..018e759
Binary files /dev/null and b/models/grass/grass.tga differ
diff --git a/scripts/.DS_Store b/scripts/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/scripts/.DS_Store differ
diff --git a/scripts/grass.shader b/scripts/grass.shader
new file mode 100755
index 0000000..fb450f4
--- /dev/null
+++ b/scripts/grass.shader
@@ -0,0 +1,61 @@
+
+textures/grass/grass2
+{
+    qer_editorimage textures/grass/grass2.tga
+
+    surfaceparm nomarks
+    surfaceparm nosteps
+    q3map_surfaceModel models/grass/grass.obj 23 0.5 9 12 0 360 1
+        //modelpath density odds minscale maxscale minangle maxangle oriented
+
+    {
+        map textures/grass/grass2.tga
+    }
+    {
+        map $lightmap
+        rgbGen identity
+        tcGen lightmap
+        blendFunc filter
+    }
+}
+
+textures/grass/grass3
+{
+    qer_editorimage textures/terrain01x/ground/drylake01.tga
+
+    surfaceparm nomarks
+    surfaceparm nosteps
+    q3map_surfaceModel models/grass/grass.obj 26 0.6 10 12 0 360 1
+        //modelpath density odds minscale maxscale minangle maxangle oriented
+
+    {
+        map textures/grass/grass2.tga
+    }
+    {
+        map $lightmap
+        rgbGen identity
+        tcGen lightmap
+        blendFunc filter
+    }
+}
+
+models/grass/grass
+{
+    qer_editorimage models/grass/grass.tga
+
+    surfaceparm trans
+    surfaceparm nonsolid
+    surfaceparm nomarks
+    surfaceparm noimpact
+    cull none
+
+    {
+        map models/grass/grass.tga
+    }
+    {
+        map $lightmap
+        rgbGen identity
+        tcGen lightmap
+        blendFunc filter
+    }
+}
diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 5d16535..bd3d8a7 100644
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -13,6 +13,7 @@ exomorphx
 exx
 facility114invx
 facility114x
+grass
 liquids_lava
 liquids_slime
 liquids_water
@@ -55,3 +56,5 @@ trak4x
 trak5x
 trak6x
 trak7x
+solarium
+
diff --git a/scripts/solarium.shader b/scripts/solarium.shader
new file mode 100644
index 0000000..fab4ce7
--- /dev/null
+++ b/scripts/solarium.shader
@@ -0,0 +1,45 @@
+textures/solarium/waterfall
+{
+    qer_editorimage textures/solarium/waterfall/water2.tga
+
+    qer_trans 20
+    surfaceparm water
+    cull none
+    surfaceparm nomarks
+    surfaceparm trans
+    surfaceparm nolightmap
+
+
+    {    
+        map textures/solarium/waterfall/water2.tga    
+        tcMod scroll 0 -1.5
+        blendfunc blend
+    }
+
+}
+
+textures/solarium/water4
+{
+    qer_trans 20
+    surfaceparm nomarks
+    surfaceparm trans
+    surfaceparm water
+    surfaceparm nolightmap
+    cull none
+    q3map_globaltexture
+    tessSize 256
+    qer_editorimage textures/solarium/water4/water4.tga
+    {
+        map textures/solarium/water4/water4.tga
+        tcMod scroll 0.07 0.07
+        tcmod scale .4 .5
+        blendfunc add
+    }
+    dpreflectcube cubemaps/default/sky
+    {
+        map $lightmap
+        blendfunc add
+        tcGen lightmap
+    }
+    dp_water 0.1 1.2  1.4 1.4  1 1 1  1 1 1  0.4
+}
\ No newline at end of file
diff --git a/textures/.DS_Store b/textures/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/textures/.DS_Store differ
diff --git a/textures/grass/grass2.tga b/textures/grass/grass2.tga
new file mode 100644
index 0000000..6673e5d
Binary files /dev/null and b/textures/grass/grass2.tga differ
diff --git a/textures/solarium/.DS_Store b/textures/solarium/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/textures/solarium/.DS_Store differ
diff --git a/textures/solarium/water4/.DS_Store b/textures/solarium/water4/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/textures/solarium/water4/.DS_Store differ
diff --git a/textures/solarium/water4/water4.tga b/textures/solarium/water4/water4.tga
new file mode 100644
index 0000000..233e397
Binary files /dev/null and b/textures/solarium/water4/water4.tga differ
diff --git a/textures/solarium/water4/water4_norm.tga b/textures/solarium/water4/water4_norm.tga
new file mode 100644
index 0000000..5d38a30
Binary files /dev/null and b/textures/solarium/water4/water4_norm.tga differ
diff --git a/textures/solarium/waterfall/water2.tga b/textures/solarium/waterfall/water2.tga
new file mode 100644
index 0000000..233e397
Binary files /dev/null and b/textures/solarium/waterfall/water2.tga differ
diff --git a/textures/solarium/waterfall/water2_norm.tga b/textures/solarium/waterfall/water2_norm.tga
new file mode 100644
index 0000000..fb4fb22
Binary files /dev/null and b/textures/solarium/waterfall/water2_norm.tga differ

History

#1 Updated by C.Brutail over 2 years ago

Finally! :)
Personally, I love the map, it plays very well. Though it might have some performance problems with reflections on.

#2 Updated by theShadow over 2 years ago

This merge request is obsolete, I am making a new one for the updated map.

#3 Updated by merlijn over 2 years ago

  • Status changed from New to Closed

Also available in: Atom PDF