use ptol fortress in random maps with the wall builder

This was SVN commit r14385.
Add compile time flag to disable use of miniupnpc.
2013-12-18 18:32:25 +00:00 · 2013-12-18 16:08:56 +00:00 · 2013-12-18 15:46:09 +00:00 · 2013-12-18 14:14:37 +00:00 · 2013-12-18 13:54:30 +00:00 · 2013-12-18 10:43:32 +00:00
10522 changed files with 350240 additions and 81438 deletions
@@ -8,5 +8,4 @@
 *.png filter=lfs diff=lfs merge=lfs -text
 *.psa filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text
-binaries/data/mods/internal/maps/**/*.xml filter=lfs diff=lfs merge=lfs -text
 binaries/data/mods/public/maps/**/*.xml filter=lfs diff=lfs merge=lfs -text
@@ -14,21 +14,6 @@ the file's path.
 Some files don't yet have licensing details specified - if you care about any
 in particular, let us know and we can try to clarify it.

-  /source
-    GPL version 2 (or later) - see license_gpl-2.0.txt
-
-  /source/lib
-    MIT
-
-  /source/tools
-    Various (unspecified)
-
-  /source/tools/atlas
-    GPL version 2 (or later) - see license_gpl-2.0.txt
-
-  /source/tools/atlas/wxJS
-    LGPL version 2.1 (or later) - see license_lgpl-2.1.txt
-
  /binaries/data
    GPL version 2 (or later) - see license_gpl-2.0.txt

@@ -45,11 +30,38 @@ in particular, let us know and we can try to clarify it.
    Proprietary - see license_dbghelp.txt for restrictions you must agree to
    before distributing this particular file

-  /libraries
-    Various - see individual directories and files for details
-
  /build
    Various (unspecified)

+  /build/premake/premake4
+    BSD
+
+  /build/premake/*.lua
+    MIT
+
  /docs
    Various (unspecified)
+
+  /libraries
+    Various - see LICENSE.txt within that directory
+
+  /source
+    GPL version 2 (or later) - see license_gpl-2.0.txt
+
+  /source/lib
+    MIT
+
+  /source/lobby/pkcs5_pbkdf2.cpp
+    ISC
+
+  /source/third_party/mikktspace
+    zlib
+
+  /source/third_party/mongoose
+    MIT
+
+  /source/tools
+    Various - see LICENSE.txt within that directory
+
+  /source/tools/atlas
+    GPL version 2 (or later) - see license_gpl-2.0.txt
@@ -1,2 +0,0 @@
-cd /D "%appdata%\0ad\logs\"
-start .
@@ -11,7 +11,7 @@ project of this scope.

 There are several ways to contact us and find more information:

-  Web site: http://wildfiregames.com/0ad/
+  Web site: http://play0ad.com/

  Forums: http://www.wildfiregames.com/forum/

@@ -28,7 +28,7 @@ Open the "binaries\system" folder.

 To launch the game: Run pyrogenesis.exe

-To launch the map editor: Run Atlas.bat
+To launch the map editor: Run Atlas.bat or "pyrogenesis.exe -editor"


 -----------------------------------
@@ -43,15 +43,5 @@ http://trac.wildfiregames.com/wiki/BuildInstructions
 Reporting problems
 ------------------

-Bugs should be reported on Trac: http://trac.wildfiregames.com/
-
-On Windows: If the game crashes, it should generate 'crashlog' files that will
-help us debug the problem. Run OpenLogsFolder.bat to find the files
-("%appdata%\0ad\logs\"), and attach crashlog.txt and crashlog.dmp to the bug
-report.
-
-On Linux / OS X: If the game detects an error, it should generate crashlog.txt
-in ~/.config/0ad/logs/ . If it doesn't, it should at least print some
-information on stdout. Attach crashlog.txt or the other information to the
-bug report. It might also help to run the game in gdb and copy the output of
-the "bt full" command, if possible.
+Bugs should be reported on Trac. For information on reporting problems
+and finding logs, see http://trac.wildfiregames.com/wiki/ReportingErrors
@@ -5,20 +5,33 @@
 ; * create a text file called "local.cfg" instead, and copy    *
 ; * the lines from this file that you want to change.          *
 ; *                                                            *
-; * On Linux / OS X, create:                                   *
-; *   ~/.config/0ad/config/local.cfg                           *
+; * On Linux, create:                                          *
+; *   $XDG_CONFIG_HOME/0ad/config/local.cfg                    *
+; *   (Note: $XDG_CONFIG_HOME defaults to ~/.config)           *
+; *                                                            *
+; * On OS X, create:                                           *
+; *   ~/Library/Application\ Support/0ad/config/local.cfg      *
 ; *                                                            *
 ; * On Windows, create:                                        *
-; *   %appdata%/0ad/config/local.cfg                           *
+; *   %appdata%\0ad\config\local.cfg                           *
 ; *                                                            *
 ; **************************************************************

 ; Enable/disable windowed mode by default. (Use Alt+Enter to toggle in the game.)
 windowed = false

+; Enable/disable the splashscreen
+splashscreenenable = true
+
 ; Pause the game on window focus loss (Only applicable to single player mode)
 pauseonfocusloss = true

+; Default player name to use in multiplayer
+; playername = "anonymous"
+
+; Default server name or IP to use in multiplayer
+multiplayerserver = "127.0.0.1"
+
 ; Force a particular resolution. (If these are 0, the default is
 ; to keep the current desktop resolution in fullscreen mode or to
 ; use 1024x768 in windowed mode.)
@@ -30,12 +43,20 @@ bpp = 0

 ; System settings:

-fancywater = true
+waternormals = true
+waterrealdepth = true
+waterfoam = false
+watercoastalwaves = false
+waterrefraction = true
+waterreflection = true
+watershadows = false
+
 shadows = true
 shadowpcf = true
 vsync = false
 particles = true
 silhouettes = true
+showsky = false

 nos3tc = false
 noautomipmap = true
@@ -57,15 +78,36 @@ force_s3tc_enable = true
 ; but will reduce performance and features when a modern graphics card is available.
 renderpath = default

-; Prefer GLSL shaders over ARB shaders (not recommended)
+;;;;; EXPERIMENTAL ;;;;;
+; Prefer GLSL shaders over ARB shaders (not recommended). REQUIRES gentangents=true.
 preferglsl = false

-; Replace alpha-blending with alpha-testing, for performance experiments
-forcealphatest = false
+; Generate tangents for normal and parallax mapping. REQUIRES preferglsl=true.
+gentangents = false

 ; Experimental probably-non-working GPU skinning support; requires preferglsl; use at own risk
 gpuskinning = false

+; Use smooth LOS interpolation; REQUIRES preferglsl=true.
+smoothlos = false
+
+; Use screen-space postprocessing filters (HDR, bloom, DOF, etc). Incompatible with fixed renderpath.
+postproc = false
+
+; Quality level of shader effects (set to 10 to display effects)
+materialmgr.quality = 0.0
+
+; Maximum distance to display parallax effect. Set to 0 to disable parallax.
+materialmgr.PARALLAX_DIST.max = 150
+; Maximum distance to display high quality parallax effect.
+materialmgr.PARALLAX_HQ_DIST.max = 75
+; Maximum distance to display very high quality parallax effect. Set to 30 to enable.
+materialmgr.PARALLAX_VHQ_DIST.max = 0
+;;;;;;;;;;;;;;;;;;;;;;;;
+
+; Replace alpha-blending with alpha-testing, for performance experiments
+forcealphatest = false
+
 ; Opt-in online user reporting system
 userreport.url = "http://feedback.wildfiregames.com/report/upload/v1/"

@@ -74,10 +116,15 @@ skycolor = "0 0 0"

 ; GENERAL PREFERENCES:

-sound.mastergain = 0.5
+sound.mastergain = 0.9
+sound.musicgain = 0.2
+sound.ambientgain = 0.6
+sound.actiongain = 0.7
+sound.uigain = 0.7

 ; Camera control settings
 view.scroll.speed = 120.0
+view.scroll.speed.modifier = 1.05           ; Multiplier for changing scroll speed
 view.rotate.x.speed = 1.2
 view.rotate.x.min = 28.0
 view.rotate.x.max = 60.0
@@ -85,12 +132,14 @@ view.rotate.x.default = 35.0
 view.rotate.y.speed = 2.0
 view.rotate.y.speed.wheel = 0.45
 view.rotate.y.default = 0.0
+view.rotate.speed.modifier = 1.05           ; Multiplier for changing rotation speed
 view.drag.speed = 0.5
 view.zoom.speed = 256.0
 view.zoom.speed.wheel = 32.0
 view.zoom.min = 50.0
 view.zoom.max = 200.0
 view.zoom.default = 120.0
+view.zoom.speed.modifier = 1.05             ; Multiplier for changing zoom speed
 view.pos.smoothness = 0.1
 view.zoom.smoothness = 0.4
 view.rotate.x.smoothness = 0.5
@@ -101,6 +150,9 @@ view.fov = 45.0                             ; Field of view (degrees), lower is
 view.height.smoothness = 0.5
 view.height.min = 16

+; How close do we have to be to the actual location in order to jump back to the previous one?
+camerajump.threshold = 40
+
 ; HOTKEY MAPPINGS:

 ; Each one of the specified keys will trigger the action on the left
@@ -109,34 +161,62 @@ view.height.min = 16
 ; See keys.txt for the list of key names.

 ; > SYSTEM SETTINGS
-hotkey.exit = "Alt+F4", "Ctrl+Break"        ; Exit to desktop
+hotkey.exit = "Alt+F4", "Ctrl+Break", "Super+Q" ; Exit to desktop
 hotkey.leave = Escape                       ; End current game or Exit
+hotkey.confirm = Return                     ; Confirm the current command.
 hotkey.pause = Pause                        ; Pause/unpause game
 hotkey.screenshot = F2                      ; Take PNG screenshot
 hotkey.bigscreenshot = "Shift+F2"           ; Take large BMP screenshot
 hotkey.togglefullscreen = "Alt+Return"      ; Toggle fullscreen/windowed mode
-hotkey.screenshot.watermark = "K"           ; Toggle product/company watermark for official screenshots
+hotkey.screenshot.watermark = "Alt+K"       ; Toggle product/company watermark for official screenshots
 hotkey.wireframe = "Alt+W"                  ; Toggle wireframe mode
 hotkey.silhouettes = "Alt+S"                ; Toggle unit silhouettes
+hotkey.showsky = "Alt+Z"                    ; Toggle sky

 ; > CAMERA SETTINGS
-hotkey.camera.reset = "H"                                 ; Reset camera rotation to default.
-hotkey.camera.follow = "F"                                ; Follow the first unit in the selection
-hotkey.camera.zoom.in = Plus, Equals, NumPlus             ; Zoom camera in (continuous control)
-hotkey.camera.zoom.out = Minus, NumMinus                  ; Zoom camera out (continuous control)
-hotkey.camera.zoom.wheel.in = WheelUp                     ; Zoom camera in (stepped control)
-hotkey.camera.zoom.wheel.out = WheelDown                  ; Zoom camera out (stepped control)
-hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W"        ; Rotate camera to look upwards
-hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S"    ; Rotate camera to look downwards
-hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q   ; Rotate camera clockwise around terrain
-hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E ; Rotate camera anticlockwise around terrain
+hotkey.camera.reset = "R"                                   ; Reset camera rotation to default.
+hotkey.camera.follow = "F"                                  ; Follow the first unit in the selection
+hotkey.camera.zoom.in = Plus, Equals, NumPlus               ; Zoom camera in (continuous control)
+hotkey.camera.zoom.out = Minus, NumMinus                    ; Zoom camera out (continuous control)
+hotkey.camera.zoom.wheel.in = WheelUp                       ; Zoom camera in (stepped control)
+hotkey.camera.zoom.wheel.out = WheelDown                    ; Zoom camera out (stepped control)
+hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W"          ; Rotate camera to look upwards
+hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S"      ; Rotate camera to look downwards
+hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q     ; Rotate camera clockwise around terrain
+hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E   ; Rotate camera anticlockwise around terrain
 hotkey.camera.rotate.wheel.cw = "Shift+WheelUp", MouseX1    ; Rotate camera clockwise around terrain (stepped control)
 hotkey.camera.rotate.wheel.ccw = "Shift+WheelDown", MouseX2 ; Rotate camera anticlockwise around terrain (stepped control)
-hotkey.camera.pan = MouseMiddle, ForwardSlash             ; Enable scrolling by moving mouse
-hotkey.camera.left = A, LeftArrow                         ; Scroll or rotate left
-hotkey.camera.right = D, RightArrow                       ; Scroll or rotate right
-hotkey.camera.up = W, UpArrow                             ; Scroll or rotate up/forwards
-hotkey.camera.down = S, DownArrow                         ; Scroll or rotate down/backwards
+hotkey.camera.pan = MouseMiddle                             ; Enable scrolling by moving mouse
+hotkey.camera.left = A, LeftArrow                           ; Scroll or rotate left
+hotkey.camera.right = D, RightArrow                         ; Scroll or rotate right
+hotkey.camera.up = W, UpArrow                               ; Scroll or rotate up/forwards
+hotkey.camera.down = S, DownArrow                           ; Scroll or rotate down/backwards
+hotkey.camera.scroll.speed.increase = "Ctrl+Shift+S"        ; Increase scroll speed
+hotkey.camera.scroll.speed.decrease = "Ctrl+Alt+S"          ; Decrease scroll speed
+hotkey.camera.rotate.speed.increase = "Ctrl+Shift+R"        ; Increase rotation speed
+hotkey.camera.rotate.speed.decrease = "Ctrl+Alt+R"          ; Decrease rotation speed
+hotkey.camera.zoom.speed.increase = "Ctrl+Shift+Z"          ; Increase zoom speed
+hotkey.camera.zoom.speed.decrease = "Ctrl+Alt+Z"            ; Decrease zoom speed
+hotkey.camera.jump.1 = F5                                   ; Jump to position N
+hotkey.camera.jump.2 = F6
+hotkey.camera.jump.3 = F7
+hotkey.camera.jump.4 = F8
+;hotkey.camera.jump.5 =
+;hotkey.camera.jump.6 =
+;hotkey.camera.jump.7 =
+;hotkey.camera.jump.8 =
+;hotkey.camera.jump.9 =
+;hotkey.camera.jump.10 =
+hotkey.camera.jump.set.1 = "Ctrl+F5"                        ; Set jump position N
+hotkey.camera.jump.set.2 = "Ctrl+F6"
+hotkey.camera.jump.set.3 = "Ctrl+F7"
+hotkey.camera.jump.set.4 = "Ctrl+F8"
+;hotkey.camera.jump.set.5 =
+;hotkey.camera.jump.set.6 =
+;hotkey.camera.jump.set.7 =
+;hotkey.camera.jump.set.8 =
+;hotkey.camera.jump.set.9 =
+;hotkey.camera.jump.set.10 =

 ; > CONSOLE SETTINGS
 hotkey.console.toggle = BackQuote, F9       ; Open/close console
@@ -150,8 +230,9 @@ hotkey.cut = "Ctrl+X"               ; Cut selected text and copy to the clipboar
 hotkey.selection.add = Shift                ; Add units to selection
 hotkey.selection.milonly = Alt              ; Add only military units to selection
 hotkey.selection.remove = Ctrl              ; Remove units from selection
+hotkey.selection.cancel = Esc               ; Un-select all units and cancel building placement 
 hotkey.selection.idleworker = Period        ; Select next idle worker
-hotkey.selection.idlewarrior = Comma        ; Select next idle warrior
+hotkey.selection.idlewarrior = ForwardSlash ; Select next idle warrior
 hotkey.selection.offscreen = Alt            ; Include offscreen units in selection
 hotkey.selection.group.select.0 = 0
 hotkey.selection.group.save.0 = "Ctrl+0"
@@ -186,10 +267,16 @@ hotkey.selection.group.add.9 = "Shift+9"

 ; > SESSION CONTROLS
 hotkey.session.kill = Delete                ; Destroy selected units
+hotkey.session.stop = "H"                   ; Stop the current action
+hotkey.session.attack = "Ctrl+Alt"          ; Modifier to force attack instead of another action
+hotkey.session.attackmove = Ctrl            ; Modifier to attackmove when clicking on a point
 hotkey.session.garrison = Ctrl              ; Modifier to garrison when clicking on building
+hotkey.session.autorallypoint = Ctrl        ; Modifier to set the rally point on the building itself
+hotkey.session.guard = "G"                  ; Modifier to escort/guard when clicking on unit/building
 hotkey.session.queue = Shift                ; Modifier to queue unit orders instead of replacing
 hotkey.session.batchtrain = Shift           ; Modifier to train units in batches
 hotkey.session.massbarter = Shift           ; Modifier to barter bunch of resources
+hotkey.session.masstribute = Shift          ; Modifier to tribute bunch of resources
 hotkey.session.unloadtype = Shift           ; Modifier to unload all units of type
 hotkey.session.deselectgroup = Ctrl         ; Modifier to deselect units when clicking group icon, instead of selecting
 hotkey.session.rotate.cw = RightBracket     ; Rotate building placement preview clockwise
@@ -197,15 +284,30 @@ hotkey.session.rotate.ccw = LeftBracket     ; Rotate building placement preview
 hotkey.timewarp.fastforward = Space         ; If timewarp mode enabled, speed up the game
 hotkey.timewarp.rewind = Backspace          ; If timewarp mode enabled, go back to earlier point in the game

+; > UNIT TRAINING
+hotkey.session.queueunit.1 = "Z"            ; add first unit type to queue
+hotkey.session.queueunit.2 = "X"            ; add second unit type to queue
+hotkey.session.queueunit.3 = "C"            ; add third unit type to queue
+hotkey.session.queueunit.4 = "V"            ; add fourth unit type to queue
+hotkey.session.queueunit.5 = "B"            ; add fivth unit type to queue
+hotkey.session.queueunit.6 = "N"            ; add sixth unit type to queue
+hotkey.session.queueunit.7 = "M"            ; add seventh unit type to queue
+hotkey.session.queueunit.8 = Comma          ; add eighth unit type to queue
+
 ; > OVERLAY KEYS
 hotkey.fps.toggle = "Alt+F"                  ; Toggle frame counter
 hotkey.session.devcommands.toggle = "Alt+D"  ; Toggle developer commands panel
 hotkey.session.gui.toggle = "Alt+G"          ; Toggle visibility of session GUI
 hotkey.menu.toggle = "F10"                   ; Toggle in-game menu
 hotkey.timeelapsedcounter.toggle = "F12"     ; Toggle time elapsed counter
+hotkey.session.showstatusbars = Tab          ; Toggle display of status bars
+hotkey.session.highlightguarding = PgDn      ; Toggle highlight of guarding units
+hotkey.session.highlightguarded = PgUp       ; Toggle highlight of guarded units

 ; > HOTKEYS ONLY
 hotkey.chat = Return                        ; Toggle chat window
+hotkey.teamchat = "T"                       ; Toggle chat window in team chat mode
+hotkey.complete.playername = "Alt+C"        ; Complete a player's name

 ; > GUI TEXTBOX HOTKEYS
 hotkey.text.delete.left = "Ctrl+Backspace"    ; Delete word to the left of cursor
@@ -219,11 +321,15 @@ hotkey.profile.save = "Shift+F11"           ; Save current profiler data to logs
 hotkey.profile2.enable = "F11"              ; Enable HTTP/GPU modes for new profiler

 profiler2.http.autoenable = false           ; Enable HTTP server output at startup (default off for security/performance)
+profiler2.script.enable = false             ; Enable Javascript profiling. Needs to be set before startup and can't be changed later. (default off for performance)
 profiler2.gpu.autoenable = false            ; Enable GPU timing at startup (default off for performance/compatibility)
 profiler2.gpu.arb.enable = true             ; Allow GL_ARB_timer_query timing mode when available
 profiler2.gpu.ext.enable = true             ; Allow GL_EXT_timer_query timing mode when available
 profiler2.gpu.intel.enable = true           ; Allow GL_INTEL_performance_queries timing mode when available

+; > JS DEBUGGER
+jsdebugger.enable = false                   ; Enable Javascript debugging (default off for security/performance)
+
 ; > QUICKSAVE
 hotkey.quicksave = "Shift+F5"
 hotkey.quickload = "Shift+F8"
@@ -237,3 +343,18 @@ joystick.camera.rotate.x = 3
 joystick.camera.rotate.y = 2
 joystick.camera.zoom.in = 5
 joystick.camera.zoom.out = 4
+
+; SESSION GUI SETTINGS
+gui.session.timeelapsedcounter = false          ; Show the game duration in the top right corner
+gui.session.attacknotificationmessage = true    ; Show attack notification messages
+gui.session.minimap.pingduration = 50.0         ; The duration for which an entity will be pinged after an attack notification
+gui.session.minimap.blinkduration = 1.7         ; The blink duration while pinging
+
+; GENERAL GUI SETTINGS
+gui.cursorblinkrate = 0.5          ; Cursor blink rate in seconds (0.0 to disable blinking)
+
+; Multiplayer lobby preferences
+lobby.server = "lobby.wildfiregames.com"  ; Address of lobby server
+lobby.xpartamupp = "wfgbot"               ; Name of the server-side xmpp client that manage games
+lobby.chattimestamp = false               ; Show time chat message was posted
+lobby.room = "arena15"                    ; Default MUC room to join
@@ -0,0 +1,11 @@
+;
+; Developer configuration file
+;
+; NOTE: This is not read by the config system currently.
+;
+; This file is used by the engine to decide which mods are mounted, and in what
+; order. The precense of this file suppresses loading of mods in the user mod
+; path (see http://trac.wildfiregames.com/wiki/GameDataPaths) if the same mod is
+; present in binaries/data/mods. It also implies -noUserMod.
+; This is done to make saved maps end up in the right mod folder (and in the 
+; game-relative data path) to commit them later on. 
@@ -1,4 +1,5 @@
-## List of key names that can be used in .cfg files for specifying hotkeys:
+## This file documents keynames that can be used in .cfg files for specifying hotkeys
+## Note: the keynames are not actually configured or implemented here

 Backspace, BkSp
 Tab
@@ -120,16 +121,18 @@ Caps Lock, CapsLock
 Scroll Lock, ScrlLock
 Right Shift, RightShift
 Left Shift, LeftShift
+Shift, AnyShift
 Right Ctrl, RightCtrl
 Left Ctrl, LeftCtrl
+Ctrl, AnyCtrl
 Right Alt, RightAlt
 Left Alt, LeftAlt
-Right Meta
-Left Meta
+Alt, AnyAlt
 Left Super, LeftWin
 Right Super, RightWin
+Super, AnyWindows		## Windows key, also Command/meta key on Macs
 Alt Gr, AltGr
-Compose 
+Compose

 Help
 Print Screen, PrtSc
@@ -144,3 +147,101 @@ Right Mouse Button, MouseRight
 Middle Mouse Button, MouseMiddle
 Mouse Wheel Up, WheelUp
 Mouse Wheel Down, WheelDown
+
+## Special keys for international and non-QWERTY keyboards:
+World0, W0
+World1, W1
+World2, W2
+World3, W3
+World4, W4
+World5, W5
+World6, W6
+World7, W7
+World8, W8
+World9, W9
+World10, W10
+World11, W11
+World12, W12
+World13, W13
+World14, W14
+World15, W15
+World16, W16
+World17, W17
+World18, W18
+World19, W19
+World20, W20
+World21, W21
+World22, W22
+World23, W23
+World24, W24
+World25, W25
+World26, W26
+World27, W27
+World28, W28
+World29, W29
+World30, W30
+World31, W31
+World32, W32
+World33, W33
+World34, W34
+World35, W35
+World36, W36
+World37, W37
+World38, W38
+World39, W39
+World40, W40
+World41, W41
+World42, W42
+World43, W43
+World44, W44
+World45, W45
+World46, W46
+World47, W47
+World48, W48
+World49, W49
+World50, W50
+World51, W51
+World52, W52
+World53, W53
+World54, W54
+World55, W55
+World56, W56
+World57, W57
+World58, W58
+World59, W59
+World60, W60
+World61, W61
+World62, W62
+World63, W63
+World64, W64
+World65, W65
+World66, W66
+World67, W67
+World68, W68
+World69, W69
+World70, W70
+World71, W71
+World72, W72
+World73, W73
+World74, W74
+World75, W75
+World76, W76
+World77, W77
+World78, W78
+World79, W79
+World80, W80
+World81, W81
+World82, W82
+World83, W83
+World84, W84
+World85, W85
+World86, W86
+World87, W87
+World88, W88
+World89, W89
+World90, W90
+World91, W91
+World92, W92
+World93, W93
+World94, W94
+World95, W95
@@ -0,0 +1,4 @@
+function GlobalSubtractionHelper(a, b)
+{
+	return a-b;
+}
@@ -0,0 +1,8 @@
+function TestScript1_GlobalHelper() {}
+
+TestScript1_GlobalHelper.prototype.GetX = function()
+{
+	return GlobalSubtractionHelper(1, -1);
+};
+
+Engine.RegisterComponentType(IID_Test1, "TestScript1_GlobalHelper", TestScript1_GlobalHelper);
@@ -3,5 +3,6 @@
  <VisualActor>
    <SilhouetteDisplay>false</SilhouetteDisplay>
    <SilhouetteOccluder>false</SilhouetteOccluder>
+    <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
  </VisualActor>
 </Entity>
@@ -4,6 +4,7 @@
        <Actor>example</Actor>
        <SilhouetteDisplay>false</SilhouetteDisplay>
        <SilhouetteOccluder>false</SilhouetteOccluder>
+        <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
    </VisualActor>
    <Selectable/>
    <Position>
@@ -4,6 +4,7 @@
        <Actor>example</Actor>
        <SilhouetteDisplay>false</SilhouetteDisplay>
        <SilhouetteOccluder>false</SilhouetteOccluder>
+        <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
    </VisualActor>
    <Selectable/>
    <Position>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="straight_a">
-      <mesh>gaia/cliff_a.dae</mesh>
-    </variant>
-    <variant name="corner_inside">
-      <mesh>gaia/cliff_a_corner_inside.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <texture>gaia/cliff_desert_a.dds</texture>
-    </variant>
-  </group>
-  <material>basic_trans.xml</material>
-</actor>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="chinese merchant sail">
-      <mesh>props/chin_merch_sail.dae</mesh>
-      <texture>props/chin_sail_dragon.dds</texture>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="chinese trireme sail">
-      <mesh>props/chin_tri_sail.dae</mesh>
-      <texture>props/chin_sail_dragon.dds</texture>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>props/iber_barracks_a.dae</mesh>
-      <texture>props/iber_prop_shields.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="shields-a">
-      <mesh>props/iber_civic_centre.dae</mesh>
-      <texture>props/iber_prop_shields.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>props/iber_pc.pmd</mesh>
-      <props/>
-      <texture>props/iber_prop_a.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/iber_dock_boat.dae</mesh>
-      <texture>structural/iber_ship.dds</texture>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>props/iber_fc.dae</mesh>
-      <props/>
-      <texture>props/iber_prop_a.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant>
-      <mesh>props/iber_farmstead_hay.dae</mesh>
-      <texture>props/wrld_hay_a.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="mesh">
-      <mesh>props/iber_fishship_sail.dae</mesh>
-      <texture>props/iber_sail_b.dds</texture>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1">
-      <mesh>props/iber_fortress_props.dae</mesh>
-      <texture>props/iber_prop_a.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="props-1">
-      <mesh>props/iber_gate_door.dae</mesh>
-      <texture>structural/iber_struct.dds</texture>
-    </variant>
-  </group>
-</actor>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="props-1">
-      <mesh>props/iber_gate_door_2.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>props/iber_prop_a.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>props/iber_wallgate_shields.dae</mesh>
-      <texture>props/iber_prop_shields.dds</texture>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="House A - props 1">
-      <mesh>props/iber_house_a_1.dae</mesh>
-    </variant>
-    <variant frequency="1" name="House A - props 2">
-      <mesh>props/iber_house_a_2.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>structural/iber_struct.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="House B - props 1">
-      <mesh>props/iber_house_b_1.dae</mesh>
-    </variant>
-    <variant frequency="1" name="House B - props 2">
-      <mesh>props/iber_house_b_2.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>structural/iber_struct.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="House C - props 1">
-      <mesh>props/iber_house_c_1.dae</mesh>
-    </variant>
-    <variant frequency="1" name="House C - props 2">
-      <mesh>props/iber_house_c_2.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>structural/iber_struct.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>props/iber_tc.dae</mesh>
-      <props/>
-      <texture>props/iber_prop_a.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="Market Props 1">
-      <mesh>props/iber_market_props_01.dae</mesh>
-    </variant>
-    <variant frequency="1" name="Market Props 2">
-      <mesh>props/iber_market_props_02.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>structural/iber_struct.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="mesh">
-      <mesh>props/iber_merch_sail.dae</mesh>
-      <texture>props/iber_sail_a.dds</texture>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="mill-props-a">
-      <mesh>props/iber_mill_a.dae</mesh>
-    </variant>
-    <variant frequency="1" name="mill-props-b">
-      <mesh>props/iber_mill_b.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>structural/iber_struct.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="monument_props_a">
-      <mesh>props/iber_sb_props_a.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>structural/iber_struct.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="monument_props_b">
-      <mesh>props/iber_sb_props_b.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>props/iber_prop_shields.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" name="shields-a">
-      <mesh>props/iber_scout_tower.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <texture>props/iber_prop_shields.dds</texture>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="temple-shields-a">
-      <mesh>props/iber_temple_a.dae</mesh>
-    </variant>
-    <variant frequency="1" name="temple-shields-b">
-      <mesh>props/iber_temple_b.dae</mesh>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>props/iber_prop_shields.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <mesh>props/iber_hc_fancy.dae</mesh>
-      <texture>structural/wrld_stone_iber.dds</texture>
-    </variant>
-  </group>
-
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <float/>
-  <group>
-    <variant name="Chinese Merchant Ship">
-      <mesh>structural/chin_merch.dae</mesh>
-      <props>
-        <prop actor="props/structures/chinese/merchant_sail.xml" attachpoint="root"/>
-      </props>
-      <texture>structural/chin_ship.dds</texture>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <float/>
-  <group>
-    <variant name="Chinese Trireme">
-      <mesh>structural/chin_tri.dae</mesh>
-      <props>
-        <prop actor="props/structures/chinese/trireme_sail.xml" attachpoint="root"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-      <texture>structural/chin_ship.dds</texture>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>structural/wonder_colosseum_main.dae</mesh>
-      <props>
-        <prop actor="props/structures/miscellaneous/colosseum_details.xml" attachpoint="root"/>
-        <prop actor="props/structures/miscellaneous/colosseum_interior.xml" attachpoint="root"/>
-        <prop actor="props/structures/miscellaneous/colosseum_roof.xml" attachpoint="root"/>
-      </props>
-      <texture>null_white.dds</texture>
-    </variant>
-  </group>
-</actor>
--- a/Show More
+++ b/Show More