diff --git a/config/keymap.cfg b/config/keymap.cfg
index 361d0c5d..11b49e82 100755
--- a/config/keymap.cfg
+++ b/config/keymap.cfg
@@ -113,7 +113,7 @@ keymap 289 F8 ""
keymap 290 F9 ""
keymap 291 F10 "getdemo"
keymap 292 F11 "toggleconsole"
-keymap 293 F12 [ screenshot; sleep 3 [ echo "Screenshot created." ] ]
+keymap 293 F12 [ screenshot [ echo "Screenshot created." ] ]
keymap 294 F13 ""
keymap 295 F14 ""
keymap 296 F15 ""
diff --git a/config/maprot.cfg b/config/maprot.cfg
index 78ccf98c..fdade6c7 100644
--- a/config/maprot.cfg
+++ b/config/maprot.cfg
@@ -14,15 +14,18 @@ ac_mines:5:15:1
ac_depot:5:15:1
ac_power:5:15:1
ac_elevation:5:15:1
+ac_sunset:5:15:1
ac_desert3:5:15:1
// dm
ac_toxic:2:10:1
ac_complex:2:10:1
ac_snow:2:10:1
+ac_arctic:2:10:1
// osok
ac_desert2:10:10:1
ac_desert:10:10:1
+
// Change this file to make the map rotation different and add more..
diff --git a/config/menus.cfg b/config/menus.cfg
index 4aacb94f..bcc63bdf 100755
--- a/config/menus.cfg
+++ b/config/menus.cfg
@@ -26,7 +26,7 @@ alias genmapitems [
newmenu maps
-genmapitems "ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_elevation ac_keller ac_mines ac_power ac_shine ac_snow ac_toxic ac_urban"
+genmapitems "ac_arctic ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_elevation ac_keller ac_mines ac_power ac_shine ac_snow ac_sunset ac_toxic ac_urban"
menuitem """"
menuitem "Show all maps..." [ showmenu "all maps" ]
@@ -35,7 +35,7 @@ menudirlist "packages/maps" "cgz" "map $arg1"
newmenu maps_ctf
-genmapitems "ac_depot ac_desert3 ac_elevation ac_keller ac_mines ac_power ac_shine ac_urban"
+genmapitems "ac_depot ac_desert3 ac_elevation ac_keller ac_mines ac_power ac_shine ac_sunset ac_urban"
menuitem """"
menuitem "Show all maps.." [showmenu "all maps"]
@@ -104,6 +104,8 @@ menuitem "Nieb Map: ac_desert2, ac_desert3, plus mapmodels, 2D-art and hostin
menuitem "Archangel Map: ac_urban." ""
menuitem "Mr.Floppy Map: ac_keller."
menuitem "DogDancing Map: ac_shine."
+menuitem "R4zor Map: ac_sunset."
+menuitem "KC Map: ac_arctic."
menuitem "" ""
menuitem "Special thanks" ""
menuitem "----------------" ""
@@ -134,7 +136,7 @@ menuitem "Texture sources" ""
menuitem "------------------""
menuitem "Articool, Boeck, Craig Fortune, Digital Flux, mayang.com, imageafter.com, " ""
menuitem "Craig Fortune, Digital Flux, mayang.com, afflict.net, Rohrschach, Lemog 3D," ""
-menuitem "Golgotha team, NOCTUA, Chris Zastrow, 3D Cafe, Kurt Keslar." ""
+menuitem "Golgotha team, NOCTUA, Chris Zastrow, 3D Cafe, Kurt Keslar, John Solo." ""
menuitem "" ""
menuitem "Also thanks to kurtis84, player1, quase, exis, talou and others for testing." ""
menuitem "Thanks to flowtron and exis for organising the 0.93 AssaultCube Release Cup." ""
diff --git a/config/resetbinds.cfg b/config/resetbinds.cfg
index 6a759903..071e5284 100644
--- a/config/resetbinds.cfg
+++ b/config/resetbinds.cfg
@@ -116,7 +116,7 @@ bind F8 ""
bind F9 ""
bind F10 "getdemo"
bind F11 "toggleconsole"
-bind F12 [ screenshot; sleep 3 [ echo "Screenshot created." ] ]
+bind F12 [ screenshot [ echo "Screenshot created." ] ]
bind F13 ""
bind F14 ""
bind F15 ""
diff --git a/config/securemaps.cfg b/config/securemaps.cfg
index ac88ef47..ba26e650 100644
--- a/config/securemaps.cfg
+++ b/config/securemaps.cfg
@@ -1,4 +1,5 @@
clearsecuremaps
+securemap ac_arctic
securemap ac_complex
securemap ac_depot
securemap ac_desert
@@ -10,5 +11,6 @@ securemap ac_mines
securemap ac_power
securemap ac_shine
securemap ac_snow
+securemap ac_sunset
securemap ac_toxic
-securemap ac_urban
+securemap ac_urban
\ No newline at end of file
diff --git a/docs/README.xml b/docs/README.xml
index cb121aeb..62565859 100644
--- a/docs/README.xml
+++ b/docs/README.xml
@@ -300,6 +300,22 @@
Map: ac_shine, plus textures.
+
+ |
+ R4zor
+ |
+
+ Map: ac_sunset
+ |
+
+
+ |
+ KC
+ |
+
+ Map: ac_artic
+ |
+
Special thanks
@@ -514,6 +530,9 @@
Kurt Keslar
+
+ John Solo
+
diff --git a/packages/maps/ac_depot.cgz b/packages/maps/ac_depot.cgz
index 392f059f..99e5b539 100644
Binary files a/packages/maps/ac_depot.cgz and b/packages/maps/ac_depot.cgz differ
diff --git a/source/ChangeLog.txt b/source/ChangeLog.txt
index 7b81935c..c2a78096 100644
--- a/source/ChangeLog.txt
+++ b/source/ChangeLog.txt
@@ -12,9 +12,11 @@ NEW STUFF!
* New map: ac_elevation.
* New map: ac_toxic.
* New map: ac_urban.
-* New map: ac_shine (plus texture for it).
+* New map: ac_shine.
* New map: ac_desert3.
* New map: ac_keller.
+* New map: ac_sunset
+* New map: ac_arctic.
* Map: ac_snow got updated with a brand new look.
* Map: ac_depot had its pickups changed around a bit.
* Spectator mode, with 2 following modes.
@@ -29,7 +31,7 @@ NEW STUFF!
* Customizable ports allowed for servers.
* New netcode with various new features and changes.
* Muzzle flashes.
-* OpenAL support (Allows for 5.1 surround sound).
+* OpenAL (or OpenAL-soft) support (Allows for 5.1 surround sound).
* Brand new mapmodels made by Toca.
* Lots of brand new settings in the reworked "settings" menu, including Sound, Video and HUD settings.
* You can "giveadmin" instead of givemaster, since master is now gone.
@@ -74,6 +76,8 @@ NEW STUFF!
* Reset all settings command.
* HUDgun, etc doesn't appear while in editmode.
* Music plays when you have the CTF flag to make you feel like a total badass!
+* Multi-user support for Windows/Linux (stores your configurations/files
+ to your Windows/Linux user profile).
Bugs (from 0.93) fixes: