Patches #1090

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

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

Status:ResolvedStart date:03/01/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. 

Repository: xonotic/xonotic-maps.pk3dir.git
Commit: 14086c03fb36964f5a1f0b00ea7556cbaa79a324
Branch: theshadow/solarium

Merge commands:

cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '14086c03fb36964f5a1f0b00ea7556cbaa79a324'..'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'..'14086c03fb36964f5a1f0b00ea7556cbaa79a324'
to view the full diff.

Diffstat:

 .DS_Store                                          |  Bin 0 -> 6148 bytes
 gfx/.DS_Store                                      |  Bin 0 -> 6148 bytes
 gfx/solarium_mini.tga                              |  Bin 0 -> 262162 bytes
 maps/.DS_Store                                     |  Bin 0 -> 6148 bytes
 maps/solarium.map                                  |26042 ++++++++++++++++++++
 maps/solarium.map.options                          |    7 +
 maps/solarium.mapinfo                              |   15 +
 maps/solarium.tga                                  |  Bin 0 -> 1000044 bytes
 maps/solarium.waypoints                            |  165 +
 maps/solarium.waypoints.cache                      | 1065 +
 models/.DS_Store                                   |  Bin 0 -> 6148 bytes
 models/map_solarium/.DS_Store                      |  Bin 0 -> 6148 bytes
 models/map_solarium/radardish.ase                  | 7463 ++++++
 scripts/.DS_Store                                  |  Bin 0 -> 6148 bytes
 scripts/grass.shader                               |   61 +
 scripts/map_solarium.shader                        |   64 +
 scripts/shaderlist.txt                             |    4 +
 sound/map_solarium/.DS_Store                       |  Bin 0 -> 6148 bytes
 sound/map_solarium/trickle.wav                     |  Bin 0 -> 553320 bytes
 textures/.DS_Store                                 |  Bin 0 -> 6148 bytes
 textures/map_solarium/.DS_Store                    |  Bin 0 -> 6148 bytes
 textures/map_solarium/cubemap_glass/.DS_Store      |  Bin 0 -> 12292 bytes
 textures/map_solarium/cubemap_glass/env2.tga       |  Bin 0 -> 1048620 bytes
 textures/map_solarium/cubemap_glass/glass.tga      |  Bin 0 -> 262188 bytes
 textures/map_solarium/water4/.DS_Store             |  Bin 0 -> 6148 bytes
 textures/map_solarium/water4/water4.tga            |  Bin 0 -> 1048620 bytes
 textures/map_solarium/water4/water4_gloss.tga      |  Bin 0 -> 1048620 bytes
 textures/map_solarium/water4/water4_norm.tga       |  Bin 0 -> 1048620 bytes
 textures/map_solarium/water4/water4_reflect.png    |  Bin 0 -> 4536 bytes
 textures/map_solarium/waterfall/.DS_Store          |  Bin 0 -> 6148 bytes
 textures/map_solarium/waterfall/water2.tga         |  Bin 0 -> 1048594 bytes
 textures/map_solarium/waterfall/water2_gloss.tga   |  Bin 0 -> 1048620 bytes
 textures/map_solarium/waterfall/water2_norm.tga    |  Bin 0 -> 786476 bytes
 textures/map_solarium/waterfall/water2_reflect.tga |  Bin 0 -> 1048620 bytes
 textures/skies/.DS_Store                           |  Bin 0 -> 6148 bytes
 35 files changed, 34886 insertions(+), 0 deletions(-)

Revision log:

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

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

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

    final version, ready for merging with master.

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

    morpheds texture fix, and a few tweaks.

commit 85dc9ef15c90ea14ddd0ef3400412691efb22ca3
Merge: 1eff284 0f640a4
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

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

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

    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>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

    added some stuff, and cleaned up some degenerate patches.

commit 9375092d8bb1aa4b209e87be0fcf5632c47b63b7
Merge: 1eab788 10abbd7
Author: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

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

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

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

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

    new stairs textures.

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

    some texture changes and such

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

    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>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

    retextured lots of stuff. just expirimenting at this point.

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

    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>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

    fixed compile options, so it looks good again.

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

    changed somethings around in map options and map.

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

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

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

    push again, maybe server's fixed?

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

    fix the model, and hopefully compile works now.

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

    more cleanup

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

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

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

    cleanup

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

     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>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

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

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

    add skybox. shut up matthiaskrgr

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

    some details, and a huge brush cleanup.

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

    fixd broken reflections, and also modified some textures a bit

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

    fix reflections, maybe? also update to fix 404 error

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

    fixed water, and deleting unused files

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

    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>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

    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>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

    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>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

    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>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

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

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

    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>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

    seriously. cubemaps. i really really mean it this time

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

    ok, cubemaps for serious this time.

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

    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>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

    cubemaps! cubmaops all around!

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

    forgot to delete some files

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

    bugfixes, details, and initial cubemap test.

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

    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>
Commit: Pearce 'theShadow' Michal <pearcem.dx@gmail.com>

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

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

    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>
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/gfx/solarium_mini.tga b/gfx/solarium_mini.tga
new file mode 100644
index 0000000..e5a8323
Binary files /dev/null and b/gfx/solarium_mini.tga 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..13f9032
--- /dev/null
+++ b/maps/solarium.map
@@ -0,0 +1,26042 @@
*** LONG HUNK SKIPPED ***
*** TO VIEW, USE git diff 'refs/heads/master'..'14086c03fb36964f5a1f0b00ea7556cbaa79a324' ***
diff --git a/maps/solarium.map.options b/maps/solarium.map.options
new file mode 100644
index 0000000..b32e117
--- /dev/null
+++ b/maps/solarium.map.options
@@ -0,0 +1,7 @@
+-bsp + -samplesize 6
+-vis +
+-light + -bounce 1 -dirty -dirtscale 1 -bouncescale 1 -areascale 0.10
+
+
+
+version: 1.0
\ No newline at end of file
diff --git a/maps/solarium.mapinfo b/maps/solarium.mapinfo
new file mode 100644
index 0000000..951fac3
--- /dev/null
+++ b/maps/solarium.mapinfo
@@ -0,0 +1,15 @@
+title Solarium
+description Medium sized open map, good for 3 to 6 players. Special thanks to: Maikmerten, matthiaskrgr, Samuncle, and the rest of the dev team for all their help and support.
+
+author theShadow
+
+cdtrack 5
+has weapons
+gametype dm
+gametype tdm
+gametype lms
+gametype arena
+gametype ca
+gametype ka
+gametype ft
+
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'..'14086c03fb36964f5a1f0b00ea7556cbaa79a324' ***
diff --git a/models/.DS_Store b/models/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/models/.DS_Store differ
diff --git a/models/map_solarium/.DS_Store b/models/map_solarium/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/models/map_solarium/.DS_Store differ
diff --git a/models/map_solarium/radardish.ase b/models/map_solarium/radardish.ase
new file mode 100644
index 0000000..c91c89c
--- /dev/null
+++ b/models/map_solarium/radardish.ase
@@ -0,0 +1,7463 @@
*** LONG HUNK SKIPPED ***
*** TO VIEW, USE git diff 'refs/heads/master'..'14086c03fb36964f5a1f0b00ea7556cbaa79a324' ***
\ No newline at end of file
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/map_solarium.shader b/scripts/map_solarium.shader
new file mode 100644
index 0000000..85aa027
--- /dev/null
+++ b/scripts/map_solarium.shader
@@ -0,0 +1,64 @@
+textures/map_solarium/waterfall
+{
+    qer_editorimage textures/map_solarium/waterfall/water2.tga
+    qer_trans 20
+    cull disable
+    surfaceparm trans
+
+    {
+        map textures/map_solarium/waterfall/water2.tga    
+        tcMod scroll 0 -1.9
+        blendfunc blend
+    
+    }
+        dpreflectcube cubemaps/default/sky
+    {
+        map $lightmap
+        blendfunc add
+        tcGen lightmap
+    }
+}
+
+textures/map_solarium/water4
+{
+    qer_editorimage textures/map_solarium/water4/water4.tga
+    qer_trans 20
+    surfaceparm nomarks
+    surfaceparm trans 
+    surfaceparm water
+    surfaceparm nolightmap
+    cull none
+    q3map_globaltexture
+    tessSize 256
+
+    {
+        map textures/map_solarium/water4/water4.tga
+        tcmod scale 0.3 0.4
+        tcMod scroll 0.05 0.05
+        blendfunc add
+        alphaGen vertex
+    }
+        dpreflectcube cubemaps/default/sky
+    {
+        map $lightmap
+        blendfunc add
+        tcGen lightmap
+    }
+    dp_water 0.1 1.2  1.4 0.7  1 1 1  1 1 1  0.1
+}
+
+textures/map_solarium/cubemap_glass
+{
+    qer_editorimage textures/map_solarium/glass.tga
+    surfaceparm trans
+    cull disable
+    qer_trans 0.5
+
+    {
+        map textures/map_solarium/cubemap_glass/env2.tga
+        blendfunc add
+        tcgen environment
+
+    }
+
+}
\ No newline at end of file
diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 5d16535..e925318 100644
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -13,6 +13,7 @@ exomorphx
 exx
 facility114invx
 facility114x
+grass
 liquids_lava
 liquids_slime
 liquids_water
@@ -26,6 +27,7 @@ map_space-elevator
 map_stormkeep
 map_techassault
 map_xoylent
+map_solarium
 metaltechx
 model_bigfan01
 model_crate02
@@ -55,3 +57,5 @@ trak4x
 trak5x
 trak6x
 trak7x
+
+
diff --git a/sound/map_solarium/.DS_Store b/sound/map_solarium/.DS_Store
new file mode 100644
index 0000000..be5e88b
Binary files /dev/null and b/sound/map_solarium/.DS_Store differ
diff --git a/sound/map_solarium/trickle.wav b/sound/map_solarium/trickle.wav
new file mode 100644
index 0000000..71b899a
Binary files /dev/null and b/sound/map_solarium/trickle.wav differ
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/map_solarium/.DS_Store b/textures/map_solarium/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/textures/map_solarium/.DS_Store differ
diff --git a/textures/map_solarium/cubemap_glass/.DS_Store b/textures/map_solarium/cubemap_glass/.DS_Store
new file mode 100644
index 0000000..c2dd37e
Binary files /dev/null and b/textures/map_solarium/cubemap_glass/.DS_Store differ
diff --git a/textures/map_solarium/cubemap_glass/env2.tga b/textures/map_solarium/cubemap_glass/env2.tga
new file mode 100644
index 0000000..a7be430
Binary files /dev/null and b/textures/map_solarium/cubemap_glass/env2.tga differ
diff --git a/textures/map_solarium/cubemap_glass/glass.tga b/textures/map_solarium/cubemap_glass/glass.tga
new file mode 100644
index 0000000..966b607
Binary files /dev/null and b/textures/map_solarium/cubemap_glass/glass.tga differ
diff --git a/textures/map_solarium/water4/.DS_Store b/textures/map_solarium/water4/.DS_Store
new file mode 100644
index 0000000..8fdf058
Binary files /dev/null and b/textures/map_solarium/water4/.DS_Store differ
diff --git a/textures/map_solarium/water4/water4.tga b/textures/map_solarium/water4/water4.tga
new file mode 100644
index 0000000..e5bf6fc
Binary files /dev/null and b/textures/map_solarium/water4/water4.tga differ
diff --git a/textures/map_solarium/water4/water4_gloss.tga b/textures/map_solarium/water4/water4_gloss.tga
new file mode 100644
index 0000000..ef51d21
Binary files /dev/null and b/textures/map_solarium/water4/water4_gloss.tga differ
diff --git a/textures/map_solarium/water4/water4_norm.tga b/textures/map_solarium/water4/water4_norm.tga
new file mode 100644
index 0000000..5d38a30
Binary files /dev/null and b/textures/map_solarium/water4/water4_norm.tga differ
diff --git a/textures/map_solarium/water4/water4_reflect.png b/textures/map_solarium/water4/water4_reflect.png
new file mode 100644
index 0000000..569cd37
Binary files /dev/null and b/textures/map_solarium/water4/water4_reflect.png differ
diff --git a/textures/map_solarium/waterfall/.DS_Store b/textures/map_solarium/waterfall/.DS_Store
new file mode 100644
index 0000000..8fdf058
Binary files /dev/null and b/textures/map_solarium/waterfall/.DS_Store differ
diff --git a/textures/map_solarium/waterfall/water2.tga b/textures/map_solarium/waterfall/water2.tga
new file mode 100644
index 0000000..233e397
Binary files /dev/null and b/textures/map_solarium/waterfall/water2.tga differ
diff --git a/textures/map_solarium/waterfall/water2_gloss.tga b/textures/map_solarium/waterfall/water2_gloss.tga
new file mode 100644
index 0000000..9790b75
Binary files /dev/null and b/textures/map_solarium/waterfall/water2_gloss.tga differ
diff --git a/textures/map_solarium/waterfall/water2_norm.tga b/textures/map_solarium/waterfall/water2_norm.tga
new file mode 100644
index 0000000..fb4fb22
Binary files /dev/null and b/textures/map_solarium/waterfall/water2_norm.tga differ
diff --git a/textures/map_solarium/waterfall/water2_reflect.tga b/textures/map_solarium/waterfall/water2_reflect.tga
new file mode 100644
index 0000000..df251ef
Binary files /dev/null and b/textures/map_solarium/waterfall/water2_reflect.tga differ
diff --git a/textures/skies/.DS_Store b/textures/skies/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/textures/skies/.DS_Store differ

History

#1 Updated by Morphed over 2 years ago

very good map for public deathmatch, but had fps problems because of reflective water, waterfall sample is under CC-by-sa license

#2 Updated by Mepper over 2 years ago

That seems more like a problem of how dp handles water, then theShadows fault.

#3 Updated by theShadow over 2 years ago

Updated branch, removing a sound effect that was not GPL compatible, and replacing it with one that is.

#4 Updated by C.Brutail over 2 years ago

I tried the latest (though not yet GPL compatible, but that doesn't matter in this case) version with reflections on, and it stayed above 60 FPS even with high quality! Nice, definately 0.6 ready!

#5 Updated by theShadow over 2 years ago

Also, the FPS problems with the water were originally caused by the large number of reflective surfaces the map had. I have since reduced that number to 3.

#6 Updated by theShadow over 2 years ago

The only things that have changed since I made the merge request is I added 1 entity, replaced 1 sound effect, and changed the soundtrack btw.

#7 Updated by divVerent over 2 years ago

The water issue is a map bug, not an engine bug. There are places from which all 4 water levels are visible.

However, as reflections are not on by default, I don't see this as a showstopper, and therefore vote in favor.

In favor: Morphed, divVerent
Against:
Abstained:
Still to reply: merlijn, detrate, Samual, tZork, mand1nga

#8 Updated by divVerent over 2 years ago

Did some minor technical fixes. The map MUST NOT be merged as described above; we must squash the history.

To do that, add --squash to the git merge command, then add a "git commit".

#9 Updated by rocknroll237 over 2 years ago

The grass looks a bit funny. You can see a cross at the top of each bunch of grass.

#10 Updated by C.Brutail over 2 years ago

This is resolved too

#11 Updated by merlijn over 2 years ago

  • Status changed from New to Resolved

#12 Updated by rocknroll237 over 2 years ago

I still get the grass problem. Running latest 64bit autobuild on Windows 7.

Also available in: Atom PDF