]>
git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/log
Mario [Sun, 3 Nov 2013 08:59:33 +0000 (19:59 +1100)]
Merge branch 'master' into Mario/monsters
Rudolf Polzer [Wed, 30 Oct 2013 13:17:51 +0000 (14:17 +0100)]
A config file.
Rudolf Polzer [Wed, 30 Oct 2013 12:36:14 +0000 (13:36 +0100)]
Manual riddance of remaining "if not".
Rudolf Polzer [Wed, 30 Oct 2013 12:26:29 +0000 (13:26 +0100)]
Get rid of if not, step 1.
Rudolf Polzer [Fri, 25 Oct 2013 12:33:42 +0000 (14:33 +0200)]
inputtimeout: should be 0.066 (slightly less than 2 frames) so if one
frame was lost, it's compensated almost correctly.
Rudolf Polzer [Thu, 24 Oct 2013 11:23:09 +0000 (13:23 +0200)]
Actually, 0.04 was always intended here, not 0.07. Now checked engine
source that 0.04 still supports cl_netrepeatinput 1.
Mario [Thu, 24 Oct 2013 10:46:27 +0000 (21:46 +1100)]
Remove monster config system to fix compile
Mario [Fri, 18 Oct 2013 22:41:50 +0000 (09:41 +1100)]
Change invasion short name to inv
Mario [Fri, 18 Oct 2013 22:40:46 +0000 (09:40 +1100)]
Merge branch 'master' into Mario/monsters
Rudolf Polzer [Fri, 18 Oct 2013 01:15:57 +0000 (03:15 +0200)]
fix g_warmup_allguns 1
Rudolf Polzer [Fri, 18 Oct 2013 00:38:07 +0000 (02:38 +0200)]
Simpler function accumulation. Thanks, graphitemaster.
Samual Lenks [Thu, 17 Oct 2013 20:31:49 +0000 (16:31 -0400)]
Merge remote-tracking branch 'origin/samual/warmup_onlyonmap'
* origin/samual/warmup_onlyonmap:
Add feature to warmup_allguns which only provides weapons in the map
Samual Lenks [Thu, 17 Oct 2013 20:25:14 +0000 (16:25 -0400)]
Add feature to warmup_allguns which only provides weapons in the map
Rudolf Polzer [Thu, 17 Oct 2013 19:50:53 +0000 (21:50 +0200)]
Fix a division by zero.
Rudolf Polzer [Thu, 17 Oct 2013 19:44:56 +0000 (21:44 +0200)]
Get rid of an useless trace and like 1000 instructions each frame and player.
Rudolf Polzer [Mon, 14 Oct 2013 01:38:25 +0000 (03:38 +0200)]
fix typo
Rudolf Polzer [Sun, 13 Oct 2013 21:16:46 +0000 (23:16 +0200)]
OOPS. Add missing strcmp builtin defs. How could that have slipped through for ages...
Rudolf Polzer [Sun, 13 Oct 2013 20:34:17 +0000 (22:34 +0200)]
Hide empty servers a little bit more, making good servers stand out more.
Mario [Sun, 13 Oct 2013 17:00:37 +0000 (04:00 +1100)]
Use an effect for mage shield
Rudolf Polzer [Sun, 13 Oct 2013 16:09:57 +0000 (18:09 +0200)]
Fix colormap loading, fixes #1558
Rudolf Polzer [Sun, 13 Oct 2013 14:23:50 +0000 (16:23 +0200)]
Menu: avoid loading font twice on resolution switch; avoid extra r_restart on resolution switch; avoid menu reload on resolution switch
Mario [Sun, 13 Oct 2013 13:50:43 +0000 (00:50 +1100)]
Fix invasion accuracy
Rudolf Polzer [Sun, 13 Oct 2013 01:21:45 +0000 (03:21 +0200)]
ARGH, that really was a STUPID bug.
Samual Lenks [Sun, 13 Oct 2013 01:20:49 +0000 (21:20 -0400)]
Hide DVD resolutions
Mario [Sun, 13 Oct 2013 01:18:07 +0000 (12:18 +1100)]
Remove remaining monsters when round is won
Mario [Sun, 13 Oct 2013 00:42:20 +0000 (11:42 +1100)]
Disable health regeneration in invasion mode
Mario [Sun, 13 Oct 2013 00:32:43 +0000 (11:32 +1100)]
Reset spider slowness on respawn
Mario [Sun, 13 Oct 2013 00:26:06 +0000 (11:26 +1100)]
Attempt to fix mage teleporting behind walls
Mario [Sat, 12 Oct 2013 23:13:13 +0000 (10:13 +1100)]
Also apply slowness to monsters
Mario [Sat, 12 Oct 2013 22:58:41 +0000 (09:58 +1100)]
Fix shambler lightning bolt client prediction
Mario [Sat, 12 Oct 2013 22:49:22 +0000 (09:49 +1100)]
Replace spider attacks with a slowness effect
Mario [Sat, 12 Oct 2013 22:28:52 +0000 (09:28 +1100)]
Delay shambler attacks separately so they're not spammed
Mario [Sat, 12 Oct 2013 22:23:17 +0000 (09:23 +1100)]
Replace shambler attacks
Rudolf Polzer [Sat, 12 Oct 2013 22:09:07 +0000 (00:09 +0200)]
Add a checkbox for crypto_aeslevel.
Mario [Sat, 12 Oct 2013 21:42:33 +0000 (08:42 +1100)]
Use shield if enemy is too close
Mario [Sat, 12 Oct 2013 21:26:49 +0000 (08:26 +1100)]
Mage randomly teleports behind the enemy
Mario [Sat, 12 Oct 2013 20:54:52 +0000 (07:54 +1100)]
Increase monster idle sound delay & copy generic monster sounds for shambler
Mario [Sat, 12 Oct 2013 20:44:14 +0000 (07:44 +1100)]
Fix team colors
Mario [Sat, 12 Oct 2013 20:31:39 +0000 (07:31 +1100)]
New skill based damage calculation by Melanosuchus
Mario [Sat, 12 Oct 2013 19:58:31 +0000 (06:58 +1100)]
Colorize monsters based on skill
Mario [Sat, 12 Oct 2013 19:24:48 +0000 (06:24 +1100)]
Attempt to improve monster skill based damage calculation
Mario [Sat, 12 Oct 2013 18:23:14 +0000 (05:23 +1100)]
Remove disabled monsters (they don't fit very well & are too many to properly maintain)
Mario [Sat, 12 Oct 2013 17:55:11 +0000 (04:55 +1100)]
Begin working on a new mage attack
Rudolf Polzer [Sat, 12 Oct 2013 17:27:49 +0000 (19:27 +0200)]
Revert "Require >= 800x600 now. Users who want lower res and have a higher res desktop will need to manually set vid_width/vid_height." no, users probably can know what they are doing, and adjust expectations ;)
This reverts commit
f1a4f975c754e9993e5617dc86e7025779f75bd2 .
Rudolf Polzer [Sat, 12 Oct 2013 17:26:22 +0000 (19:26 +0200)]
Require >= 800x600 now. Users who want lower res and have a higher res desktop will need to manually set vid_width/vid_height.
Rudolf Polzer [Sat, 12 Oct 2013 17:18:54 +0000 (19:18 +0200)]
This (zero-sizes text warning) can now actually happen if someone sets 320x240 res. Let's just allow it.
Rudolf Polzer [Sat, 12 Oct 2013 17:17:00 +0000 (19:17 +0200)]
r_restart on conwidth/conheight change to reload fonts at the proper sizes
Rudolf Polzer [Sat, 12 Oct 2013 17:08:49 +0000 (19:08 +0200)]
kill more 640x480 hacks
Mario [Sat, 12 Oct 2013 16:41:10 +0000 (03:41 +1100)]
Add support for mobspawn argument "random" which spawns a randomly selected monster
Mario [Sat, 12 Oct 2013 16:33:23 +0000 (03:33 +1100)]
Cache monster list reply like map list & allow spawning mutator-blocked monsters with mobspawn command
Mario [Sat, 12 Oct 2013 16:09:49 +0000 (03:09 +1100)]
Disable extra monsters
Mario [Sat, 12 Oct 2013 06:55:57 +0000 (17:55 +1100)]
Clean up monster death counter checks
Mario [Sat, 12 Oct 2013 05:43:26 +0000 (16:43 +1100)]
Merge branch 'master' into Mario/monsters
Rudolf Polzer [Fri, 11 Oct 2013 14:54:39 +0000 (16:54 +0200)]
Fix compilation with gmqcc.
Rudolf Polzer [Fri, 11 Oct 2013 14:51:19 +0000 (16:51 +0200)]
Merge remote-tracking branch 'origin/mirceakitsune/func_train_beizer_curve'
Conflicts:
qcsrc/server/t_plats.qc
Rudolf Polzer [Fri, 11 Oct 2013 14:48:35 +0000 (16:48 +0200)]
Merge remote-tracking branch 'origin/mrbougo/quickfix-mapinfo_gen_typo', fixes #1756
* origin/mrbougo/quickfix-mapinfo_gen_typo:
fix typo in mapinfo generation
Rudolf Polzer [Fri, 11 Oct 2013 14:45:51 +0000 (16:45 +0200)]
Merge matthiaskrgr/cmds by squashing, fixes #1783.
Rudolf Polzer [Tue, 8 Oct 2013 21:46:05 +0000 (23:46 +0200)]
MinstaGib really should use SetModname... :(
Rudolf Polzer [Tue, 8 Oct 2013 16:44:37 +0000 (18:44 +0200)]
comments
Rudolf Polzer [Tue, 8 Oct 2013 03:51:16 +0000 (05:51 +0200)]
Fixes
Rudolf Polzer [Tue, 8 Oct 2013 00:58:50 +0000 (02:58 +0200)]
Refactor to try to support variable sized list items.
Rudolf Polzer [Tue, 8 Oct 2013 00:26:39 +0000 (02:26 +0200)]
Avoid memory leak in the resolution slider when toggling the fullscreen
checkbox.
Rudolf Polzer [Sat, 5 Oct 2013 15:52:15 +0000 (17:52 +0200)]
Update Morphed's credits
Rudolf Polzer [Fri, 4 Oct 2013 11:08:31 +0000 (13:08 +0200)]
Congratulations to terencehill - Italian is complete!
Rudolf Polzer [Fri, 4 Oct 2013 11:06:52 +0000 (13:06 +0200)]
Merge with transifex.
Rudolf Polzer [Fri, 4 Oct 2013 11:03:20 +0000 (13:03 +0200)]
Oops. Why wasn't merge-base updated...
Rudolf Polzer [Thu, 3 Oct 2013 15:09:00 +0000 (17:09 +0200)]
fix eval and when commands. Now this works:
rpn /i 91 def /k 2 def "/\"/pop 1\" \"/\\\"//k k 1 add def dup eval\\\" \\\"/pop 0\\\" i k mod 0 > when eval\" k k mul i > when eval" dup eval
Rudolf Polzer [Thu, 3 Oct 2013 10:11:25 +0000 (12:11 +0200)]
More Stuff. Belarusian is still empty.
Rudolf Polzer [Thu, 3 Oct 2013 09:56:02 +0000 (11:56 +0200)]
New pot.
Mario [Wed, 2 Oct 2013 05:16:27 +0000 (22:16 -0700)]
Clean up duplicate function a bit
Mario [Wed, 2 Oct 2013 05:05:52 +0000 (22:05 -0700)]
Use a new function for movement
Mario [Wed, 2 Oct 2013 04:51:18 +0000 (21:51 -0700)]
Remove old unused movelib functions
Mario [Wed, 2 Oct 2013 04:40:31 +0000 (21:40 -0700)]
Use normal movelib function for monster movement
Rudolf Polzer [Wed, 2 Oct 2013 04:33:32 +0000 (06:33 +0200)]
Add sorting logic to resolutions. Fixes a weird loop.
Rudolf Polzer [Wed, 2 Oct 2013 04:24:47 +0000 (06:24 +0200)]
textslider: allow inserting
Mario [Wed, 2 Oct 2013 04:24:15 +0000 (21:24 -0700)]
Merge branch 'master' into Mario/monsters
Rudolf Polzer [Tue, 1 Oct 2013 15:49:44 +0000 (17:49 +0200)]
an eval toy for the RPN hackers. RPN probably is turing complete with this.
Mario [Tue, 1 Oct 2013 13:41:42 +0000 (06:41 -0700)]
Merge branch 'master' into Mario/monsters
Mario [Tue, 1 Oct 2013 12:36:19 +0000 (05:36 -0700)]
Fix monster model scales again
Mario [Tue, 1 Oct 2013 11:10:58 +0000 (04:10 -0700)]
Properly network scale
Mario [Tue, 1 Oct 2013 10:46:25 +0000 (03:46 -0700)]
Also network scale for old monster models
Mario [Tue, 1 Oct 2013 10:05:10 +0000 (03:05 -0700)]
Remove some monster specific mins/maxs checks
Mario [Tue, 1 Oct 2013 09:57:53 +0000 (02:57 -0700)]
Network monster mins/maxs
Rudolf Polzer [Tue, 1 Oct 2013 08:58:21 +0000 (10:58 +0200)]
Make Samual's horribilificabilitudinitatibus system compile again.
Rudolf Polzer [Tue, 1 Oct 2013 08:29:33 +0000 (10:29 +0200)]
We can't use YO_DAWG_CPP any more.
fteqcc and gmqcc both dropped it - for a good reason, as it's non-C11
and we want the QC language go towards a more standard-like dialect to
help new coders.
Mario [Mon, 30 Sep 2013 12:18:06 +0000 (05:18 -0700)]
Fix slime not disappearing when it explodes & ultra slow monster revive times
Mario [Mon, 30 Sep 2013 10:48:08 +0000 (03:48 -0700)]
Update health while frozen & fix monster count not reducing if the monster was gibbed
Mario [Mon, 30 Sep 2013 10:27:07 +0000 (03:27 -0700)]
Remove some unused cvars
Mario [Mon, 30 Sep 2013 10:23:35 +0000 (03:23 -0700)]
Use the generic CSQC models implementation for client monster linking
Rudolf Polzer [Sun, 29 Sep 2013 11:49:44 +0000 (13:49 +0200)]
Merge branch 'divVerent/desktopfullscreen'
Mario [Sat, 28 Sep 2013 08:12:58 +0000 (01:12 -0700)]
Don't reduce owner's monster count if the monster can re-spawn
Mario [Sat, 28 Sep 2013 08:08:52 +0000 (01:08 -0700)]
Merge branch 'master' into Mario/monsters
Rudolf Polzer [Fri, 27 Sep 2013 13:20:31 +0000 (15:20 +0200)]
Add missing Map_Goto command.
Samual Lenks [Tue, 24 Sep 2013 19:08:18 +0000 (15:08 -0400)]
Re-enable scoreboard_accuracy by default...
Rudolf Polzer [Tue, 24 Sep 2013 10:43:25 +0000 (12:43 +0200)]
Improve skybox sRGB calculator further.
Rudolf Polzer [Tue, 24 Sep 2013 10:35:13 +0000 (12:35 +0200)]
fix math
Rudolf Polzer [Tue, 24 Sep 2013 08:22:28 +0000 (10:22 +0200)]
Add a command to convert -nosRGB to -sRGB skyboxes equivalently.
Rudolf Polzer [Tue, 24 Sep 2013 07:59:36 +0000 (09:59 +0200)]
RPN: more accuracy; add sRGB conversion macros.
Usage:
rpn 0.1 $rpn_sRGB_to_linear
Rudolf Polzer [Tue, 24 Sep 2013 07:50:13 +0000 (09:50 +0200)]
11 more rpn functions. Enjoy!
Rudolf Polzer [Mon, 23 Sep 2013 15:23:25 +0000 (17:23 +0200)]
Merge remote-tracking branch 'origin/divVerent/noautomaplist'
Conflicts:
qcsrc/common/mapinfo.qh