pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-01-07 18:43:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
300 Commits 88 Branches 159 Tags
Commit Graph

300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
j883376
b47597b813 Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes 2013-05-23 21:12:07 -04:00
j883376
d6ff01d63c Fix several GCC warnings 2013-05-23 20:22:42 -04:00
KimLS
815c3dc73f Merge branch 'master' of https://github.com/EQEmu/Server into string 2013-05-23 12:35:21 -07:00
KimLS
efe7092995 Merge and a few cleanup / bug fixes 2013-05-23 12:35:00 -07:00
Alex
12ddd30f67 Merge pull request #64 from af4t/master 
Windows compile fix: bots
 2013-05-23 12:30:06 -07:00
af4t
879ddb208b Windows compile fixes (bots) 2013-05-23 12:17:30 -04:00
Kemmler
70dab7d920 Merge pull request #6 from EQEmu/master 
Sync 2013-05-23
 2013-05-23 03:53:22 -07:00
KimLS
2840e32853 Merge branch 'master' into string 2013-05-23 00:56:27 -07:00
KimLS
320494c83d Windows compile fix 2013-05-23 00:55:29 -07:00
KimLS
e6fba5ba82 Merging 2013-05-23 00:31:02 -07:00
Arthur Ice
5255c236c3 added std:: to a lot of locations which where 
missed and added NOMINMAX to cmakelist
 2013-05-22 23:55:49 -07:00
Arthur Ice
ea2a1651d5 Merge branch 'master' into StringFormatting 
Conflicts:
	common/debug.cpp
 2013-05-22 18:07:39 -07:00
Arthur Ice
5c6e95f921 Merge branch 'master' of https://github.com/EQEmu/Server 2013-05-22 17:38:26 -07:00
Kemmler
555e21c3c7 Merge pull request #5 from EQEmu/master 
Sync 2013-05-22
 2013-05-22 16:31:52 -07:00
Michael Cook
0fdfe025cb Remove 'using namespaces std' fixes #61 2013-05-22 16:17:19 -04:00
Arthur Ice
d41331d948 Apparently the original implementation from facebook was incorrect. 
Fixed it, sadly this does mean we need to call vsnprintf twice.
Once to find out the size involved, a second time to apply.
 2013-05-20 17:51:08 -07:00
Arthur Ice
f1a487f606 Merge branch 'master' into StringFormatting. 
Cleaned up the problems. Tested on Linux. Still need to test on windows.

Conflicts:
	common/CMakeLists.txt
	common/MiscFunctions.cpp
	common/MiscFunctions.h
	common/debug.cpp
	world/Adventure.cpp
 2013-05-19 18:56:21 -07:00
Arthur Ice
fca9c1458b Merge branch 'master' of https://github.com/EQEmu/Server 
Conflicts:
	common/debug.cpp
	common/debug.h
	zone/PlayerCorpse.cpp
	zone/beacon.cpp
	zone/client.cpp
	zone/net.cpp
	zone/tribute.cpp
 2013-05-19 16:19:22 -07:00
Kemmler
7185ff25be Merge pull request #4 from EQEmu/master 
Sync 2013-05-16
 2013-05-16 05:11:13 -07:00
KimLS
312100e1c6 Azone fix for new compilers and possible fix for x64 2013-05-15 14:37:30 -07:00
j883376
f51f6e00c4 Add install paths to CMakeLists 2013-05-15 17:04:08 -04:00
KimLS
9e13a2271c Merge conflicts 2013-05-15 13:22:46 -07:00
Kemmler
b0fb8aa4be Merge pull request #3 from EQEmu/master 
Sync 2013-05-12
 2013-05-12 20:00:28 -07:00
josheb
b9a32185d7 Merge pull request #60 from josheb/master 
CHA scribe logic fix.
 2013-05-12 19:44:07 -07:00
root
0f880177e4 Merge branch 'master' of https://github.com/josheb/Server 2013-05-12 21:36:13 -05:00
root
7683252896 CHA scribe rule logic fix 2013-05-12 21:35:21 -05:00
Kemmler
ca9a1de44c Merge pull request #2 from EQEmu/master 
Sync 2013-05-11
 2013-05-11 21:49:12 -07:00
Michael Cook
73a4e87379 FreeBSD support and clean up of unnecessary ifdef FREEBSD 2013-05-11 14:32:14 -04:00
josheb
3a31ad55fb Merge pull request #5 from EQEmu/master 
sync
 2013-05-11 07:03:50 -07:00
Arthur Ice
b19755a313 For windows compile, moved definve of va_copy 2013-05-11 00:46:46 -07:00
Arthur Ice
9a139a7604 missed two string conversion functions. Moved them to StringUtil 2013-05-11 00:17:02 -07:00
Arthur Ice
373ff66240 moved string functions from MiscFunctions to StringUtil 2013-05-11 00:05:11 -07:00
Arthur Ice
babd3949f6 Added StringUtil h/cpp which contains StringFormat 2013-05-10 23:18:00 -07:00
Arthur Ice
3521472942 Merge branch 'master' of https://github.com/EQEmu/Server 2013-05-10 22:55:15 -07:00
Uleat
9ea71dd94f Merge pull request #58 from EQEmu/botproc 
-- Added Bot primary weapon proc (secondary and ranged already exist)
 2013-05-10 19:38:14 -07:00
Uleat
7a4cac84ac -- Added missing wrapper to bot update message 
-- Added notes to AESpell() update
 2013-05-10 22:24:56 -04:00
Uleat
c98c115cb6 -- Added Bot primary weapon proc (secondary and ranged already exist) 
-- Added Bard Bot Instrumentation bonuses
-- Added checks to avoid AE Buff casting on enemy mobs
-- Fixed a few typos in 'Vah Shir'-related code
 2013-05-09 20:57:02 -04:00
j883376
4bdd8b2502 Change space indentation to tabs 2013-05-09 11:37:51 -04:00
j883376
ffcff4aea1 Remove trailing whitespace 2013-05-09 11:13:16 -04:00
josheb
56b15f558c Merge pull request #4 from EQEmu/master 
sync
 2013-05-09 06:19:29 -07:00
af4t
6ea9c9218d Merge branch 'master' of git://github.com/EQEmu/Server 2013-05-09 09:07:16 -04:00
KimLS
7a93966158 VS2012 fix + return 0 fix 2013-05-08 21:03:35 -07:00
Arthur Ice
273cb928bf removed using namespace std 2013-05-08 18:13:33 -07:00
Arthur Ice
7735639e57 Merge branch 'c_11_conversion' of https://github.com/addtheice/Server 2013-05-08 17:40:04 -07:00
Arthur Ice
23c524812d Removed the _MSC_VER special cases for Visual Studio 2008 and lower. 
We no longer support 2008 and lower so these defines will never be used.
 2013-05-08 17:09:13 -07:00
Arthur Ice
c6ca89907c Converted a lot of the char[] stuff internally into std:string 
in addition I switched over to <string> rather than <string.h>
 2013-05-08 17:09:13 -07:00
Kemmler
87a75c6100 Merge pull request #1 from EQEmu/master 
Sync 2013-05-08
 2013-05-08 14:22:30 -07:00
mackal
f6100ed834 Fixed NPC::GetScore and XS_NPC_GetScore 2013-05-08 17:07:49 -04:00
Derision
21a9434f89 Changed dummy strings written into the TaskSelector packet from nullptr to ABCD since the packet size calculation was based on the strings being 4 characters long. 2013-05-08 20:02:55 +01:00
josheb
ea6e239d58 Merge pull request #54 from af4t/master 
VS2010 compatibility adjusts
 2013-05-08 05:46:49 -07:00