Commit graph

192 commits

Author SHA1 Message Date
Walter Julius Hennecke
e6c5acd221 Merge remote-tracking branch 'origin/devel' into locations 2013-04-12 23:27:45 +02:00
Walter Julius Hennecke
ae24153bb5 Big documentation update 2013-04-12 23:26:59 +02:00
Walter Julius Hennecke
063f85b6a7 Merge remote-tracking branch 'origin/list' into locations 2013-04-12 21:05:46 +02:00
Walter Julius Hennecke
f144ae5f11 Multiple changes
- added additonal documentation
- modified G_GetEntityByTargetname to use list
- modified G_GetEntityByTarget to use list
- modified G_GetEntityByBmodel to use list
2013-04-11 22:10:45 +02:00
Walter Julius Hennecke
4e08198ead See extented description ...
- modified G_RadiusList to use lists
- modified G_GetNearestEnt to use lists
- modified G_GetNearestPlayer to use lists
2013-04-11 21:50:28 +02:00
Walter Julius Hennecke
911670539a Merge remote-tracking branch 'origin/list' into locations 2013-04-10 23:04:05 +02:00
Walter Julius Hennecke
e41a75403f See extended description
- modified G_RadiusListOfTypes
- added list_init
- modified list_remove
- updated list documentation
2013-04-10 23:03:13 +02:00
Walter Julius Hennecke
2f0bf79e77 Merge remote-tracking branch 'origin/list' into locations 2013-04-10 21:44:50 +02:00
Walter Julius Hennecke
9dbeae534d Documentation update ... 2013-04-10 21:44:02 +02:00
Walter Julius Hennecke
cad3ef6ac3 Documentation update ... 2013-04-10 21:43:20 +02:00
Walter Julius Hennecke
a84ed32ce4 Merge remote-tracking branch 'origin/devel' into locations 2013-04-09 23:32:01 +02:00
Walter Julius Hennecke
194a6d9ca2 Corrected a comment 2013-04-09 23:30:57 +02:00
Walter Julius Hennecke
d6ac2db43b Merge remote-tracking branch 'origin/list' into locations 2013-04-09 23:23:43 +02:00
Walter Julius Hennecke
ece161e04a Multiple changes (list module related)
- G_RadiusListOfTypes now uses list instead of entity pointer array
- added list_clear function
2013-04-09 23:22:47 +02:00
Walter Julius Hennecke
b334114ae2 Merge remote-tracking branch 'origin/list' into locations 2013-04-09 22:43:20 +02:00
Walter Julius Hennecke
214cf3fc47 Multiple changes
- updated documentation
- corrected data type for two list_append calls
2013-04-09 22:40:50 +02:00
Walter Julius Hennecke
4a14f2a9fa Added possibility to add pointers to lists 2013-04-09 22:27:38 +02:00
Walter Julius Hennecke
2bb9e590ce Merge remote-tracking branch 'origin/list' into locations 2013-04-09 22:10:20 +02:00
Walter Julius Hennecke
f35bd7ec1d Modified some code due to use of container ...
The list now can store C types and and strings directly (without the
need of them to be in a struct).
2013-04-09 22:09:29 +02:00
Walter Julius Hennecke
a49058ba98 Added type for level locations 2013-04-07 00:57:36 +02:00
Walter Julius Hennecke
f8d1bd2419 Bugfix
Added a missing malloc
2013-04-07 00:06:08 +02:00
Walter Julius Hennecke
b58d94864d Added addtional functions ...
- added list_append
- added list_prepend
2013-04-06 22:42:06 +02:00
Walter Julius Hennecke
afe3614b2a Modified list module and sublicensed it 2013-04-06 22:27:08 +02:00
Harry Young
c9a8d31f3d More work on admin UI
I had some issues with the standalone Welcome Page so I modified the Login Page to include this and moved the Admin-Check there as well.
I altered the Defines in ui_admin.c and updated on other positions where required so far (I'll adapt the remainder as time comes)
I enabled subfolders for the Music-UI (I don't see why this is a problem at all)
I the Ingame menu I completely disabled the HC-Butttons.
Added Logout-Ability for userlogion (adapted from adminlogin)

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-03-20 11:33:29 +01:00
Harry Young
6694f3845f More work on Admin UI
Finished Login UI
Build Welcome UI
Finished Hook
some cleanup

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-03-19 13:15:19 +01:00
Harry Young
18e3921d4f First series of mods to Admin UI
Implementet the Relaod-Callvote in Ingame
Build a rudimentary Login system

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-03-18 14:36:06 +01:00
Harry Young
cdcd259913 Quickly fixed FS#37 - Self Destruct Function kills when aborted
Turned out i removed that part of the think when I cleaned up stuff
Added a new end-think to remove the entity safely.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-03-12 06:11:54 +01:00
StFi
9736433110 Linux Beta 2.3 Fix 2013-03-04 19:52:26 +01:00
Walter Julius Hennecke
e16722e2d2 Finished cleanup and reformating of g_local.h 2013-02-25 22:51:41 +01:00
Walter Julius Hennecke
fed00c7f67 Cleanup and reformatting of some structs in g_local.h 2013-02-25 13:23:30 +01:00
Walter Julius Hennecke
fd6e6fca30 Fix for FS#29
Fix for FS#29 - Server Change on ui_transporter seems broken
2013-02-25 12:15:53 +01:00
Harry Young
6ee97b6843 definition-Fixes
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-02-24 14:20:59 +01:00
Harry Young
5e6d26aeda Some minor fixes
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-02-21 21:51:34 +01:00
Walter Hennecke
2ffffcd6e4 Bug fixes to list module 2013-02-13 11:57:18 +01:00
Harry Young
c496a24d57 Added Safezone-Turnoff back in and did some more cleanup
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-02-11 06:21:55 +01:00
Harry Young
3164fdfa33 A lot of stuff!
-replaced target_safezone with target_sone (backwardscompability is in place)
--It now servers for more purposes than just escapepods. Also included in the MSD-System

-Removed list-iteration for safezones.
--They gave me such a hard time and put unneeded limits in place (like one time shots)
--now we loop trough all entities instead and find those with the right criteria and go from there

-For safezones clients are now tagged in the backend (new gclients_t-field)
--only those that aren't taggesd this way will be killed
--Closed FS#30

-First version of shiphealth HUD (FS#8, needs testing)
--There were som modifications made to the full UI as well

-Both Selfdestruct and Shiphealth communication to the client go via command now, the events got removed
-new Version Notation: RPG-X V 2.3 CB 4

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-02-10 00:31:04 +01:00
Harry Young
3797e35c61 Added target reset to MMB-Repair and made some mods to prevent multi-resetting
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-13 22:02:59 +01:00
Harry Young
76c0d8fea6 More work on torpedo relaod command
should be finished now

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-12 17:20:27 +01:00
Harry Young
c2e135da16 Added reloadtorpedos-command and som fixes for weapon-fx
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-12 02:33:04 +01:00
Harry Young
f3f7345ccd Minor fixes to selfdestruct + audio for terminal count
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-09 19:27:36 +01:00
Harry Young
ec431c010a Finished work on selfdestruct
Countdown Clock is working
Overall script is working again
removed some unused stuff
added a few more failsafes
did some finetuning

sometimes the sounds don't trigger but I don't think that is my fault...

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2013-01-08 13:54:13 +01:00
Walter Julius Hennecke
b99a372ff1 Removed ...
* g_teamautojoin
* g_teamforcebalance
2012-12-22 19:15:53 +01:00
Walter Julius Hennecke
0e4ac8e9e6 Removed g_friendlyfire as there are no teams in RPG-X 2012-12-22 19:13:45 +01:00
Walter Julius Hennecke
b5a5a4a4d8 Fix for FS#27 - No Weapon Damage 2012-12-22 19:12:00 +01:00
Harry Young
0cff0dec5a Merge branch 'master' of git@github.com:UberGames/rpgxEF.git 2012-12-21 11:16:43 +01:00
Harry Young
fe6a0f4b7c Removed some unneeded stuff from selfdestruct
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-12-21 11:16:30 +01:00
Walter Julius Hennecke
62f54b070e Continued work on slq login menu
* note: new graphics not uploaded yet
2012-12-20 22:46:38 +01:00
Walter Julius Hennecke
9101ad9a3b Added temporary command sqlmenu to the client ...
... to make designing it easier.
2012-12-20 00:35:30 +01:00
Walter Julius Hennecke
8f345fbfde Udate to precache files
* updated precache file format
* prevention of duplicate shaders in file generated with the
genPrecacheFile command
2012-12-18 19:02:33 +01:00
Walter Julius Hennecke
a1d826d8fe Some additions
* Fixed precaching on client side
* added generatePrecacheFile command on server side that will generate a
new precache file (not quite done yet but it'll work for now)
* removed some debuging outputs from G_LoadTimedMessages
* fixed check for '}' beeing on the worng place in G_LoadTimedMessages
2012-12-17 19:13:46 +01:00