]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
9 years agoMerge remote-tracking branch 'origin/master' into BuddyFriendGuy/mapStringFilter
TimePath [Sun, 10 May 2015 03:27:55 +0000 (13:27 +1000)]
Merge remote-tracking branch 'origin/master' into BuddyFriendGuy/mapStringFilter

9 years agoMerge branch 'TimePath/qc_updates' into 'master'
Mario [Sun, 10 May 2015 03:15:51 +0000 (03:15 +0000)]
Merge branch 'TimePath/qc_updates' into 'master'

Merge branch TimePath/qc_updates (XXL merge request, but no functional changes or file relocations)

Major:
* Stops relying on the progs.src order by fixing all the `#include` lists, prerequisite for removing `-Wno-field-redeclared`. Test script included at `test/compilationunit.sh`

Minor:
* `float` -> `int`
* `var .float fld; ent.fld` -> `var .float fld; ent.(fld)`, less magic
* menu `spawnXXX()` -> `NEW(XXX)`, allows for overloaded constructors to replace `makeXXX(..)`
* some entity class annotations to serve as documentation, and later type checking

See merge request !124

9 years agoAdd two useful macros
TimePath [Wed, 6 May 2015 09:30:38 +0000 (19:30 +1000)]
Add two useful macros

9 years agoRename the underscore headers
TimePath [Wed, 6 May 2015 09:10:40 +0000 (19:10 +1000)]
Rename the underscore headers

9 years agoExplain `CLASS` and `NEW` macros
TimePath [Wed, 6 May 2015 08:38:18 +0000 (08:38 +0000)]
Explain `CLASS` and `NEW` macros

9 years agoFix typedefs
TimePath [Wed, 6 May 2015 06:31:46 +0000 (16:31 +1000)]
Fix typedefs

9 years agoUse stock dpdefs
TimePath [Wed, 6 May 2015 06:12:05 +0000 (16:12 +1000)]
Use stock dpdefs

9 years agoMake menu includes order insensitive
TimePath [Sun, 3 May 2015 23:24:19 +0000 (09:24 +1000)]
Make menu includes order insensitive

9 years ago#include base classes
TimePath [Sun, 3 May 2015 23:04:29 +0000 (09:04 +1000)]
#include base classes

9 years ago#include base classes
TimePath [Sun, 3 May 2015 22:50:36 +0000 (08:50 +1000)]
#include base classes

9 years agoDon't accumulate the beginning of the constructor
TimePath [Sun, 3 May 2015 22:25:19 +0000 (08:25 +1000)]
Don't accumulate the beginning of the constructor

9 years agoSort menu classes
TimePath [Sun, 3 May 2015 22:22:35 +0000 (08:22 +1000)]
Sort menu classes

9 years agoTidy up OO helpers
TimePath [Sun, 3 May 2015 21:54:22 +0000 (07:54 +1000)]
Tidy up OO helpers

9 years agoMerge CLASS and EXTENDS, #define NEW(cname) (spawn##cname())
TimePath [Sun, 3 May 2015 11:39:11 +0000 (21:39 +1000)]
Merge CLASS and EXTENDS, #define NEW(cname) (spawn##cname())

9 years agoCleanup server progs.src
TimePath [Sun, 3 May 2015 06:34:58 +0000 (16:34 +1000)]
Cleanup server progs.src

9 years agoCleanup weapons #includes
TimePath [Sun, 3 May 2015 06:16:26 +0000 (16:16 +1000)]
Cleanup weapons #includes

9 years agoFix client compile
TimePath [Sun, 3 May 2015 05:09:20 +0000 (15:09 +1000)]
Fix client compile

9 years agoCleanup vehicle #includes
TimePath [Sun, 3 May 2015 05:00:21 +0000 (15:00 +1000)]
Cleanup vehicle #includes

9 years agoFix more server #includes
TimePath [Sun, 3 May 2015 03:19:14 +0000 (13:19 +1000)]
Fix more server #includes

9 years agoModularise commands
TimePath [Sun, 3 May 2015 02:06:55 +0000 (12:06 +1000)]
Modularise commands

9 years agoMake most server includes order insensitive
TimePath [Sat, 2 May 2015 12:28:02 +0000 (22:28 +1000)]
Make most server includes order insensitive

9 years agoCreate common client header
TimePath [Sat, 2 May 2015 05:15:44 +0000 (15:15 +1000)]
Create common client header

9 years agoFix MCU client compile
TimePath [Sat, 2 May 2015 04:48:31 +0000 (14:48 +1000)]
Fix MCU client compile
(multiple compilation units)

9 years agoRemove direct server #includes from client
TimePath [Sat, 2 May 2015 04:40:48 +0000 (14:40 +1000)]
Remove direct server #includes from client

9 years agoSort #includes
TimePath [Sat, 2 May 2015 03:14:27 +0000 (13:14 +1000)]
Sort #includes

9 years agoMake client includes order insensitive
TimePath [Fri, 1 May 2015 13:46:42 +0000 (23:46 +1000)]
Make client includes order insensitive

9 years agoAvoid including the same file twice in progs.src
TimePath [Fri, 1 May 2015 08:57:44 +0000 (18:57 +1000)]
Avoid including the same file twice in progs.src

9 years agoDefine client entity classes
TimePath [Sun, 26 Apr 2015 07:32:03 +0000 (17:32 +1000)]
Define client entity classes

9 years agoReclaim the `new` keyword for entity classes
TimePath [Sun, 26 Apr 2015 06:46:37 +0000 (16:46 +1000)]
Reclaim the `new` keyword for entity classes

9 years agoMake pointer to member usage explicit
TimePath [Sun, 26 Apr 2015 06:07:49 +0000 (16:07 +1000)]
Make pointer to member usage explicit

9 years agoDeclare more ints as ints
TimePath [Sat, 25 Apr 2015 06:32:36 +0000 (16:32 +1000)]
Declare more ints as ints

9 years agoDeclare more ints as ints
TimePath [Sat, 25 Apr 2015 06:17:02 +0000 (16:17 +1000)]
Declare more ints as ints

9 years agoDeclare more ints as ints
TimePath [Sat, 25 Apr 2015 06:00:13 +0000 (16:00 +1000)]
Declare more ints as ints

9 years agoRevert spawn_furthest to 0.5 (half random, half furthest, works better for small...
Mario [Sun, 26 Apr 2015 04:21:16 +0000 (14:21 +1000)]
Revert spawn_furthest to 0.5 (half random, half furthest, works better for small maps)

9 years agoFix a few more floats
Mario [Sat, 25 Apr 2015 04:23:53 +0000 (14:23 +1000)]
Fix a few more floats

9 years agoFix copy of ammo_none in defs.qh
Mario [Sat, 25 Apr 2015 04:21:18 +0000 (14:21 +1000)]
Fix copy of ammo_none in defs.qh

9 years agoFew more floats to ints/bools
Mario [Sat, 25 Apr 2015 04:18:57 +0000 (14:18 +1000)]
Few more floats to ints/bools

9 years agoFix a few more floats in arrays
Mario [Sat, 25 Apr 2015 04:16:22 +0000 (14:16 +1000)]
Fix a few more floats in arrays

9 years agoBoolinterize hud.qc
Mario [Sat, 25 Apr 2015 04:03:18 +0000 (14:03 +1000)]
Boolinterize hud.qc

9 years agoadded comments explaining poll decision on the spacing
BuddyFriendGuy [Sat, 25 Apr 2015 03:54:17 +0000 (23:54 -0400)]
added comments explaining poll decision on the spacing

9 years agoFix some more floats in arrays
Mario [Sat, 25 Apr 2015 02:52:46 +0000 (12:52 +1000)]
Fix some more floats in arrays

9 years agoMerge branch 'TimePath/lint' into 'master'
Mario [Sat, 25 Apr 2015 02:15:22 +0000 (02:15 +0000)]
Merge branch 'TimePath/lint' into 'master'

TimePath/lint

A few changes to get my static analysis tool working

See merge request !121

9 years agoDeclare `.SendEntity` as `bool(entity, int)`
TimePath [Sun, 19 Apr 2015 10:53:16 +0000 (20:53 +1000)]
Declare `.SendEntity` as `bool(entity, int)`

9 years agoDeclare `stoi` and `itos` when QCC_SUPPORT_INT
TimePath [Sun, 19 Apr 2015 10:52:47 +0000 (20:52 +1000)]
Declare `stoi` and `itos` when QCC_SUPPORT_INT

9 years agoRemove redundant assignment
TimePath [Sat, 18 Apr 2015 06:38:45 +0000 (06:38 +0000)]
Remove redundant assignment

9 years agoCouple more array fixes
Mario [Fri, 24 Apr 2015 12:15:10 +0000 (22:15 +1000)]
Couple more array fixes

9 years agoFew more floats to ints for arrays
Mario [Fri, 24 Apr 2015 12:11:50 +0000 (22:11 +1000)]
Few more floats to ints for arrays

9 years agoSome more floats to ints/bools
Mario [Fri, 24 Apr 2015 12:08:50 +0000 (22:08 +1000)]
Some more floats to ints/bools

9 years agoFix a few more floats, add the long awaited stob macro
Mario [Fri, 24 Apr 2015 12:02:12 +0000 (22:02 +1000)]
Fix a few more floats, add the long awaited stob macro

9 years agoAdd a couple of missing pieces for the impressive announcement
Mario [Fri, 24 Apr 2015 05:33:32 +0000 (15:33 +1000)]
Add a couple of missing pieces for the impressive announcement

9 years agoConvert a load more floats into ints and bools
Mario [Fri, 24 Apr 2015 04:55:56 +0000 (14:55 +1000)]
Convert a load more floats into ints and bools

9 years agoEven more floats to bool/int
Mario [Thu, 23 Apr 2015 08:34:23 +0000 (18:34 +1000)]
Even more floats to bool/int

9 years agoAdd impressive announcement to vortex
Mario [Thu, 23 Apr 2015 07:33:06 +0000 (17:33 +1000)]
Add impressive announcement to vortex

9 years agoConvert some floats into ints
Mario [Thu, 23 Apr 2015 00:59:00 +0000 (10:59 +1000)]
Convert some floats into ints

9 years agoadd space above and below filter box, and align mutator text
BuddyFriendGuy [Mon, 20 Apr 2015 04:19:18 +0000 (00:19 -0400)]
add space above and below filter box, and align mutator text

9 years agoMerge branch 'terencehill/unlimited_ammo_fixes' into 'master'
Mario [Sat, 18 Apr 2015 03:51:49 +0000 (03:51 +0000)]
Merge branch 'terencehill/unlimited_ammo_fixes' into 'master'

Unlimited ammo fixes

Fix a few weapons not working with 0 ammo while owning the unlimited ammo powerup
Namely Arc, Devastator and Hagar.

See merge request !119

9 years agoUpdate credits
Mirio [Thu, 16 Apr 2015 00:10:12 +0000 (02:10 +0200)]
Update credits

9 years agoRemove an old unused model
Mario [Wed, 15 Apr 2015 22:49:44 +0000 (08:49 +1000)]
Remove an old unused model

9 years agoMerge branch 'master' into terencehill/unlimited_ammo_fixes
terencehill [Wed, 15 Apr 2015 22:47:56 +0000 (00:47 +0200)]
Merge branch 'master' into terencehill/unlimited_ammo_fixes

9 years agoMerge branch 'terencehill/preferred_focus' into 'master'
Mario [Wed, 15 Apr 2015 22:23:11 +0000 (22:23 +0000)]
Merge branch 'terencehill/preferred_focus' into 'master'

Make work focus on preferred controls on dialog open (only root dialogs!)

You can now join a team game by just pressing SPACE twice, as the auto-join button is initially focused in the team selection dialog (with menu_mouse_absolute 0 the cursor is also moved over the button).

See merge request !118

9 years agoAlso check if owner is in a vehicle when stopping the arc beam
Mario [Wed, 15 Apr 2015 21:47:13 +0000 (07:47 +1000)]
Also check if owner is in a vehicle when stopping the arc beam

9 years agoFix compile
Mario [Wed, 15 Apr 2015 02:05:06 +0000 (12:05 +1000)]
Fix compile

9 years agoFix target locking not working on turrets
Mario [Wed, 15 Apr 2015 01:22:26 +0000 (11:22 +1000)]
Fix target locking not working on turrets

9 years agoRevert changes to electro combos (too controversial, will move to a different branch)
Mario [Tue, 14 Apr 2015 21:49:15 +0000 (07:49 +1000)]
Revert changes to electro combos (too controversial, will move to a different branch)

9 years agoMake work focus on preferred controls on dialog open (only root dialogs!). You can...
terencehill [Mon, 13 Apr 2015 18:09:36 +0000 (20:09 +0200)]
Make work focus on preferred controls on dialog open (only root dialogs!). You can now join a team game by just pressing SPACE twice, as the auto-join button is initially focused in the team selection dialog (with menu_mouse_absolute 0 the cursor is also moved over the button).

9 years agoMerge branch 'master' into BuddyFriendGuy/mapStringFilter
BuddyFriendGuy [Fri, 10 Apr 2015 04:13:10 +0000 (00:13 -0400)]
Merge branch 'master' into BuddyFriendGuy/mapStringFilter

9 years agoadd hotkey info to the tooltip
BuddyFriendGuy [Fri, 10 Apr 2015 03:36:55 +0000 (23:36 -0400)]
add hotkey info to the tooltip

9 years agoadd tooltips for the textbox and the buttons
BuddyFriendGuy [Fri, 10 Apr 2015 03:34:04 +0000 (23:34 -0400)]
add tooltips for the textbox and the buttons

9 years agoadd hotkeys for better usability
BuddyFriendGuy [Thu, 9 Apr 2015 21:38:27 +0000 (17:38 -0400)]
add hotkeys for better usability

9 years agocomplete filter button functions
BuddyFriendGuy [Thu, 9 Apr 2015 20:21:48 +0000 (16:21 -0400)]
complete filter button functions

9 years agoChanged wrong cvar in that balance config, fixed
Mirio [Thu, 9 Apr 2015 18:18:40 +0000 (20:18 +0200)]
Changed wrong cvar in that balance config, fixed

9 years agoLower midair radius for Electro, cause you were hurting yourself a lot by shooting...
Mirio [Thu, 9 Apr 2015 18:01:30 +0000 (20:01 +0200)]
Lower midair radius for Electro, cause you were hurting yourself a lot by shooting the combo from a higher to lower level

9 years agoDon't immediately send name changes while you're typing (spam).
Rudolf Polzer [Thu, 9 Apr 2015 13:08:36 +0000 (15:08 +0200)]
Don't immediately send name changes while you're typing (spam).

This is because the engine automatically sends changes to $_cl_name to the server.

Maybe we later want to use another cvar for menu editing of the name... sucks.

9 years agoDon't show a clear textbox button in name entry fields.
Rudolf Polzer [Thu, 9 Apr 2015 13:02:20 +0000 (15:02 +0200)]
Don't show a clear textbox button in name entry fields.

9 years agoclearer button labels; still fixing button functions
BuddyFriendGuy [Thu, 9 Apr 2015 06:49:50 +0000 (02:49 -0400)]
clearer button labels; still fixing button functions

9 years agofix layout parameters; added comments
BuddyFriendGuy [Thu, 9 Apr 2015 02:09:07 +0000 (22:09 -0400)]
fix layout parameters; added comments

9 years agouse more readable keycode (suggested by terencehill)
BuddyFriendGuy [Thu, 9 Apr 2015 02:07:59 +0000 (22:07 -0400)]
use more readable keycode (suggested by terencehill)

9 years agorewrite the comment; change function return to void
BuddyFriendGuy [Thu, 9 Apr 2015 02:06:21 +0000 (22:06 -0400)]
rewrite the comment; change function return to void

9 years agoremove declaration of a removed function
BuddyFriendGuy [Wed, 8 Apr 2015 04:24:09 +0000 (00:24 -0400)]
remove declaration of a removed function

9 years agorefactor the filter for cleaner code
BuddyFriendGuy [Wed, 8 Apr 2015 01:25:41 +0000 (21:25 -0400)]
refactor the filter for cleaner code

9 years agoadd ctrl-f hotkey; fix variable name consistency
BuddyFriendGuy [Wed, 8 Apr 2015 00:06:15 +0000 (20:06 -0400)]
add ctrl-f hotkey; fix variable name consistency

9 years agoadded string filter to map list
BuddyFriendGuy [Tue, 7 Apr 2015 21:06:48 +0000 (17:06 -0400)]
added string filter to map list

9 years agoFix references to unfinished plasma ammo item
Mario [Mon, 6 Apr 2015 15:06:58 +0000 (01:06 +1000)]
Fix references to unfinished plasma ammo item

9 years agoMerge branch 'master' into terencehill/unlimited_ammo_fixes
terencehill [Sun, 5 Apr 2015 22:54:48 +0000 (00:54 +0200)]
Merge branch 'master' into terencehill/unlimited_ammo_fixes

9 years agoMerge branch 'matthiaskrgr/hudsetup' into 'master'
Mario [Sun, 5 Apr 2015 20:23:15 +0000 (20:23 +0000)]
Merge branch 'matthiaskrgr/hudsetup' into 'master'

fix commands

changed path to hudsetup map as requested by div0

See merge request !116

9 years agoMerge branch 'terencehill/mapvote_cursor_fix' into 'master'
Mario [Sun, 5 Apr 2015 18:09:27 +0000 (18:09 +0000)]
Merge branch 'terencehill/mapvote_cursor_fix' into 'master'

Fix for #1465 "joining server while on map selection screen locks cursor"

Setting hud_configure_prev to -1 to detect the very first frame isn't useful anymore.

See merge request !115

9 years agoFix for #1465 "joining server while on map selection screen locks cursor"
terencehill [Sun, 5 Apr 2015 12:16:30 +0000 (14:16 +0200)]
Fix for #1465 "joining server while on map selection screen locks cursor"

Setting hud_configure_prev to -1 to detect the very first frame isn't useful anymore.

9 years agofix commands
Matthias Krüger [Sat, 4 Apr 2015 20:07:47 +0000 (22:07 +0200)]
fix commands

9 years agoMerge branch 'matthiaskrgr/hudsetup' into 'master'
Mario [Fri, 3 Apr 2015 10:11:56 +0000 (10:11 +0000)]
Merge branch 'matthiaskrgr/hudsetup' into 'master'

Matthiaskrgr/hudsetup

makes hudsetup an actual map which is handled via map compile server.
the map is not shown in lsmaps or map selections as I saw it.

needs equivalent branch in map repo to work

See merge request !111

9 years agoMerge branch 'Mario/crosshair_blink_fix' into 'master'
Mario [Tue, 31 Mar 2015 12:49:25 +0000 (12:49 +0000)]
Merge branch 'Mario/crosshair_blink_fix' into 'master'

Merge branch Mario/crosshair_blink_fix (XXS merge request)

Fixes blinking crosshair while spectating.

See merge request !114

9 years agoDisable hit indication while spectating (serves no purpose as a spectator, disabling...
Mario [Tue, 31 Mar 2015 12:47:15 +0000 (23:47 +1100)]
Disable hit indication while spectating (serves no purpose as a spectator, disabling also fixes "blinking" bug)

9 years agoMerge branch 'Mario/accuracy_fix' into 'master'
Mario [Tue, 31 Mar 2015 12:37:17 +0000 (12:37 +0000)]
Merge branch 'Mario/accuracy_fix' into 'master'

Merge branch Mario/accuracy_fix (M merge request)

Restores the hacks to use Blaster weapon for secondary fire's accuracy counting in overkill and instagib.

See merge request !113

9 years agoFix secondary fire taking accuracy off the overkill/instagib primary attacks
Mario [Tue, 31 Mar 2015 12:20:35 +0000 (23:20 +1100)]
Fix secondary fire taking accuracy off the overkill/instagib primary attacks

9 years agoMerge branch 'Mario/nade_fixes' into 'master'
Mario [Fri, 27 Mar 2015 08:15:05 +0000 (08:15 +0000)]
Merge branch 'Mario/nade_fixes' into 'master'

Merge branch Mario/nade_fixes (M merge request)

Fixes nades disappearing when touching clips, allows dropping the nade down only when player is both looking down and holding crouch, fixes ultra fast overkill superweapon re-spawn times, adds an option to change the nade throw offset (possibly useful for servers that wish to attempt to reproduce the old overkill's nade throw offsets).

See merge request !112

9 years agoMerge branch 'master' into Mario/nade_fixes
Mario [Fri, 27 Mar 2015 07:58:43 +0000 (18:58 +1100)]
Merge branch 'master' into Mario/nade_fixes

9 years agoAllow maps to specify "warpzone_isboxy" "1" to disable exacttrigger logic on anything.
Rudolf Polzer [Tue, 24 Mar 2015 18:52:05 +0000 (19:52 +0100)]
Allow maps to specify "warpzone_isboxy" "1" to disable exacttrigger logic on anything.

This allows for some performance optimizations.

9 years agoMake the face normal calculation clearer by using less variables.
Rudolf Polzer [Tue, 24 Mar 2015 18:51:00 +0000 (19:51 +0100)]
Make the face normal calculation clearer by using less variables.

9 years agoKill dotproduct() function as it's built-in in QC; move cross() to warpzonelib so...
Rudolf Polzer [Tue, 24 Mar 2015 14:36:12 +0000 (15:36 +0100)]
Kill dotproduct() function as it's built-in in QC; move cross() to warpzonelib so warpzonelib can use it and stay standalone.

9 years agoFix some overbright maps when realtime world lights are enabled.
Rudolf Polzer [Sat, 21 Mar 2015 22:13:35 +0000 (23:13 +0100)]
Fix some overbright maps when realtime world lights are enabled.

9 years agoSupport workarea limiting of the window size.
Rudolf Polzer [Tue, 17 Mar 2015 11:03:11 +0000 (12:03 +0100)]
Support workarea limiting of the window size.

Requires an engine change to support getresolution(-2) to return the workarea.