Commit graph

55 commits

Author SHA1 Message Date
Walter Julius 'GSIO01' Hennecke
6bde5fb79e Sync with rpgxEF repo ...
How long will we keep syncing these back?
2012-09-10 21:29:23 +02:00
Walter Julius 'GSIO01' Hennecke
350a734c14 Updated .gitignore with github defualt .gitignore 2012-09-07 17:10:02 +02:00
Walter Julius Hennecke
28f8cde337 Makefile update 2012-08-04 10:05:27 +02:00
Walter Julius Hennecke
b60d5c353e Update game/Makefile
x86_64 to x64 for Windows
2012-08-04 10:43:35 +03:00
Walter Julius Hennecke
e06aadb9d3 Update cgame/Makefile
x86_64 to x64 for Windows
2012-08-04 10:42:58 +03:00
Walter Julius Hennecke
5767df99e6 Fixed a minor bug in two Makefiles 2012-08-03 22:07:52 +02:00
Walter Julius Hennecke
69caaa5b03 Updated make files
- added cross compiling support with mingw32-64
- added windows 64bit support (only with cross compiling)
2012-08-03 21:50:58 +02:00
Harry Young
3153b9a2d6 Okay, all issues are resolved, the commands are in and the libs compile. All that's missing is the external file and a few failsaves. the latter I can do myself with some research, the first is outside my field of expertise.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-08-03 00:17:15 +02:00
Harry Young
fdd83d724b New target_shiphealth entity. I still need to do some debugging here, which I intend to do later tonight.
Minor tweaks.

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-08-02 18:56:55 +02:00
Walter Julius Hennecke
45e4d5f31c Fixed a bug ...
... where on maps without target_safezone(s) player wouldn't die through
self destruct.
2012-08-01 21:28:56 +02:00
Walter Julius Hennecke
301fcf69ae Revert "Made all function in g_active.c static where possible"
This reverts commit 5c1777541d.
2012-08-01 20:55:38 +02:00
Walter Julius Hennecke
b8d249950a Revert "Made function static in g_breakable.c where possible"
This reverts commit 3dceb25e0b.
2012-08-01 20:55:34 +02:00
Walter Julius Hennecke
291bbfa0ee Revert "Made functions static where possible in g_target.c"
This reverts commit 973eb5cd23.
2012-08-01 20:55:19 +02:00
Walter Julius Hennecke
973eb5cd23 Made functions static where possible in g_target.c 2012-08-01 20:43:13 +02:00
Walter Julius Hennecke
3dceb25e0b Made function static in g_breakable.c where possible 2012-08-01 20:28:02 +02:00
Walter Julius Hennecke
5c1777541d Made all function in g_active.c static where possible 2012-08-01 20:21:39 +02:00
Walter Julius Hennecke
2ba2ab8005 Fix for shader remapping 2012-08-01 15:28:27 +02:00
Walter Julius Hennecke
d586d19e33 Fixed mem access violation 2012-07-31 21:38:41 +02:00
Walter Julius Hennecke
b7d34b9994 Steps towards reenabling SQL suppport (much TODO)
- acccessing the user DB now works. if it does not exist it will be
  created
- adding new users with the useradd command works again
- userlogin command works again
2012-07-31 13:21:23 +02:00
Walter Julius Hennecke
d58101a275 Missed some things yesterday ... now fixed. 2012-07-28 12:27:28 +02:00
Walter Julius Hennecke
063a0734a5 Removed some unused things 2012-07-28 00:38:41 +02:00
Walter Julius Hennecke
a7cdbc0d95 Changed target_safezones to be freed after spawn again ....
... still can be toggled though :)
2012-07-28 00:16:21 +02:00
Walter Julius Hennecke
0f24d33722 final commit for this night 2012-07-27 01:19:07 +02:00
Walter Julius Hennecke
872f3326e0 target_safezone can now be toggled on and off
- target_safezone can now be toggled on and off
- added STARTON spawnflag
2012-07-27 00:50:55 +02:00
Walter Julius Hennecke
a0b1d4fc9e Added safe zones for self destruct ... 2012-07-27 00:18:35 +02:00
Walter Julius Hennecke
af3633db4d Added missing files ... 2012-07-26 22:48:42 +02:00
Walter Julius Hennecke
85910eb34d forgot to commit changes to game project file 2012-07-26 19:30:34 +02:00
Walter Julius Hennecke
bbbcf322f2 fixed cam shake for self destruct 2012-07-26 19:25:48 +02:00
Walter Julius Hennecke
f027e4ef19 Added a double linked list implementation 2012-07-26 19:19:22 +02:00
Harry Young
185451ad39 still need to learn things about git...
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-07-26 19:04:22 +02:00
Harry Young
51c98703cf Merge branch 'master' of git@github.com:UberGames/RPG-X2-rpgxEF.git
Conflicts:
	game/g_target.c
2012-07-26 18:53:16 +02:00
Harry Young
edcb550455 some fixes and some new stuff in here.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-07-26 18:50:31 +02:00
Walter Julius Hennecke
38fbd74209 Self destruct is now leathal 2012-07-26 17:43:42 +02:00
Walter Julius Hennecke
0b6c73beff Fixes to selfdestruct
Some fixes to selfdestruct .... not done yet still needs lots of debugging
...
2012-07-25 23:57:38 +02:00
Walter Julius Hennecke
6a7a1aa1ec Fixed some thing in selfdestruct command
- command was not registered on client side
- G_PrintClient with string of length > 1024 was split up
- added a missing }
2012-07-25 20:49:52 +02:00
Harry Young
31d1c720de Some fixes, however it won't compile due to a bug the compiler tells me about but taht I don't understand.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-07-25 18:22:43 +02:00
Harry Young
bb1797ba5c Minor fixes to the self destruct command
Added target_selfdestruct. I hope I got everything right so far...

I'd need someone to compile it for me. If I try to my game dies horribly...

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-07-25 17:31:17 +02:00
Harry Young
9b3931e37e Command-End of target_selfdestruct, eill try the entity once I'm back home.
Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-07-25 10:44:57 +02:00
Harry Young
41f98cbaad *Added Selfdestruct-sounds and a map to test them with both english and german audio-settings
*added folder RPG-X2 and put everything in there that might later become part of a .pk3 (excluding lua-associated files as they'll stand alone)

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>
2012-07-25 03:24:03 +02:00
Walter Julius Hennecke
ff9d79a85a Modified repairing of func_breakables
func_breakables now don't need a trigger anymore to be repaired which
saves one entity for each reapairable func_breakable. Still needs a bit of
finetuning and code cleanup.
2012-07-18 15:03:52 +02:00
unknown
0d022b90e3 Updated DEVELOPER macro
Updated DEVELOPER macro:
- now uses cvar g_developer instead of developer
- now allows single statement, multistatement, block, and multiple blocks
  as argument
2012-07-07 00:35:20 +02:00
unknown
b2461f9868 New developer macro and changed output for entity errors and Warnings
Added a new macro DEVELOPER(X) that only executes the statement X if the
cvar developer != 0.
Changed output of Entity errors and warnings:
- only printed if developer is set
- color changed to yello for all
- Errors are now printed as: [Entity-Error] ErrorMessage
- Warnings are now printed as: [Entity-Warning] WarningMessage
2012-07-06 17:01:47 +02:00
unknown
bedd10be73 Updated Makefiles
- Added warning level var $WL
- Added missing linking against pthread on linux
2012-07-06 15:28:39 +02:00
Walter Julius Hennecke
0827ec473c Changes to g_main.c and xml support
- changed some buffers to dynamically allocate the size the files to be
  read have
- xml support ... nothing done yet just empty files for now
2012-06-02 11:59:23 +02:00
Walter Julius Hennecke
74086df7ba - 2012-05-26 00:28:00 +02:00
Walter Julius Hennecke
661427ccbb Reformatting and function descriptions
Reformated and adde function descriptions to:
- game/g_trigger.c
2012-05-09 22:20:41 +02:00
Walter Julius Hennecke
5d0ee597ed Reformatting and function descriptions
Reformated some code in:
- game/g_turrets.c
- game/g_ui.c
Added function descriptions in:
- game/g_turrets.c
2012-05-09 19:14:59 +02:00
Walter Julius Hennecke
927a1d8d83 Reformating and Optimizing 2012-05-08 15:07:48 +02:00
Walter Julius Hennecke
0f01d35a58 Reformating and optimization
Changes in g_weapons.c:
- reformated a lot of comments
- reformated some code
- removed unused macros, variables, and functions
- made all functions and variables static where it was possible
2012-05-08 00:48:18 +02:00
Walter Julius Hennecke
a0a0ac525e Removed all #ifdefs that are no longer needed 2012-05-05 23:35:00 +02:00